Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] godot: update to 3.4.5
@ 2022-08-05  0:24 Relected
  2022-08-05  0:33 ` abenson
                   ` (28 more replies)
  0 siblings, 29 replies; 30+ messages in thread
From: Relected @ 2022-08-05  0:24 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Relected/void-packages master
https://github.com/void-linux/void-packages/pull/38473

godot: update to 3.4.5
<!-- Uncomment relevant sections and delete options which are not applicable -->

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


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

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

From 9ab49387e3eb179b48383e68fdb6e2a88246aa72 Mon Sep 17 00:00:00 2001
From: Relected <m7md11xd@gmail.com>
Date: Fri, 5 Aug 2022 02:20:32 +0200
Subject: [PATCH] godot: update to 3.4.5

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

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index c38f3f8c525a..ee19c7fa5823 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,6 +1,6 @@
 # Template file for 'godot'
 pkgname=godot
-version=3.4
+version=3.4.5
 revision=1
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 wrksrc="${pkgname}-${version}-stable"
@@ -27,7 +27,7 @@ maintainer="Nick Hahn <nick.hahn@hotmail.de>"
 license="MIT"
 homepage="https://www.godotengine.org/"
 distfiles="https://github.com/godotengine/${pkgname}/archive/${version}-stable.tar.gz"
-checksum=61749d12cb094c0be2a2c451ae2aceb8bb45f59f67fcd13fcd8f0c9114262d88
+checksum=87c988d52e7a06100d30164a18c213e022ef175a6de3bd945352bacc87d5289c
 nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio
 
 CFLAGS+=" -fPIE -fPIC"

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

* Re: godot: update to 3.4.5
  2022-08-05  0:24 [PR PATCH] godot: update to 3.4.5 Relected
@ 2022-08-05  0:33 ` abenson
  2022-08-05  1:04 ` Relected
                   ` (27 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: abenson @ 2022-08-05  0:33 UTC (permalink / raw)
  To: ml

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

New comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/38473#issuecomment-1205911630

Comment:
Please don't open and close commits, it makes it harder to track PRs; just squash the commits and force push.

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

* Re: godot: update to 3.4.5
  2022-08-05  0:24 [PR PATCH] godot: update to 3.4.5 Relected
  2022-08-05  0:33 ` abenson
@ 2022-08-05  1:04 ` Relected
  2022-08-05  1:08 ` Relected
                   ` (26 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: Relected @ 2022-08-05  1:04 UTC (permalink / raw)
  To: ml

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

New comment by Relected on void-packages repository

https://github.com/void-linux/void-packages/pull/38473#issuecomment-1205929164

Comment:
@abenson I'm very sorry I didnt know that this feature exists, I will try to not do that next time

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

* Re: godot: update to 3.4.5
  2022-08-05  0:24 [PR PATCH] godot: update to 3.4.5 Relected
  2022-08-05  0:33 ` abenson
  2022-08-05  1:04 ` Relected
@ 2022-08-05  1:08 ` Relected
  2022-08-05 13:53 ` Relected
                   ` (25 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: Relected @ 2022-08-05  1:08 UTC (permalink / raw)
  To: ml

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

New comment by Relected on void-packages repository

https://github.com/void-linux/void-packages/pull/38473#issuecomment-1205929164

Comment:
@abenson I'm very sorry I didnt know that this feature exists, I will try to not do that next time

edit: also I'm relatively new to git, I only know the bare basics of it so please forgive me.

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

* Re: godot: update to 3.4.5
  2022-08-05  0:24 [PR PATCH] godot: update to 3.4.5 Relected
                   ` (2 preceding siblings ...)
  2022-08-05  1:08 ` Relected
@ 2022-08-05 13:53 ` Relected
  2022-08-05 14:51 ` [PR PATCH] [Updated] " Relected
                   ` (24 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: Relected @ 2022-08-05 13:53 UTC (permalink / raw)
  To: ml

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

New comment by Relected on void-packages repository

https://github.com/void-linux/void-packages/pull/38473#issuecomment-1206483920

Comment:
@classabbyamp also do you have alsa-pipewire installed by any chance? some people are saying that there is no error upon launch, some do, and i dont know which one is right.

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

* Re: [PR PATCH] [Updated] godot: update to 3.4.5
  2022-08-05  0:24 [PR PATCH] godot: update to 3.4.5 Relected
                   ` (3 preceding siblings ...)
  2022-08-05 13:53 ` Relected
@ 2022-08-05 14:51 ` Relected
  2022-08-05 16:24 ` Relected
                   ` (23 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: Relected @ 2022-08-05 14:51 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Relected/void-packages master
https://github.com/void-linux/void-packages/pull/38473

godot: update to 3.4.5
<!-- Uncomment relevant sections and delete options which are not applicable -->

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


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

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

From 9ab49387e3eb179b48383e68fdb6e2a88246aa72 Mon Sep 17 00:00:00 2001
From: Relected <m7md11xd@gmail.com>
Date: Fri, 5 Aug 2022 02:20:32 +0200
Subject: [PATCH] godot: update to 3.4.5

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

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index c38f3f8c525a..ee19c7fa5823 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,6 +1,6 @@
 # Template file for 'godot'
 pkgname=godot
-version=3.4
+version=3.4.5
 revision=1
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 wrksrc="${pkgname}-${version}-stable"
@@ -27,7 +27,7 @@ maintainer="Nick Hahn <nick.hahn@hotmail.de>"
 license="MIT"
 homepage="https://www.godotengine.org/"
 distfiles="https://github.com/godotengine/${pkgname}/archive/${version}-stable.tar.gz"
-checksum=61749d12cb094c0be2a2c451ae2aceb8bb45f59f67fcd13fcd8f0c9114262d88
+checksum=87c988d52e7a06100d30164a18c213e022ef175a6de3bd945352bacc87d5289c
 nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio
 
 CFLAGS+=" -fPIE -fPIC"

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

* Re: [PR PATCH] [Updated] godot: update to 3.4.5
  2022-08-05  0:24 [PR PATCH] godot: update to 3.4.5 Relected
                   ` (4 preceding siblings ...)
  2022-08-05 14:51 ` [PR PATCH] [Updated] " Relected
@ 2022-08-05 16:24 ` Relected
  2022-08-05 17:01 ` [PR PATCH] [Updated] godot: update to 3.5 Relected
                   ` (22 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: Relected @ 2022-08-05 16:24 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Relected/void-packages master
https://github.com/void-linux/void-packages/pull/38473

godot: update to 3.4.5
<!-- Uncomment relevant sections and delete options which are not applicable -->

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


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

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

From 9ab49387e3eb179b48383e68fdb6e2a88246aa72 Mon Sep 17 00:00:00 2001
From: Relected <m7md11xd@gmail.com>
Date: Fri, 5 Aug 2022 02:20:32 +0200
Subject: [PATCH] godot: update to 3.4.5

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

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index c38f3f8c525a..ee19c7fa5823 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,6 +1,6 @@
 # Template file for 'godot'
 pkgname=godot
-version=3.4
+version=3.4.5
 revision=1
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 wrksrc="${pkgname}-${version}-stable"
@@ -27,7 +27,7 @@ maintainer="Nick Hahn <nick.hahn@hotmail.de>"
 license="MIT"
 homepage="https://www.godotengine.org/"
 distfiles="https://github.com/godotengine/${pkgname}/archive/${version}-stable.tar.gz"
-checksum=61749d12cb094c0be2a2c451ae2aceb8bb45f59f67fcd13fcd8f0c9114262d88
+checksum=87c988d52e7a06100d30164a18c213e022ef175a6de3bd945352bacc87d5289c
 nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio
 
 CFLAGS+=" -fPIE -fPIC"

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

* Re: [PR PATCH] [Updated] godot: update to 3.5
  2022-08-05  0:24 [PR PATCH] godot: update to 3.4.5 Relected
                   ` (5 preceding siblings ...)
  2022-08-05 16:24 ` Relected
@ 2022-08-05 17:01 ` Relected
  2022-08-05 17:09 ` classabbyamp
                   ` (21 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: Relected @ 2022-08-05 17:01 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Relected/void-packages master
https://github.com/void-linux/void-packages/pull/38473

godot: update to 3.5
<!-- Uncomment relevant sections and delete options which are not applicable -->

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


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

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

From 9ab49387e3eb179b48383e68fdb6e2a88246aa72 Mon Sep 17 00:00:00 2001
From: Relected <m7md11xd@gmail.com>
Date: Fri, 5 Aug 2022 02:20:32 +0200
Subject: [PATCH 01/11] godot: update to 3.4.5

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

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index c38f3f8c525a..ee19c7fa5823 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,6 +1,6 @@
 # Template file for 'godot'
 pkgname=godot
-version=3.4
+version=3.4.5
 revision=1
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 wrksrc="${pkgname}-${version}-stable"
@@ -27,7 +27,7 @@ maintainer="Nick Hahn <nick.hahn@hotmail.de>"
 license="MIT"
 homepage="https://www.godotengine.org/"
 distfiles="https://github.com/godotengine/${pkgname}/archive/${version}-stable.tar.gz"
-checksum=61749d12cb094c0be2a2c451ae2aceb8bb45f59f67fcd13fcd8f0c9114262d88
+checksum=87c988d52e7a06100d30164a18c213e022ef175a6de3bd945352bacc87d5289c
 nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio
 
 CFLAGS+=" -fPIE -fPIC"

From 5a2c77e96feddf914788cb5cb1792745b4dada52 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 3 Aug 2022 00:08:14 -0400
Subject: [PATCH 02/11] CONTRIBUTING.md: add instructions for testing PRs

---
 CONTRIBUTING.md | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index da3bef29c883..3f33aeb1d974 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -129,3 +129,25 @@ Please abstain from temporarily closing a pull request while revising the templa
 
 Once the reviewers have merged the pull request, our [build server](http://build.voidlinux.org) is automatically triggered and builds
 all packages in the pull request for all supported platforms. Upon completion, the packages are available to all Void Linux users.
+
+## Testing Pull Requests
+
+While it is the responsibility of the PR creator to test changes before sending it, one person can't test all configuration options, usecases, hardware, etc.
+Testing new package submissions and updates is always helpful, and is a great way to get started with contributing.
+First, [clone the repository](https://github.com/void-linux/void-packages#quick-start) if you haven't done so already.
+Then check out the pull request, either with `github-cli`:
+
+    $ gh pr checkout <number>
+
+Or with `git`:
+
+If your local void-packages repository is cloned from your fork, you may need to add the main repository as a remote first:
+
+    $ git remote add upstream https://github.com/void-linux/void-packages.git
+
+Then fetch and check out the PR (replacing `<remote>` with either `origin` or `upstream`):
+
+    $ git fetch <remote> pull/<number>/head:<branch-name>
+    $ git checkout <branch-name>
+
+Then [build and install](https://github.com/void-linux/void-packages#building-packages) the package and test its functionality.

From a282e80a78785e68e99593b535a8b0876e62eb5c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 2 Aug 2022 18:46:18 +0200
Subject: [PATCH 03/11] xcdroast: remove package

gtk2
---
 srcpkgs/removed-packages/template |  1 +
 srcpkgs/xcdroast/template         | 14 --------------
 2 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 srcpkgs/xcdroast/template

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 4a325984709b..c716bb3a0b6f 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -416,6 +416,7 @@ replaces="
  wicd-gtk<=1.7.4_6
  wireguard-go<=0.0.20181222_2
  wireshark-gtk<=3.0.7_1
+ xcdroast<=1.19_1
  xlennart<=1.1.1_1
  xmonad-contrib<=0.16_3
  xmonad<=0.15_5
diff --git a/srcpkgs/xcdroast/template b/srcpkgs/xcdroast/template
deleted file mode 100644
index a8334bbb0dd1..000000000000
--- a/srcpkgs/xcdroast/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'xcdroast'
-pkgname=xcdroast
-version=1.19
-revision=1
-build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="gtk+-devel alsa-lib-devel"
-depends="cdrtools"
-short_desc="Flexible frontend for optical disc authoring"
-maintainer="Nick Hahn <nick.hahn@hotmail.de>"
-license="GPL-2.0-only"
-homepage="http://www.xcdroast.org"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=86f52ba796d4d8ad346a4c73667f728a79d96e1045c239cf94d1529e2c271615

From 799f41402a6f8cad9c5bb9fc053480489cb08b64 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 2 Aug 2022 18:40:40 +0200
Subject: [PATCH 04/11] yabause-gtk: remove package

gtk2, dead upstream
---
 srcpkgs/removed-packages/template            |  1 +
 srcpkgs/yabause-gtk/patches/fix-cflags.patch | 13 -------------
 srcpkgs/yabause-gtk/patches/rwx.patch        | 20 --------------------
 srcpkgs/yabause-gtk/template                 | 19 -------------------
 srcpkgs/yabause-gtk/update                   |  1 -
 5 files changed, 1 insertion(+), 53 deletions(-)
 delete mode 100644 srcpkgs/yabause-gtk/patches/fix-cflags.patch
 delete mode 100644 srcpkgs/yabause-gtk/patches/rwx.patch
 delete mode 100644 srcpkgs/yabause-gtk/template
 delete mode 100644 srcpkgs/yabause-gtk/update

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index c716bb3a0b6f..873cf9c1927d 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -422,6 +422,7 @@ replaces="
  xmonad<=0.15_5
  xnoise-devel<=0.2.21_4
  xnoise<=0.2.21_4
+ yabause-gtk<=0.9.15_2
  yt-play<=20140117_2
  yturl<=2.0.2_5
  zbackup<=1.4.4_23
diff --git a/srcpkgs/yabause-gtk/patches/fix-cflags.patch b/srcpkgs/yabause-gtk/patches/fix-cflags.patch
deleted file mode 100644
index b69426bd3016..000000000000
--- a/srcpkgs/yabause-gtk/patches/fix-cflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: src/CMakeLists.txt
-===================================================================
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -659,7 +659,7 @@ else ()
- 	set(yabause_SOURCES ${yabause_SOURCES} sock-dummy.c thr-dummy.c)
- endif ()
- 
--set(YAB_OPTIMIZATION "-O3" CACHE STRING "Override optimization level")
-+set(YAB_OPTIMIZATION "" CACHE STRING "Override optimization level")
- 
- if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i686")
- 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${YAB_OPTIMIZATION} -march=i686 -msse")
diff --git a/srcpkgs/yabause-gtk/patches/rwx.patch b/srcpkgs/yabause-gtk/patches/rwx.patch
deleted file mode 100644
index bb0491b373f8..000000000000
--- a/srcpkgs/yabause-gtk/patches/rwx.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/sh2_dynarec/linkage_x64.s	2013-03-11 20:29:53.112870900 +0100
-+++ b/src/sh2_dynarec/linkage_x64.s	2013-03-11 20:31:48.856778600 +0100
-@@ -747,3 +747,7 @@ breakpoint:
- 	ret
- 	/* Set breakpoint here for debugging */
- 	.size	breakpoint, .-breakpoint
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
---- a/src/sh2_dynarec/linkage_x86.s	2013-03-11 20:30:08.157693100 +0100
-+++ b/src/sh2_dynarec/linkage_x86.s	2013-03-11 20:32:30.993310600 +0100
-@@ -743,3 +743,7 @@ breakpoint:
- 	ret
- 	/* Set breakpoint here for debugging */
- 	.size	breakpoint, .-breakpoint
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
diff --git a/srcpkgs/yabause-gtk/template b/srcpkgs/yabause-gtk/template
deleted file mode 100644
index 841c0af36b78..000000000000
--- a/srcpkgs/yabause-gtk/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'yabause-gtk'
-pkgname=yabause-gtk
-version=0.9.15
-revision=2
-wrksrc="${pkgname%-gtk}-${version}"
-build_style=cmake
-configure_args="-DYAB_PORTS=gtk -DYAB_NETWORK=ON -DYAB_OPTIMIZED_DMA=ON"
-hostmakedepends="pkg-config"
-makedepends="libXmu-devel libfreeglut-devel gtkglext-devel libopenal-devel SDL2-devel"
-depends="desktop-file-utils"
-short_desc="Sega Saturn emulator with GTK UI)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://yabause.org/"
-distfiles="https://download.tuxfamily.org/yabause/releases/${version}/yabause-${version}.tar.gz"
-checksum=4334c43fe0f3ff297bac8e91f4e059fe5fd276291faff2489e37b5b3a4ccc2b2
-nopie=yes
-# Would need m68kmake built for the host
-nocross=yes
diff --git a/srcpkgs/yabause-gtk/update b/srcpkgs/yabause-gtk/update
deleted file mode 100644
index b93f2e9eada0..000000000000
--- a/srcpkgs/yabause-gtk/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname="${pkgname%-gtk}"

From 5bbb705cad1b760371626fa74c1ff0359c93c48d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 2 Aug 2022 18:44:15 +0200
Subject: [PATCH 05/11] xnp2: remove package

gtk2, dead upstream
---
 srcpkgs/removed-packages/template           |  1 +
 srcpkgs/xnp2/INSTALL.msg                    |  7 ------
 srcpkgs/xnp2/patches/define_cplusplus.patch | 17 -------------
 srcpkgs/xnp2/template                       | 27 ---------------------
 srcpkgs/xnp2/update                         |  1 -
 5 files changed, 1 insertion(+), 52 deletions(-)
 delete mode 100644 srcpkgs/xnp2/INSTALL.msg
 delete mode 100644 srcpkgs/xnp2/patches/define_cplusplus.patch
 delete mode 100644 srcpkgs/xnp2/template
 delete mode 100644 srcpkgs/xnp2/update

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 873cf9c1927d..392f1e39e130 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -420,6 +420,7 @@ replaces="
  xlennart<=1.1.1_1
  xmonad-contrib<=0.16_3
  xmonad<=0.15_5
+ xnp2<=0.86_2
  xnoise-devel<=0.2.21_4
  xnoise<=0.2.21_4
  yabause-gtk<=0.9.15_2
diff --git a/srcpkgs/xnp2/INSTALL.msg b/srcpkgs/xnp2/INSTALL.msg
deleted file mode 100644
index 53fc91ec76da..000000000000
--- a/srcpkgs/xnp2/INSTALL.msg
+++ /dev/null
@@ -1,7 +0,0 @@
-The following packages are not required for operation, but are necessary
-to support extra features:
-
-SDL2       Required when using sound and joystick.
-SDL2_mixer Required when playing PCM such as floppy seek sound.
-libXxf86vm Required when using full screen function to change screen resolution.
-libusb     Required when supporting C86 BOX.
diff --git a/srcpkgs/xnp2/patches/define_cplusplus.patch b/srcpkgs/xnp2/patches/define_cplusplus.patch
deleted file mode 100644
index 12b24c90bb28..000000000000
--- a/srcpkgs/xnp2/patches/define_cplusplus.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/x11/compiler.h.old	2018-02-02 17:00:29.174895866 +0000
-+++ b/x11/compiler.h	2018-02-02 17:00:41.199160781 +0000
-@@ -117,12 +117,14 @@
- #define	MAX_PATH	MAXPATHLEN
- #endif
- 
-+#ifndef __cplusplus
- #ifndef	max
- #define	max(a,b)	(((a) > (b)) ? (a) : (b))
- #endif
- #ifndef	min
- #define	min(a,b)	(((a) < (b)) ? (a) : (b))
- #endif
-+#endif /* __cplusplus */
- 
- #ifndef	ZeroMemory
- #define	ZeroMemory(d,n)		memset((d), 0, (n))
diff --git a/srcpkgs/xnp2/template b/srcpkgs/xnp2/template
deleted file mode 100644
index 7ae496fc224e..000000000000
--- a/srcpkgs/xnp2/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'xnp2'
-pkgname=xnp2
-version=0.86
-revision=2
-build_wrksrc=x11
-build_style=gnu-configure
-configure_args="--enable-ia32 --enable-build-all"
-hostmakedepends="pkg-config nasm"
-makedepends="gtk+-devel SDL2-devel"
-short_desc="Port for UNIX with X11 of the Neko Project II PC-9801 emulator"
-maintainer="hipperson0 <hipperson0@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://www.nonakap.org/np2"
-distfiles="https://www.nonakap.org/np2/release/xnp2-${version}.tar.bz2"
-checksum=e0b8c93f54682a4b3373907fd9ffe78094f95f7430dffc5038eccbcc4c3f78fd
-
-do_install() {
-	vbin xnp2
-	vbin xnp21
-	vman xnp2.1
-	vman xnp2.1j
-	vman xnp21.1
-	vman xnp21.1j
-	vdoc README.ja
-	sed '/\*\//q' main.c > LICENSE
-	vlicense LICENSE
-}
diff --git a/srcpkgs/xnp2/update b/srcpkgs/xnp2/update
deleted file mode 100644
index 04584df73d29..000000000000
--- a/srcpkgs/xnp2/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="20140607"

From 032d290829598f66a768410f9b02ab88aee13f5f Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 5 Aug 2022 00:44:21 +0000
Subject: [PATCH 06/11] graphviz-x11: remove stale symlink

---
 srcpkgs/graphviz-x11 | 1 -
 1 file changed, 1 deletion(-)
 delete mode 120000 srcpkgs/graphviz-x11

diff --git a/srcpkgs/graphviz-x11 b/srcpkgs/graphviz-x11
deleted file mode 120000
index abecf5d9457d..000000000000
--- a/srcpkgs/graphviz-x11
+++ /dev/null
@@ -1 +0,0 @@
-graphviz
\ No newline at end of file

From 2f1ce58a19db21eeee706175863be750c6ec7c3c Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 4 Aug 2022 20:06:49 -0400
Subject: [PATCH 07/11] watchexec: update to 1.20.5

---
 srcpkgs/watchexec/patches/fix-tests.patch | 14 --------------
 srcpkgs/watchexec/template                |  4 ++--
 2 files changed, 2 insertions(+), 16 deletions(-)
 delete mode 100644 srcpkgs/watchexec/patches/fix-tests.patch

diff --git a/srcpkgs/watchexec/patches/fix-tests.patch b/srcpkgs/watchexec/patches/fix-tests.patch
deleted file mode 100644
index f210de15e314..000000000000
--- a/srcpkgs/watchexec/patches/fix-tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# Remove debug notice from test case
-diff --git a/crates/cli/tests/snapshots/help__help_unix.snap b/crates/cli/tests/snapshots/help__help_unix.snap
-index b55782f022..c5642f98ce 100644
---- a/crates/cli/tests/snapshots/help__help_unix.snap
-+++ b/crates/cli/tests/snapshots/help__help_unix.snap
-@@ -2,8 +2,6 @@
- source: crates/cli/tests/help.rs
- expression: "String::from_utf8(output.stdout).unwrap()"
- ---
--⚠ DEBUG BUILD ⚠
--
- watchexec 1.20.2
- Execute commands when watched files change
- 
diff --git a/srcpkgs/watchexec/template b/srcpkgs/watchexec/template
index 4bd08d626870..c6401cd925d2 100644
--- a/srcpkgs/watchexec/template
+++ b/srcpkgs/watchexec/template
@@ -1,6 +1,6 @@
 # Template file for 'watchexec'
 pkgname=watchexec
-version=1.20.2
+version=1.20.5
 revision=1
 wrksrc="${pkgname}-cli-v${version}"
 build_wrksrc="crates/cli"
@@ -10,7 +10,7 @@ maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/watchexec/watchexec"
 distfiles="https://github.com/watchexec/watchexec/archive/refs/tags/cli-v${version}.tar.gz"
-checksum=62e2e722a84475436286010edff36c56c4c6fad9e76be4b35381877e93faeac8
+checksum=2bc04c7ecf58d34a48c3eeea54a76b7e621717cb93305497bea2f6399dd119c6
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From c1c879327c25f00556647a522a6177624860a81d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Thu, 4 Aug 2022 15:39:56 +0200
Subject: [PATCH 08/11] element-desktop: update to 1.11.2.

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

diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index 4f5aae940e49..a2c70cf88a8e 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.1
+version=1.11.2
 revision=1
 create_wrksrc=yes
 conf_files="/etc/${pkgname}/config.json"
@@ -14,12 +14,10 @@ short_desc="Glossy Matrix collaboration client, desktop version"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0"
 homepage="https://element.io"
-_ghpage="https://github.com/vector-im"
-_archive="archive/v${version}.tar.gz"
-distfiles="${_ghpage}/element-desktop/${_archive}>element-desktop.tar.gz
- ${_ghpage}/element-web/${_archive}>element-web.tar.gz"
-checksum="b93c82705bde69504d201b3624bcbd5fb258c0bf20e1535c0339132e593469b4
- b223fcff42a305ce8034892e0bdcb4806e45f5fd7f902e2914bc65dbd910230b"
+distfiles="https://github.com/vector-im/element-desktop/archive/v${version}.tar.gz>element-desktop.tar.gz
+ https://github.com/vector-im/element-web/archive/v${version}.tar.gz>element-web.tar.gz"
+checksum="f8cae27b6960e58d4a78f19b8198a6452e4789e7107950d678ec88a08247f84a
+ 2e9498a910acfc78d1b5ba4beb99af05195bde664c08ec1c2da47ef0d6ef21af"
 
 export USE_SYSTEM_APP_BUILDER=true
 

From 95ed006d2e2ea1b1314d78eb94a5a5127a580af8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 5 Aug 2022 08:25:04 -0400
Subject: [PATCH 09/11] mkinitcpio: backport fix for kmod>=30

---
 srcpkgs/mkinitcpio/patches/fix-depmod.patch | 30 +++++++++++++++++++++
 srcpkgs/mkinitcpio/template                 |  2 +-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/mkinitcpio/patches/fix-depmod.patch

diff --git a/srcpkgs/mkinitcpio/patches/fix-depmod.patch b/srcpkgs/mkinitcpio/patches/fix-depmod.patch
new file mode 100644
index 000000000000..55e5e7bb3a1d
--- /dev/null
+++ b/srcpkgs/mkinitcpio/patches/fix-depmod.patch
@@ -0,0 +1,30 @@
+From e629e34f18141a6244eaac2f0288d7b2a5d669ee Mon Sep 17 00:00:00 2001
+From: Chih-Hsuan Yen <yan12125@gmail.com>
+Date: Sun, 3 Jul 2022 11:03:10 +0800
+Subject: [PATCH] Fix the warning about missing modules.builtin.modinfo
+
+> depmod: WARNING: could not open modules.builtin.modinfo at /tmp/mkinitcpio.EftMSK/root/lib/modules/5.15.52-1-lts: No such file or directory
+
+kmod wants modules.builtin.modinfo since v30 [1].
+
+Also adds modules.order as suggested by heftig. That file is used (if
+exists) since the first commit of depmod.
+
+[1] https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git/commit/?id=0246e06340df292b5dda4bc00e24cc9ae894e881
+---
+ functions | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/functions b/functions
+index 48cfd7a..e77a4c4 100644
+--- a/functions
++++ b/functions
+@@ -876,7 +876,7 @@ install_modules() {
+     (( ${#zst_comp[*]} )) && zstd -d --rm -q "${zst_comp[@]}"
+ 
+     msg "Generating module dependencies"
+-    install -m644 -t "$moduledest" "$_d_kmoduledir"/modules.builtin
++    install -m644 -t "$moduledest" "$_d_kmoduledir"/modules.{builtin,builtin.modinfo,order}
+ 
+     # we install all modules into kernel/, making the .order file incorrect for
+     # the module tree. munge it, so that we have an accurate index. This avoids
diff --git a/srcpkgs/mkinitcpio/template b/srcpkgs/mkinitcpio/template
index ddd733d5e56d..ab00be349a27 100644
--- a/srcpkgs/mkinitcpio/template
+++ b/srcpkgs/mkinitcpio/template
@@ -1,7 +1,7 @@
 # Template file for 'mkinitcpio'
 pkgname=mkinitcpio
 version=31
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="asciidoc"
 depends="busybox-static bsdtar bash"

From aaf69e37b9061a066e84cf33aafa89c6ae1cc9a4 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sat, 30 Jul 2022 22:57:27 +0200
Subject: [PATCH 10/11] apt: update to 2.5.2

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

diff --git a/srcpkgs/apt/template b/srcpkgs/apt/template
index 9e477574ead0..17f842c34843 100644
--- a/srcpkgs/apt/template
+++ b/srcpkgs/apt/template
@@ -1,24 +1,30 @@
 # Template file for 'apt'
 pkgname=apt
-version=2.1.12
+version=2.5.2
 revision=1
 build_style=cmake
 configure_args="-DDPKG_DATADIR=/usr/share/dpkg -DCURRENT_VENDOR=debian
  -DDOCBOOK_XSL=/usr/share/xsl/docbook"
 hostmakedepends="pkg-config docbook-xsl doxygen po4a w3m libxslt triehash"
 makedepends="db-devel gnutls-devel bzip2-devel liblzma-devel liblz4-devel
- libzstd-devel libseccomp-devel eudev-libudev-devel dpkg-devel gtest-devel"
+ libzstd-devel libseccomp-devel eudev-libudev-devel dpkg-devel gtest-devel
+ libgcrypt-devel xxHash-devel"
+checkdepends="dpkg runit-void tar"
 short_desc="APT package management tools"
 maintainer="Elie ROUDNINSKI <xademax@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://salsa.debian.org/apt-team/apt"
 distfiles="https://github.com/Debian/apt/archive/${version}.tar.gz"
-checksum=61f639d3d37a56de37263aaa22dfe8b3f8cc56b1d6d9a59a4ce4ce70fcb139e9
+checksum=6f8817f1091a9f8fd001e9b84185cd198f739391e89e3cabcc253f46c4cf9d68
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) broken="error: void value not ignored as it ought to be" ;;
 esac
 
+pre_check() {
+	export GTEST_FILTER="-FileUtlTest.GetTempDir"
+}
+
 apt-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision}"

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

* Re: godot: update to 3.5
  2022-08-05  0:24 [PR PATCH] godot: update to 3.4.5 Relected
                   ` (6 preceding siblings ...)
  2022-08-05 17:01 ` [PR PATCH] [Updated] godot: update to 3.5 Relected
@ 2022-08-05 17:09 ` classabbyamp
  2022-08-05 17:22 ` [PR PATCH] [Updated] " Relected
                   ` (20 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: classabbyamp @ 2022-08-05 17:09 UTC (permalink / raw)
  To: ml

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/38473#issuecomment-1206669618

Comment:
I have alsa-pipewire-0.3.54_2 installed

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

* Re: [PR PATCH] [Updated] godot: update to 3.5
  2022-08-05  0:24 [PR PATCH] godot: update to 3.4.5 Relected
                   ` (7 preceding siblings ...)
  2022-08-05 17:09 ` classabbyamp
@ 2022-08-05 17:22 ` Relected
  2022-08-05 17:28 ` Relected
                   ` (19 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: Relected @ 2022-08-05 17:22 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Relected/void-packages master
https://github.com/void-linux/void-packages/pull/38473

godot: update to 3.5
<!-- Uncomment relevant sections and delete options which are not applicable -->

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


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

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

From 9ab49387e3eb179b48383e68fdb6e2a88246aa72 Mon Sep 17 00:00:00 2001
From: Relected <m7md11xd@gmail.com>
Date: Fri, 5 Aug 2022 02:20:32 +0200
Subject: [PATCH 01/20] godot: update to 3.4.5

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

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index c38f3f8c525a..ee19c7fa5823 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,6 +1,6 @@
 # Template file for 'godot'
 pkgname=godot
-version=3.4
+version=3.4.5
 revision=1
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 wrksrc="${pkgname}-${version}-stable"
@@ -27,7 +27,7 @@ maintainer="Nick Hahn <nick.hahn@hotmail.de>"
 license="MIT"
 homepage="https://www.godotengine.org/"
 distfiles="https://github.com/godotengine/${pkgname}/archive/${version}-stable.tar.gz"
-checksum=61749d12cb094c0be2a2c451ae2aceb8bb45f59f67fcd13fcd8f0c9114262d88
+checksum=87c988d52e7a06100d30164a18c213e022ef175a6de3bd945352bacc87d5289c
 nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio
 
 CFLAGS+=" -fPIE -fPIC"

From 836f8d10bb4c8eea00a2cbaafa7e76966343c29e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 3 Aug 2022 00:08:14 -0400
Subject: [PATCH 02/20] CONTRIBUTING.md: add instructions for testing PRs

---
 CONTRIBUTING.md | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index da3bef29c883..3f33aeb1d974 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -129,3 +129,25 @@ Please abstain from temporarily closing a pull request while revising the templa
 
 Once the reviewers have merged the pull request, our [build server](http://build.voidlinux.org) is automatically triggered and builds
 all packages in the pull request for all supported platforms. Upon completion, the packages are available to all Void Linux users.
+
+## Testing Pull Requests
+
+While it is the responsibility of the PR creator to test changes before sending it, one person can't test all configuration options, usecases, hardware, etc.
+Testing new package submissions and updates is always helpful, and is a great way to get started with contributing.
+First, [clone the repository](https://github.com/void-linux/void-packages#quick-start) if you haven't done so already.
+Then check out the pull request, either with `github-cli`:
+
+    $ gh pr checkout <number>
+
+Or with `git`:
+
+If your local void-packages repository is cloned from your fork, you may need to add the main repository as a remote first:
+
+    $ git remote add upstream https://github.com/void-linux/void-packages.git
+
+Then fetch and check out the PR (replacing `<remote>` with either `origin` or `upstream`):
+
+    $ git fetch <remote> pull/<number>/head:<branch-name>
+    $ git checkout <branch-name>
+
+Then [build and install](https://github.com/void-linux/void-packages#building-packages) the package and test its functionality.

From 4d80d0a46552e9207197a4529a0803d1880be475 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 2 Aug 2022 18:46:18 +0200
Subject: [PATCH 03/20] xcdroast: remove package

gtk2
---
 srcpkgs/removed-packages/template |  1 +
 srcpkgs/xcdroast/template         | 14 --------------
 2 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 srcpkgs/xcdroast/template

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 4a325984709b..c716bb3a0b6f 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -416,6 +416,7 @@ replaces="
  wicd-gtk<=1.7.4_6
  wireguard-go<=0.0.20181222_2
  wireshark-gtk<=3.0.7_1
+ xcdroast<=1.19_1
  xlennart<=1.1.1_1
  xmonad-contrib<=0.16_3
  xmonad<=0.15_5
diff --git a/srcpkgs/xcdroast/template b/srcpkgs/xcdroast/template
deleted file mode 100644
index a8334bbb0dd1..000000000000
--- a/srcpkgs/xcdroast/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'xcdroast'
-pkgname=xcdroast
-version=1.19
-revision=1
-build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="gtk+-devel alsa-lib-devel"
-depends="cdrtools"
-short_desc="Flexible frontend for optical disc authoring"
-maintainer="Nick Hahn <nick.hahn@hotmail.de>"
-license="GPL-2.0-only"
-homepage="http://www.xcdroast.org"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=86f52ba796d4d8ad346a4c73667f728a79d96e1045c239cf94d1529e2c271615

From 0cf096b4f7598eba21f3e4e7ebaa28e10d8f2a4e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 2 Aug 2022 18:40:40 +0200
Subject: [PATCH 04/20] yabause-gtk: remove package

gtk2, dead upstream
---
 srcpkgs/removed-packages/template            |  1 +
 srcpkgs/yabause-gtk/patches/fix-cflags.patch | 13 -------------
 srcpkgs/yabause-gtk/patches/rwx.patch        | 20 --------------------
 srcpkgs/yabause-gtk/template                 | 19 -------------------
 srcpkgs/yabause-gtk/update                   |  1 -
 5 files changed, 1 insertion(+), 53 deletions(-)
 delete mode 100644 srcpkgs/yabause-gtk/patches/fix-cflags.patch
 delete mode 100644 srcpkgs/yabause-gtk/patches/rwx.patch
 delete mode 100644 srcpkgs/yabause-gtk/template
 delete mode 100644 srcpkgs/yabause-gtk/update

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index c716bb3a0b6f..873cf9c1927d 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -422,6 +422,7 @@ replaces="
  xmonad<=0.15_5
  xnoise-devel<=0.2.21_4
  xnoise<=0.2.21_4
+ yabause-gtk<=0.9.15_2
  yt-play<=20140117_2
  yturl<=2.0.2_5
  zbackup<=1.4.4_23
diff --git a/srcpkgs/yabause-gtk/patches/fix-cflags.patch b/srcpkgs/yabause-gtk/patches/fix-cflags.patch
deleted file mode 100644
index b69426bd3016..000000000000
--- a/srcpkgs/yabause-gtk/patches/fix-cflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: src/CMakeLists.txt
-===================================================================
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -659,7 +659,7 @@ else ()
- 	set(yabause_SOURCES ${yabause_SOURCES} sock-dummy.c thr-dummy.c)
- endif ()
- 
--set(YAB_OPTIMIZATION "-O3" CACHE STRING "Override optimization level")
-+set(YAB_OPTIMIZATION "" CACHE STRING "Override optimization level")
- 
- if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i686")
- 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${YAB_OPTIMIZATION} -march=i686 -msse")
diff --git a/srcpkgs/yabause-gtk/patches/rwx.patch b/srcpkgs/yabause-gtk/patches/rwx.patch
deleted file mode 100644
index bb0491b373f8..000000000000
--- a/srcpkgs/yabause-gtk/patches/rwx.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/sh2_dynarec/linkage_x64.s	2013-03-11 20:29:53.112870900 +0100
-+++ b/src/sh2_dynarec/linkage_x64.s	2013-03-11 20:31:48.856778600 +0100
-@@ -747,3 +747,7 @@ breakpoint:
- 	ret
- 	/* Set breakpoint here for debugging */
- 	.size	breakpoint, .-breakpoint
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
---- a/src/sh2_dynarec/linkage_x86.s	2013-03-11 20:30:08.157693100 +0100
-+++ b/src/sh2_dynarec/linkage_x86.s	2013-03-11 20:32:30.993310600 +0100
-@@ -743,3 +743,7 @@ breakpoint:
- 	ret
- 	/* Set breakpoint here for debugging */
- 	.size	breakpoint, .-breakpoint
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
diff --git a/srcpkgs/yabause-gtk/template b/srcpkgs/yabause-gtk/template
deleted file mode 100644
index 841c0af36b78..000000000000
--- a/srcpkgs/yabause-gtk/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'yabause-gtk'
-pkgname=yabause-gtk
-version=0.9.15
-revision=2
-wrksrc="${pkgname%-gtk}-${version}"
-build_style=cmake
-configure_args="-DYAB_PORTS=gtk -DYAB_NETWORK=ON -DYAB_OPTIMIZED_DMA=ON"
-hostmakedepends="pkg-config"
-makedepends="libXmu-devel libfreeglut-devel gtkglext-devel libopenal-devel SDL2-devel"
-depends="desktop-file-utils"
-short_desc="Sega Saturn emulator with GTK UI)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://yabause.org/"
-distfiles="https://download.tuxfamily.org/yabause/releases/${version}/yabause-${version}.tar.gz"
-checksum=4334c43fe0f3ff297bac8e91f4e059fe5fd276291faff2489e37b5b3a4ccc2b2
-nopie=yes
-# Would need m68kmake built for the host
-nocross=yes
diff --git a/srcpkgs/yabause-gtk/update b/srcpkgs/yabause-gtk/update
deleted file mode 100644
index b93f2e9eada0..000000000000
--- a/srcpkgs/yabause-gtk/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname="${pkgname%-gtk}"

From 33c0249d165c86eab0a39a203ecd14a28459a62b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 2 Aug 2022 18:44:15 +0200
Subject: [PATCH 05/20] xnp2: remove package

gtk2, dead upstream
---
 srcpkgs/removed-packages/template           |  1 +
 srcpkgs/xnp2/INSTALL.msg                    |  7 ------
 srcpkgs/xnp2/patches/define_cplusplus.patch | 17 -------------
 srcpkgs/xnp2/template                       | 27 ---------------------
 srcpkgs/xnp2/update                         |  1 -
 5 files changed, 1 insertion(+), 52 deletions(-)
 delete mode 100644 srcpkgs/xnp2/INSTALL.msg
 delete mode 100644 srcpkgs/xnp2/patches/define_cplusplus.patch
 delete mode 100644 srcpkgs/xnp2/template
 delete mode 100644 srcpkgs/xnp2/update

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 873cf9c1927d..392f1e39e130 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -420,6 +420,7 @@ replaces="
  xlennart<=1.1.1_1
  xmonad-contrib<=0.16_3
  xmonad<=0.15_5
+ xnp2<=0.86_2
  xnoise-devel<=0.2.21_4
  xnoise<=0.2.21_4
  yabause-gtk<=0.9.15_2
diff --git a/srcpkgs/xnp2/INSTALL.msg b/srcpkgs/xnp2/INSTALL.msg
deleted file mode 100644
index 53fc91ec76da..000000000000
--- a/srcpkgs/xnp2/INSTALL.msg
+++ /dev/null
@@ -1,7 +0,0 @@
-The following packages are not required for operation, but are necessary
-to support extra features:
-
-SDL2       Required when using sound and joystick.
-SDL2_mixer Required when playing PCM such as floppy seek sound.
-libXxf86vm Required when using full screen function to change screen resolution.
-libusb     Required when supporting C86 BOX.
diff --git a/srcpkgs/xnp2/patches/define_cplusplus.patch b/srcpkgs/xnp2/patches/define_cplusplus.patch
deleted file mode 100644
index 12b24c90bb28..000000000000
--- a/srcpkgs/xnp2/patches/define_cplusplus.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/x11/compiler.h.old	2018-02-02 17:00:29.174895866 +0000
-+++ b/x11/compiler.h	2018-02-02 17:00:41.199160781 +0000
-@@ -117,12 +117,14 @@
- #define	MAX_PATH	MAXPATHLEN
- #endif
- 
-+#ifndef __cplusplus
- #ifndef	max
- #define	max(a,b)	(((a) > (b)) ? (a) : (b))
- #endif
- #ifndef	min
- #define	min(a,b)	(((a) < (b)) ? (a) : (b))
- #endif
-+#endif /* __cplusplus */
- 
- #ifndef	ZeroMemory
- #define	ZeroMemory(d,n)		memset((d), 0, (n))
diff --git a/srcpkgs/xnp2/template b/srcpkgs/xnp2/template
deleted file mode 100644
index 7ae496fc224e..000000000000
--- a/srcpkgs/xnp2/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'xnp2'
-pkgname=xnp2
-version=0.86
-revision=2
-build_wrksrc=x11
-build_style=gnu-configure
-configure_args="--enable-ia32 --enable-build-all"
-hostmakedepends="pkg-config nasm"
-makedepends="gtk+-devel SDL2-devel"
-short_desc="Port for UNIX with X11 of the Neko Project II PC-9801 emulator"
-maintainer="hipperson0 <hipperson0@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://www.nonakap.org/np2"
-distfiles="https://www.nonakap.org/np2/release/xnp2-${version}.tar.bz2"
-checksum=e0b8c93f54682a4b3373907fd9ffe78094f95f7430dffc5038eccbcc4c3f78fd
-
-do_install() {
-	vbin xnp2
-	vbin xnp21
-	vman xnp2.1
-	vman xnp2.1j
-	vman xnp21.1
-	vman xnp21.1j
-	vdoc README.ja
-	sed '/\*\//q' main.c > LICENSE
-	vlicense LICENSE
-}
diff --git a/srcpkgs/xnp2/update b/srcpkgs/xnp2/update
deleted file mode 100644
index 04584df73d29..000000000000
--- a/srcpkgs/xnp2/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="20140607"

From 7cb634b777b157976dbd0f1ec6fdf80ddc6aa4f6 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 5 Aug 2022 00:44:21 +0000
Subject: [PATCH 06/20] graphviz-x11: remove stale symlink

---
 srcpkgs/graphviz-x11 | 1 -
 1 file changed, 1 deletion(-)
 delete mode 120000 srcpkgs/graphviz-x11

diff --git a/srcpkgs/graphviz-x11 b/srcpkgs/graphviz-x11
deleted file mode 120000
index abecf5d9457d..000000000000
--- a/srcpkgs/graphviz-x11
+++ /dev/null
@@ -1 +0,0 @@
-graphviz
\ No newline at end of file

From c8271d68e65b07990ae8dbe5f19d4e94f93c7530 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 4 Aug 2022 20:06:49 -0400
Subject: [PATCH 07/20] watchexec: update to 1.20.5

---
 srcpkgs/watchexec/patches/fix-tests.patch | 14 --------------
 srcpkgs/watchexec/template                |  4 ++--
 2 files changed, 2 insertions(+), 16 deletions(-)
 delete mode 100644 srcpkgs/watchexec/patches/fix-tests.patch

diff --git a/srcpkgs/watchexec/patches/fix-tests.patch b/srcpkgs/watchexec/patches/fix-tests.patch
deleted file mode 100644
index f210de15e314..000000000000
--- a/srcpkgs/watchexec/patches/fix-tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# Remove debug notice from test case
-diff --git a/crates/cli/tests/snapshots/help__help_unix.snap b/crates/cli/tests/snapshots/help__help_unix.snap
-index b55782f022..c5642f98ce 100644
---- a/crates/cli/tests/snapshots/help__help_unix.snap
-+++ b/crates/cli/tests/snapshots/help__help_unix.snap
-@@ -2,8 +2,6 @@
- source: crates/cli/tests/help.rs
- expression: "String::from_utf8(output.stdout).unwrap()"
- ---
--⚠ DEBUG BUILD ⚠
--
- watchexec 1.20.2
- Execute commands when watched files change
- 
diff --git a/srcpkgs/watchexec/template b/srcpkgs/watchexec/template
index 4bd08d626870..c6401cd925d2 100644
--- a/srcpkgs/watchexec/template
+++ b/srcpkgs/watchexec/template
@@ -1,6 +1,6 @@
 # Template file for 'watchexec'
 pkgname=watchexec
-version=1.20.2
+version=1.20.5
 revision=1
 wrksrc="${pkgname}-cli-v${version}"
 build_wrksrc="crates/cli"
@@ -10,7 +10,7 @@ maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/watchexec/watchexec"
 distfiles="https://github.com/watchexec/watchexec/archive/refs/tags/cli-v${version}.tar.gz"
-checksum=62e2e722a84475436286010edff36c56c4c6fad9e76be4b35381877e93faeac8
+checksum=2bc04c7ecf58d34a48c3eeea54a76b7e621717cb93305497bea2f6399dd119c6
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From f245a59b1701bfaa994e17ad70157f5be03df06b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Thu, 4 Aug 2022 15:39:56 +0200
Subject: [PATCH 08/20] element-desktop: update to 1.11.2.

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

diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index 4f5aae940e49..a2c70cf88a8e 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.1
+version=1.11.2
 revision=1
 create_wrksrc=yes
 conf_files="/etc/${pkgname}/config.json"
@@ -14,12 +14,10 @@ short_desc="Glossy Matrix collaboration client, desktop version"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0"
 homepage="https://element.io"
-_ghpage="https://github.com/vector-im"
-_archive="archive/v${version}.tar.gz"
-distfiles="${_ghpage}/element-desktop/${_archive}>element-desktop.tar.gz
- ${_ghpage}/element-web/${_archive}>element-web.tar.gz"
-checksum="b93c82705bde69504d201b3624bcbd5fb258c0bf20e1535c0339132e593469b4
- b223fcff42a305ce8034892e0bdcb4806e45f5fd7f902e2914bc65dbd910230b"
+distfiles="https://github.com/vector-im/element-desktop/archive/v${version}.tar.gz>element-desktop.tar.gz
+ https://github.com/vector-im/element-web/archive/v${version}.tar.gz>element-web.tar.gz"
+checksum="f8cae27b6960e58d4a78f19b8198a6452e4789e7107950d678ec88a08247f84a
+ 2e9498a910acfc78d1b5ba4beb99af05195bde664c08ec1c2da47ef0d6ef21af"
 
 export USE_SYSTEM_APP_BUILDER=true
 

From b424ca75c311258510bb52ff77cf61fa32b74f94 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 5 Aug 2022 08:25:04 -0400
Subject: [PATCH 09/20] mkinitcpio: backport fix for kmod>=30

---
 srcpkgs/mkinitcpio/patches/fix-depmod.patch | 30 +++++++++++++++++++++
 srcpkgs/mkinitcpio/template                 |  2 +-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/mkinitcpio/patches/fix-depmod.patch

diff --git a/srcpkgs/mkinitcpio/patches/fix-depmod.patch b/srcpkgs/mkinitcpio/patches/fix-depmod.patch
new file mode 100644
index 000000000000..55e5e7bb3a1d
--- /dev/null
+++ b/srcpkgs/mkinitcpio/patches/fix-depmod.patch
@@ -0,0 +1,30 @@
+From e629e34f18141a6244eaac2f0288d7b2a5d669ee Mon Sep 17 00:00:00 2001
+From: Chih-Hsuan Yen <yan12125@gmail.com>
+Date: Sun, 3 Jul 2022 11:03:10 +0800
+Subject: [PATCH] Fix the warning about missing modules.builtin.modinfo
+
+> depmod: WARNING: could not open modules.builtin.modinfo at /tmp/mkinitcpio.EftMSK/root/lib/modules/5.15.52-1-lts: No such file or directory
+
+kmod wants modules.builtin.modinfo since v30 [1].
+
+Also adds modules.order as suggested by heftig. That file is used (if
+exists) since the first commit of depmod.
+
+[1] https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git/commit/?id=0246e06340df292b5dda4bc00e24cc9ae894e881
+---
+ functions | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/functions b/functions
+index 48cfd7a..e77a4c4 100644
+--- a/functions
++++ b/functions
+@@ -876,7 +876,7 @@ install_modules() {
+     (( ${#zst_comp[*]} )) && zstd -d --rm -q "${zst_comp[@]}"
+ 
+     msg "Generating module dependencies"
+-    install -m644 -t "$moduledest" "$_d_kmoduledir"/modules.builtin
++    install -m644 -t "$moduledest" "$_d_kmoduledir"/modules.{builtin,builtin.modinfo,order}
+ 
+     # we install all modules into kernel/, making the .order file incorrect for
+     # the module tree. munge it, so that we have an accurate index. This avoids
diff --git a/srcpkgs/mkinitcpio/template b/srcpkgs/mkinitcpio/template
index ddd733d5e56d..ab00be349a27 100644
--- a/srcpkgs/mkinitcpio/template
+++ b/srcpkgs/mkinitcpio/template
@@ -1,7 +1,7 @@
 # Template file for 'mkinitcpio'
 pkgname=mkinitcpio
 version=31
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="asciidoc"
 depends="busybox-static bsdtar bash"

From af2ce48a1ad83b344161af672feaa2b910ac88d3 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sat, 30 Jul 2022 22:57:27 +0200
Subject: [PATCH 10/20] apt: update to 2.5.2

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

diff --git a/srcpkgs/apt/template b/srcpkgs/apt/template
index 9e477574ead0..17f842c34843 100644
--- a/srcpkgs/apt/template
+++ b/srcpkgs/apt/template
@@ -1,24 +1,30 @@
 # Template file for 'apt'
 pkgname=apt
-version=2.1.12
+version=2.5.2
 revision=1
 build_style=cmake
 configure_args="-DDPKG_DATADIR=/usr/share/dpkg -DCURRENT_VENDOR=debian
  -DDOCBOOK_XSL=/usr/share/xsl/docbook"
 hostmakedepends="pkg-config docbook-xsl doxygen po4a w3m libxslt triehash"
 makedepends="db-devel gnutls-devel bzip2-devel liblzma-devel liblz4-devel
- libzstd-devel libseccomp-devel eudev-libudev-devel dpkg-devel gtest-devel"
+ libzstd-devel libseccomp-devel eudev-libudev-devel dpkg-devel gtest-devel
+ libgcrypt-devel xxHash-devel"
+checkdepends="dpkg runit-void tar"
 short_desc="APT package management tools"
 maintainer="Elie ROUDNINSKI <xademax@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://salsa.debian.org/apt-team/apt"
 distfiles="https://github.com/Debian/apt/archive/${version}.tar.gz"
-checksum=61f639d3d37a56de37263aaa22dfe8b3f8cc56b1d6d9a59a4ce4ce70fcb139e9
+checksum=6f8817f1091a9f8fd001e9b84185cd198f739391e89e3cabcc253f46c4cf9d68
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) broken="error: void value not ignored as it ought to be" ;;
 esac
 
+pre_check() {
+	export GTEST_FILTER="-FileUtlTest.GetTempDir"
+}
+
 apt-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision}"

From 5a2c77e96feddf914788cb5cb1792745b4dada52 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 3 Aug 2022 00:08:14 -0400
Subject: [PATCH 11/20] CONTRIBUTING.md: add instructions for testing PRs

---
 CONTRIBUTING.md | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index da3bef29c883..3f33aeb1d974 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -129,3 +129,25 @@ Please abstain from temporarily closing a pull request while revising the templa
 
 Once the reviewers have merged the pull request, our [build server](http://build.voidlinux.org) is automatically triggered and builds
 all packages in the pull request for all supported platforms. Upon completion, the packages are available to all Void Linux users.
+
+## Testing Pull Requests
+
+While it is the responsibility of the PR creator to test changes before sending it, one person can't test all configuration options, usecases, hardware, etc.
+Testing new package submissions and updates is always helpful, and is a great way to get started with contributing.
+First, [clone the repository](https://github.com/void-linux/void-packages#quick-start) if you haven't done so already.
+Then check out the pull request, either with `github-cli`:
+
+    $ gh pr checkout <number>
+
+Or with `git`:
+
+If your local void-packages repository is cloned from your fork, you may need to add the main repository as a remote first:
+
+    $ git remote add upstream https://github.com/void-linux/void-packages.git
+
+Then fetch and check out the PR (replacing `<remote>` with either `origin` or `upstream`):
+
+    $ git fetch <remote> pull/<number>/head:<branch-name>
+    $ git checkout <branch-name>
+
+Then [build and install](https://github.com/void-linux/void-packages#building-packages) the package and test its functionality.

From a282e80a78785e68e99593b535a8b0876e62eb5c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 2 Aug 2022 18:46:18 +0200
Subject: [PATCH 12/20] xcdroast: remove package

gtk2
---
 srcpkgs/removed-packages/template |  1 +
 srcpkgs/xcdroast/template         | 14 --------------
 2 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 srcpkgs/xcdroast/template

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 4a325984709b..c716bb3a0b6f 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -416,6 +416,7 @@ replaces="
  wicd-gtk<=1.7.4_6
  wireguard-go<=0.0.20181222_2
  wireshark-gtk<=3.0.7_1
+ xcdroast<=1.19_1
  xlennart<=1.1.1_1
  xmonad-contrib<=0.16_3
  xmonad<=0.15_5
diff --git a/srcpkgs/xcdroast/template b/srcpkgs/xcdroast/template
deleted file mode 100644
index a8334bbb0dd1..000000000000
--- a/srcpkgs/xcdroast/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'xcdroast'
-pkgname=xcdroast
-version=1.19
-revision=1
-build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="gtk+-devel alsa-lib-devel"
-depends="cdrtools"
-short_desc="Flexible frontend for optical disc authoring"
-maintainer="Nick Hahn <nick.hahn@hotmail.de>"
-license="GPL-2.0-only"
-homepage="http://www.xcdroast.org"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=86f52ba796d4d8ad346a4c73667f728a79d96e1045c239cf94d1529e2c271615

From 799f41402a6f8cad9c5bb9fc053480489cb08b64 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 2 Aug 2022 18:40:40 +0200
Subject: [PATCH 13/20] yabause-gtk: remove package

gtk2, dead upstream
---
 srcpkgs/removed-packages/template            |  1 +
 srcpkgs/yabause-gtk/patches/fix-cflags.patch | 13 -------------
 srcpkgs/yabause-gtk/patches/rwx.patch        | 20 --------------------
 srcpkgs/yabause-gtk/template                 | 19 -------------------
 srcpkgs/yabause-gtk/update                   |  1 -
 5 files changed, 1 insertion(+), 53 deletions(-)
 delete mode 100644 srcpkgs/yabause-gtk/patches/fix-cflags.patch
 delete mode 100644 srcpkgs/yabause-gtk/patches/rwx.patch
 delete mode 100644 srcpkgs/yabause-gtk/template
 delete mode 100644 srcpkgs/yabause-gtk/update

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index c716bb3a0b6f..873cf9c1927d 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -422,6 +422,7 @@ replaces="
  xmonad<=0.15_5
  xnoise-devel<=0.2.21_4
  xnoise<=0.2.21_4
+ yabause-gtk<=0.9.15_2
  yt-play<=20140117_2
  yturl<=2.0.2_5
  zbackup<=1.4.4_23
diff --git a/srcpkgs/yabause-gtk/patches/fix-cflags.patch b/srcpkgs/yabause-gtk/patches/fix-cflags.patch
deleted file mode 100644
index b69426bd3016..000000000000
--- a/srcpkgs/yabause-gtk/patches/fix-cflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: src/CMakeLists.txt
-===================================================================
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -659,7 +659,7 @@ else ()
- 	set(yabause_SOURCES ${yabause_SOURCES} sock-dummy.c thr-dummy.c)
- endif ()
- 
--set(YAB_OPTIMIZATION "-O3" CACHE STRING "Override optimization level")
-+set(YAB_OPTIMIZATION "" CACHE STRING "Override optimization level")
- 
- if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i686")
- 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${YAB_OPTIMIZATION} -march=i686 -msse")
diff --git a/srcpkgs/yabause-gtk/patches/rwx.patch b/srcpkgs/yabause-gtk/patches/rwx.patch
deleted file mode 100644
index bb0491b373f8..000000000000
--- a/srcpkgs/yabause-gtk/patches/rwx.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/sh2_dynarec/linkage_x64.s	2013-03-11 20:29:53.112870900 +0100
-+++ b/src/sh2_dynarec/linkage_x64.s	2013-03-11 20:31:48.856778600 +0100
-@@ -747,3 +747,7 @@ breakpoint:
- 	ret
- 	/* Set breakpoint here for debugging */
- 	.size	breakpoint, .-breakpoint
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
---- a/src/sh2_dynarec/linkage_x86.s	2013-03-11 20:30:08.157693100 +0100
-+++ b/src/sh2_dynarec/linkage_x86.s	2013-03-11 20:32:30.993310600 +0100
-@@ -743,3 +743,7 @@ breakpoint:
- 	ret
- 	/* Set breakpoint here for debugging */
- 	.size	breakpoint, .-breakpoint
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
diff --git a/srcpkgs/yabause-gtk/template b/srcpkgs/yabause-gtk/template
deleted file mode 100644
index 841c0af36b78..000000000000
--- a/srcpkgs/yabause-gtk/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'yabause-gtk'
-pkgname=yabause-gtk
-version=0.9.15
-revision=2
-wrksrc="${pkgname%-gtk}-${version}"
-build_style=cmake
-configure_args="-DYAB_PORTS=gtk -DYAB_NETWORK=ON -DYAB_OPTIMIZED_DMA=ON"
-hostmakedepends="pkg-config"
-makedepends="libXmu-devel libfreeglut-devel gtkglext-devel libopenal-devel SDL2-devel"
-depends="desktop-file-utils"
-short_desc="Sega Saturn emulator with GTK UI)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://yabause.org/"
-distfiles="https://download.tuxfamily.org/yabause/releases/${version}/yabause-${version}.tar.gz"
-checksum=4334c43fe0f3ff297bac8e91f4e059fe5fd276291faff2489e37b5b3a4ccc2b2
-nopie=yes
-# Would need m68kmake built for the host
-nocross=yes
diff --git a/srcpkgs/yabause-gtk/update b/srcpkgs/yabause-gtk/update
deleted file mode 100644
index b93f2e9eada0..000000000000
--- a/srcpkgs/yabause-gtk/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname="${pkgname%-gtk}"

From 5bbb705cad1b760371626fa74c1ff0359c93c48d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 2 Aug 2022 18:44:15 +0200
Subject: [PATCH 14/20] xnp2: remove package

gtk2, dead upstream
---
 srcpkgs/removed-packages/template           |  1 +
 srcpkgs/xnp2/INSTALL.msg                    |  7 ------
 srcpkgs/xnp2/patches/define_cplusplus.patch | 17 -------------
 srcpkgs/xnp2/template                       | 27 ---------------------
 srcpkgs/xnp2/update                         |  1 -
 5 files changed, 1 insertion(+), 52 deletions(-)
 delete mode 100644 srcpkgs/xnp2/INSTALL.msg
 delete mode 100644 srcpkgs/xnp2/patches/define_cplusplus.patch
 delete mode 100644 srcpkgs/xnp2/template
 delete mode 100644 srcpkgs/xnp2/update

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 873cf9c1927d..392f1e39e130 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -420,6 +420,7 @@ replaces="
  xlennart<=1.1.1_1
  xmonad-contrib<=0.16_3
  xmonad<=0.15_5
+ xnp2<=0.86_2
  xnoise-devel<=0.2.21_4
  xnoise<=0.2.21_4
  yabause-gtk<=0.9.15_2
diff --git a/srcpkgs/xnp2/INSTALL.msg b/srcpkgs/xnp2/INSTALL.msg
deleted file mode 100644
index 53fc91ec76da..000000000000
--- a/srcpkgs/xnp2/INSTALL.msg
+++ /dev/null
@@ -1,7 +0,0 @@
-The following packages are not required for operation, but are necessary
-to support extra features:
-
-SDL2       Required when using sound and joystick.
-SDL2_mixer Required when playing PCM such as floppy seek sound.
-libXxf86vm Required when using full screen function to change screen resolution.
-libusb     Required when supporting C86 BOX.
diff --git a/srcpkgs/xnp2/patches/define_cplusplus.patch b/srcpkgs/xnp2/patches/define_cplusplus.patch
deleted file mode 100644
index 12b24c90bb28..000000000000
--- a/srcpkgs/xnp2/patches/define_cplusplus.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/x11/compiler.h.old	2018-02-02 17:00:29.174895866 +0000
-+++ b/x11/compiler.h	2018-02-02 17:00:41.199160781 +0000
-@@ -117,12 +117,14 @@
- #define	MAX_PATH	MAXPATHLEN
- #endif
- 
-+#ifndef __cplusplus
- #ifndef	max
- #define	max(a,b)	(((a) > (b)) ? (a) : (b))
- #endif
- #ifndef	min
- #define	min(a,b)	(((a) < (b)) ? (a) : (b))
- #endif
-+#endif /* __cplusplus */
- 
- #ifndef	ZeroMemory
- #define	ZeroMemory(d,n)		memset((d), 0, (n))
diff --git a/srcpkgs/xnp2/template b/srcpkgs/xnp2/template
deleted file mode 100644
index 7ae496fc224e..000000000000
--- a/srcpkgs/xnp2/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'xnp2'
-pkgname=xnp2
-version=0.86
-revision=2
-build_wrksrc=x11
-build_style=gnu-configure
-configure_args="--enable-ia32 --enable-build-all"
-hostmakedepends="pkg-config nasm"
-makedepends="gtk+-devel SDL2-devel"
-short_desc="Port for UNIX with X11 of the Neko Project II PC-9801 emulator"
-maintainer="hipperson0 <hipperson0@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://www.nonakap.org/np2"
-distfiles="https://www.nonakap.org/np2/release/xnp2-${version}.tar.bz2"
-checksum=e0b8c93f54682a4b3373907fd9ffe78094f95f7430dffc5038eccbcc4c3f78fd
-
-do_install() {
-	vbin xnp2
-	vbin xnp21
-	vman xnp2.1
-	vman xnp2.1j
-	vman xnp21.1
-	vman xnp21.1j
-	vdoc README.ja
-	sed '/\*\//q' main.c > LICENSE
-	vlicense LICENSE
-}
diff --git a/srcpkgs/xnp2/update b/srcpkgs/xnp2/update
deleted file mode 100644
index 04584df73d29..000000000000
--- a/srcpkgs/xnp2/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="20140607"

From 032d290829598f66a768410f9b02ab88aee13f5f Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 5 Aug 2022 00:44:21 +0000
Subject: [PATCH 15/20] graphviz-x11: remove stale symlink

---
 srcpkgs/graphviz-x11 | 1 -
 1 file changed, 1 deletion(-)
 delete mode 120000 srcpkgs/graphviz-x11

diff --git a/srcpkgs/graphviz-x11 b/srcpkgs/graphviz-x11
deleted file mode 120000
index abecf5d9457d..000000000000
--- a/srcpkgs/graphviz-x11
+++ /dev/null
@@ -1 +0,0 @@
-graphviz
\ No newline at end of file

From 2f1ce58a19db21eeee706175863be750c6ec7c3c Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 4 Aug 2022 20:06:49 -0400
Subject: [PATCH 16/20] watchexec: update to 1.20.5

---
 srcpkgs/watchexec/patches/fix-tests.patch | 14 --------------
 srcpkgs/watchexec/template                |  4 ++--
 2 files changed, 2 insertions(+), 16 deletions(-)
 delete mode 100644 srcpkgs/watchexec/patches/fix-tests.patch

diff --git a/srcpkgs/watchexec/patches/fix-tests.patch b/srcpkgs/watchexec/patches/fix-tests.patch
deleted file mode 100644
index f210de15e314..000000000000
--- a/srcpkgs/watchexec/patches/fix-tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# Remove debug notice from test case
-diff --git a/crates/cli/tests/snapshots/help__help_unix.snap b/crates/cli/tests/snapshots/help__help_unix.snap
-index b55782f022..c5642f98ce 100644
---- a/crates/cli/tests/snapshots/help__help_unix.snap
-+++ b/crates/cli/tests/snapshots/help__help_unix.snap
-@@ -2,8 +2,6 @@
- source: crates/cli/tests/help.rs
- expression: "String::from_utf8(output.stdout).unwrap()"
- ---
--⚠ DEBUG BUILD ⚠
--
- watchexec 1.20.2
- Execute commands when watched files change
- 
diff --git a/srcpkgs/watchexec/template b/srcpkgs/watchexec/template
index 4bd08d626870..c6401cd925d2 100644
--- a/srcpkgs/watchexec/template
+++ b/srcpkgs/watchexec/template
@@ -1,6 +1,6 @@
 # Template file for 'watchexec'
 pkgname=watchexec
-version=1.20.2
+version=1.20.5
 revision=1
 wrksrc="${pkgname}-cli-v${version}"
 build_wrksrc="crates/cli"
@@ -10,7 +10,7 @@ maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/watchexec/watchexec"
 distfiles="https://github.com/watchexec/watchexec/archive/refs/tags/cli-v${version}.tar.gz"
-checksum=62e2e722a84475436286010edff36c56c4c6fad9e76be4b35381877e93faeac8
+checksum=2bc04c7ecf58d34a48c3eeea54a76b7e621717cb93305497bea2f6399dd119c6
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From c1c879327c25f00556647a522a6177624860a81d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Thu, 4 Aug 2022 15:39:56 +0200
Subject: [PATCH 17/20] element-desktop: update to 1.11.2.

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

diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index 4f5aae940e49..a2c70cf88a8e 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.1
+version=1.11.2
 revision=1
 create_wrksrc=yes
 conf_files="/etc/${pkgname}/config.json"
@@ -14,12 +14,10 @@ short_desc="Glossy Matrix collaboration client, desktop version"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0"
 homepage="https://element.io"
-_ghpage="https://github.com/vector-im"
-_archive="archive/v${version}.tar.gz"
-distfiles="${_ghpage}/element-desktop/${_archive}>element-desktop.tar.gz
- ${_ghpage}/element-web/${_archive}>element-web.tar.gz"
-checksum="b93c82705bde69504d201b3624bcbd5fb258c0bf20e1535c0339132e593469b4
- b223fcff42a305ce8034892e0bdcb4806e45f5fd7f902e2914bc65dbd910230b"
+distfiles="https://github.com/vector-im/element-desktop/archive/v${version}.tar.gz>element-desktop.tar.gz
+ https://github.com/vector-im/element-web/archive/v${version}.tar.gz>element-web.tar.gz"
+checksum="f8cae27b6960e58d4a78f19b8198a6452e4789e7107950d678ec88a08247f84a
+ 2e9498a910acfc78d1b5ba4beb99af05195bde664c08ec1c2da47ef0d6ef21af"
 
 export USE_SYSTEM_APP_BUILDER=true
 

From 95ed006d2e2ea1b1314d78eb94a5a5127a580af8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 5 Aug 2022 08:25:04 -0400
Subject: [PATCH 18/20] mkinitcpio: backport fix for kmod>=30

---
 srcpkgs/mkinitcpio/patches/fix-depmod.patch | 30 +++++++++++++++++++++
 srcpkgs/mkinitcpio/template                 |  2 +-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/mkinitcpio/patches/fix-depmod.patch

diff --git a/srcpkgs/mkinitcpio/patches/fix-depmod.patch b/srcpkgs/mkinitcpio/patches/fix-depmod.patch
new file mode 100644
index 000000000000..55e5e7bb3a1d
--- /dev/null
+++ b/srcpkgs/mkinitcpio/patches/fix-depmod.patch
@@ -0,0 +1,30 @@
+From e629e34f18141a6244eaac2f0288d7b2a5d669ee Mon Sep 17 00:00:00 2001
+From: Chih-Hsuan Yen <yan12125@gmail.com>
+Date: Sun, 3 Jul 2022 11:03:10 +0800
+Subject: [PATCH] Fix the warning about missing modules.builtin.modinfo
+
+> depmod: WARNING: could not open modules.builtin.modinfo at /tmp/mkinitcpio.EftMSK/root/lib/modules/5.15.52-1-lts: No such file or directory
+
+kmod wants modules.builtin.modinfo since v30 [1].
+
+Also adds modules.order as suggested by heftig. That file is used (if
+exists) since the first commit of depmod.
+
+[1] https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git/commit/?id=0246e06340df292b5dda4bc00e24cc9ae894e881
+---
+ functions | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/functions b/functions
+index 48cfd7a..e77a4c4 100644
+--- a/functions
++++ b/functions
+@@ -876,7 +876,7 @@ install_modules() {
+     (( ${#zst_comp[*]} )) && zstd -d --rm -q "${zst_comp[@]}"
+ 
+     msg "Generating module dependencies"
+-    install -m644 -t "$moduledest" "$_d_kmoduledir"/modules.builtin
++    install -m644 -t "$moduledest" "$_d_kmoduledir"/modules.{builtin,builtin.modinfo,order}
+ 
+     # we install all modules into kernel/, making the .order file incorrect for
+     # the module tree. munge it, so that we have an accurate index. This avoids
diff --git a/srcpkgs/mkinitcpio/template b/srcpkgs/mkinitcpio/template
index ddd733d5e56d..ab00be349a27 100644
--- a/srcpkgs/mkinitcpio/template
+++ b/srcpkgs/mkinitcpio/template
@@ -1,7 +1,7 @@
 # Template file for 'mkinitcpio'
 pkgname=mkinitcpio
 version=31
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="asciidoc"
 depends="busybox-static bsdtar bash"

From aaf69e37b9061a066e84cf33aafa89c6ae1cc9a4 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sat, 30 Jul 2022 22:57:27 +0200
Subject: [PATCH 19/20] apt: update to 2.5.2

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

diff --git a/srcpkgs/apt/template b/srcpkgs/apt/template
index 9e477574ead0..17f842c34843 100644
--- a/srcpkgs/apt/template
+++ b/srcpkgs/apt/template
@@ -1,24 +1,30 @@
 # Template file for 'apt'
 pkgname=apt
-version=2.1.12
+version=2.5.2
 revision=1
 build_style=cmake
 configure_args="-DDPKG_DATADIR=/usr/share/dpkg -DCURRENT_VENDOR=debian
  -DDOCBOOK_XSL=/usr/share/xsl/docbook"
 hostmakedepends="pkg-config docbook-xsl doxygen po4a w3m libxslt triehash"
 makedepends="db-devel gnutls-devel bzip2-devel liblzma-devel liblz4-devel
- libzstd-devel libseccomp-devel eudev-libudev-devel dpkg-devel gtest-devel"
+ libzstd-devel libseccomp-devel eudev-libudev-devel dpkg-devel gtest-devel
+ libgcrypt-devel xxHash-devel"
+checkdepends="dpkg runit-void tar"
 short_desc="APT package management tools"
 maintainer="Elie ROUDNINSKI <xademax@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://salsa.debian.org/apt-team/apt"
 distfiles="https://github.com/Debian/apt/archive/${version}.tar.gz"
-checksum=61f639d3d37a56de37263aaa22dfe8b3f8cc56b1d6d9a59a4ce4ce70fcb139e9
+checksum=6f8817f1091a9f8fd001e9b84185cd198f739391e89e3cabcc253f46c4cf9d68
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) broken="error: void value not ignored as it ought to be" ;;
 esac
 
+pre_check() {
+	export GTEST_FILTER="-FileUtlTest.GetTempDir"
+}
+
 apt-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision}"

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

* Re: [PR PATCH] [Updated] godot: update to 3.5
  2022-08-05  0:24 [PR PATCH] godot: update to 3.4.5 Relected
                   ` (8 preceding siblings ...)
  2022-08-05 17:22 ` [PR PATCH] [Updated] " Relected
@ 2022-08-05 17:28 ` Relected
  2022-08-05 17:32 ` Relected
                   ` (18 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: Relected @ 2022-08-05 17:28 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Relected/void-packages master
https://github.com/void-linux/void-packages/pull/38473

godot: update to 3.5
<!-- Uncomment relevant sections and delete options which are not applicable -->

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


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

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

From 9ab49387e3eb179b48383e68fdb6e2a88246aa72 Mon Sep 17 00:00:00 2001
From: Relected <m7md11xd@gmail.com>
Date: Fri, 5 Aug 2022 02:20:32 +0200
Subject: [PATCH 01/22] godot: update to 3.4.5

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

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index c38f3f8c525a..ee19c7fa5823 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,6 +1,6 @@
 # Template file for 'godot'
 pkgname=godot
-version=3.4
+version=3.4.5
 revision=1
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 wrksrc="${pkgname}-${version}-stable"
@@ -27,7 +27,7 @@ maintainer="Nick Hahn <nick.hahn@hotmail.de>"
 license="MIT"
 homepage="https://www.godotengine.org/"
 distfiles="https://github.com/godotengine/${pkgname}/archive/${version}-stable.tar.gz"
-checksum=61749d12cb094c0be2a2c451ae2aceb8bb45f59f67fcd13fcd8f0c9114262d88
+checksum=87c988d52e7a06100d30164a18c213e022ef175a6de3bd945352bacc87d5289c
 nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio
 
 CFLAGS+=" -fPIE -fPIC"

From 836f8d10bb4c8eea00a2cbaafa7e76966343c29e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 3 Aug 2022 00:08:14 -0400
Subject: [PATCH 02/22] CONTRIBUTING.md: add instructions for testing PRs

---
 CONTRIBUTING.md | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index da3bef29c883..3f33aeb1d974 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -129,3 +129,25 @@ Please abstain from temporarily closing a pull request while revising the templa
 
 Once the reviewers have merged the pull request, our [build server](http://build.voidlinux.org) is automatically triggered and builds
 all packages in the pull request for all supported platforms. Upon completion, the packages are available to all Void Linux users.
+
+## Testing Pull Requests
+
+While it is the responsibility of the PR creator to test changes before sending it, one person can't test all configuration options, usecases, hardware, etc.
+Testing new package submissions and updates is always helpful, and is a great way to get started with contributing.
+First, [clone the repository](https://github.com/void-linux/void-packages#quick-start) if you haven't done so already.
+Then check out the pull request, either with `github-cli`:
+
+    $ gh pr checkout <number>
+
+Or with `git`:
+
+If your local void-packages repository is cloned from your fork, you may need to add the main repository as a remote first:
+
+    $ git remote add upstream https://github.com/void-linux/void-packages.git
+
+Then fetch and check out the PR (replacing `<remote>` with either `origin` or `upstream`):
+
+    $ git fetch <remote> pull/<number>/head:<branch-name>
+    $ git checkout <branch-name>
+
+Then [build and install](https://github.com/void-linux/void-packages#building-packages) the package and test its functionality.

From 4d80d0a46552e9207197a4529a0803d1880be475 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 2 Aug 2022 18:46:18 +0200
Subject: [PATCH 03/22] xcdroast: remove package

gtk2
---
 srcpkgs/removed-packages/template |  1 +
 srcpkgs/xcdroast/template         | 14 --------------
 2 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 srcpkgs/xcdroast/template

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 4a325984709b..c716bb3a0b6f 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -416,6 +416,7 @@ replaces="
  wicd-gtk<=1.7.4_6
  wireguard-go<=0.0.20181222_2
  wireshark-gtk<=3.0.7_1
+ xcdroast<=1.19_1
  xlennart<=1.1.1_1
  xmonad-contrib<=0.16_3
  xmonad<=0.15_5
diff --git a/srcpkgs/xcdroast/template b/srcpkgs/xcdroast/template
deleted file mode 100644
index a8334bbb0dd1..000000000000
--- a/srcpkgs/xcdroast/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'xcdroast'
-pkgname=xcdroast
-version=1.19
-revision=1
-build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="gtk+-devel alsa-lib-devel"
-depends="cdrtools"
-short_desc="Flexible frontend for optical disc authoring"
-maintainer="Nick Hahn <nick.hahn@hotmail.de>"
-license="GPL-2.0-only"
-homepage="http://www.xcdroast.org"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=86f52ba796d4d8ad346a4c73667f728a79d96e1045c239cf94d1529e2c271615

From 0cf096b4f7598eba21f3e4e7ebaa28e10d8f2a4e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 2 Aug 2022 18:40:40 +0200
Subject: [PATCH 04/22] yabause-gtk: remove package

gtk2, dead upstream
---
 srcpkgs/removed-packages/template            |  1 +
 srcpkgs/yabause-gtk/patches/fix-cflags.patch | 13 -------------
 srcpkgs/yabause-gtk/patches/rwx.patch        | 20 --------------------
 srcpkgs/yabause-gtk/template                 | 19 -------------------
 srcpkgs/yabause-gtk/update                   |  1 -
 5 files changed, 1 insertion(+), 53 deletions(-)
 delete mode 100644 srcpkgs/yabause-gtk/patches/fix-cflags.patch
 delete mode 100644 srcpkgs/yabause-gtk/patches/rwx.patch
 delete mode 100644 srcpkgs/yabause-gtk/template
 delete mode 100644 srcpkgs/yabause-gtk/update

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index c716bb3a0b6f..873cf9c1927d 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -422,6 +422,7 @@ replaces="
  xmonad<=0.15_5
  xnoise-devel<=0.2.21_4
  xnoise<=0.2.21_4
+ yabause-gtk<=0.9.15_2
  yt-play<=20140117_2
  yturl<=2.0.2_5
  zbackup<=1.4.4_23
diff --git a/srcpkgs/yabause-gtk/patches/fix-cflags.patch b/srcpkgs/yabause-gtk/patches/fix-cflags.patch
deleted file mode 100644
index b69426bd3016..000000000000
--- a/srcpkgs/yabause-gtk/patches/fix-cflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: src/CMakeLists.txt
-===================================================================
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -659,7 +659,7 @@ else ()
- 	set(yabause_SOURCES ${yabause_SOURCES} sock-dummy.c thr-dummy.c)
- endif ()
- 
--set(YAB_OPTIMIZATION "-O3" CACHE STRING "Override optimization level")
-+set(YAB_OPTIMIZATION "" CACHE STRING "Override optimization level")
- 
- if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i686")
- 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${YAB_OPTIMIZATION} -march=i686 -msse")
diff --git a/srcpkgs/yabause-gtk/patches/rwx.patch b/srcpkgs/yabause-gtk/patches/rwx.patch
deleted file mode 100644
index bb0491b373f8..000000000000
--- a/srcpkgs/yabause-gtk/patches/rwx.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/sh2_dynarec/linkage_x64.s	2013-03-11 20:29:53.112870900 +0100
-+++ b/src/sh2_dynarec/linkage_x64.s	2013-03-11 20:31:48.856778600 +0100
-@@ -747,3 +747,7 @@ breakpoint:
- 	ret
- 	/* Set breakpoint here for debugging */
- 	.size	breakpoint, .-breakpoint
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
---- a/src/sh2_dynarec/linkage_x86.s	2013-03-11 20:30:08.157693100 +0100
-+++ b/src/sh2_dynarec/linkage_x86.s	2013-03-11 20:32:30.993310600 +0100
-@@ -743,3 +743,7 @@ breakpoint:
- 	ret
- 	/* Set breakpoint here for debugging */
- 	.size	breakpoint, .-breakpoint
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
diff --git a/srcpkgs/yabause-gtk/template b/srcpkgs/yabause-gtk/template
deleted file mode 100644
index 841c0af36b78..000000000000
--- a/srcpkgs/yabause-gtk/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'yabause-gtk'
-pkgname=yabause-gtk
-version=0.9.15
-revision=2
-wrksrc="${pkgname%-gtk}-${version}"
-build_style=cmake
-configure_args="-DYAB_PORTS=gtk -DYAB_NETWORK=ON -DYAB_OPTIMIZED_DMA=ON"
-hostmakedepends="pkg-config"
-makedepends="libXmu-devel libfreeglut-devel gtkglext-devel libopenal-devel SDL2-devel"
-depends="desktop-file-utils"
-short_desc="Sega Saturn emulator with GTK UI)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://yabause.org/"
-distfiles="https://download.tuxfamily.org/yabause/releases/${version}/yabause-${version}.tar.gz"
-checksum=4334c43fe0f3ff297bac8e91f4e059fe5fd276291faff2489e37b5b3a4ccc2b2
-nopie=yes
-# Would need m68kmake built for the host
-nocross=yes
diff --git a/srcpkgs/yabause-gtk/update b/srcpkgs/yabause-gtk/update
deleted file mode 100644
index b93f2e9eada0..000000000000
--- a/srcpkgs/yabause-gtk/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname="${pkgname%-gtk}"

From 33c0249d165c86eab0a39a203ecd14a28459a62b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 2 Aug 2022 18:44:15 +0200
Subject: [PATCH 05/22] xnp2: remove package

gtk2, dead upstream
---
 srcpkgs/removed-packages/template           |  1 +
 srcpkgs/xnp2/INSTALL.msg                    |  7 ------
 srcpkgs/xnp2/patches/define_cplusplus.patch | 17 -------------
 srcpkgs/xnp2/template                       | 27 ---------------------
 srcpkgs/xnp2/update                         |  1 -
 5 files changed, 1 insertion(+), 52 deletions(-)
 delete mode 100644 srcpkgs/xnp2/INSTALL.msg
 delete mode 100644 srcpkgs/xnp2/patches/define_cplusplus.patch
 delete mode 100644 srcpkgs/xnp2/template
 delete mode 100644 srcpkgs/xnp2/update

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 873cf9c1927d..392f1e39e130 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -420,6 +420,7 @@ replaces="
  xlennart<=1.1.1_1
  xmonad-contrib<=0.16_3
  xmonad<=0.15_5
+ xnp2<=0.86_2
  xnoise-devel<=0.2.21_4
  xnoise<=0.2.21_4
  yabause-gtk<=0.9.15_2
diff --git a/srcpkgs/xnp2/INSTALL.msg b/srcpkgs/xnp2/INSTALL.msg
deleted file mode 100644
index 53fc91ec76da..000000000000
--- a/srcpkgs/xnp2/INSTALL.msg
+++ /dev/null
@@ -1,7 +0,0 @@
-The following packages are not required for operation, but are necessary
-to support extra features:
-
-SDL2       Required when using sound and joystick.
-SDL2_mixer Required when playing PCM such as floppy seek sound.
-libXxf86vm Required when using full screen function to change screen resolution.
-libusb     Required when supporting C86 BOX.
diff --git a/srcpkgs/xnp2/patches/define_cplusplus.patch b/srcpkgs/xnp2/patches/define_cplusplus.patch
deleted file mode 100644
index 12b24c90bb28..000000000000
--- a/srcpkgs/xnp2/patches/define_cplusplus.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/x11/compiler.h.old	2018-02-02 17:00:29.174895866 +0000
-+++ b/x11/compiler.h	2018-02-02 17:00:41.199160781 +0000
-@@ -117,12 +117,14 @@
- #define	MAX_PATH	MAXPATHLEN
- #endif
- 
-+#ifndef __cplusplus
- #ifndef	max
- #define	max(a,b)	(((a) > (b)) ? (a) : (b))
- #endif
- #ifndef	min
- #define	min(a,b)	(((a) < (b)) ? (a) : (b))
- #endif
-+#endif /* __cplusplus */
- 
- #ifndef	ZeroMemory
- #define	ZeroMemory(d,n)		memset((d), 0, (n))
diff --git a/srcpkgs/xnp2/template b/srcpkgs/xnp2/template
deleted file mode 100644
index 7ae496fc224e..000000000000
--- a/srcpkgs/xnp2/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'xnp2'
-pkgname=xnp2
-version=0.86
-revision=2
-build_wrksrc=x11
-build_style=gnu-configure
-configure_args="--enable-ia32 --enable-build-all"
-hostmakedepends="pkg-config nasm"
-makedepends="gtk+-devel SDL2-devel"
-short_desc="Port for UNIX with X11 of the Neko Project II PC-9801 emulator"
-maintainer="hipperson0 <hipperson0@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://www.nonakap.org/np2"
-distfiles="https://www.nonakap.org/np2/release/xnp2-${version}.tar.bz2"
-checksum=e0b8c93f54682a4b3373907fd9ffe78094f95f7430dffc5038eccbcc4c3f78fd
-
-do_install() {
-	vbin xnp2
-	vbin xnp21
-	vman xnp2.1
-	vman xnp2.1j
-	vman xnp21.1
-	vman xnp21.1j
-	vdoc README.ja
-	sed '/\*\//q' main.c > LICENSE
-	vlicense LICENSE
-}
diff --git a/srcpkgs/xnp2/update b/srcpkgs/xnp2/update
deleted file mode 100644
index 04584df73d29..000000000000
--- a/srcpkgs/xnp2/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="20140607"

From 7cb634b777b157976dbd0f1ec6fdf80ddc6aa4f6 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 5 Aug 2022 00:44:21 +0000
Subject: [PATCH 06/22] graphviz-x11: remove stale symlink

---
 srcpkgs/graphviz-x11 | 1 -
 1 file changed, 1 deletion(-)
 delete mode 120000 srcpkgs/graphviz-x11

diff --git a/srcpkgs/graphviz-x11 b/srcpkgs/graphviz-x11
deleted file mode 120000
index abecf5d9457d..000000000000
--- a/srcpkgs/graphviz-x11
+++ /dev/null
@@ -1 +0,0 @@
-graphviz
\ No newline at end of file

From c8271d68e65b07990ae8dbe5f19d4e94f93c7530 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 4 Aug 2022 20:06:49 -0400
Subject: [PATCH 07/22] watchexec: update to 1.20.5

---
 srcpkgs/watchexec/patches/fix-tests.patch | 14 --------------
 srcpkgs/watchexec/template                |  4 ++--
 2 files changed, 2 insertions(+), 16 deletions(-)
 delete mode 100644 srcpkgs/watchexec/patches/fix-tests.patch

diff --git a/srcpkgs/watchexec/patches/fix-tests.patch b/srcpkgs/watchexec/patches/fix-tests.patch
deleted file mode 100644
index f210de15e314..000000000000
--- a/srcpkgs/watchexec/patches/fix-tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# Remove debug notice from test case
-diff --git a/crates/cli/tests/snapshots/help__help_unix.snap b/crates/cli/tests/snapshots/help__help_unix.snap
-index b55782f022..c5642f98ce 100644
---- a/crates/cli/tests/snapshots/help__help_unix.snap
-+++ b/crates/cli/tests/snapshots/help__help_unix.snap
-@@ -2,8 +2,6 @@
- source: crates/cli/tests/help.rs
- expression: "String::from_utf8(output.stdout).unwrap()"
- ---
--⚠ DEBUG BUILD ⚠
--
- watchexec 1.20.2
- Execute commands when watched files change
- 
diff --git a/srcpkgs/watchexec/template b/srcpkgs/watchexec/template
index 4bd08d626870..c6401cd925d2 100644
--- a/srcpkgs/watchexec/template
+++ b/srcpkgs/watchexec/template
@@ -1,6 +1,6 @@
 # Template file for 'watchexec'
 pkgname=watchexec
-version=1.20.2
+version=1.20.5
 revision=1
 wrksrc="${pkgname}-cli-v${version}"
 build_wrksrc="crates/cli"
@@ -10,7 +10,7 @@ maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/watchexec/watchexec"
 distfiles="https://github.com/watchexec/watchexec/archive/refs/tags/cli-v${version}.tar.gz"
-checksum=62e2e722a84475436286010edff36c56c4c6fad9e76be4b35381877e93faeac8
+checksum=2bc04c7ecf58d34a48c3eeea54a76b7e621717cb93305497bea2f6399dd119c6
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From f245a59b1701bfaa994e17ad70157f5be03df06b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Thu, 4 Aug 2022 15:39:56 +0200
Subject: [PATCH 08/22] element-desktop: update to 1.11.2.

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

diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index 4f5aae940e49..a2c70cf88a8e 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.1
+version=1.11.2
 revision=1
 create_wrksrc=yes
 conf_files="/etc/${pkgname}/config.json"
@@ -14,12 +14,10 @@ short_desc="Glossy Matrix collaboration client, desktop version"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0"
 homepage="https://element.io"
-_ghpage="https://github.com/vector-im"
-_archive="archive/v${version}.tar.gz"
-distfiles="${_ghpage}/element-desktop/${_archive}>element-desktop.tar.gz
- ${_ghpage}/element-web/${_archive}>element-web.tar.gz"
-checksum="b93c82705bde69504d201b3624bcbd5fb258c0bf20e1535c0339132e593469b4
- b223fcff42a305ce8034892e0bdcb4806e45f5fd7f902e2914bc65dbd910230b"
+distfiles="https://github.com/vector-im/element-desktop/archive/v${version}.tar.gz>element-desktop.tar.gz
+ https://github.com/vector-im/element-web/archive/v${version}.tar.gz>element-web.tar.gz"
+checksum="f8cae27b6960e58d4a78f19b8198a6452e4789e7107950d678ec88a08247f84a
+ 2e9498a910acfc78d1b5ba4beb99af05195bde664c08ec1c2da47ef0d6ef21af"
 
 export USE_SYSTEM_APP_BUILDER=true
 

From b424ca75c311258510bb52ff77cf61fa32b74f94 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 5 Aug 2022 08:25:04 -0400
Subject: [PATCH 09/22] mkinitcpio: backport fix for kmod>=30

---
 srcpkgs/mkinitcpio/patches/fix-depmod.patch | 30 +++++++++++++++++++++
 srcpkgs/mkinitcpio/template                 |  2 +-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/mkinitcpio/patches/fix-depmod.patch

diff --git a/srcpkgs/mkinitcpio/patches/fix-depmod.patch b/srcpkgs/mkinitcpio/patches/fix-depmod.patch
new file mode 100644
index 000000000000..55e5e7bb3a1d
--- /dev/null
+++ b/srcpkgs/mkinitcpio/patches/fix-depmod.patch
@@ -0,0 +1,30 @@
+From e629e34f18141a6244eaac2f0288d7b2a5d669ee Mon Sep 17 00:00:00 2001
+From: Chih-Hsuan Yen <yan12125@gmail.com>
+Date: Sun, 3 Jul 2022 11:03:10 +0800
+Subject: [PATCH] Fix the warning about missing modules.builtin.modinfo
+
+> depmod: WARNING: could not open modules.builtin.modinfo at /tmp/mkinitcpio.EftMSK/root/lib/modules/5.15.52-1-lts: No such file or directory
+
+kmod wants modules.builtin.modinfo since v30 [1].
+
+Also adds modules.order as suggested by heftig. That file is used (if
+exists) since the first commit of depmod.
+
+[1] https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git/commit/?id=0246e06340df292b5dda4bc00e24cc9ae894e881
+---
+ functions | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/functions b/functions
+index 48cfd7a..e77a4c4 100644
+--- a/functions
++++ b/functions
+@@ -876,7 +876,7 @@ install_modules() {
+     (( ${#zst_comp[*]} )) && zstd -d --rm -q "${zst_comp[@]}"
+ 
+     msg "Generating module dependencies"
+-    install -m644 -t "$moduledest" "$_d_kmoduledir"/modules.builtin
++    install -m644 -t "$moduledest" "$_d_kmoduledir"/modules.{builtin,builtin.modinfo,order}
+ 
+     # we install all modules into kernel/, making the .order file incorrect for
+     # the module tree. munge it, so that we have an accurate index. This avoids
diff --git a/srcpkgs/mkinitcpio/template b/srcpkgs/mkinitcpio/template
index ddd733d5e56d..ab00be349a27 100644
--- a/srcpkgs/mkinitcpio/template
+++ b/srcpkgs/mkinitcpio/template
@@ -1,7 +1,7 @@
 # Template file for 'mkinitcpio'
 pkgname=mkinitcpio
 version=31
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="asciidoc"
 depends="busybox-static bsdtar bash"

From af2ce48a1ad83b344161af672feaa2b910ac88d3 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sat, 30 Jul 2022 22:57:27 +0200
Subject: [PATCH 10/22] apt: update to 2.5.2

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

diff --git a/srcpkgs/apt/template b/srcpkgs/apt/template
index 9e477574ead0..17f842c34843 100644
--- a/srcpkgs/apt/template
+++ b/srcpkgs/apt/template
@@ -1,24 +1,30 @@
 # Template file for 'apt'
 pkgname=apt
-version=2.1.12
+version=2.5.2
 revision=1
 build_style=cmake
 configure_args="-DDPKG_DATADIR=/usr/share/dpkg -DCURRENT_VENDOR=debian
  -DDOCBOOK_XSL=/usr/share/xsl/docbook"
 hostmakedepends="pkg-config docbook-xsl doxygen po4a w3m libxslt triehash"
 makedepends="db-devel gnutls-devel bzip2-devel liblzma-devel liblz4-devel
- libzstd-devel libseccomp-devel eudev-libudev-devel dpkg-devel gtest-devel"
+ libzstd-devel libseccomp-devel eudev-libudev-devel dpkg-devel gtest-devel
+ libgcrypt-devel xxHash-devel"
+checkdepends="dpkg runit-void tar"
 short_desc="APT package management tools"
 maintainer="Elie ROUDNINSKI <xademax@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://salsa.debian.org/apt-team/apt"
 distfiles="https://github.com/Debian/apt/archive/${version}.tar.gz"
-checksum=61f639d3d37a56de37263aaa22dfe8b3f8cc56b1d6d9a59a4ce4ce70fcb139e9
+checksum=6f8817f1091a9f8fd001e9b84185cd198f739391e89e3cabcc253f46c4cf9d68
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) broken="error: void value not ignored as it ought to be" ;;
 esac
 
+pre_check() {
+	export GTEST_FILTER="-FileUtlTest.GetTempDir"
+}
+
 apt-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision}"

From 3285b57693125e0c76e610167df7160eea1ba616 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 5 Aug 2022 11:53:40 -0500
Subject: [PATCH 11/22] sqlmap: update to 1.6.8.

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

diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template
index 4b6eb70fee68..312a20b710ee 100644
--- a/srcpkgs/sqlmap/template
+++ b/srcpkgs/sqlmap/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlmap'
 pkgname=sqlmap
-version=1.6.7
+version=1.6.8
 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=397472048c3b454da3e5448944002661fff376edd38f6fe902ab1db0f9fd8d2b
+checksum=35c51f4bd6f5cb8dd8efee4cf87d49bc7e7311ed6f42ffdd038394f7f98e69a2
 python_version=3
 
 do_install() {

From 5a2c77e96feddf914788cb5cb1792745b4dada52 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 3 Aug 2022 00:08:14 -0400
Subject: [PATCH 12/22] CONTRIBUTING.md: add instructions for testing PRs

---
 CONTRIBUTING.md | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index da3bef29c883..3f33aeb1d974 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -129,3 +129,25 @@ Please abstain from temporarily closing a pull request while revising the templa
 
 Once the reviewers have merged the pull request, our [build server](http://build.voidlinux.org) is automatically triggered and builds
 all packages in the pull request for all supported platforms. Upon completion, the packages are available to all Void Linux users.
+
+## Testing Pull Requests
+
+While it is the responsibility of the PR creator to test changes before sending it, one person can't test all configuration options, usecases, hardware, etc.
+Testing new package submissions and updates is always helpful, and is a great way to get started with contributing.
+First, [clone the repository](https://github.com/void-linux/void-packages#quick-start) if you haven't done so already.
+Then check out the pull request, either with `github-cli`:
+
+    $ gh pr checkout <number>
+
+Or with `git`:
+
+If your local void-packages repository is cloned from your fork, you may need to add the main repository as a remote first:
+
+    $ git remote add upstream https://github.com/void-linux/void-packages.git
+
+Then fetch and check out the PR (replacing `<remote>` with either `origin` or `upstream`):
+
+    $ git fetch <remote> pull/<number>/head:<branch-name>
+    $ git checkout <branch-name>
+
+Then [build and install](https://github.com/void-linux/void-packages#building-packages) the package and test its functionality.

From a282e80a78785e68e99593b535a8b0876e62eb5c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 2 Aug 2022 18:46:18 +0200
Subject: [PATCH 13/22] xcdroast: remove package

gtk2
---
 srcpkgs/removed-packages/template |  1 +
 srcpkgs/xcdroast/template         | 14 --------------
 2 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 srcpkgs/xcdroast/template

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 4a325984709b..c716bb3a0b6f 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -416,6 +416,7 @@ replaces="
  wicd-gtk<=1.7.4_6
  wireguard-go<=0.0.20181222_2
  wireshark-gtk<=3.0.7_1
+ xcdroast<=1.19_1
  xlennart<=1.1.1_1
  xmonad-contrib<=0.16_3
  xmonad<=0.15_5
diff --git a/srcpkgs/xcdroast/template b/srcpkgs/xcdroast/template
deleted file mode 100644
index a8334bbb0dd1..000000000000
--- a/srcpkgs/xcdroast/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'xcdroast'
-pkgname=xcdroast
-version=1.19
-revision=1
-build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="gtk+-devel alsa-lib-devel"
-depends="cdrtools"
-short_desc="Flexible frontend for optical disc authoring"
-maintainer="Nick Hahn <nick.hahn@hotmail.de>"
-license="GPL-2.0-only"
-homepage="http://www.xcdroast.org"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=86f52ba796d4d8ad346a4c73667f728a79d96e1045c239cf94d1529e2c271615

From 799f41402a6f8cad9c5bb9fc053480489cb08b64 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 2 Aug 2022 18:40:40 +0200
Subject: [PATCH 14/22] yabause-gtk: remove package

gtk2, dead upstream
---
 srcpkgs/removed-packages/template            |  1 +
 srcpkgs/yabause-gtk/patches/fix-cflags.patch | 13 -------------
 srcpkgs/yabause-gtk/patches/rwx.patch        | 20 --------------------
 srcpkgs/yabause-gtk/template                 | 19 -------------------
 srcpkgs/yabause-gtk/update                   |  1 -
 5 files changed, 1 insertion(+), 53 deletions(-)
 delete mode 100644 srcpkgs/yabause-gtk/patches/fix-cflags.patch
 delete mode 100644 srcpkgs/yabause-gtk/patches/rwx.patch
 delete mode 100644 srcpkgs/yabause-gtk/template
 delete mode 100644 srcpkgs/yabause-gtk/update

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index c716bb3a0b6f..873cf9c1927d 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -422,6 +422,7 @@ replaces="
  xmonad<=0.15_5
  xnoise-devel<=0.2.21_4
  xnoise<=0.2.21_4
+ yabause-gtk<=0.9.15_2
  yt-play<=20140117_2
  yturl<=2.0.2_5
  zbackup<=1.4.4_23
diff --git a/srcpkgs/yabause-gtk/patches/fix-cflags.patch b/srcpkgs/yabause-gtk/patches/fix-cflags.patch
deleted file mode 100644
index b69426bd3016..000000000000
--- a/srcpkgs/yabause-gtk/patches/fix-cflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: src/CMakeLists.txt
-===================================================================
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -659,7 +659,7 @@ else ()
- 	set(yabause_SOURCES ${yabause_SOURCES} sock-dummy.c thr-dummy.c)
- endif ()
- 
--set(YAB_OPTIMIZATION "-O3" CACHE STRING "Override optimization level")
-+set(YAB_OPTIMIZATION "" CACHE STRING "Override optimization level")
- 
- if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i686")
- 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${YAB_OPTIMIZATION} -march=i686 -msse")
diff --git a/srcpkgs/yabause-gtk/patches/rwx.patch b/srcpkgs/yabause-gtk/patches/rwx.patch
deleted file mode 100644
index bb0491b373f8..000000000000
--- a/srcpkgs/yabause-gtk/patches/rwx.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/sh2_dynarec/linkage_x64.s	2013-03-11 20:29:53.112870900 +0100
-+++ b/src/sh2_dynarec/linkage_x64.s	2013-03-11 20:31:48.856778600 +0100
-@@ -747,3 +747,7 @@ breakpoint:
- 	ret
- 	/* Set breakpoint here for debugging */
- 	.size	breakpoint, .-breakpoint
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
---- a/src/sh2_dynarec/linkage_x86.s	2013-03-11 20:30:08.157693100 +0100
-+++ b/src/sh2_dynarec/linkage_x86.s	2013-03-11 20:32:30.993310600 +0100
-@@ -743,3 +743,7 @@ breakpoint:
- 	ret
- 	/* Set breakpoint here for debugging */
- 	.size	breakpoint, .-breakpoint
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
diff --git a/srcpkgs/yabause-gtk/template b/srcpkgs/yabause-gtk/template
deleted file mode 100644
index 841c0af36b78..000000000000
--- a/srcpkgs/yabause-gtk/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'yabause-gtk'
-pkgname=yabause-gtk
-version=0.9.15
-revision=2
-wrksrc="${pkgname%-gtk}-${version}"
-build_style=cmake
-configure_args="-DYAB_PORTS=gtk -DYAB_NETWORK=ON -DYAB_OPTIMIZED_DMA=ON"
-hostmakedepends="pkg-config"
-makedepends="libXmu-devel libfreeglut-devel gtkglext-devel libopenal-devel SDL2-devel"
-depends="desktop-file-utils"
-short_desc="Sega Saturn emulator with GTK UI)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://yabause.org/"
-distfiles="https://download.tuxfamily.org/yabause/releases/${version}/yabause-${version}.tar.gz"
-checksum=4334c43fe0f3ff297bac8e91f4e059fe5fd276291faff2489e37b5b3a4ccc2b2
-nopie=yes
-# Would need m68kmake built for the host
-nocross=yes
diff --git a/srcpkgs/yabause-gtk/update b/srcpkgs/yabause-gtk/update
deleted file mode 100644
index b93f2e9eada0..000000000000
--- a/srcpkgs/yabause-gtk/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname="${pkgname%-gtk}"

From 5bbb705cad1b760371626fa74c1ff0359c93c48d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 2 Aug 2022 18:44:15 +0200
Subject: [PATCH 15/22] xnp2: remove package

gtk2, dead upstream
---
 srcpkgs/removed-packages/template           |  1 +
 srcpkgs/xnp2/INSTALL.msg                    |  7 ------
 srcpkgs/xnp2/patches/define_cplusplus.patch | 17 -------------
 srcpkgs/xnp2/template                       | 27 ---------------------
 srcpkgs/xnp2/update                         |  1 -
 5 files changed, 1 insertion(+), 52 deletions(-)
 delete mode 100644 srcpkgs/xnp2/INSTALL.msg
 delete mode 100644 srcpkgs/xnp2/patches/define_cplusplus.patch
 delete mode 100644 srcpkgs/xnp2/template
 delete mode 100644 srcpkgs/xnp2/update

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 873cf9c1927d..392f1e39e130 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -420,6 +420,7 @@ replaces="
  xlennart<=1.1.1_1
  xmonad-contrib<=0.16_3
  xmonad<=0.15_5
+ xnp2<=0.86_2
  xnoise-devel<=0.2.21_4
  xnoise<=0.2.21_4
  yabause-gtk<=0.9.15_2
diff --git a/srcpkgs/xnp2/INSTALL.msg b/srcpkgs/xnp2/INSTALL.msg
deleted file mode 100644
index 53fc91ec76da..000000000000
--- a/srcpkgs/xnp2/INSTALL.msg
+++ /dev/null
@@ -1,7 +0,0 @@
-The following packages are not required for operation, but are necessary
-to support extra features:
-
-SDL2       Required when using sound and joystick.
-SDL2_mixer Required when playing PCM such as floppy seek sound.
-libXxf86vm Required when using full screen function to change screen resolution.
-libusb     Required when supporting C86 BOX.
diff --git a/srcpkgs/xnp2/patches/define_cplusplus.patch b/srcpkgs/xnp2/patches/define_cplusplus.patch
deleted file mode 100644
index 12b24c90bb28..000000000000
--- a/srcpkgs/xnp2/patches/define_cplusplus.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/x11/compiler.h.old	2018-02-02 17:00:29.174895866 +0000
-+++ b/x11/compiler.h	2018-02-02 17:00:41.199160781 +0000
-@@ -117,12 +117,14 @@
- #define	MAX_PATH	MAXPATHLEN
- #endif
- 
-+#ifndef __cplusplus
- #ifndef	max
- #define	max(a,b)	(((a) > (b)) ? (a) : (b))
- #endif
- #ifndef	min
- #define	min(a,b)	(((a) < (b)) ? (a) : (b))
- #endif
-+#endif /* __cplusplus */
- 
- #ifndef	ZeroMemory
- #define	ZeroMemory(d,n)		memset((d), 0, (n))
diff --git a/srcpkgs/xnp2/template b/srcpkgs/xnp2/template
deleted file mode 100644
index 7ae496fc224e..000000000000
--- a/srcpkgs/xnp2/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'xnp2'
-pkgname=xnp2
-version=0.86
-revision=2
-build_wrksrc=x11
-build_style=gnu-configure
-configure_args="--enable-ia32 --enable-build-all"
-hostmakedepends="pkg-config nasm"
-makedepends="gtk+-devel SDL2-devel"
-short_desc="Port for UNIX with X11 of the Neko Project II PC-9801 emulator"
-maintainer="hipperson0 <hipperson0@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://www.nonakap.org/np2"
-distfiles="https://www.nonakap.org/np2/release/xnp2-${version}.tar.bz2"
-checksum=e0b8c93f54682a4b3373907fd9ffe78094f95f7430dffc5038eccbcc4c3f78fd
-
-do_install() {
-	vbin xnp2
-	vbin xnp21
-	vman xnp2.1
-	vman xnp2.1j
-	vman xnp21.1
-	vman xnp21.1j
-	vdoc README.ja
-	sed '/\*\//q' main.c > LICENSE
-	vlicense LICENSE
-}
diff --git a/srcpkgs/xnp2/update b/srcpkgs/xnp2/update
deleted file mode 100644
index 04584df73d29..000000000000
--- a/srcpkgs/xnp2/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="20140607"

From 032d290829598f66a768410f9b02ab88aee13f5f Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 5 Aug 2022 00:44:21 +0000
Subject: [PATCH 16/22] graphviz-x11: remove stale symlink

---
 srcpkgs/graphviz-x11 | 1 -
 1 file changed, 1 deletion(-)
 delete mode 120000 srcpkgs/graphviz-x11

diff --git a/srcpkgs/graphviz-x11 b/srcpkgs/graphviz-x11
deleted file mode 120000
index abecf5d9457d..000000000000
--- a/srcpkgs/graphviz-x11
+++ /dev/null
@@ -1 +0,0 @@
-graphviz
\ No newline at end of file

From 2f1ce58a19db21eeee706175863be750c6ec7c3c Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 4 Aug 2022 20:06:49 -0400
Subject: [PATCH 17/22] watchexec: update to 1.20.5

---
 srcpkgs/watchexec/patches/fix-tests.patch | 14 --------------
 srcpkgs/watchexec/template                |  4 ++--
 2 files changed, 2 insertions(+), 16 deletions(-)
 delete mode 100644 srcpkgs/watchexec/patches/fix-tests.patch

diff --git a/srcpkgs/watchexec/patches/fix-tests.patch b/srcpkgs/watchexec/patches/fix-tests.patch
deleted file mode 100644
index f210de15e314..000000000000
--- a/srcpkgs/watchexec/patches/fix-tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# Remove debug notice from test case
-diff --git a/crates/cli/tests/snapshots/help__help_unix.snap b/crates/cli/tests/snapshots/help__help_unix.snap
-index b55782f022..c5642f98ce 100644
---- a/crates/cli/tests/snapshots/help__help_unix.snap
-+++ b/crates/cli/tests/snapshots/help__help_unix.snap
-@@ -2,8 +2,6 @@
- source: crates/cli/tests/help.rs
- expression: "String::from_utf8(output.stdout).unwrap()"
- ---
--⚠ DEBUG BUILD ⚠
--
- watchexec 1.20.2
- Execute commands when watched files change
- 
diff --git a/srcpkgs/watchexec/template b/srcpkgs/watchexec/template
index 4bd08d626870..c6401cd925d2 100644
--- a/srcpkgs/watchexec/template
+++ b/srcpkgs/watchexec/template
@@ -1,6 +1,6 @@
 # Template file for 'watchexec'
 pkgname=watchexec
-version=1.20.2
+version=1.20.5
 revision=1
 wrksrc="${pkgname}-cli-v${version}"
 build_wrksrc="crates/cli"
@@ -10,7 +10,7 @@ maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/watchexec/watchexec"
 distfiles="https://github.com/watchexec/watchexec/archive/refs/tags/cli-v${version}.tar.gz"
-checksum=62e2e722a84475436286010edff36c56c4c6fad9e76be4b35381877e93faeac8
+checksum=2bc04c7ecf58d34a48c3eeea54a76b7e621717cb93305497bea2f6399dd119c6
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From c1c879327c25f00556647a522a6177624860a81d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Thu, 4 Aug 2022 15:39:56 +0200
Subject: [PATCH 18/22] element-desktop: update to 1.11.2.

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

diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index 4f5aae940e49..a2c70cf88a8e 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.1
+version=1.11.2
 revision=1
 create_wrksrc=yes
 conf_files="/etc/${pkgname}/config.json"
@@ -14,12 +14,10 @@ short_desc="Glossy Matrix collaboration client, desktop version"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0"
 homepage="https://element.io"
-_ghpage="https://github.com/vector-im"
-_archive="archive/v${version}.tar.gz"
-distfiles="${_ghpage}/element-desktop/${_archive}>element-desktop.tar.gz
- ${_ghpage}/element-web/${_archive}>element-web.tar.gz"
-checksum="b93c82705bde69504d201b3624bcbd5fb258c0bf20e1535c0339132e593469b4
- b223fcff42a305ce8034892e0bdcb4806e45f5fd7f902e2914bc65dbd910230b"
+distfiles="https://github.com/vector-im/element-desktop/archive/v${version}.tar.gz>element-desktop.tar.gz
+ https://github.com/vector-im/element-web/archive/v${version}.tar.gz>element-web.tar.gz"
+checksum="f8cae27b6960e58d4a78f19b8198a6452e4789e7107950d678ec88a08247f84a
+ 2e9498a910acfc78d1b5ba4beb99af05195bde664c08ec1c2da47ef0d6ef21af"
 
 export USE_SYSTEM_APP_BUILDER=true
 

From 95ed006d2e2ea1b1314d78eb94a5a5127a580af8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 5 Aug 2022 08:25:04 -0400
Subject: [PATCH 19/22] mkinitcpio: backport fix for kmod>=30

---
 srcpkgs/mkinitcpio/patches/fix-depmod.patch | 30 +++++++++++++++++++++
 srcpkgs/mkinitcpio/template                 |  2 +-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/mkinitcpio/patches/fix-depmod.patch

diff --git a/srcpkgs/mkinitcpio/patches/fix-depmod.patch b/srcpkgs/mkinitcpio/patches/fix-depmod.patch
new file mode 100644
index 000000000000..55e5e7bb3a1d
--- /dev/null
+++ b/srcpkgs/mkinitcpio/patches/fix-depmod.patch
@@ -0,0 +1,30 @@
+From e629e34f18141a6244eaac2f0288d7b2a5d669ee Mon Sep 17 00:00:00 2001
+From: Chih-Hsuan Yen <yan12125@gmail.com>
+Date: Sun, 3 Jul 2022 11:03:10 +0800
+Subject: [PATCH] Fix the warning about missing modules.builtin.modinfo
+
+> depmod: WARNING: could not open modules.builtin.modinfo at /tmp/mkinitcpio.EftMSK/root/lib/modules/5.15.52-1-lts: No such file or directory
+
+kmod wants modules.builtin.modinfo since v30 [1].
+
+Also adds modules.order as suggested by heftig. That file is used (if
+exists) since the first commit of depmod.
+
+[1] https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git/commit/?id=0246e06340df292b5dda4bc00e24cc9ae894e881
+---
+ functions | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/functions b/functions
+index 48cfd7a..e77a4c4 100644
+--- a/functions
++++ b/functions
+@@ -876,7 +876,7 @@ install_modules() {
+     (( ${#zst_comp[*]} )) && zstd -d --rm -q "${zst_comp[@]}"
+ 
+     msg "Generating module dependencies"
+-    install -m644 -t "$moduledest" "$_d_kmoduledir"/modules.builtin
++    install -m644 -t "$moduledest" "$_d_kmoduledir"/modules.{builtin,builtin.modinfo,order}
+ 
+     # we install all modules into kernel/, making the .order file incorrect for
+     # the module tree. munge it, so that we have an accurate index. This avoids
diff --git a/srcpkgs/mkinitcpio/template b/srcpkgs/mkinitcpio/template
index ddd733d5e56d..ab00be349a27 100644
--- a/srcpkgs/mkinitcpio/template
+++ b/srcpkgs/mkinitcpio/template
@@ -1,7 +1,7 @@
 # Template file for 'mkinitcpio'
 pkgname=mkinitcpio
 version=31
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="asciidoc"
 depends="busybox-static bsdtar bash"

From aaf69e37b9061a066e84cf33aafa89c6ae1cc9a4 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sat, 30 Jul 2022 22:57:27 +0200
Subject: [PATCH 20/22] apt: update to 2.5.2

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

diff --git a/srcpkgs/apt/template b/srcpkgs/apt/template
index 9e477574ead0..17f842c34843 100644
--- a/srcpkgs/apt/template
+++ b/srcpkgs/apt/template
@@ -1,24 +1,30 @@
 # Template file for 'apt'
 pkgname=apt
-version=2.1.12
+version=2.5.2
 revision=1
 build_style=cmake
 configure_args="-DDPKG_DATADIR=/usr/share/dpkg -DCURRENT_VENDOR=debian
  -DDOCBOOK_XSL=/usr/share/xsl/docbook"
 hostmakedepends="pkg-config docbook-xsl doxygen po4a w3m libxslt triehash"
 makedepends="db-devel gnutls-devel bzip2-devel liblzma-devel liblz4-devel
- libzstd-devel libseccomp-devel eudev-libudev-devel dpkg-devel gtest-devel"
+ libzstd-devel libseccomp-devel eudev-libudev-devel dpkg-devel gtest-devel
+ libgcrypt-devel xxHash-devel"
+checkdepends="dpkg runit-void tar"
 short_desc="APT package management tools"
 maintainer="Elie ROUDNINSKI <xademax@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://salsa.debian.org/apt-team/apt"
 distfiles="https://github.com/Debian/apt/archive/${version}.tar.gz"
-checksum=61f639d3d37a56de37263aaa22dfe8b3f8cc56b1d6d9a59a4ce4ce70fcb139e9
+checksum=6f8817f1091a9f8fd001e9b84185cd198f739391e89e3cabcc253f46c4cf9d68
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) broken="error: void value not ignored as it ought to be" ;;
 esac
 
+pre_check() {
+	export GTEST_FILTER="-FileUtlTest.GetTempDir"
+}
+
 apt-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision}"

From c122617aa5fea771de98b8cc9155a9aad74e1f55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 5 Aug 2022 17:24:47 +0200
Subject: [PATCH 22/22] cargo-deny: update to 0.12.2.

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

diff --git a/srcpkgs/cargo-deny/template b/srcpkgs/cargo-deny/template
index 7de8e764ec90..ec8ad592b9c6 100644
--- a/srcpkgs/cargo-deny/template
+++ b/srcpkgs/cargo-deny/template
@@ -1,6 +1,6 @@
 # Template file for 'cargo-deny'
 pkgname=cargo-deny
-version=0.12.1
+version=0.12.2
 revision=1
 build_style=cargo
 configure_args="--no-default-features"
@@ -12,7 +12,7 @@ license="MIT, Apache-2.0"
 homepage="https://github.com/EmbarkStudios/cargo-deny"
 changelog="https://raw.githubusercontent.com/EmbarkStudios/cargo-deny/main/CHANGELOG.md"
 distfiles="https://github.com/EmbarkStudios/cargo-deny/archive/${version}.tar.gz"
-checksum=9f77445008553b4de1f74c4f903b68f318842f769dc8bfffa5a17af2460c0963
+checksum=7d8a034fe0219f8b7adc0ab25c90f7f253b4c387d7d5c8f74f6ad79f4810dc1e
 
 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	broken="bitvec crate unimplemented for big endian"

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

* Re: [PR PATCH] [Updated] godot: update to 3.5
  2022-08-05  0:24 [PR PATCH] godot: update to 3.4.5 Relected
                   ` (9 preceding siblings ...)
  2022-08-05 17:28 ` Relected
@ 2022-08-05 17:32 ` Relected
  2022-08-05 17:32 ` Relected
                   ` (17 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: Relected @ 2022-08-05 17:32 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Relected/void-packages master
https://github.com/void-linux/void-packages/pull/38473

godot: update to 3.5
<!-- Uncomment relevant sections and delete options which are not applicable -->

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


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

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

From 9ab49387e3eb179b48383e68fdb6e2a88246aa72 Mon Sep 17 00:00:00 2001
From: Relected <m7md11xd@gmail.com>
Date: Fri, 5 Aug 2022 02:20:32 +0200
Subject: [PATCH 01/23] godot: update to 3.4.5

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

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index c38f3f8c525a..ee19c7fa5823 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,6 +1,6 @@
 # Template file for 'godot'
 pkgname=godot
-version=3.4
+version=3.4.5
 revision=1
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 wrksrc="${pkgname}-${version}-stable"
@@ -27,7 +27,7 @@ maintainer="Nick Hahn <nick.hahn@hotmail.de>"
 license="MIT"
 homepage="https://www.godotengine.org/"
 distfiles="https://github.com/godotengine/${pkgname}/archive/${version}-stable.tar.gz"
-checksum=61749d12cb094c0be2a2c451ae2aceb8bb45f59f67fcd13fcd8f0c9114262d88
+checksum=87c988d52e7a06100d30164a18c213e022ef175a6de3bd945352bacc87d5289c
 nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio
 
 CFLAGS+=" -fPIE -fPIC"

From 836f8d10bb4c8eea00a2cbaafa7e76966343c29e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 3 Aug 2022 00:08:14 -0400
Subject: [PATCH 02/23] CONTRIBUTING.md: add instructions for testing PRs

---
 CONTRIBUTING.md | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index da3bef29c883..3f33aeb1d974 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -129,3 +129,25 @@ Please abstain from temporarily closing a pull request while revising the templa
 
 Once the reviewers have merged the pull request, our [build server](http://build.voidlinux.org) is automatically triggered and builds
 all packages in the pull request for all supported platforms. Upon completion, the packages are available to all Void Linux users.
+
+## Testing Pull Requests
+
+While it is the responsibility of the PR creator to test changes before sending it, one person can't test all configuration options, usecases, hardware, etc.
+Testing new package submissions and updates is always helpful, and is a great way to get started with contributing.
+First, [clone the repository](https://github.com/void-linux/void-packages#quick-start) if you haven't done so already.
+Then check out the pull request, either with `github-cli`:
+
+    $ gh pr checkout <number>
+
+Or with `git`:
+
+If your local void-packages repository is cloned from your fork, you may need to add the main repository as a remote first:
+
+    $ git remote add upstream https://github.com/void-linux/void-packages.git
+
+Then fetch and check out the PR (replacing `<remote>` with either `origin` or `upstream`):
+
+    $ git fetch <remote> pull/<number>/head:<branch-name>
+    $ git checkout <branch-name>
+
+Then [build and install](https://github.com/void-linux/void-packages#building-packages) the package and test its functionality.

From 4d80d0a46552e9207197a4529a0803d1880be475 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 2 Aug 2022 18:46:18 +0200
Subject: [PATCH 03/23] xcdroast: remove package

gtk2
---
 srcpkgs/removed-packages/template |  1 +
 srcpkgs/xcdroast/template         | 14 --------------
 2 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 srcpkgs/xcdroast/template

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 4a325984709b..c716bb3a0b6f 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -416,6 +416,7 @@ replaces="
  wicd-gtk<=1.7.4_6
  wireguard-go<=0.0.20181222_2
  wireshark-gtk<=3.0.7_1
+ xcdroast<=1.19_1
  xlennart<=1.1.1_1
  xmonad-contrib<=0.16_3
  xmonad<=0.15_5
diff --git a/srcpkgs/xcdroast/template b/srcpkgs/xcdroast/template
deleted file mode 100644
index a8334bbb0dd1..000000000000
--- a/srcpkgs/xcdroast/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'xcdroast'
-pkgname=xcdroast
-version=1.19
-revision=1
-build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="gtk+-devel alsa-lib-devel"
-depends="cdrtools"
-short_desc="Flexible frontend for optical disc authoring"
-maintainer="Nick Hahn <nick.hahn@hotmail.de>"
-license="GPL-2.0-only"
-homepage="http://www.xcdroast.org"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=86f52ba796d4d8ad346a4c73667f728a79d96e1045c239cf94d1529e2c271615

From 0cf096b4f7598eba21f3e4e7ebaa28e10d8f2a4e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 2 Aug 2022 18:40:40 +0200
Subject: [PATCH 04/23] yabause-gtk: remove package

gtk2, dead upstream
---
 srcpkgs/removed-packages/template            |  1 +
 srcpkgs/yabause-gtk/patches/fix-cflags.patch | 13 -------------
 srcpkgs/yabause-gtk/patches/rwx.patch        | 20 --------------------
 srcpkgs/yabause-gtk/template                 | 19 -------------------
 srcpkgs/yabause-gtk/update                   |  1 -
 5 files changed, 1 insertion(+), 53 deletions(-)
 delete mode 100644 srcpkgs/yabause-gtk/patches/fix-cflags.patch
 delete mode 100644 srcpkgs/yabause-gtk/patches/rwx.patch
 delete mode 100644 srcpkgs/yabause-gtk/template
 delete mode 100644 srcpkgs/yabause-gtk/update

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index c716bb3a0b6f..873cf9c1927d 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -422,6 +422,7 @@ replaces="
  xmonad<=0.15_5
  xnoise-devel<=0.2.21_4
  xnoise<=0.2.21_4
+ yabause-gtk<=0.9.15_2
  yt-play<=20140117_2
  yturl<=2.0.2_5
  zbackup<=1.4.4_23
diff --git a/srcpkgs/yabause-gtk/patches/fix-cflags.patch b/srcpkgs/yabause-gtk/patches/fix-cflags.patch
deleted file mode 100644
index b69426bd3016..000000000000
--- a/srcpkgs/yabause-gtk/patches/fix-cflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: src/CMakeLists.txt
-===================================================================
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -659,7 +659,7 @@ else ()
- 	set(yabause_SOURCES ${yabause_SOURCES} sock-dummy.c thr-dummy.c)
- endif ()
- 
--set(YAB_OPTIMIZATION "-O3" CACHE STRING "Override optimization level")
-+set(YAB_OPTIMIZATION "" CACHE STRING "Override optimization level")
- 
- if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i686")
- 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${YAB_OPTIMIZATION} -march=i686 -msse")
diff --git a/srcpkgs/yabause-gtk/patches/rwx.patch b/srcpkgs/yabause-gtk/patches/rwx.patch
deleted file mode 100644
index bb0491b373f8..000000000000
--- a/srcpkgs/yabause-gtk/patches/rwx.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/sh2_dynarec/linkage_x64.s	2013-03-11 20:29:53.112870900 +0100
-+++ b/src/sh2_dynarec/linkage_x64.s	2013-03-11 20:31:48.856778600 +0100
-@@ -747,3 +747,7 @@ breakpoint:
- 	ret
- 	/* Set breakpoint here for debugging */
- 	.size	breakpoint, .-breakpoint
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
---- a/src/sh2_dynarec/linkage_x86.s	2013-03-11 20:30:08.157693100 +0100
-+++ b/src/sh2_dynarec/linkage_x86.s	2013-03-11 20:32:30.993310600 +0100
-@@ -743,3 +743,7 @@ breakpoint:
- 	ret
- 	/* Set breakpoint here for debugging */
- 	.size	breakpoint, .-breakpoint
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
diff --git a/srcpkgs/yabause-gtk/template b/srcpkgs/yabause-gtk/template
deleted file mode 100644
index 841c0af36b78..000000000000
--- a/srcpkgs/yabause-gtk/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'yabause-gtk'
-pkgname=yabause-gtk
-version=0.9.15
-revision=2
-wrksrc="${pkgname%-gtk}-${version}"
-build_style=cmake
-configure_args="-DYAB_PORTS=gtk -DYAB_NETWORK=ON -DYAB_OPTIMIZED_DMA=ON"
-hostmakedepends="pkg-config"
-makedepends="libXmu-devel libfreeglut-devel gtkglext-devel libopenal-devel SDL2-devel"
-depends="desktop-file-utils"
-short_desc="Sega Saturn emulator with GTK UI)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://yabause.org/"
-distfiles="https://download.tuxfamily.org/yabause/releases/${version}/yabause-${version}.tar.gz"
-checksum=4334c43fe0f3ff297bac8e91f4e059fe5fd276291faff2489e37b5b3a4ccc2b2
-nopie=yes
-# Would need m68kmake built for the host
-nocross=yes
diff --git a/srcpkgs/yabause-gtk/update b/srcpkgs/yabause-gtk/update
deleted file mode 100644
index b93f2e9eada0..000000000000
--- a/srcpkgs/yabause-gtk/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname="${pkgname%-gtk}"

From 33c0249d165c86eab0a39a203ecd14a28459a62b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 2 Aug 2022 18:44:15 +0200
Subject: [PATCH 05/23] xnp2: remove package

gtk2, dead upstream
---
 srcpkgs/removed-packages/template           |  1 +
 srcpkgs/xnp2/INSTALL.msg                    |  7 ------
 srcpkgs/xnp2/patches/define_cplusplus.patch | 17 -------------
 srcpkgs/xnp2/template                       | 27 ---------------------
 srcpkgs/xnp2/update                         |  1 -
 5 files changed, 1 insertion(+), 52 deletions(-)
 delete mode 100644 srcpkgs/xnp2/INSTALL.msg
 delete mode 100644 srcpkgs/xnp2/patches/define_cplusplus.patch
 delete mode 100644 srcpkgs/xnp2/template
 delete mode 100644 srcpkgs/xnp2/update

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 873cf9c1927d..392f1e39e130 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -420,6 +420,7 @@ replaces="
  xlennart<=1.1.1_1
  xmonad-contrib<=0.16_3
  xmonad<=0.15_5
+ xnp2<=0.86_2
  xnoise-devel<=0.2.21_4
  xnoise<=0.2.21_4
  yabause-gtk<=0.9.15_2
diff --git a/srcpkgs/xnp2/INSTALL.msg b/srcpkgs/xnp2/INSTALL.msg
deleted file mode 100644
index 53fc91ec76da..000000000000
--- a/srcpkgs/xnp2/INSTALL.msg
+++ /dev/null
@@ -1,7 +0,0 @@
-The following packages are not required for operation, but are necessary
-to support extra features:
-
-SDL2       Required when using sound and joystick.
-SDL2_mixer Required when playing PCM such as floppy seek sound.
-libXxf86vm Required when using full screen function to change screen resolution.
-libusb     Required when supporting C86 BOX.
diff --git a/srcpkgs/xnp2/patches/define_cplusplus.patch b/srcpkgs/xnp2/patches/define_cplusplus.patch
deleted file mode 100644
index 12b24c90bb28..000000000000
--- a/srcpkgs/xnp2/patches/define_cplusplus.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/x11/compiler.h.old	2018-02-02 17:00:29.174895866 +0000
-+++ b/x11/compiler.h	2018-02-02 17:00:41.199160781 +0000
-@@ -117,12 +117,14 @@
- #define	MAX_PATH	MAXPATHLEN
- #endif
- 
-+#ifndef __cplusplus
- #ifndef	max
- #define	max(a,b)	(((a) > (b)) ? (a) : (b))
- #endif
- #ifndef	min
- #define	min(a,b)	(((a) < (b)) ? (a) : (b))
- #endif
-+#endif /* __cplusplus */
- 
- #ifndef	ZeroMemory
- #define	ZeroMemory(d,n)		memset((d), 0, (n))
diff --git a/srcpkgs/xnp2/template b/srcpkgs/xnp2/template
deleted file mode 100644
index 7ae496fc224e..000000000000
--- a/srcpkgs/xnp2/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'xnp2'
-pkgname=xnp2
-version=0.86
-revision=2
-build_wrksrc=x11
-build_style=gnu-configure
-configure_args="--enable-ia32 --enable-build-all"
-hostmakedepends="pkg-config nasm"
-makedepends="gtk+-devel SDL2-devel"
-short_desc="Port for UNIX with X11 of the Neko Project II PC-9801 emulator"
-maintainer="hipperson0 <hipperson0@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://www.nonakap.org/np2"
-distfiles="https://www.nonakap.org/np2/release/xnp2-${version}.tar.bz2"
-checksum=e0b8c93f54682a4b3373907fd9ffe78094f95f7430dffc5038eccbcc4c3f78fd
-
-do_install() {
-	vbin xnp2
-	vbin xnp21
-	vman xnp2.1
-	vman xnp2.1j
-	vman xnp21.1
-	vman xnp21.1j
-	vdoc README.ja
-	sed '/\*\//q' main.c > LICENSE
-	vlicense LICENSE
-}
diff --git a/srcpkgs/xnp2/update b/srcpkgs/xnp2/update
deleted file mode 100644
index 04584df73d29..000000000000
--- a/srcpkgs/xnp2/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="20140607"

From 7cb634b777b157976dbd0f1ec6fdf80ddc6aa4f6 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 5 Aug 2022 00:44:21 +0000
Subject: [PATCH 06/23] graphviz-x11: remove stale symlink

---
 srcpkgs/graphviz-x11 | 1 -
 1 file changed, 1 deletion(-)
 delete mode 120000 srcpkgs/graphviz-x11

diff --git a/srcpkgs/graphviz-x11 b/srcpkgs/graphviz-x11
deleted file mode 120000
index abecf5d9457d..000000000000
--- a/srcpkgs/graphviz-x11
+++ /dev/null
@@ -1 +0,0 @@
-graphviz
\ No newline at end of file

From c8271d68e65b07990ae8dbe5f19d4e94f93c7530 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 4 Aug 2022 20:06:49 -0400
Subject: [PATCH 07/23] watchexec: update to 1.20.5

---
 srcpkgs/watchexec/patches/fix-tests.patch | 14 --------------
 srcpkgs/watchexec/template                |  4 ++--
 2 files changed, 2 insertions(+), 16 deletions(-)
 delete mode 100644 srcpkgs/watchexec/patches/fix-tests.patch

diff --git a/srcpkgs/watchexec/patches/fix-tests.patch b/srcpkgs/watchexec/patches/fix-tests.patch
deleted file mode 100644
index f210de15e314..000000000000
--- a/srcpkgs/watchexec/patches/fix-tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# Remove debug notice from test case
-diff --git a/crates/cli/tests/snapshots/help__help_unix.snap b/crates/cli/tests/snapshots/help__help_unix.snap
-index b55782f022..c5642f98ce 100644
---- a/crates/cli/tests/snapshots/help__help_unix.snap
-+++ b/crates/cli/tests/snapshots/help__help_unix.snap
-@@ -2,8 +2,6 @@
- source: crates/cli/tests/help.rs
- expression: "String::from_utf8(output.stdout).unwrap()"
- ---
--⚠ DEBUG BUILD ⚠
--
- watchexec 1.20.2
- Execute commands when watched files change
- 
diff --git a/srcpkgs/watchexec/template b/srcpkgs/watchexec/template
index 4bd08d626870..c6401cd925d2 100644
--- a/srcpkgs/watchexec/template
+++ b/srcpkgs/watchexec/template
@@ -1,6 +1,6 @@
 # Template file for 'watchexec'
 pkgname=watchexec
-version=1.20.2
+version=1.20.5
 revision=1
 wrksrc="${pkgname}-cli-v${version}"
 build_wrksrc="crates/cli"
@@ -10,7 +10,7 @@ maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/watchexec/watchexec"
 distfiles="https://github.com/watchexec/watchexec/archive/refs/tags/cli-v${version}.tar.gz"
-checksum=62e2e722a84475436286010edff36c56c4c6fad9e76be4b35381877e93faeac8
+checksum=2bc04c7ecf58d34a48c3eeea54a76b7e621717cb93305497bea2f6399dd119c6
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From f245a59b1701bfaa994e17ad70157f5be03df06b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Thu, 4 Aug 2022 15:39:56 +0200
Subject: [PATCH 08/23] element-desktop: update to 1.11.2.

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

diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index 4f5aae940e49..a2c70cf88a8e 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.1
+version=1.11.2
 revision=1
 create_wrksrc=yes
 conf_files="/etc/${pkgname}/config.json"
@@ -14,12 +14,10 @@ short_desc="Glossy Matrix collaboration client, desktop version"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0"
 homepage="https://element.io"
-_ghpage="https://github.com/vector-im"
-_archive="archive/v${version}.tar.gz"
-distfiles="${_ghpage}/element-desktop/${_archive}>element-desktop.tar.gz
- ${_ghpage}/element-web/${_archive}>element-web.tar.gz"
-checksum="b93c82705bde69504d201b3624bcbd5fb258c0bf20e1535c0339132e593469b4
- b223fcff42a305ce8034892e0bdcb4806e45f5fd7f902e2914bc65dbd910230b"
+distfiles="https://github.com/vector-im/element-desktop/archive/v${version}.tar.gz>element-desktop.tar.gz
+ https://github.com/vector-im/element-web/archive/v${version}.tar.gz>element-web.tar.gz"
+checksum="f8cae27b6960e58d4a78f19b8198a6452e4789e7107950d678ec88a08247f84a
+ 2e9498a910acfc78d1b5ba4beb99af05195bde664c08ec1c2da47ef0d6ef21af"
 
 export USE_SYSTEM_APP_BUILDER=true
 

From b424ca75c311258510bb52ff77cf61fa32b74f94 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 5 Aug 2022 08:25:04 -0400
Subject: [PATCH 09/23] mkinitcpio: backport fix for kmod>=30

---
 srcpkgs/mkinitcpio/patches/fix-depmod.patch | 30 +++++++++++++++++++++
 srcpkgs/mkinitcpio/template                 |  2 +-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/mkinitcpio/patches/fix-depmod.patch

diff --git a/srcpkgs/mkinitcpio/patches/fix-depmod.patch b/srcpkgs/mkinitcpio/patches/fix-depmod.patch
new file mode 100644
index 000000000000..55e5e7bb3a1d
--- /dev/null
+++ b/srcpkgs/mkinitcpio/patches/fix-depmod.patch
@@ -0,0 +1,30 @@
+From e629e34f18141a6244eaac2f0288d7b2a5d669ee Mon Sep 17 00:00:00 2001
+From: Chih-Hsuan Yen <yan12125@gmail.com>
+Date: Sun, 3 Jul 2022 11:03:10 +0800
+Subject: [PATCH] Fix the warning about missing modules.builtin.modinfo
+
+> depmod: WARNING: could not open modules.builtin.modinfo at /tmp/mkinitcpio.EftMSK/root/lib/modules/5.15.52-1-lts: No such file or directory
+
+kmod wants modules.builtin.modinfo since v30 [1].
+
+Also adds modules.order as suggested by heftig. That file is used (if
+exists) since the first commit of depmod.
+
+[1] https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git/commit/?id=0246e06340df292b5dda4bc00e24cc9ae894e881
+---
+ functions | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/functions b/functions
+index 48cfd7a..e77a4c4 100644
+--- a/functions
++++ b/functions
+@@ -876,7 +876,7 @@ install_modules() {
+     (( ${#zst_comp[*]} )) && zstd -d --rm -q "${zst_comp[@]}"
+ 
+     msg "Generating module dependencies"
+-    install -m644 -t "$moduledest" "$_d_kmoduledir"/modules.builtin
++    install -m644 -t "$moduledest" "$_d_kmoduledir"/modules.{builtin,builtin.modinfo,order}
+ 
+     # we install all modules into kernel/, making the .order file incorrect for
+     # the module tree. munge it, so that we have an accurate index. This avoids
diff --git a/srcpkgs/mkinitcpio/template b/srcpkgs/mkinitcpio/template
index ddd733d5e56d..ab00be349a27 100644
--- a/srcpkgs/mkinitcpio/template
+++ b/srcpkgs/mkinitcpio/template
@@ -1,7 +1,7 @@
 # Template file for 'mkinitcpio'
 pkgname=mkinitcpio
 version=31
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="asciidoc"
 depends="busybox-static bsdtar bash"

From af2ce48a1ad83b344161af672feaa2b910ac88d3 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sat, 30 Jul 2022 22:57:27 +0200
Subject: [PATCH 10/23] apt: update to 2.5.2

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

diff --git a/srcpkgs/apt/template b/srcpkgs/apt/template
index 9e477574ead0..17f842c34843 100644
--- a/srcpkgs/apt/template
+++ b/srcpkgs/apt/template
@@ -1,24 +1,30 @@
 # Template file for 'apt'
 pkgname=apt
-version=2.1.12
+version=2.5.2
 revision=1
 build_style=cmake
 configure_args="-DDPKG_DATADIR=/usr/share/dpkg -DCURRENT_VENDOR=debian
  -DDOCBOOK_XSL=/usr/share/xsl/docbook"
 hostmakedepends="pkg-config docbook-xsl doxygen po4a w3m libxslt triehash"
 makedepends="db-devel gnutls-devel bzip2-devel liblzma-devel liblz4-devel
- libzstd-devel libseccomp-devel eudev-libudev-devel dpkg-devel gtest-devel"
+ libzstd-devel libseccomp-devel eudev-libudev-devel dpkg-devel gtest-devel
+ libgcrypt-devel xxHash-devel"
+checkdepends="dpkg runit-void tar"
 short_desc="APT package management tools"
 maintainer="Elie ROUDNINSKI <xademax@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://salsa.debian.org/apt-team/apt"
 distfiles="https://github.com/Debian/apt/archive/${version}.tar.gz"
-checksum=61f639d3d37a56de37263aaa22dfe8b3f8cc56b1d6d9a59a4ce4ce70fcb139e9
+checksum=6f8817f1091a9f8fd001e9b84185cd198f739391e89e3cabcc253f46c4cf9d68
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) broken="error: void value not ignored as it ought to be" ;;
 esac
 
+pre_check() {
+	export GTEST_FILTER="-FileUtlTest.GetTempDir"
+}
+
 apt-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision}"

From 3285b57693125e0c76e610167df7160eea1ba616 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 5 Aug 2022 11:53:40 -0500
Subject: [PATCH 11/23] sqlmap: update to 1.6.8.

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

diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template
index 4b6eb70fee68..312a20b710ee 100644
--- a/srcpkgs/sqlmap/template
+++ b/srcpkgs/sqlmap/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlmap'
 pkgname=sqlmap
-version=1.6.7
+version=1.6.8
 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=397472048c3b454da3e5448944002661fff376edd38f6fe902ab1db0f9fd8d2b
+checksum=35c51f4bd6f5cb8dd8efee4cf87d49bc7e7311ed6f42ffdd038394f7f98e69a2
 python_version=3
 
 do_install() {

From 5a2c77e96feddf914788cb5cb1792745b4dada52 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 3 Aug 2022 00:08:14 -0400
Subject: [PATCH 12/23] CONTRIBUTING.md: add instructions for testing PRs

---
 CONTRIBUTING.md | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index da3bef29c883..3f33aeb1d974 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -129,3 +129,25 @@ Please abstain from temporarily closing a pull request while revising the templa
 
 Once the reviewers have merged the pull request, our [build server](http://build.voidlinux.org) is automatically triggered and builds
 all packages in the pull request for all supported platforms. Upon completion, the packages are available to all Void Linux users.
+
+## Testing Pull Requests
+
+While it is the responsibility of the PR creator to test changes before sending it, one person can't test all configuration options, usecases, hardware, etc.
+Testing new package submissions and updates is always helpful, and is a great way to get started with contributing.
+First, [clone the repository](https://github.com/void-linux/void-packages#quick-start) if you haven't done so already.
+Then check out the pull request, either with `github-cli`:
+
+    $ gh pr checkout <number>
+
+Or with `git`:
+
+If your local void-packages repository is cloned from your fork, you may need to add the main repository as a remote first:
+
+    $ git remote add upstream https://github.com/void-linux/void-packages.git
+
+Then fetch and check out the PR (replacing `<remote>` with either `origin` or `upstream`):
+
+    $ git fetch <remote> pull/<number>/head:<branch-name>
+    $ git checkout <branch-name>
+
+Then [build and install](https://github.com/void-linux/void-packages#building-packages) the package and test its functionality.

From a282e80a78785e68e99593b535a8b0876e62eb5c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 2 Aug 2022 18:46:18 +0200
Subject: [PATCH 13/23] xcdroast: remove package

gtk2
---
 srcpkgs/removed-packages/template |  1 +
 srcpkgs/xcdroast/template         | 14 --------------
 2 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 srcpkgs/xcdroast/template

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 4a325984709b..c716bb3a0b6f 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -416,6 +416,7 @@ replaces="
  wicd-gtk<=1.7.4_6
  wireguard-go<=0.0.20181222_2
  wireshark-gtk<=3.0.7_1
+ xcdroast<=1.19_1
  xlennart<=1.1.1_1
  xmonad-contrib<=0.16_3
  xmonad<=0.15_5
diff --git a/srcpkgs/xcdroast/template b/srcpkgs/xcdroast/template
deleted file mode 100644
index a8334bbb0dd1..000000000000
--- a/srcpkgs/xcdroast/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'xcdroast'
-pkgname=xcdroast
-version=1.19
-revision=1
-build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="gtk+-devel alsa-lib-devel"
-depends="cdrtools"
-short_desc="Flexible frontend for optical disc authoring"
-maintainer="Nick Hahn <nick.hahn@hotmail.de>"
-license="GPL-2.0-only"
-homepage="http://www.xcdroast.org"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=86f52ba796d4d8ad346a4c73667f728a79d96e1045c239cf94d1529e2c271615

From 799f41402a6f8cad9c5bb9fc053480489cb08b64 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 2 Aug 2022 18:40:40 +0200
Subject: [PATCH 14/23] yabause-gtk: remove package

gtk2, dead upstream
---
 srcpkgs/removed-packages/template            |  1 +
 srcpkgs/yabause-gtk/patches/fix-cflags.patch | 13 -------------
 srcpkgs/yabause-gtk/patches/rwx.patch        | 20 --------------------
 srcpkgs/yabause-gtk/template                 | 19 -------------------
 srcpkgs/yabause-gtk/update                   |  1 -
 5 files changed, 1 insertion(+), 53 deletions(-)
 delete mode 100644 srcpkgs/yabause-gtk/patches/fix-cflags.patch
 delete mode 100644 srcpkgs/yabause-gtk/patches/rwx.patch
 delete mode 100644 srcpkgs/yabause-gtk/template
 delete mode 100644 srcpkgs/yabause-gtk/update

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index c716bb3a0b6f..873cf9c1927d 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -422,6 +422,7 @@ replaces="
  xmonad<=0.15_5
  xnoise-devel<=0.2.21_4
  xnoise<=0.2.21_4
+ yabause-gtk<=0.9.15_2
  yt-play<=20140117_2
  yturl<=2.0.2_5
  zbackup<=1.4.4_23
diff --git a/srcpkgs/yabause-gtk/patches/fix-cflags.patch b/srcpkgs/yabause-gtk/patches/fix-cflags.patch
deleted file mode 100644
index b69426bd3016..000000000000
--- a/srcpkgs/yabause-gtk/patches/fix-cflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: src/CMakeLists.txt
-===================================================================
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -659,7 +659,7 @@ else ()
- 	set(yabause_SOURCES ${yabause_SOURCES} sock-dummy.c thr-dummy.c)
- endif ()
- 
--set(YAB_OPTIMIZATION "-O3" CACHE STRING "Override optimization level")
-+set(YAB_OPTIMIZATION "" CACHE STRING "Override optimization level")
- 
- if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i686")
- 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${YAB_OPTIMIZATION} -march=i686 -msse")
diff --git a/srcpkgs/yabause-gtk/patches/rwx.patch b/srcpkgs/yabause-gtk/patches/rwx.patch
deleted file mode 100644
index bb0491b373f8..000000000000
--- a/srcpkgs/yabause-gtk/patches/rwx.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/sh2_dynarec/linkage_x64.s	2013-03-11 20:29:53.112870900 +0100
-+++ b/src/sh2_dynarec/linkage_x64.s	2013-03-11 20:31:48.856778600 +0100
-@@ -747,3 +747,7 @@ breakpoint:
- 	ret
- 	/* Set breakpoint here for debugging */
- 	.size	breakpoint, .-breakpoint
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
---- a/src/sh2_dynarec/linkage_x86.s	2013-03-11 20:30:08.157693100 +0100
-+++ b/src/sh2_dynarec/linkage_x86.s	2013-03-11 20:32:30.993310600 +0100
-@@ -743,3 +743,7 @@ breakpoint:
- 	ret
- 	/* Set breakpoint here for debugging */
- 	.size	breakpoint, .-breakpoint
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
diff --git a/srcpkgs/yabause-gtk/template b/srcpkgs/yabause-gtk/template
deleted file mode 100644
index 841c0af36b78..000000000000
--- a/srcpkgs/yabause-gtk/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'yabause-gtk'
-pkgname=yabause-gtk
-version=0.9.15
-revision=2
-wrksrc="${pkgname%-gtk}-${version}"
-build_style=cmake
-configure_args="-DYAB_PORTS=gtk -DYAB_NETWORK=ON -DYAB_OPTIMIZED_DMA=ON"
-hostmakedepends="pkg-config"
-makedepends="libXmu-devel libfreeglut-devel gtkglext-devel libopenal-devel SDL2-devel"
-depends="desktop-file-utils"
-short_desc="Sega Saturn emulator with GTK UI)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://yabause.org/"
-distfiles="https://download.tuxfamily.org/yabause/releases/${version}/yabause-${version}.tar.gz"
-checksum=4334c43fe0f3ff297bac8e91f4e059fe5fd276291faff2489e37b5b3a4ccc2b2
-nopie=yes
-# Would need m68kmake built for the host
-nocross=yes
diff --git a/srcpkgs/yabause-gtk/update b/srcpkgs/yabause-gtk/update
deleted file mode 100644
index b93f2e9eada0..000000000000
--- a/srcpkgs/yabause-gtk/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname="${pkgname%-gtk}"

From 5bbb705cad1b760371626fa74c1ff0359c93c48d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 2 Aug 2022 18:44:15 +0200
Subject: [PATCH 15/23] xnp2: remove package

gtk2, dead upstream
---
 srcpkgs/removed-packages/template           |  1 +
 srcpkgs/xnp2/INSTALL.msg                    |  7 ------
 srcpkgs/xnp2/patches/define_cplusplus.patch | 17 -------------
 srcpkgs/xnp2/template                       | 27 ---------------------
 srcpkgs/xnp2/update                         |  1 -
 5 files changed, 1 insertion(+), 52 deletions(-)
 delete mode 100644 srcpkgs/xnp2/INSTALL.msg
 delete mode 100644 srcpkgs/xnp2/patches/define_cplusplus.patch
 delete mode 100644 srcpkgs/xnp2/template
 delete mode 100644 srcpkgs/xnp2/update

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 873cf9c1927d..392f1e39e130 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -420,6 +420,7 @@ replaces="
  xlennart<=1.1.1_1
  xmonad-contrib<=0.16_3
  xmonad<=0.15_5
+ xnp2<=0.86_2
  xnoise-devel<=0.2.21_4
  xnoise<=0.2.21_4
  yabause-gtk<=0.9.15_2
diff --git a/srcpkgs/xnp2/INSTALL.msg b/srcpkgs/xnp2/INSTALL.msg
deleted file mode 100644
index 53fc91ec76da..000000000000
--- a/srcpkgs/xnp2/INSTALL.msg
+++ /dev/null
@@ -1,7 +0,0 @@
-The following packages are not required for operation, but are necessary
-to support extra features:
-
-SDL2       Required when using sound and joystick.
-SDL2_mixer Required when playing PCM such as floppy seek sound.
-libXxf86vm Required when using full screen function to change screen resolution.
-libusb     Required when supporting C86 BOX.
diff --git a/srcpkgs/xnp2/patches/define_cplusplus.patch b/srcpkgs/xnp2/patches/define_cplusplus.patch
deleted file mode 100644
index 12b24c90bb28..000000000000
--- a/srcpkgs/xnp2/patches/define_cplusplus.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/x11/compiler.h.old	2018-02-02 17:00:29.174895866 +0000
-+++ b/x11/compiler.h	2018-02-02 17:00:41.199160781 +0000
-@@ -117,12 +117,14 @@
- #define	MAX_PATH	MAXPATHLEN
- #endif
- 
-+#ifndef __cplusplus
- #ifndef	max
- #define	max(a,b)	(((a) > (b)) ? (a) : (b))
- #endif
- #ifndef	min
- #define	min(a,b)	(((a) < (b)) ? (a) : (b))
- #endif
-+#endif /* __cplusplus */
- 
- #ifndef	ZeroMemory
- #define	ZeroMemory(d,n)		memset((d), 0, (n))
diff --git a/srcpkgs/xnp2/template b/srcpkgs/xnp2/template
deleted file mode 100644
index 7ae496fc224e..000000000000
--- a/srcpkgs/xnp2/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'xnp2'
-pkgname=xnp2
-version=0.86
-revision=2
-build_wrksrc=x11
-build_style=gnu-configure
-configure_args="--enable-ia32 --enable-build-all"
-hostmakedepends="pkg-config nasm"
-makedepends="gtk+-devel SDL2-devel"
-short_desc="Port for UNIX with X11 of the Neko Project II PC-9801 emulator"
-maintainer="hipperson0 <hipperson0@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://www.nonakap.org/np2"
-distfiles="https://www.nonakap.org/np2/release/xnp2-${version}.tar.bz2"
-checksum=e0b8c93f54682a4b3373907fd9ffe78094f95f7430dffc5038eccbcc4c3f78fd
-
-do_install() {
-	vbin xnp2
-	vbin xnp21
-	vman xnp2.1
-	vman xnp2.1j
-	vman xnp21.1
-	vman xnp21.1j
-	vdoc README.ja
-	sed '/\*\//q' main.c > LICENSE
-	vlicense LICENSE
-}
diff --git a/srcpkgs/xnp2/update b/srcpkgs/xnp2/update
deleted file mode 100644
index 04584df73d29..000000000000
--- a/srcpkgs/xnp2/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="20140607"

From 032d290829598f66a768410f9b02ab88aee13f5f Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 5 Aug 2022 00:44:21 +0000
Subject: [PATCH 16/23] graphviz-x11: remove stale symlink

---
 srcpkgs/graphviz-x11 | 1 -
 1 file changed, 1 deletion(-)
 delete mode 120000 srcpkgs/graphviz-x11

diff --git a/srcpkgs/graphviz-x11 b/srcpkgs/graphviz-x11
deleted file mode 120000
index abecf5d9457d..000000000000
--- a/srcpkgs/graphviz-x11
+++ /dev/null
@@ -1 +0,0 @@
-graphviz
\ No newline at end of file

From 2f1ce58a19db21eeee706175863be750c6ec7c3c Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 4 Aug 2022 20:06:49 -0400
Subject: [PATCH 17/23] watchexec: update to 1.20.5

---
 srcpkgs/watchexec/patches/fix-tests.patch | 14 --------------
 srcpkgs/watchexec/template                |  4 ++--
 2 files changed, 2 insertions(+), 16 deletions(-)
 delete mode 100644 srcpkgs/watchexec/patches/fix-tests.patch

diff --git a/srcpkgs/watchexec/patches/fix-tests.patch b/srcpkgs/watchexec/patches/fix-tests.patch
deleted file mode 100644
index f210de15e314..000000000000
--- a/srcpkgs/watchexec/patches/fix-tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# Remove debug notice from test case
-diff --git a/crates/cli/tests/snapshots/help__help_unix.snap b/crates/cli/tests/snapshots/help__help_unix.snap
-index b55782f022..c5642f98ce 100644
---- a/crates/cli/tests/snapshots/help__help_unix.snap
-+++ b/crates/cli/tests/snapshots/help__help_unix.snap
-@@ -2,8 +2,6 @@
- source: crates/cli/tests/help.rs
- expression: "String::from_utf8(output.stdout).unwrap()"
- ---
--⚠ DEBUG BUILD ⚠
--
- watchexec 1.20.2
- Execute commands when watched files change
- 
diff --git a/srcpkgs/watchexec/template b/srcpkgs/watchexec/template
index 4bd08d626870..c6401cd925d2 100644
--- a/srcpkgs/watchexec/template
+++ b/srcpkgs/watchexec/template
@@ -1,6 +1,6 @@
 # Template file for 'watchexec'
 pkgname=watchexec
-version=1.20.2
+version=1.20.5
 revision=1
 wrksrc="${pkgname}-cli-v${version}"
 build_wrksrc="crates/cli"
@@ -10,7 +10,7 @@ maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/watchexec/watchexec"
 distfiles="https://github.com/watchexec/watchexec/archive/refs/tags/cli-v${version}.tar.gz"
-checksum=62e2e722a84475436286010edff36c56c4c6fad9e76be4b35381877e93faeac8
+checksum=2bc04c7ecf58d34a48c3eeea54a76b7e621717cb93305497bea2f6399dd119c6
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From c1c879327c25f00556647a522a6177624860a81d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Thu, 4 Aug 2022 15:39:56 +0200
Subject: [PATCH 18/23] element-desktop: update to 1.11.2.

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

diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index 4f5aae940e49..a2c70cf88a8e 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.1
+version=1.11.2
 revision=1
 create_wrksrc=yes
 conf_files="/etc/${pkgname}/config.json"
@@ -14,12 +14,10 @@ short_desc="Glossy Matrix collaboration client, desktop version"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0"
 homepage="https://element.io"
-_ghpage="https://github.com/vector-im"
-_archive="archive/v${version}.tar.gz"
-distfiles="${_ghpage}/element-desktop/${_archive}>element-desktop.tar.gz
- ${_ghpage}/element-web/${_archive}>element-web.tar.gz"
-checksum="b93c82705bde69504d201b3624bcbd5fb258c0bf20e1535c0339132e593469b4
- b223fcff42a305ce8034892e0bdcb4806e45f5fd7f902e2914bc65dbd910230b"
+distfiles="https://github.com/vector-im/element-desktop/archive/v${version}.tar.gz>element-desktop.tar.gz
+ https://github.com/vector-im/element-web/archive/v${version}.tar.gz>element-web.tar.gz"
+checksum="f8cae27b6960e58d4a78f19b8198a6452e4789e7107950d678ec88a08247f84a
+ 2e9498a910acfc78d1b5ba4beb99af05195bde664c08ec1c2da47ef0d6ef21af"
 
 export USE_SYSTEM_APP_BUILDER=true
 

From 95ed006d2e2ea1b1314d78eb94a5a5127a580af8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 5 Aug 2022 08:25:04 -0400
Subject: [PATCH 19/23] mkinitcpio: backport fix for kmod>=30

---
 srcpkgs/mkinitcpio/patches/fix-depmod.patch | 30 +++++++++++++++++++++
 srcpkgs/mkinitcpio/template                 |  2 +-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/mkinitcpio/patches/fix-depmod.patch

diff --git a/srcpkgs/mkinitcpio/patches/fix-depmod.patch b/srcpkgs/mkinitcpio/patches/fix-depmod.patch
new file mode 100644
index 000000000000..55e5e7bb3a1d
--- /dev/null
+++ b/srcpkgs/mkinitcpio/patches/fix-depmod.patch
@@ -0,0 +1,30 @@
+From e629e34f18141a6244eaac2f0288d7b2a5d669ee Mon Sep 17 00:00:00 2001
+From: Chih-Hsuan Yen <yan12125@gmail.com>
+Date: Sun, 3 Jul 2022 11:03:10 +0800
+Subject: [PATCH] Fix the warning about missing modules.builtin.modinfo
+
+> depmod: WARNING: could not open modules.builtin.modinfo at /tmp/mkinitcpio.EftMSK/root/lib/modules/5.15.52-1-lts: No such file or directory
+
+kmod wants modules.builtin.modinfo since v30 [1].
+
+Also adds modules.order as suggested by heftig. That file is used (if
+exists) since the first commit of depmod.
+
+[1] https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git/commit/?id=0246e06340df292b5dda4bc00e24cc9ae894e881
+---
+ functions | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/functions b/functions
+index 48cfd7a..e77a4c4 100644
+--- a/functions
++++ b/functions
+@@ -876,7 +876,7 @@ install_modules() {
+     (( ${#zst_comp[*]} )) && zstd -d --rm -q "${zst_comp[@]}"
+ 
+     msg "Generating module dependencies"
+-    install -m644 -t "$moduledest" "$_d_kmoduledir"/modules.builtin
++    install -m644 -t "$moduledest" "$_d_kmoduledir"/modules.{builtin,builtin.modinfo,order}
+ 
+     # we install all modules into kernel/, making the .order file incorrect for
+     # the module tree. munge it, so that we have an accurate index. This avoids
diff --git a/srcpkgs/mkinitcpio/template b/srcpkgs/mkinitcpio/template
index ddd733d5e56d..ab00be349a27 100644
--- a/srcpkgs/mkinitcpio/template
+++ b/srcpkgs/mkinitcpio/template
@@ -1,7 +1,7 @@
 # Template file for 'mkinitcpio'
 pkgname=mkinitcpio
 version=31
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="asciidoc"
 depends="busybox-static bsdtar bash"

From aaf69e37b9061a066e84cf33aafa89c6ae1cc9a4 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sat, 30 Jul 2022 22:57:27 +0200
Subject: [PATCH 20/23] apt: update to 2.5.2

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

diff --git a/srcpkgs/apt/template b/srcpkgs/apt/template
index 9e477574ead0..17f842c34843 100644
--- a/srcpkgs/apt/template
+++ b/srcpkgs/apt/template
@@ -1,24 +1,30 @@
 # Template file for 'apt'
 pkgname=apt
-version=2.1.12
+version=2.5.2
 revision=1
 build_style=cmake
 configure_args="-DDPKG_DATADIR=/usr/share/dpkg -DCURRENT_VENDOR=debian
  -DDOCBOOK_XSL=/usr/share/xsl/docbook"
 hostmakedepends="pkg-config docbook-xsl doxygen po4a w3m libxslt triehash"
 makedepends="db-devel gnutls-devel bzip2-devel liblzma-devel liblz4-devel
- libzstd-devel libseccomp-devel eudev-libudev-devel dpkg-devel gtest-devel"
+ libzstd-devel libseccomp-devel eudev-libudev-devel dpkg-devel gtest-devel
+ libgcrypt-devel xxHash-devel"
+checkdepends="dpkg runit-void tar"
 short_desc="APT package management tools"
 maintainer="Elie ROUDNINSKI <xademax@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://salsa.debian.org/apt-team/apt"
 distfiles="https://github.com/Debian/apt/archive/${version}.tar.gz"
-checksum=61f639d3d37a56de37263aaa22dfe8b3f8cc56b1d6d9a59a4ce4ce70fcb139e9
+checksum=6f8817f1091a9f8fd001e9b84185cd198f739391e89e3cabcc253f46c4cf9d68
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) broken="error: void value not ignored as it ought to be" ;;
 esac
 
+pre_check() {
+	export GTEST_FILTER="-FileUtlTest.GetTempDir"
+}
+
 apt-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision}"

From c122617aa5fea771de98b8cc9155a9aad74e1f55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 5 Aug 2022 17:24:47 +0200
Subject: [PATCH 22/23] cargo-deny: update to 0.12.2.

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

diff --git a/srcpkgs/cargo-deny/template b/srcpkgs/cargo-deny/template
index 7de8e764ec90..ec8ad592b9c6 100644
--- a/srcpkgs/cargo-deny/template
+++ b/srcpkgs/cargo-deny/template
@@ -1,6 +1,6 @@
 # Template file for 'cargo-deny'
 pkgname=cargo-deny
-version=0.12.1
+version=0.12.2
 revision=1
 build_style=cargo
 configure_args="--no-default-features"
@@ -12,7 +12,7 @@ license="MIT, Apache-2.0"
 homepage="https://github.com/EmbarkStudios/cargo-deny"
 changelog="https://raw.githubusercontent.com/EmbarkStudios/cargo-deny/main/CHANGELOG.md"
 distfiles="https://github.com/EmbarkStudios/cargo-deny/archive/${version}.tar.gz"
-checksum=9f77445008553b4de1f74c4f903b68f318842f769dc8bfffa5a17af2460c0963
+checksum=7d8a034fe0219f8b7adc0ab25c90f7f253b4c387d7d5c8f74f6ad79f4810dc1e
 
 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	broken="bitvec crate unimplemented for big endian"

From 9df54754b4ccc5c8746ee3662879f87d0aba76f7 Mon Sep 17 00:00:00 2001
From: Relected <m7md11xd@gmail.com>
Date: Fri, 5 Aug 2022 19:32:26 +0200
Subject: [PATCH 23/23] Delete template

---
 srcpkgs/cargo-deny/template | 25 -------------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 srcpkgs/cargo-deny/template

diff --git a/srcpkgs/cargo-deny/template b/srcpkgs/cargo-deny/template
deleted file mode 100644
index ec8ad592b9c6..000000000000
--- a/srcpkgs/cargo-deny/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'cargo-deny'
-pkgname=cargo-deny
-version=0.12.2
-revision=1
-build_style=cargo
-configure_args="--no-default-features"
-hostmakedepends="pkg-config"
-makedepends="openssl-devel"
-short_desc="Cargo plugin to help you manage large dependency graphs"
-maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
-license="MIT, Apache-2.0"
-homepage="https://github.com/EmbarkStudios/cargo-deny"
-changelog="https://raw.githubusercontent.com/EmbarkStudios/cargo-deny/main/CHANGELOG.md"
-distfiles="https://github.com/EmbarkStudios/cargo-deny/archive/${version}.tar.gz"
-checksum=7d8a034fe0219f8b7adc0ab25c90f7f253b4c387d7d5c8f74f6ad79f4810dc1e
-
-if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
-	broken="bitvec crate unimplemented for big endian"
-fi
-
-post_install() {
-	vlicense LICENSE-APACHE
-	vlicense LICENSE-MIT
-	vdoc README.md
-}

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

* Re: [PR PATCH] [Updated] godot: update to 3.5
  2022-08-05  0:24 [PR PATCH] godot: update to 3.4.5 Relected
                   ` (10 preceding siblings ...)
  2022-08-05 17:32 ` Relected
@ 2022-08-05 17:32 ` Relected
  2022-08-05 18:29 ` Relected
                   ` (16 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: Relected @ 2022-08-05 17:32 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Relected/void-packages master
https://github.com/void-linux/void-packages/pull/38473

godot: update to 3.5
<!-- Uncomment relevant sections and delete options which are not applicable -->

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


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

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

From 9ab49387e3eb179b48383e68fdb6e2a88246aa72 Mon Sep 17 00:00:00 2001
From: Relected <m7md11xd@gmail.com>
Date: Fri, 5 Aug 2022 02:20:32 +0200
Subject: [PATCH 01/24] godot: update to 3.4.5

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

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index c38f3f8c525a..ee19c7fa5823 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,6 +1,6 @@
 # Template file for 'godot'
 pkgname=godot
-version=3.4
+version=3.4.5
 revision=1
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 wrksrc="${pkgname}-${version}-stable"
@@ -27,7 +27,7 @@ maintainer="Nick Hahn <nick.hahn@hotmail.de>"
 license="MIT"
 homepage="https://www.godotengine.org/"
 distfiles="https://github.com/godotengine/${pkgname}/archive/${version}-stable.tar.gz"
-checksum=61749d12cb094c0be2a2c451ae2aceb8bb45f59f67fcd13fcd8f0c9114262d88
+checksum=87c988d52e7a06100d30164a18c213e022ef175a6de3bd945352bacc87d5289c
 nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio
 
 CFLAGS+=" -fPIE -fPIC"

From 836f8d10bb4c8eea00a2cbaafa7e76966343c29e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 3 Aug 2022 00:08:14 -0400
Subject: [PATCH 02/24] CONTRIBUTING.md: add instructions for testing PRs

---
 CONTRIBUTING.md | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index da3bef29c883..3f33aeb1d974 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -129,3 +129,25 @@ Please abstain from temporarily closing a pull request while revising the templa
 
 Once the reviewers have merged the pull request, our [build server](http://build.voidlinux.org) is automatically triggered and builds
 all packages in the pull request for all supported platforms. Upon completion, the packages are available to all Void Linux users.
+
+## Testing Pull Requests
+
+While it is the responsibility of the PR creator to test changes before sending it, one person can't test all configuration options, usecases, hardware, etc.
+Testing new package submissions and updates is always helpful, and is a great way to get started with contributing.
+First, [clone the repository](https://github.com/void-linux/void-packages#quick-start) if you haven't done so already.
+Then check out the pull request, either with `github-cli`:
+
+    $ gh pr checkout <number>
+
+Or with `git`:
+
+If your local void-packages repository is cloned from your fork, you may need to add the main repository as a remote first:
+
+    $ git remote add upstream https://github.com/void-linux/void-packages.git
+
+Then fetch and check out the PR (replacing `<remote>` with either `origin` or `upstream`):
+
+    $ git fetch <remote> pull/<number>/head:<branch-name>
+    $ git checkout <branch-name>
+
+Then [build and install](https://github.com/void-linux/void-packages#building-packages) the package and test its functionality.

From 4d80d0a46552e9207197a4529a0803d1880be475 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 2 Aug 2022 18:46:18 +0200
Subject: [PATCH 03/24] xcdroast: remove package

gtk2
---
 srcpkgs/removed-packages/template |  1 +
 srcpkgs/xcdroast/template         | 14 --------------
 2 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 srcpkgs/xcdroast/template

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 4a325984709b..c716bb3a0b6f 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -416,6 +416,7 @@ replaces="
  wicd-gtk<=1.7.4_6
  wireguard-go<=0.0.20181222_2
  wireshark-gtk<=3.0.7_1
+ xcdroast<=1.19_1
  xlennart<=1.1.1_1
  xmonad-contrib<=0.16_3
  xmonad<=0.15_5
diff --git a/srcpkgs/xcdroast/template b/srcpkgs/xcdroast/template
deleted file mode 100644
index a8334bbb0dd1..000000000000
--- a/srcpkgs/xcdroast/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'xcdroast'
-pkgname=xcdroast
-version=1.19
-revision=1
-build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="gtk+-devel alsa-lib-devel"
-depends="cdrtools"
-short_desc="Flexible frontend for optical disc authoring"
-maintainer="Nick Hahn <nick.hahn@hotmail.de>"
-license="GPL-2.0-only"
-homepage="http://www.xcdroast.org"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=86f52ba796d4d8ad346a4c73667f728a79d96e1045c239cf94d1529e2c271615

From 0cf096b4f7598eba21f3e4e7ebaa28e10d8f2a4e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 2 Aug 2022 18:40:40 +0200
Subject: [PATCH 04/24] yabause-gtk: remove package

gtk2, dead upstream
---
 srcpkgs/removed-packages/template            |  1 +
 srcpkgs/yabause-gtk/patches/fix-cflags.patch | 13 -------------
 srcpkgs/yabause-gtk/patches/rwx.patch        | 20 --------------------
 srcpkgs/yabause-gtk/template                 | 19 -------------------
 srcpkgs/yabause-gtk/update                   |  1 -
 5 files changed, 1 insertion(+), 53 deletions(-)
 delete mode 100644 srcpkgs/yabause-gtk/patches/fix-cflags.patch
 delete mode 100644 srcpkgs/yabause-gtk/patches/rwx.patch
 delete mode 100644 srcpkgs/yabause-gtk/template
 delete mode 100644 srcpkgs/yabause-gtk/update

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index c716bb3a0b6f..873cf9c1927d 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -422,6 +422,7 @@ replaces="
  xmonad<=0.15_5
  xnoise-devel<=0.2.21_4
  xnoise<=0.2.21_4
+ yabause-gtk<=0.9.15_2
  yt-play<=20140117_2
  yturl<=2.0.2_5
  zbackup<=1.4.4_23
diff --git a/srcpkgs/yabause-gtk/patches/fix-cflags.patch b/srcpkgs/yabause-gtk/patches/fix-cflags.patch
deleted file mode 100644
index b69426bd3016..000000000000
--- a/srcpkgs/yabause-gtk/patches/fix-cflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: src/CMakeLists.txt
-===================================================================
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -659,7 +659,7 @@ else ()
- 	set(yabause_SOURCES ${yabause_SOURCES} sock-dummy.c thr-dummy.c)
- endif ()
- 
--set(YAB_OPTIMIZATION "-O3" CACHE STRING "Override optimization level")
-+set(YAB_OPTIMIZATION "" CACHE STRING "Override optimization level")
- 
- if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i686")
- 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${YAB_OPTIMIZATION} -march=i686 -msse")
diff --git a/srcpkgs/yabause-gtk/patches/rwx.patch b/srcpkgs/yabause-gtk/patches/rwx.patch
deleted file mode 100644
index bb0491b373f8..000000000000
--- a/srcpkgs/yabause-gtk/patches/rwx.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/sh2_dynarec/linkage_x64.s	2013-03-11 20:29:53.112870900 +0100
-+++ b/src/sh2_dynarec/linkage_x64.s	2013-03-11 20:31:48.856778600 +0100
-@@ -747,3 +747,7 @@ breakpoint:
- 	ret
- 	/* Set breakpoint here for debugging */
- 	.size	breakpoint, .-breakpoint
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
---- a/src/sh2_dynarec/linkage_x86.s	2013-03-11 20:30:08.157693100 +0100
-+++ b/src/sh2_dynarec/linkage_x86.s	2013-03-11 20:32:30.993310600 +0100
-@@ -743,3 +743,7 @@ breakpoint:
- 	ret
- 	/* Set breakpoint here for debugging */
- 	.size	breakpoint, .-breakpoint
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
diff --git a/srcpkgs/yabause-gtk/template b/srcpkgs/yabause-gtk/template
deleted file mode 100644
index 841c0af36b78..000000000000
--- a/srcpkgs/yabause-gtk/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'yabause-gtk'
-pkgname=yabause-gtk
-version=0.9.15
-revision=2
-wrksrc="${pkgname%-gtk}-${version}"
-build_style=cmake
-configure_args="-DYAB_PORTS=gtk -DYAB_NETWORK=ON -DYAB_OPTIMIZED_DMA=ON"
-hostmakedepends="pkg-config"
-makedepends="libXmu-devel libfreeglut-devel gtkglext-devel libopenal-devel SDL2-devel"
-depends="desktop-file-utils"
-short_desc="Sega Saturn emulator with GTK UI)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://yabause.org/"
-distfiles="https://download.tuxfamily.org/yabause/releases/${version}/yabause-${version}.tar.gz"
-checksum=4334c43fe0f3ff297bac8e91f4e059fe5fd276291faff2489e37b5b3a4ccc2b2
-nopie=yes
-# Would need m68kmake built for the host
-nocross=yes
diff --git a/srcpkgs/yabause-gtk/update b/srcpkgs/yabause-gtk/update
deleted file mode 100644
index b93f2e9eada0..000000000000
--- a/srcpkgs/yabause-gtk/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname="${pkgname%-gtk}"

From 33c0249d165c86eab0a39a203ecd14a28459a62b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 2 Aug 2022 18:44:15 +0200
Subject: [PATCH 05/24] xnp2: remove package

gtk2, dead upstream
---
 srcpkgs/removed-packages/template           |  1 +
 srcpkgs/xnp2/INSTALL.msg                    |  7 ------
 srcpkgs/xnp2/patches/define_cplusplus.patch | 17 -------------
 srcpkgs/xnp2/template                       | 27 ---------------------
 srcpkgs/xnp2/update                         |  1 -
 5 files changed, 1 insertion(+), 52 deletions(-)
 delete mode 100644 srcpkgs/xnp2/INSTALL.msg
 delete mode 100644 srcpkgs/xnp2/patches/define_cplusplus.patch
 delete mode 100644 srcpkgs/xnp2/template
 delete mode 100644 srcpkgs/xnp2/update

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 873cf9c1927d..392f1e39e130 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -420,6 +420,7 @@ replaces="
  xlennart<=1.1.1_1
  xmonad-contrib<=0.16_3
  xmonad<=0.15_5
+ xnp2<=0.86_2
  xnoise-devel<=0.2.21_4
  xnoise<=0.2.21_4
  yabause-gtk<=0.9.15_2
diff --git a/srcpkgs/xnp2/INSTALL.msg b/srcpkgs/xnp2/INSTALL.msg
deleted file mode 100644
index 53fc91ec76da..000000000000
--- a/srcpkgs/xnp2/INSTALL.msg
+++ /dev/null
@@ -1,7 +0,0 @@
-The following packages are not required for operation, but are necessary
-to support extra features:
-
-SDL2       Required when using sound and joystick.
-SDL2_mixer Required when playing PCM such as floppy seek sound.
-libXxf86vm Required when using full screen function to change screen resolution.
-libusb     Required when supporting C86 BOX.
diff --git a/srcpkgs/xnp2/patches/define_cplusplus.patch b/srcpkgs/xnp2/patches/define_cplusplus.patch
deleted file mode 100644
index 12b24c90bb28..000000000000
--- a/srcpkgs/xnp2/patches/define_cplusplus.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/x11/compiler.h.old	2018-02-02 17:00:29.174895866 +0000
-+++ b/x11/compiler.h	2018-02-02 17:00:41.199160781 +0000
-@@ -117,12 +117,14 @@
- #define	MAX_PATH	MAXPATHLEN
- #endif
- 
-+#ifndef __cplusplus
- #ifndef	max
- #define	max(a,b)	(((a) > (b)) ? (a) : (b))
- #endif
- #ifndef	min
- #define	min(a,b)	(((a) < (b)) ? (a) : (b))
- #endif
-+#endif /* __cplusplus */
- 
- #ifndef	ZeroMemory
- #define	ZeroMemory(d,n)		memset((d), 0, (n))
diff --git a/srcpkgs/xnp2/template b/srcpkgs/xnp2/template
deleted file mode 100644
index 7ae496fc224e..000000000000
--- a/srcpkgs/xnp2/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'xnp2'
-pkgname=xnp2
-version=0.86
-revision=2
-build_wrksrc=x11
-build_style=gnu-configure
-configure_args="--enable-ia32 --enable-build-all"
-hostmakedepends="pkg-config nasm"
-makedepends="gtk+-devel SDL2-devel"
-short_desc="Port for UNIX with X11 of the Neko Project II PC-9801 emulator"
-maintainer="hipperson0 <hipperson0@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://www.nonakap.org/np2"
-distfiles="https://www.nonakap.org/np2/release/xnp2-${version}.tar.bz2"
-checksum=e0b8c93f54682a4b3373907fd9ffe78094f95f7430dffc5038eccbcc4c3f78fd
-
-do_install() {
-	vbin xnp2
-	vbin xnp21
-	vman xnp2.1
-	vman xnp2.1j
-	vman xnp21.1
-	vman xnp21.1j
-	vdoc README.ja
-	sed '/\*\//q' main.c > LICENSE
-	vlicense LICENSE
-}
diff --git a/srcpkgs/xnp2/update b/srcpkgs/xnp2/update
deleted file mode 100644
index 04584df73d29..000000000000
--- a/srcpkgs/xnp2/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="20140607"

From 7cb634b777b157976dbd0f1ec6fdf80ddc6aa4f6 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 5 Aug 2022 00:44:21 +0000
Subject: [PATCH 06/24] graphviz-x11: remove stale symlink

---
 srcpkgs/graphviz-x11 | 1 -
 1 file changed, 1 deletion(-)
 delete mode 120000 srcpkgs/graphviz-x11

diff --git a/srcpkgs/graphviz-x11 b/srcpkgs/graphviz-x11
deleted file mode 120000
index abecf5d9457d..000000000000
--- a/srcpkgs/graphviz-x11
+++ /dev/null
@@ -1 +0,0 @@
-graphviz
\ No newline at end of file

From c8271d68e65b07990ae8dbe5f19d4e94f93c7530 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 4 Aug 2022 20:06:49 -0400
Subject: [PATCH 07/24] watchexec: update to 1.20.5

---
 srcpkgs/watchexec/patches/fix-tests.patch | 14 --------------
 srcpkgs/watchexec/template                |  4 ++--
 2 files changed, 2 insertions(+), 16 deletions(-)
 delete mode 100644 srcpkgs/watchexec/patches/fix-tests.patch

diff --git a/srcpkgs/watchexec/patches/fix-tests.patch b/srcpkgs/watchexec/patches/fix-tests.patch
deleted file mode 100644
index f210de15e314..000000000000
--- a/srcpkgs/watchexec/patches/fix-tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# Remove debug notice from test case
-diff --git a/crates/cli/tests/snapshots/help__help_unix.snap b/crates/cli/tests/snapshots/help__help_unix.snap
-index b55782f022..c5642f98ce 100644
---- a/crates/cli/tests/snapshots/help__help_unix.snap
-+++ b/crates/cli/tests/snapshots/help__help_unix.snap
-@@ -2,8 +2,6 @@
- source: crates/cli/tests/help.rs
- expression: "String::from_utf8(output.stdout).unwrap()"
- ---
--⚠ DEBUG BUILD ⚠
--
- watchexec 1.20.2
- Execute commands when watched files change
- 
diff --git a/srcpkgs/watchexec/template b/srcpkgs/watchexec/template
index 4bd08d626870..c6401cd925d2 100644
--- a/srcpkgs/watchexec/template
+++ b/srcpkgs/watchexec/template
@@ -1,6 +1,6 @@
 # Template file for 'watchexec'
 pkgname=watchexec
-version=1.20.2
+version=1.20.5
 revision=1
 wrksrc="${pkgname}-cli-v${version}"
 build_wrksrc="crates/cli"
@@ -10,7 +10,7 @@ maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/watchexec/watchexec"
 distfiles="https://github.com/watchexec/watchexec/archive/refs/tags/cli-v${version}.tar.gz"
-checksum=62e2e722a84475436286010edff36c56c4c6fad9e76be4b35381877e93faeac8
+checksum=2bc04c7ecf58d34a48c3eeea54a76b7e621717cb93305497bea2f6399dd119c6
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From f245a59b1701bfaa994e17ad70157f5be03df06b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Thu, 4 Aug 2022 15:39:56 +0200
Subject: [PATCH 08/24] element-desktop: update to 1.11.2.

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

diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index 4f5aae940e49..a2c70cf88a8e 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.1
+version=1.11.2
 revision=1
 create_wrksrc=yes
 conf_files="/etc/${pkgname}/config.json"
@@ -14,12 +14,10 @@ short_desc="Glossy Matrix collaboration client, desktop version"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0"
 homepage="https://element.io"
-_ghpage="https://github.com/vector-im"
-_archive="archive/v${version}.tar.gz"
-distfiles="${_ghpage}/element-desktop/${_archive}>element-desktop.tar.gz
- ${_ghpage}/element-web/${_archive}>element-web.tar.gz"
-checksum="b93c82705bde69504d201b3624bcbd5fb258c0bf20e1535c0339132e593469b4
- b223fcff42a305ce8034892e0bdcb4806e45f5fd7f902e2914bc65dbd910230b"
+distfiles="https://github.com/vector-im/element-desktop/archive/v${version}.tar.gz>element-desktop.tar.gz
+ https://github.com/vector-im/element-web/archive/v${version}.tar.gz>element-web.tar.gz"
+checksum="f8cae27b6960e58d4a78f19b8198a6452e4789e7107950d678ec88a08247f84a
+ 2e9498a910acfc78d1b5ba4beb99af05195bde664c08ec1c2da47ef0d6ef21af"
 
 export USE_SYSTEM_APP_BUILDER=true
 

From b424ca75c311258510bb52ff77cf61fa32b74f94 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 5 Aug 2022 08:25:04 -0400
Subject: [PATCH 09/24] mkinitcpio: backport fix for kmod>=30

---
 srcpkgs/mkinitcpio/patches/fix-depmod.patch | 30 +++++++++++++++++++++
 srcpkgs/mkinitcpio/template                 |  2 +-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/mkinitcpio/patches/fix-depmod.patch

diff --git a/srcpkgs/mkinitcpio/patches/fix-depmod.patch b/srcpkgs/mkinitcpio/patches/fix-depmod.patch
new file mode 100644
index 000000000000..55e5e7bb3a1d
--- /dev/null
+++ b/srcpkgs/mkinitcpio/patches/fix-depmod.patch
@@ -0,0 +1,30 @@
+From e629e34f18141a6244eaac2f0288d7b2a5d669ee Mon Sep 17 00:00:00 2001
+From: Chih-Hsuan Yen <yan12125@gmail.com>
+Date: Sun, 3 Jul 2022 11:03:10 +0800
+Subject: [PATCH] Fix the warning about missing modules.builtin.modinfo
+
+> depmod: WARNING: could not open modules.builtin.modinfo at /tmp/mkinitcpio.EftMSK/root/lib/modules/5.15.52-1-lts: No such file or directory
+
+kmod wants modules.builtin.modinfo since v30 [1].
+
+Also adds modules.order as suggested by heftig. That file is used (if
+exists) since the first commit of depmod.
+
+[1] https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git/commit/?id=0246e06340df292b5dda4bc00e24cc9ae894e881
+---
+ functions | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/functions b/functions
+index 48cfd7a..e77a4c4 100644
+--- a/functions
++++ b/functions
+@@ -876,7 +876,7 @@ install_modules() {
+     (( ${#zst_comp[*]} )) && zstd -d --rm -q "${zst_comp[@]}"
+ 
+     msg "Generating module dependencies"
+-    install -m644 -t "$moduledest" "$_d_kmoduledir"/modules.builtin
++    install -m644 -t "$moduledest" "$_d_kmoduledir"/modules.{builtin,builtin.modinfo,order}
+ 
+     # we install all modules into kernel/, making the .order file incorrect for
+     # the module tree. munge it, so that we have an accurate index. This avoids
diff --git a/srcpkgs/mkinitcpio/template b/srcpkgs/mkinitcpio/template
index ddd733d5e56d..ab00be349a27 100644
--- a/srcpkgs/mkinitcpio/template
+++ b/srcpkgs/mkinitcpio/template
@@ -1,7 +1,7 @@
 # Template file for 'mkinitcpio'
 pkgname=mkinitcpio
 version=31
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="asciidoc"
 depends="busybox-static bsdtar bash"

From af2ce48a1ad83b344161af672feaa2b910ac88d3 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sat, 30 Jul 2022 22:57:27 +0200
Subject: [PATCH 10/24] apt: update to 2.5.2

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

diff --git a/srcpkgs/apt/template b/srcpkgs/apt/template
index 9e477574ead0..17f842c34843 100644
--- a/srcpkgs/apt/template
+++ b/srcpkgs/apt/template
@@ -1,24 +1,30 @@
 # Template file for 'apt'
 pkgname=apt
-version=2.1.12
+version=2.5.2
 revision=1
 build_style=cmake
 configure_args="-DDPKG_DATADIR=/usr/share/dpkg -DCURRENT_VENDOR=debian
  -DDOCBOOK_XSL=/usr/share/xsl/docbook"
 hostmakedepends="pkg-config docbook-xsl doxygen po4a w3m libxslt triehash"
 makedepends="db-devel gnutls-devel bzip2-devel liblzma-devel liblz4-devel
- libzstd-devel libseccomp-devel eudev-libudev-devel dpkg-devel gtest-devel"
+ libzstd-devel libseccomp-devel eudev-libudev-devel dpkg-devel gtest-devel
+ libgcrypt-devel xxHash-devel"
+checkdepends="dpkg runit-void tar"
 short_desc="APT package management tools"
 maintainer="Elie ROUDNINSKI <xademax@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://salsa.debian.org/apt-team/apt"
 distfiles="https://github.com/Debian/apt/archive/${version}.tar.gz"
-checksum=61f639d3d37a56de37263aaa22dfe8b3f8cc56b1d6d9a59a4ce4ce70fcb139e9
+checksum=6f8817f1091a9f8fd001e9b84185cd198f739391e89e3cabcc253f46c4cf9d68
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) broken="error: void value not ignored as it ought to be" ;;
 esac
 
+pre_check() {
+	export GTEST_FILTER="-FileUtlTest.GetTempDir"
+}
+
 apt-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision}"

From 3285b57693125e0c76e610167df7160eea1ba616 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 5 Aug 2022 11:53:40 -0500
Subject: [PATCH 11/24] sqlmap: update to 1.6.8.

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

diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template
index 4b6eb70fee68..312a20b710ee 100644
--- a/srcpkgs/sqlmap/template
+++ b/srcpkgs/sqlmap/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlmap'
 pkgname=sqlmap
-version=1.6.7
+version=1.6.8
 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=397472048c3b454da3e5448944002661fff376edd38f6fe902ab1db0f9fd8d2b
+checksum=35c51f4bd6f5cb8dd8efee4cf87d49bc7e7311ed6f42ffdd038394f7f98e69a2
 python_version=3
 
 do_install() {

From 5a2c77e96feddf914788cb5cb1792745b4dada52 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 3 Aug 2022 00:08:14 -0400
Subject: [PATCH 12/24] CONTRIBUTING.md: add instructions for testing PRs

---
 CONTRIBUTING.md | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index da3bef29c883..3f33aeb1d974 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -129,3 +129,25 @@ Please abstain from temporarily closing a pull request while revising the templa
 
 Once the reviewers have merged the pull request, our [build server](http://build.voidlinux.org) is automatically triggered and builds
 all packages in the pull request for all supported platforms. Upon completion, the packages are available to all Void Linux users.
+
+## Testing Pull Requests
+
+While it is the responsibility of the PR creator to test changes before sending it, one person can't test all configuration options, usecases, hardware, etc.
+Testing new package submissions and updates is always helpful, and is a great way to get started with contributing.
+First, [clone the repository](https://github.com/void-linux/void-packages#quick-start) if you haven't done so already.
+Then check out the pull request, either with `github-cli`:
+
+    $ gh pr checkout <number>
+
+Or with `git`:
+
+If your local void-packages repository is cloned from your fork, you may need to add the main repository as a remote first:
+
+    $ git remote add upstream https://github.com/void-linux/void-packages.git
+
+Then fetch and check out the PR (replacing `<remote>` with either `origin` or `upstream`):
+
+    $ git fetch <remote> pull/<number>/head:<branch-name>
+    $ git checkout <branch-name>
+
+Then [build and install](https://github.com/void-linux/void-packages#building-packages) the package and test its functionality.

From a282e80a78785e68e99593b535a8b0876e62eb5c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 2 Aug 2022 18:46:18 +0200
Subject: [PATCH 13/24] xcdroast: remove package

gtk2
---
 srcpkgs/removed-packages/template |  1 +
 srcpkgs/xcdroast/template         | 14 --------------
 2 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 srcpkgs/xcdroast/template

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 4a325984709b..c716bb3a0b6f 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -416,6 +416,7 @@ replaces="
  wicd-gtk<=1.7.4_6
  wireguard-go<=0.0.20181222_2
  wireshark-gtk<=3.0.7_1
+ xcdroast<=1.19_1
  xlennart<=1.1.1_1
  xmonad-contrib<=0.16_3
  xmonad<=0.15_5
diff --git a/srcpkgs/xcdroast/template b/srcpkgs/xcdroast/template
deleted file mode 100644
index a8334bbb0dd1..000000000000
--- a/srcpkgs/xcdroast/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'xcdroast'
-pkgname=xcdroast
-version=1.19
-revision=1
-build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="gtk+-devel alsa-lib-devel"
-depends="cdrtools"
-short_desc="Flexible frontend for optical disc authoring"
-maintainer="Nick Hahn <nick.hahn@hotmail.de>"
-license="GPL-2.0-only"
-homepage="http://www.xcdroast.org"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=86f52ba796d4d8ad346a4c73667f728a79d96e1045c239cf94d1529e2c271615

From 799f41402a6f8cad9c5bb9fc053480489cb08b64 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 2 Aug 2022 18:40:40 +0200
Subject: [PATCH 14/24] yabause-gtk: remove package

gtk2, dead upstream
---
 srcpkgs/removed-packages/template            |  1 +
 srcpkgs/yabause-gtk/patches/fix-cflags.patch | 13 -------------
 srcpkgs/yabause-gtk/patches/rwx.patch        | 20 --------------------
 srcpkgs/yabause-gtk/template                 | 19 -------------------
 srcpkgs/yabause-gtk/update                   |  1 -
 5 files changed, 1 insertion(+), 53 deletions(-)
 delete mode 100644 srcpkgs/yabause-gtk/patches/fix-cflags.patch
 delete mode 100644 srcpkgs/yabause-gtk/patches/rwx.patch
 delete mode 100644 srcpkgs/yabause-gtk/template
 delete mode 100644 srcpkgs/yabause-gtk/update

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index c716bb3a0b6f..873cf9c1927d 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -422,6 +422,7 @@ replaces="
  xmonad<=0.15_5
  xnoise-devel<=0.2.21_4
  xnoise<=0.2.21_4
+ yabause-gtk<=0.9.15_2
  yt-play<=20140117_2
  yturl<=2.0.2_5
  zbackup<=1.4.4_23
diff --git a/srcpkgs/yabause-gtk/patches/fix-cflags.patch b/srcpkgs/yabause-gtk/patches/fix-cflags.patch
deleted file mode 100644
index b69426bd3016..000000000000
--- a/srcpkgs/yabause-gtk/patches/fix-cflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: src/CMakeLists.txt
-===================================================================
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -659,7 +659,7 @@ else ()
- 	set(yabause_SOURCES ${yabause_SOURCES} sock-dummy.c thr-dummy.c)
- endif ()
- 
--set(YAB_OPTIMIZATION "-O3" CACHE STRING "Override optimization level")
-+set(YAB_OPTIMIZATION "" CACHE STRING "Override optimization level")
- 
- if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i686")
- 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${YAB_OPTIMIZATION} -march=i686 -msse")
diff --git a/srcpkgs/yabause-gtk/patches/rwx.patch b/srcpkgs/yabause-gtk/patches/rwx.patch
deleted file mode 100644
index bb0491b373f8..000000000000
--- a/srcpkgs/yabause-gtk/patches/rwx.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/sh2_dynarec/linkage_x64.s	2013-03-11 20:29:53.112870900 +0100
-+++ b/src/sh2_dynarec/linkage_x64.s	2013-03-11 20:31:48.856778600 +0100
-@@ -747,3 +747,7 @@ breakpoint:
- 	ret
- 	/* Set breakpoint here for debugging */
- 	.size	breakpoint, .-breakpoint
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
---- a/src/sh2_dynarec/linkage_x86.s	2013-03-11 20:30:08.157693100 +0100
-+++ b/src/sh2_dynarec/linkage_x86.s	2013-03-11 20:32:30.993310600 +0100
-@@ -743,3 +743,7 @@ breakpoint:
- 	ret
- 	/* Set breakpoint here for debugging */
- 	.size	breakpoint, .-breakpoint
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
diff --git a/srcpkgs/yabause-gtk/template b/srcpkgs/yabause-gtk/template
deleted file mode 100644
index 841c0af36b78..000000000000
--- a/srcpkgs/yabause-gtk/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'yabause-gtk'
-pkgname=yabause-gtk
-version=0.9.15
-revision=2
-wrksrc="${pkgname%-gtk}-${version}"
-build_style=cmake
-configure_args="-DYAB_PORTS=gtk -DYAB_NETWORK=ON -DYAB_OPTIMIZED_DMA=ON"
-hostmakedepends="pkg-config"
-makedepends="libXmu-devel libfreeglut-devel gtkglext-devel libopenal-devel SDL2-devel"
-depends="desktop-file-utils"
-short_desc="Sega Saturn emulator with GTK UI)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://yabause.org/"
-distfiles="https://download.tuxfamily.org/yabause/releases/${version}/yabause-${version}.tar.gz"
-checksum=4334c43fe0f3ff297bac8e91f4e059fe5fd276291faff2489e37b5b3a4ccc2b2
-nopie=yes
-# Would need m68kmake built for the host
-nocross=yes
diff --git a/srcpkgs/yabause-gtk/update b/srcpkgs/yabause-gtk/update
deleted file mode 100644
index b93f2e9eada0..000000000000
--- a/srcpkgs/yabause-gtk/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname="${pkgname%-gtk}"

From 5bbb705cad1b760371626fa74c1ff0359c93c48d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 2 Aug 2022 18:44:15 +0200
Subject: [PATCH 15/24] xnp2: remove package

gtk2, dead upstream
---
 srcpkgs/removed-packages/template           |  1 +
 srcpkgs/xnp2/INSTALL.msg                    |  7 ------
 srcpkgs/xnp2/patches/define_cplusplus.patch | 17 -------------
 srcpkgs/xnp2/template                       | 27 ---------------------
 srcpkgs/xnp2/update                         |  1 -
 5 files changed, 1 insertion(+), 52 deletions(-)
 delete mode 100644 srcpkgs/xnp2/INSTALL.msg
 delete mode 100644 srcpkgs/xnp2/patches/define_cplusplus.patch
 delete mode 100644 srcpkgs/xnp2/template
 delete mode 100644 srcpkgs/xnp2/update

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 873cf9c1927d..392f1e39e130 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -420,6 +420,7 @@ replaces="
  xlennart<=1.1.1_1
  xmonad-contrib<=0.16_3
  xmonad<=0.15_5
+ xnp2<=0.86_2
  xnoise-devel<=0.2.21_4
  xnoise<=0.2.21_4
  yabause-gtk<=0.9.15_2
diff --git a/srcpkgs/xnp2/INSTALL.msg b/srcpkgs/xnp2/INSTALL.msg
deleted file mode 100644
index 53fc91ec76da..000000000000
--- a/srcpkgs/xnp2/INSTALL.msg
+++ /dev/null
@@ -1,7 +0,0 @@
-The following packages are not required for operation, but are necessary
-to support extra features:
-
-SDL2       Required when using sound and joystick.
-SDL2_mixer Required when playing PCM such as floppy seek sound.
-libXxf86vm Required when using full screen function to change screen resolution.
-libusb     Required when supporting C86 BOX.
diff --git a/srcpkgs/xnp2/patches/define_cplusplus.patch b/srcpkgs/xnp2/patches/define_cplusplus.patch
deleted file mode 100644
index 12b24c90bb28..000000000000
--- a/srcpkgs/xnp2/patches/define_cplusplus.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/x11/compiler.h.old	2018-02-02 17:00:29.174895866 +0000
-+++ b/x11/compiler.h	2018-02-02 17:00:41.199160781 +0000
-@@ -117,12 +117,14 @@
- #define	MAX_PATH	MAXPATHLEN
- #endif
- 
-+#ifndef __cplusplus
- #ifndef	max
- #define	max(a,b)	(((a) > (b)) ? (a) : (b))
- #endif
- #ifndef	min
- #define	min(a,b)	(((a) < (b)) ? (a) : (b))
- #endif
-+#endif /* __cplusplus */
- 
- #ifndef	ZeroMemory
- #define	ZeroMemory(d,n)		memset((d), 0, (n))
diff --git a/srcpkgs/xnp2/template b/srcpkgs/xnp2/template
deleted file mode 100644
index 7ae496fc224e..000000000000
--- a/srcpkgs/xnp2/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'xnp2'
-pkgname=xnp2
-version=0.86
-revision=2
-build_wrksrc=x11
-build_style=gnu-configure
-configure_args="--enable-ia32 --enable-build-all"
-hostmakedepends="pkg-config nasm"
-makedepends="gtk+-devel SDL2-devel"
-short_desc="Port for UNIX with X11 of the Neko Project II PC-9801 emulator"
-maintainer="hipperson0 <hipperson0@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://www.nonakap.org/np2"
-distfiles="https://www.nonakap.org/np2/release/xnp2-${version}.tar.bz2"
-checksum=e0b8c93f54682a4b3373907fd9ffe78094f95f7430dffc5038eccbcc4c3f78fd
-
-do_install() {
-	vbin xnp2
-	vbin xnp21
-	vman xnp2.1
-	vman xnp2.1j
-	vman xnp21.1
-	vman xnp21.1j
-	vdoc README.ja
-	sed '/\*\//q' main.c > LICENSE
-	vlicense LICENSE
-}
diff --git a/srcpkgs/xnp2/update b/srcpkgs/xnp2/update
deleted file mode 100644
index 04584df73d29..000000000000
--- a/srcpkgs/xnp2/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="20140607"

From 032d290829598f66a768410f9b02ab88aee13f5f Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 5 Aug 2022 00:44:21 +0000
Subject: [PATCH 16/24] graphviz-x11: remove stale symlink

---
 srcpkgs/graphviz-x11 | 1 -
 1 file changed, 1 deletion(-)
 delete mode 120000 srcpkgs/graphviz-x11

diff --git a/srcpkgs/graphviz-x11 b/srcpkgs/graphviz-x11
deleted file mode 120000
index abecf5d9457d..000000000000
--- a/srcpkgs/graphviz-x11
+++ /dev/null
@@ -1 +0,0 @@
-graphviz
\ No newline at end of file

From 2f1ce58a19db21eeee706175863be750c6ec7c3c Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 4 Aug 2022 20:06:49 -0400
Subject: [PATCH 17/24] watchexec: update to 1.20.5

---
 srcpkgs/watchexec/patches/fix-tests.patch | 14 --------------
 srcpkgs/watchexec/template                |  4 ++--
 2 files changed, 2 insertions(+), 16 deletions(-)
 delete mode 100644 srcpkgs/watchexec/patches/fix-tests.patch

diff --git a/srcpkgs/watchexec/patches/fix-tests.patch b/srcpkgs/watchexec/patches/fix-tests.patch
deleted file mode 100644
index f210de15e314..000000000000
--- a/srcpkgs/watchexec/patches/fix-tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# Remove debug notice from test case
-diff --git a/crates/cli/tests/snapshots/help__help_unix.snap b/crates/cli/tests/snapshots/help__help_unix.snap
-index b55782f022..c5642f98ce 100644
---- a/crates/cli/tests/snapshots/help__help_unix.snap
-+++ b/crates/cli/tests/snapshots/help__help_unix.snap
-@@ -2,8 +2,6 @@
- source: crates/cli/tests/help.rs
- expression: "String::from_utf8(output.stdout).unwrap()"
- ---
--⚠ DEBUG BUILD ⚠
--
- watchexec 1.20.2
- Execute commands when watched files change
- 
diff --git a/srcpkgs/watchexec/template b/srcpkgs/watchexec/template
index 4bd08d626870..c6401cd925d2 100644
--- a/srcpkgs/watchexec/template
+++ b/srcpkgs/watchexec/template
@@ -1,6 +1,6 @@
 # Template file for 'watchexec'
 pkgname=watchexec
-version=1.20.2
+version=1.20.5
 revision=1
 wrksrc="${pkgname}-cli-v${version}"
 build_wrksrc="crates/cli"
@@ -10,7 +10,7 @@ maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/watchexec/watchexec"
 distfiles="https://github.com/watchexec/watchexec/archive/refs/tags/cli-v${version}.tar.gz"
-checksum=62e2e722a84475436286010edff36c56c4c6fad9e76be4b35381877e93faeac8
+checksum=2bc04c7ecf58d34a48c3eeea54a76b7e621717cb93305497bea2f6399dd119c6
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From c1c879327c25f00556647a522a6177624860a81d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Thu, 4 Aug 2022 15:39:56 +0200
Subject: [PATCH 18/24] element-desktop: update to 1.11.2.

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

diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index 4f5aae940e49..a2c70cf88a8e 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.1
+version=1.11.2
 revision=1
 create_wrksrc=yes
 conf_files="/etc/${pkgname}/config.json"
@@ -14,12 +14,10 @@ short_desc="Glossy Matrix collaboration client, desktop version"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0"
 homepage="https://element.io"
-_ghpage="https://github.com/vector-im"
-_archive="archive/v${version}.tar.gz"
-distfiles="${_ghpage}/element-desktop/${_archive}>element-desktop.tar.gz
- ${_ghpage}/element-web/${_archive}>element-web.tar.gz"
-checksum="b93c82705bde69504d201b3624bcbd5fb258c0bf20e1535c0339132e593469b4
- b223fcff42a305ce8034892e0bdcb4806e45f5fd7f902e2914bc65dbd910230b"
+distfiles="https://github.com/vector-im/element-desktop/archive/v${version}.tar.gz>element-desktop.tar.gz
+ https://github.com/vector-im/element-web/archive/v${version}.tar.gz>element-web.tar.gz"
+checksum="f8cae27b6960e58d4a78f19b8198a6452e4789e7107950d678ec88a08247f84a
+ 2e9498a910acfc78d1b5ba4beb99af05195bde664c08ec1c2da47ef0d6ef21af"
 
 export USE_SYSTEM_APP_BUILDER=true
 

From 95ed006d2e2ea1b1314d78eb94a5a5127a580af8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 5 Aug 2022 08:25:04 -0400
Subject: [PATCH 19/24] mkinitcpio: backport fix for kmod>=30

---
 srcpkgs/mkinitcpio/patches/fix-depmod.patch | 30 +++++++++++++++++++++
 srcpkgs/mkinitcpio/template                 |  2 +-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/mkinitcpio/patches/fix-depmod.patch

diff --git a/srcpkgs/mkinitcpio/patches/fix-depmod.patch b/srcpkgs/mkinitcpio/patches/fix-depmod.patch
new file mode 100644
index 000000000000..55e5e7bb3a1d
--- /dev/null
+++ b/srcpkgs/mkinitcpio/patches/fix-depmod.patch
@@ -0,0 +1,30 @@
+From e629e34f18141a6244eaac2f0288d7b2a5d669ee Mon Sep 17 00:00:00 2001
+From: Chih-Hsuan Yen <yan12125@gmail.com>
+Date: Sun, 3 Jul 2022 11:03:10 +0800
+Subject: [PATCH] Fix the warning about missing modules.builtin.modinfo
+
+> depmod: WARNING: could not open modules.builtin.modinfo at /tmp/mkinitcpio.EftMSK/root/lib/modules/5.15.52-1-lts: No such file or directory
+
+kmod wants modules.builtin.modinfo since v30 [1].
+
+Also adds modules.order as suggested by heftig. That file is used (if
+exists) since the first commit of depmod.
+
+[1] https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git/commit/?id=0246e06340df292b5dda4bc00e24cc9ae894e881
+---
+ functions | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/functions b/functions
+index 48cfd7a..e77a4c4 100644
+--- a/functions
++++ b/functions
+@@ -876,7 +876,7 @@ install_modules() {
+     (( ${#zst_comp[*]} )) && zstd -d --rm -q "${zst_comp[@]}"
+ 
+     msg "Generating module dependencies"
+-    install -m644 -t "$moduledest" "$_d_kmoduledir"/modules.builtin
++    install -m644 -t "$moduledest" "$_d_kmoduledir"/modules.{builtin,builtin.modinfo,order}
+ 
+     # we install all modules into kernel/, making the .order file incorrect for
+     # the module tree. munge it, so that we have an accurate index. This avoids
diff --git a/srcpkgs/mkinitcpio/template b/srcpkgs/mkinitcpio/template
index ddd733d5e56d..ab00be349a27 100644
--- a/srcpkgs/mkinitcpio/template
+++ b/srcpkgs/mkinitcpio/template
@@ -1,7 +1,7 @@
 # Template file for 'mkinitcpio'
 pkgname=mkinitcpio
 version=31
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="asciidoc"
 depends="busybox-static bsdtar bash"

From aaf69e37b9061a066e84cf33aafa89c6ae1cc9a4 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sat, 30 Jul 2022 22:57:27 +0200
Subject: [PATCH 20/24] apt: update to 2.5.2

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

diff --git a/srcpkgs/apt/template b/srcpkgs/apt/template
index 9e477574ead0..17f842c34843 100644
--- a/srcpkgs/apt/template
+++ b/srcpkgs/apt/template
@@ -1,24 +1,30 @@
 # Template file for 'apt'
 pkgname=apt
-version=2.1.12
+version=2.5.2
 revision=1
 build_style=cmake
 configure_args="-DDPKG_DATADIR=/usr/share/dpkg -DCURRENT_VENDOR=debian
  -DDOCBOOK_XSL=/usr/share/xsl/docbook"
 hostmakedepends="pkg-config docbook-xsl doxygen po4a w3m libxslt triehash"
 makedepends="db-devel gnutls-devel bzip2-devel liblzma-devel liblz4-devel
- libzstd-devel libseccomp-devel eudev-libudev-devel dpkg-devel gtest-devel"
+ libzstd-devel libseccomp-devel eudev-libudev-devel dpkg-devel gtest-devel
+ libgcrypt-devel xxHash-devel"
+checkdepends="dpkg runit-void tar"
 short_desc="APT package management tools"
 maintainer="Elie ROUDNINSKI <xademax@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://salsa.debian.org/apt-team/apt"
 distfiles="https://github.com/Debian/apt/archive/${version}.tar.gz"
-checksum=61f639d3d37a56de37263aaa22dfe8b3f8cc56b1d6d9a59a4ce4ce70fcb139e9
+checksum=6f8817f1091a9f8fd001e9b84185cd198f739391e89e3cabcc253f46c4cf9d68
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) broken="error: void value not ignored as it ought to be" ;;
 esac
 
+pre_check() {
+	export GTEST_FILTER="-FileUtlTest.GetTempDir"
+}
+
 apt-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision}"

From c122617aa5fea771de98b8cc9155a9aad74e1f55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 5 Aug 2022 17:24:47 +0200
Subject: [PATCH 22/24] cargo-deny: update to 0.12.2.

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

diff --git a/srcpkgs/cargo-deny/template b/srcpkgs/cargo-deny/template
index 7de8e764ec90..ec8ad592b9c6 100644
--- a/srcpkgs/cargo-deny/template
+++ b/srcpkgs/cargo-deny/template
@@ -1,6 +1,6 @@
 # Template file for 'cargo-deny'
 pkgname=cargo-deny
-version=0.12.1
+version=0.12.2
 revision=1
 build_style=cargo
 configure_args="--no-default-features"
@@ -12,7 +12,7 @@ license="MIT, Apache-2.0"
 homepage="https://github.com/EmbarkStudios/cargo-deny"
 changelog="https://raw.githubusercontent.com/EmbarkStudios/cargo-deny/main/CHANGELOG.md"
 distfiles="https://github.com/EmbarkStudios/cargo-deny/archive/${version}.tar.gz"
-checksum=9f77445008553b4de1f74c4f903b68f318842f769dc8bfffa5a17af2460c0963
+checksum=7d8a034fe0219f8b7adc0ab25c90f7f253b4c387d7d5c8f74f6ad79f4810dc1e
 
 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	broken="bitvec crate unimplemented for big endian"

From 9df54754b4ccc5c8746ee3662879f87d0aba76f7 Mon Sep 17 00:00:00 2001
From: Relected <m7md11xd@gmail.com>
Date: Fri, 5 Aug 2022 19:32:26 +0200
Subject: [PATCH 23/24] Delete template

---
 srcpkgs/cargo-deny/template | 25 -------------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 srcpkgs/cargo-deny/template

diff --git a/srcpkgs/cargo-deny/template b/srcpkgs/cargo-deny/template
deleted file mode 100644
index ec8ad592b9c6..000000000000
--- a/srcpkgs/cargo-deny/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'cargo-deny'
-pkgname=cargo-deny
-version=0.12.2
-revision=1
-build_style=cargo
-configure_args="--no-default-features"
-hostmakedepends="pkg-config"
-makedepends="openssl-devel"
-short_desc="Cargo plugin to help you manage large dependency graphs"
-maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
-license="MIT, Apache-2.0"
-homepage="https://github.com/EmbarkStudios/cargo-deny"
-changelog="https://raw.githubusercontent.com/EmbarkStudios/cargo-deny/main/CHANGELOG.md"
-distfiles="https://github.com/EmbarkStudios/cargo-deny/archive/${version}.tar.gz"
-checksum=7d8a034fe0219f8b7adc0ab25c90f7f253b4c387d7d5c8f74f6ad79f4810dc1e
-
-if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
-	broken="bitvec crate unimplemented for big endian"
-fi
-
-post_install() {
-	vlicense LICENSE-APACHE
-	vlicense LICENSE-MIT
-	vdoc README.md
-}

From 3319de723a2a7da6d7c5b6d68957f913182091a7 Mon Sep 17 00:00:00 2001
From: Relected <m7md11xd@gmail.com>
Date: Fri, 5 Aug 2022 19:32:44 +0200
Subject: [PATCH 24/24] Delete template

---
 srcpkgs/sqlmap/template | 26 --------------------------
 1 file changed, 26 deletions(-)
 delete mode 100644 srcpkgs/sqlmap/template

diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template
deleted file mode 100644
index 312a20b710ee..000000000000
--- a/srcpkgs/sqlmap/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'sqlmap'
-pkgname=sqlmap
-version=1.6.8
-revision=1
-pycompile_dirs="usr/libexec/sqlmap"
-depends="python3"
-short_desc="Automatic SQL injection and database takeover tool"
-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=35c51f4bd6f5cb8dd8efee4cf87d49bc7e7311ed6f42ffdd038394f7f98e69a2
-python_version=3
-
-do_install() {
-	vmkdir usr/libexec/${pkgname}
-	for dir in data extra lib plugins tamper thirdparty sqlmap.py sqlmapapi.py; do
-		vcopy $dir usr/libexec/${pkgname}
-	done
-
-	vmkdir usr/bin
-	ln -sf /usr/libexec/${pkgname}/sqlmap.py ${DESTDIR}/usr/bin/
-	ln -sf /usr/libexec/${pkgname}/sqlmapapi.py ${DESTDIR}/usr/bin/
-
-	vsconf sqlmap.conf
-}

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

* Re: [PR PATCH] [Updated] godot: update to 3.5
  2022-08-05  0:24 [PR PATCH] godot: update to 3.4.5 Relected
                   ` (11 preceding siblings ...)
  2022-08-05 17:32 ` Relected
@ 2022-08-05 18:29 ` Relected
  2022-08-05 18:46 ` Relected
                   ` (15 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: Relected @ 2022-08-05 18:29 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Relected/void-packages master
https://github.com/void-linux/void-packages/pull/38473

godot: update to 3.5
<!-- Uncomment relevant sections and delete options which are not applicable -->

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


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

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

From 9ab49387e3eb179b48383e68fdb6e2a88246aa72 Mon Sep 17 00:00:00 2001
From: Relected <m7md11xd@gmail.com>
Date: Fri, 5 Aug 2022 02:20:32 +0200
Subject: [PATCH 01/20] godot: update to 3.4.5

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

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index c38f3f8c525a..ee19c7fa5823 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,6 +1,6 @@
 # Template file for 'godot'
 pkgname=godot
-version=3.4
+version=3.4.5
 revision=1
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 wrksrc="${pkgname}-${version}-stable"
@@ -27,7 +27,7 @@ maintainer="Nick Hahn <nick.hahn@hotmail.de>"
 license="MIT"
 homepage="https://www.godotengine.org/"
 distfiles="https://github.com/godotengine/${pkgname}/archive/${version}-stable.tar.gz"
-checksum=61749d12cb094c0be2a2c451ae2aceb8bb45f59f67fcd13fcd8f0c9114262d88
+checksum=87c988d52e7a06100d30164a18c213e022ef175a6de3bd945352bacc87d5289c
 nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio
 
 CFLAGS+=" -fPIE -fPIC"

From 836f8d10bb4c8eea00a2cbaafa7e76966343c29e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 3 Aug 2022 00:08:14 -0400
Subject: [PATCH 02/20] CONTRIBUTING.md: add instructions for testing PRs

---
 CONTRIBUTING.md | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index da3bef29c883..3f33aeb1d974 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -129,3 +129,25 @@ Please abstain from temporarily closing a pull request while revising the templa
 
 Once the reviewers have merged the pull request, our [build server](http://build.voidlinux.org) is automatically triggered and builds
 all packages in the pull request for all supported platforms. Upon completion, the packages are available to all Void Linux users.
+
+## Testing Pull Requests
+
+While it is the responsibility of the PR creator to test changes before sending it, one person can't test all configuration options, usecases, hardware, etc.
+Testing new package submissions and updates is always helpful, and is a great way to get started with contributing.
+First, [clone the repository](https://github.com/void-linux/void-packages#quick-start) if you haven't done so already.
+Then check out the pull request, either with `github-cli`:
+
+    $ gh pr checkout <number>
+
+Or with `git`:
+
+If your local void-packages repository is cloned from your fork, you may need to add the main repository as a remote first:
+
+    $ git remote add upstream https://github.com/void-linux/void-packages.git
+
+Then fetch and check out the PR (replacing `<remote>` with either `origin` or `upstream`):
+
+    $ git fetch <remote> pull/<number>/head:<branch-name>
+    $ git checkout <branch-name>
+
+Then [build and install](https://github.com/void-linux/void-packages#building-packages) the package and test its functionality.

From 4d80d0a46552e9207197a4529a0803d1880be475 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 2 Aug 2022 18:46:18 +0200
Subject: [PATCH 03/20] xcdroast: remove package

gtk2
---
 srcpkgs/removed-packages/template |  1 +
 srcpkgs/xcdroast/template         | 14 --------------
 2 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 srcpkgs/xcdroast/template

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 4a325984709b..c716bb3a0b6f 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -416,6 +416,7 @@ replaces="
  wicd-gtk<=1.7.4_6
  wireguard-go<=0.0.20181222_2
  wireshark-gtk<=3.0.7_1
+ xcdroast<=1.19_1
  xlennart<=1.1.1_1
  xmonad-contrib<=0.16_3
  xmonad<=0.15_5
diff --git a/srcpkgs/xcdroast/template b/srcpkgs/xcdroast/template
deleted file mode 100644
index a8334bbb0dd1..000000000000
--- a/srcpkgs/xcdroast/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'xcdroast'
-pkgname=xcdroast
-version=1.19
-revision=1
-build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="gtk+-devel alsa-lib-devel"
-depends="cdrtools"
-short_desc="Flexible frontend for optical disc authoring"
-maintainer="Nick Hahn <nick.hahn@hotmail.de>"
-license="GPL-2.0-only"
-homepage="http://www.xcdroast.org"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=86f52ba796d4d8ad346a4c73667f728a79d96e1045c239cf94d1529e2c271615

From 0cf096b4f7598eba21f3e4e7ebaa28e10d8f2a4e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 2 Aug 2022 18:40:40 +0200
Subject: [PATCH 04/20] yabause-gtk: remove package

gtk2, dead upstream
---
 srcpkgs/removed-packages/template            |  1 +
 srcpkgs/yabause-gtk/patches/fix-cflags.patch | 13 -------------
 srcpkgs/yabause-gtk/patches/rwx.patch        | 20 --------------------
 srcpkgs/yabause-gtk/template                 | 19 -------------------
 srcpkgs/yabause-gtk/update                   |  1 -
 5 files changed, 1 insertion(+), 53 deletions(-)
 delete mode 100644 srcpkgs/yabause-gtk/patches/fix-cflags.patch
 delete mode 100644 srcpkgs/yabause-gtk/patches/rwx.patch
 delete mode 100644 srcpkgs/yabause-gtk/template
 delete mode 100644 srcpkgs/yabause-gtk/update

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index c716bb3a0b6f..873cf9c1927d 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -422,6 +422,7 @@ replaces="
  xmonad<=0.15_5
  xnoise-devel<=0.2.21_4
  xnoise<=0.2.21_4
+ yabause-gtk<=0.9.15_2
  yt-play<=20140117_2
  yturl<=2.0.2_5
  zbackup<=1.4.4_23
diff --git a/srcpkgs/yabause-gtk/patches/fix-cflags.patch b/srcpkgs/yabause-gtk/patches/fix-cflags.patch
deleted file mode 100644
index b69426bd3016..000000000000
--- a/srcpkgs/yabause-gtk/patches/fix-cflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: src/CMakeLists.txt
-===================================================================
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -659,7 +659,7 @@ else ()
- 	set(yabause_SOURCES ${yabause_SOURCES} sock-dummy.c thr-dummy.c)
- endif ()
- 
--set(YAB_OPTIMIZATION "-O3" CACHE STRING "Override optimization level")
-+set(YAB_OPTIMIZATION "" CACHE STRING "Override optimization level")
- 
- if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i686")
- 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${YAB_OPTIMIZATION} -march=i686 -msse")
diff --git a/srcpkgs/yabause-gtk/patches/rwx.patch b/srcpkgs/yabause-gtk/patches/rwx.patch
deleted file mode 100644
index bb0491b373f8..000000000000
--- a/srcpkgs/yabause-gtk/patches/rwx.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/sh2_dynarec/linkage_x64.s	2013-03-11 20:29:53.112870900 +0100
-+++ b/src/sh2_dynarec/linkage_x64.s	2013-03-11 20:31:48.856778600 +0100
-@@ -747,3 +747,7 @@ breakpoint:
- 	ret
- 	/* Set breakpoint here for debugging */
- 	.size	breakpoint, .-breakpoint
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
---- a/src/sh2_dynarec/linkage_x86.s	2013-03-11 20:30:08.157693100 +0100
-+++ b/src/sh2_dynarec/linkage_x86.s	2013-03-11 20:32:30.993310600 +0100
-@@ -743,3 +743,7 @@ breakpoint:
- 	ret
- 	/* Set breakpoint here for debugging */
- 	.size	breakpoint, .-breakpoint
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
diff --git a/srcpkgs/yabause-gtk/template b/srcpkgs/yabause-gtk/template
deleted file mode 100644
index 841c0af36b78..000000000000
--- a/srcpkgs/yabause-gtk/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'yabause-gtk'
-pkgname=yabause-gtk
-version=0.9.15
-revision=2
-wrksrc="${pkgname%-gtk}-${version}"
-build_style=cmake
-configure_args="-DYAB_PORTS=gtk -DYAB_NETWORK=ON -DYAB_OPTIMIZED_DMA=ON"
-hostmakedepends="pkg-config"
-makedepends="libXmu-devel libfreeglut-devel gtkglext-devel libopenal-devel SDL2-devel"
-depends="desktop-file-utils"
-short_desc="Sega Saturn emulator with GTK UI)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://yabause.org/"
-distfiles="https://download.tuxfamily.org/yabause/releases/${version}/yabause-${version}.tar.gz"
-checksum=4334c43fe0f3ff297bac8e91f4e059fe5fd276291faff2489e37b5b3a4ccc2b2
-nopie=yes
-# Would need m68kmake built for the host
-nocross=yes
diff --git a/srcpkgs/yabause-gtk/update b/srcpkgs/yabause-gtk/update
deleted file mode 100644
index b93f2e9eada0..000000000000
--- a/srcpkgs/yabause-gtk/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname="${pkgname%-gtk}"

From 33c0249d165c86eab0a39a203ecd14a28459a62b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 2 Aug 2022 18:44:15 +0200
Subject: [PATCH 05/20] xnp2: remove package

gtk2, dead upstream
---
 srcpkgs/removed-packages/template           |  1 +
 srcpkgs/xnp2/INSTALL.msg                    |  7 ------
 srcpkgs/xnp2/patches/define_cplusplus.patch | 17 -------------
 srcpkgs/xnp2/template                       | 27 ---------------------
 srcpkgs/xnp2/update                         |  1 -
 5 files changed, 1 insertion(+), 52 deletions(-)
 delete mode 100644 srcpkgs/xnp2/INSTALL.msg
 delete mode 100644 srcpkgs/xnp2/patches/define_cplusplus.patch
 delete mode 100644 srcpkgs/xnp2/template
 delete mode 100644 srcpkgs/xnp2/update

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 873cf9c1927d..392f1e39e130 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -420,6 +420,7 @@ replaces="
  xlennart<=1.1.1_1
  xmonad-contrib<=0.16_3
  xmonad<=0.15_5
+ xnp2<=0.86_2
  xnoise-devel<=0.2.21_4
  xnoise<=0.2.21_4
  yabause-gtk<=0.9.15_2
diff --git a/srcpkgs/xnp2/INSTALL.msg b/srcpkgs/xnp2/INSTALL.msg
deleted file mode 100644
index 53fc91ec76da..000000000000
--- a/srcpkgs/xnp2/INSTALL.msg
+++ /dev/null
@@ -1,7 +0,0 @@
-The following packages are not required for operation, but are necessary
-to support extra features:
-
-SDL2       Required when using sound and joystick.
-SDL2_mixer Required when playing PCM such as floppy seek sound.
-libXxf86vm Required when using full screen function to change screen resolution.
-libusb     Required when supporting C86 BOX.
diff --git a/srcpkgs/xnp2/patches/define_cplusplus.patch b/srcpkgs/xnp2/patches/define_cplusplus.patch
deleted file mode 100644
index 12b24c90bb28..000000000000
--- a/srcpkgs/xnp2/patches/define_cplusplus.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/x11/compiler.h.old	2018-02-02 17:00:29.174895866 +0000
-+++ b/x11/compiler.h	2018-02-02 17:00:41.199160781 +0000
-@@ -117,12 +117,14 @@
- #define	MAX_PATH	MAXPATHLEN
- #endif
- 
-+#ifndef __cplusplus
- #ifndef	max
- #define	max(a,b)	(((a) > (b)) ? (a) : (b))
- #endif
- #ifndef	min
- #define	min(a,b)	(((a) < (b)) ? (a) : (b))
- #endif
-+#endif /* __cplusplus */
- 
- #ifndef	ZeroMemory
- #define	ZeroMemory(d,n)		memset((d), 0, (n))
diff --git a/srcpkgs/xnp2/template b/srcpkgs/xnp2/template
deleted file mode 100644
index 7ae496fc224e..000000000000
--- a/srcpkgs/xnp2/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'xnp2'
-pkgname=xnp2
-version=0.86
-revision=2
-build_wrksrc=x11
-build_style=gnu-configure
-configure_args="--enable-ia32 --enable-build-all"
-hostmakedepends="pkg-config nasm"
-makedepends="gtk+-devel SDL2-devel"
-short_desc="Port for UNIX with X11 of the Neko Project II PC-9801 emulator"
-maintainer="hipperson0 <hipperson0@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://www.nonakap.org/np2"
-distfiles="https://www.nonakap.org/np2/release/xnp2-${version}.tar.bz2"
-checksum=e0b8c93f54682a4b3373907fd9ffe78094f95f7430dffc5038eccbcc4c3f78fd
-
-do_install() {
-	vbin xnp2
-	vbin xnp21
-	vman xnp2.1
-	vman xnp2.1j
-	vman xnp21.1
-	vman xnp21.1j
-	vdoc README.ja
-	sed '/\*\//q' main.c > LICENSE
-	vlicense LICENSE
-}
diff --git a/srcpkgs/xnp2/update b/srcpkgs/xnp2/update
deleted file mode 100644
index 04584df73d29..000000000000
--- a/srcpkgs/xnp2/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="20140607"

From 7cb634b777b157976dbd0f1ec6fdf80ddc6aa4f6 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 5 Aug 2022 00:44:21 +0000
Subject: [PATCH 06/20] graphviz-x11: remove stale symlink

---
 srcpkgs/graphviz-x11 | 1 -
 1 file changed, 1 deletion(-)
 delete mode 120000 srcpkgs/graphviz-x11

diff --git a/srcpkgs/graphviz-x11 b/srcpkgs/graphviz-x11
deleted file mode 120000
index abecf5d9457d..000000000000
--- a/srcpkgs/graphviz-x11
+++ /dev/null
@@ -1 +0,0 @@
-graphviz
\ No newline at end of file

From c8271d68e65b07990ae8dbe5f19d4e94f93c7530 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 4 Aug 2022 20:06:49 -0400
Subject: [PATCH 07/20] watchexec: update to 1.20.5

---
 srcpkgs/watchexec/patches/fix-tests.patch | 14 --------------
 srcpkgs/watchexec/template                |  4 ++--
 2 files changed, 2 insertions(+), 16 deletions(-)
 delete mode 100644 srcpkgs/watchexec/patches/fix-tests.patch

diff --git a/srcpkgs/watchexec/patches/fix-tests.patch b/srcpkgs/watchexec/patches/fix-tests.patch
deleted file mode 100644
index f210de15e314..000000000000
--- a/srcpkgs/watchexec/patches/fix-tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# Remove debug notice from test case
-diff --git a/crates/cli/tests/snapshots/help__help_unix.snap b/crates/cli/tests/snapshots/help__help_unix.snap
-index b55782f022..c5642f98ce 100644
---- a/crates/cli/tests/snapshots/help__help_unix.snap
-+++ b/crates/cli/tests/snapshots/help__help_unix.snap
-@@ -2,8 +2,6 @@
- source: crates/cli/tests/help.rs
- expression: "String::from_utf8(output.stdout).unwrap()"
- ---
--⚠ DEBUG BUILD ⚠
--
- watchexec 1.20.2
- Execute commands when watched files change
- 
diff --git a/srcpkgs/watchexec/template b/srcpkgs/watchexec/template
index 4bd08d626870..c6401cd925d2 100644
--- a/srcpkgs/watchexec/template
+++ b/srcpkgs/watchexec/template
@@ -1,6 +1,6 @@
 # Template file for 'watchexec'
 pkgname=watchexec
-version=1.20.2
+version=1.20.5
 revision=1
 wrksrc="${pkgname}-cli-v${version}"
 build_wrksrc="crates/cli"
@@ -10,7 +10,7 @@ maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/watchexec/watchexec"
 distfiles="https://github.com/watchexec/watchexec/archive/refs/tags/cli-v${version}.tar.gz"
-checksum=62e2e722a84475436286010edff36c56c4c6fad9e76be4b35381877e93faeac8
+checksum=2bc04c7ecf58d34a48c3eeea54a76b7e621717cb93305497bea2f6399dd119c6
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From f245a59b1701bfaa994e17ad70157f5be03df06b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Thu, 4 Aug 2022 15:39:56 +0200
Subject: [PATCH 08/20] element-desktop: update to 1.11.2.

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

diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index 4f5aae940e49..a2c70cf88a8e 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.1
+version=1.11.2
 revision=1
 create_wrksrc=yes
 conf_files="/etc/${pkgname}/config.json"
@@ -14,12 +14,10 @@ short_desc="Glossy Matrix collaboration client, desktop version"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0"
 homepage="https://element.io"
-_ghpage="https://github.com/vector-im"
-_archive="archive/v${version}.tar.gz"
-distfiles="${_ghpage}/element-desktop/${_archive}>element-desktop.tar.gz
- ${_ghpage}/element-web/${_archive}>element-web.tar.gz"
-checksum="b93c82705bde69504d201b3624bcbd5fb258c0bf20e1535c0339132e593469b4
- b223fcff42a305ce8034892e0bdcb4806e45f5fd7f902e2914bc65dbd910230b"
+distfiles="https://github.com/vector-im/element-desktop/archive/v${version}.tar.gz>element-desktop.tar.gz
+ https://github.com/vector-im/element-web/archive/v${version}.tar.gz>element-web.tar.gz"
+checksum="f8cae27b6960e58d4a78f19b8198a6452e4789e7107950d678ec88a08247f84a
+ 2e9498a910acfc78d1b5ba4beb99af05195bde664c08ec1c2da47ef0d6ef21af"
 
 export USE_SYSTEM_APP_BUILDER=true
 

From b424ca75c311258510bb52ff77cf61fa32b74f94 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 5 Aug 2022 08:25:04 -0400
Subject: [PATCH 09/20] mkinitcpio: backport fix for kmod>=30

---
 srcpkgs/mkinitcpio/patches/fix-depmod.patch | 30 +++++++++++++++++++++
 srcpkgs/mkinitcpio/template                 |  2 +-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/mkinitcpio/patches/fix-depmod.patch

diff --git a/srcpkgs/mkinitcpio/patches/fix-depmod.patch b/srcpkgs/mkinitcpio/patches/fix-depmod.patch
new file mode 100644
index 000000000000..55e5e7bb3a1d
--- /dev/null
+++ b/srcpkgs/mkinitcpio/patches/fix-depmod.patch
@@ -0,0 +1,30 @@
+From e629e34f18141a6244eaac2f0288d7b2a5d669ee Mon Sep 17 00:00:00 2001
+From: Chih-Hsuan Yen <yan12125@gmail.com>
+Date: Sun, 3 Jul 2022 11:03:10 +0800
+Subject: [PATCH] Fix the warning about missing modules.builtin.modinfo
+
+> depmod: WARNING: could not open modules.builtin.modinfo at /tmp/mkinitcpio.EftMSK/root/lib/modules/5.15.52-1-lts: No such file or directory
+
+kmod wants modules.builtin.modinfo since v30 [1].
+
+Also adds modules.order as suggested by heftig. That file is used (if
+exists) since the first commit of depmod.
+
+[1] https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git/commit/?id=0246e06340df292b5dda4bc00e24cc9ae894e881
+---
+ functions | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/functions b/functions
+index 48cfd7a..e77a4c4 100644
+--- a/functions
++++ b/functions
+@@ -876,7 +876,7 @@ install_modules() {
+     (( ${#zst_comp[*]} )) && zstd -d --rm -q "${zst_comp[@]}"
+ 
+     msg "Generating module dependencies"
+-    install -m644 -t "$moduledest" "$_d_kmoduledir"/modules.builtin
++    install -m644 -t "$moduledest" "$_d_kmoduledir"/modules.{builtin,builtin.modinfo,order}
+ 
+     # we install all modules into kernel/, making the .order file incorrect for
+     # the module tree. munge it, so that we have an accurate index. This avoids
diff --git a/srcpkgs/mkinitcpio/template b/srcpkgs/mkinitcpio/template
index ddd733d5e56d..ab00be349a27 100644
--- a/srcpkgs/mkinitcpio/template
+++ b/srcpkgs/mkinitcpio/template
@@ -1,7 +1,7 @@
 # Template file for 'mkinitcpio'
 pkgname=mkinitcpio
 version=31
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="asciidoc"
 depends="busybox-static bsdtar bash"

From af2ce48a1ad83b344161af672feaa2b910ac88d3 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sat, 30 Jul 2022 22:57:27 +0200
Subject: [PATCH 10/20] apt: update to 2.5.2

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

diff --git a/srcpkgs/apt/template b/srcpkgs/apt/template
index 9e477574ead0..17f842c34843 100644
--- a/srcpkgs/apt/template
+++ b/srcpkgs/apt/template
@@ -1,24 +1,30 @@
 # Template file for 'apt'
 pkgname=apt
-version=2.1.12
+version=2.5.2
 revision=1
 build_style=cmake
 configure_args="-DDPKG_DATADIR=/usr/share/dpkg -DCURRENT_VENDOR=debian
  -DDOCBOOK_XSL=/usr/share/xsl/docbook"
 hostmakedepends="pkg-config docbook-xsl doxygen po4a w3m libxslt triehash"
 makedepends="db-devel gnutls-devel bzip2-devel liblzma-devel liblz4-devel
- libzstd-devel libseccomp-devel eudev-libudev-devel dpkg-devel gtest-devel"
+ libzstd-devel libseccomp-devel eudev-libudev-devel dpkg-devel gtest-devel
+ libgcrypt-devel xxHash-devel"
+checkdepends="dpkg runit-void tar"
 short_desc="APT package management tools"
 maintainer="Elie ROUDNINSKI <xademax@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://salsa.debian.org/apt-team/apt"
 distfiles="https://github.com/Debian/apt/archive/${version}.tar.gz"
-checksum=61f639d3d37a56de37263aaa22dfe8b3f8cc56b1d6d9a59a4ce4ce70fcb139e9
+checksum=6f8817f1091a9f8fd001e9b84185cd198f739391e89e3cabcc253f46c4cf9d68
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) broken="error: void value not ignored as it ought to be" ;;
 esac
 
+pre_check() {
+	export GTEST_FILTER="-FileUtlTest.GetTempDir"
+}
+
 apt-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision}"

From 5a2c77e96feddf914788cb5cb1792745b4dada52 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 3 Aug 2022 00:08:14 -0400
Subject: [PATCH 11/20] CONTRIBUTING.md: add instructions for testing PRs

---
 CONTRIBUTING.md | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index da3bef29c883..3f33aeb1d974 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -129,3 +129,25 @@ Please abstain from temporarily closing a pull request while revising the templa
 
 Once the reviewers have merged the pull request, our [build server](http://build.voidlinux.org) is automatically triggered and builds
 all packages in the pull request for all supported platforms. Upon completion, the packages are available to all Void Linux users.
+
+## Testing Pull Requests
+
+While it is the responsibility of the PR creator to test changes before sending it, one person can't test all configuration options, usecases, hardware, etc.
+Testing new package submissions and updates is always helpful, and is a great way to get started with contributing.
+First, [clone the repository](https://github.com/void-linux/void-packages#quick-start) if you haven't done so already.
+Then check out the pull request, either with `github-cli`:
+
+    $ gh pr checkout <number>
+
+Or with `git`:
+
+If your local void-packages repository is cloned from your fork, you may need to add the main repository as a remote first:
+
+    $ git remote add upstream https://github.com/void-linux/void-packages.git
+
+Then fetch and check out the PR (replacing `<remote>` with either `origin` or `upstream`):
+
+    $ git fetch <remote> pull/<number>/head:<branch-name>
+    $ git checkout <branch-name>
+
+Then [build and install](https://github.com/void-linux/void-packages#building-packages) the package and test its functionality.

From a282e80a78785e68e99593b535a8b0876e62eb5c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 2 Aug 2022 18:46:18 +0200
Subject: [PATCH 12/20] xcdroast: remove package

gtk2
---
 srcpkgs/removed-packages/template |  1 +
 srcpkgs/xcdroast/template         | 14 --------------
 2 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 srcpkgs/xcdroast/template

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 4a325984709b..c716bb3a0b6f 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -416,6 +416,7 @@ replaces="
  wicd-gtk<=1.7.4_6
  wireguard-go<=0.0.20181222_2
  wireshark-gtk<=3.0.7_1
+ xcdroast<=1.19_1
  xlennart<=1.1.1_1
  xmonad-contrib<=0.16_3
  xmonad<=0.15_5
diff --git a/srcpkgs/xcdroast/template b/srcpkgs/xcdroast/template
deleted file mode 100644
index a8334bbb0dd1..000000000000
--- a/srcpkgs/xcdroast/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'xcdroast'
-pkgname=xcdroast
-version=1.19
-revision=1
-build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="gtk+-devel alsa-lib-devel"
-depends="cdrtools"
-short_desc="Flexible frontend for optical disc authoring"
-maintainer="Nick Hahn <nick.hahn@hotmail.de>"
-license="GPL-2.0-only"
-homepage="http://www.xcdroast.org"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=86f52ba796d4d8ad346a4c73667f728a79d96e1045c239cf94d1529e2c271615

From 799f41402a6f8cad9c5bb9fc053480489cb08b64 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 2 Aug 2022 18:40:40 +0200
Subject: [PATCH 13/20] yabause-gtk: remove package

gtk2, dead upstream
---
 srcpkgs/removed-packages/template            |  1 +
 srcpkgs/yabause-gtk/patches/fix-cflags.patch | 13 -------------
 srcpkgs/yabause-gtk/patches/rwx.patch        | 20 --------------------
 srcpkgs/yabause-gtk/template                 | 19 -------------------
 srcpkgs/yabause-gtk/update                   |  1 -
 5 files changed, 1 insertion(+), 53 deletions(-)
 delete mode 100644 srcpkgs/yabause-gtk/patches/fix-cflags.patch
 delete mode 100644 srcpkgs/yabause-gtk/patches/rwx.patch
 delete mode 100644 srcpkgs/yabause-gtk/template
 delete mode 100644 srcpkgs/yabause-gtk/update

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index c716bb3a0b6f..873cf9c1927d 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -422,6 +422,7 @@ replaces="
  xmonad<=0.15_5
  xnoise-devel<=0.2.21_4
  xnoise<=0.2.21_4
+ yabause-gtk<=0.9.15_2
  yt-play<=20140117_2
  yturl<=2.0.2_5
  zbackup<=1.4.4_23
diff --git a/srcpkgs/yabause-gtk/patches/fix-cflags.patch b/srcpkgs/yabause-gtk/patches/fix-cflags.patch
deleted file mode 100644
index b69426bd3016..000000000000
--- a/srcpkgs/yabause-gtk/patches/fix-cflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: src/CMakeLists.txt
-===================================================================
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -659,7 +659,7 @@ else ()
- 	set(yabause_SOURCES ${yabause_SOURCES} sock-dummy.c thr-dummy.c)
- endif ()
- 
--set(YAB_OPTIMIZATION "-O3" CACHE STRING "Override optimization level")
-+set(YAB_OPTIMIZATION "" CACHE STRING "Override optimization level")
- 
- if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i686")
- 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${YAB_OPTIMIZATION} -march=i686 -msse")
diff --git a/srcpkgs/yabause-gtk/patches/rwx.patch b/srcpkgs/yabause-gtk/patches/rwx.patch
deleted file mode 100644
index bb0491b373f8..000000000000
--- a/srcpkgs/yabause-gtk/patches/rwx.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/sh2_dynarec/linkage_x64.s	2013-03-11 20:29:53.112870900 +0100
-+++ b/src/sh2_dynarec/linkage_x64.s	2013-03-11 20:31:48.856778600 +0100
-@@ -747,3 +747,7 @@ breakpoint:
- 	ret
- 	/* Set breakpoint here for debugging */
- 	.size	breakpoint, .-breakpoint
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
---- a/src/sh2_dynarec/linkage_x86.s	2013-03-11 20:30:08.157693100 +0100
-+++ b/src/sh2_dynarec/linkage_x86.s	2013-03-11 20:32:30.993310600 +0100
-@@ -743,3 +743,7 @@ breakpoint:
- 	ret
- 	/* Set breakpoint here for debugging */
- 	.size	breakpoint, .-breakpoint
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
diff --git a/srcpkgs/yabause-gtk/template b/srcpkgs/yabause-gtk/template
deleted file mode 100644
index 841c0af36b78..000000000000
--- a/srcpkgs/yabause-gtk/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'yabause-gtk'
-pkgname=yabause-gtk
-version=0.9.15
-revision=2
-wrksrc="${pkgname%-gtk}-${version}"
-build_style=cmake
-configure_args="-DYAB_PORTS=gtk -DYAB_NETWORK=ON -DYAB_OPTIMIZED_DMA=ON"
-hostmakedepends="pkg-config"
-makedepends="libXmu-devel libfreeglut-devel gtkglext-devel libopenal-devel SDL2-devel"
-depends="desktop-file-utils"
-short_desc="Sega Saturn emulator with GTK UI)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://yabause.org/"
-distfiles="https://download.tuxfamily.org/yabause/releases/${version}/yabause-${version}.tar.gz"
-checksum=4334c43fe0f3ff297bac8e91f4e059fe5fd276291faff2489e37b5b3a4ccc2b2
-nopie=yes
-# Would need m68kmake built for the host
-nocross=yes
diff --git a/srcpkgs/yabause-gtk/update b/srcpkgs/yabause-gtk/update
deleted file mode 100644
index b93f2e9eada0..000000000000
--- a/srcpkgs/yabause-gtk/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname="${pkgname%-gtk}"

From 5bbb705cad1b760371626fa74c1ff0359c93c48d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 2 Aug 2022 18:44:15 +0200
Subject: [PATCH 14/20] xnp2: remove package

gtk2, dead upstream
---
 srcpkgs/removed-packages/template           |  1 +
 srcpkgs/xnp2/INSTALL.msg                    |  7 ------
 srcpkgs/xnp2/patches/define_cplusplus.patch | 17 -------------
 srcpkgs/xnp2/template                       | 27 ---------------------
 srcpkgs/xnp2/update                         |  1 -
 5 files changed, 1 insertion(+), 52 deletions(-)
 delete mode 100644 srcpkgs/xnp2/INSTALL.msg
 delete mode 100644 srcpkgs/xnp2/patches/define_cplusplus.patch
 delete mode 100644 srcpkgs/xnp2/template
 delete mode 100644 srcpkgs/xnp2/update

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 873cf9c1927d..392f1e39e130 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -420,6 +420,7 @@ replaces="
  xlennart<=1.1.1_1
  xmonad-contrib<=0.16_3
  xmonad<=0.15_5
+ xnp2<=0.86_2
  xnoise-devel<=0.2.21_4
  xnoise<=0.2.21_4
  yabause-gtk<=0.9.15_2
diff --git a/srcpkgs/xnp2/INSTALL.msg b/srcpkgs/xnp2/INSTALL.msg
deleted file mode 100644
index 53fc91ec76da..000000000000
--- a/srcpkgs/xnp2/INSTALL.msg
+++ /dev/null
@@ -1,7 +0,0 @@
-The following packages are not required for operation, but are necessary
-to support extra features:
-
-SDL2       Required when using sound and joystick.
-SDL2_mixer Required when playing PCM such as floppy seek sound.
-libXxf86vm Required when using full screen function to change screen resolution.
-libusb     Required when supporting C86 BOX.
diff --git a/srcpkgs/xnp2/patches/define_cplusplus.patch b/srcpkgs/xnp2/patches/define_cplusplus.patch
deleted file mode 100644
index 12b24c90bb28..000000000000
--- a/srcpkgs/xnp2/patches/define_cplusplus.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/x11/compiler.h.old	2018-02-02 17:00:29.174895866 +0000
-+++ b/x11/compiler.h	2018-02-02 17:00:41.199160781 +0000
-@@ -117,12 +117,14 @@
- #define	MAX_PATH	MAXPATHLEN
- #endif
- 
-+#ifndef __cplusplus
- #ifndef	max
- #define	max(a,b)	(((a) > (b)) ? (a) : (b))
- #endif
- #ifndef	min
- #define	min(a,b)	(((a) < (b)) ? (a) : (b))
- #endif
-+#endif /* __cplusplus */
- 
- #ifndef	ZeroMemory
- #define	ZeroMemory(d,n)		memset((d), 0, (n))
diff --git a/srcpkgs/xnp2/template b/srcpkgs/xnp2/template
deleted file mode 100644
index 7ae496fc224e..000000000000
--- a/srcpkgs/xnp2/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'xnp2'
-pkgname=xnp2
-version=0.86
-revision=2
-build_wrksrc=x11
-build_style=gnu-configure
-configure_args="--enable-ia32 --enable-build-all"
-hostmakedepends="pkg-config nasm"
-makedepends="gtk+-devel SDL2-devel"
-short_desc="Port for UNIX with X11 of the Neko Project II PC-9801 emulator"
-maintainer="hipperson0 <hipperson0@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://www.nonakap.org/np2"
-distfiles="https://www.nonakap.org/np2/release/xnp2-${version}.tar.bz2"
-checksum=e0b8c93f54682a4b3373907fd9ffe78094f95f7430dffc5038eccbcc4c3f78fd
-
-do_install() {
-	vbin xnp2
-	vbin xnp21
-	vman xnp2.1
-	vman xnp2.1j
-	vman xnp21.1
-	vman xnp21.1j
-	vdoc README.ja
-	sed '/\*\//q' main.c > LICENSE
-	vlicense LICENSE
-}
diff --git a/srcpkgs/xnp2/update b/srcpkgs/xnp2/update
deleted file mode 100644
index 04584df73d29..000000000000
--- a/srcpkgs/xnp2/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="20140607"

From 032d290829598f66a768410f9b02ab88aee13f5f Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 5 Aug 2022 00:44:21 +0000
Subject: [PATCH 15/20] graphviz-x11: remove stale symlink

---
 srcpkgs/graphviz-x11 | 1 -
 1 file changed, 1 deletion(-)
 delete mode 120000 srcpkgs/graphviz-x11

diff --git a/srcpkgs/graphviz-x11 b/srcpkgs/graphviz-x11
deleted file mode 120000
index abecf5d9457d..000000000000
--- a/srcpkgs/graphviz-x11
+++ /dev/null
@@ -1 +0,0 @@
-graphviz
\ No newline at end of file

From 2f1ce58a19db21eeee706175863be750c6ec7c3c Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 4 Aug 2022 20:06:49 -0400
Subject: [PATCH 16/20] watchexec: update to 1.20.5

---
 srcpkgs/watchexec/patches/fix-tests.patch | 14 --------------
 srcpkgs/watchexec/template                |  4 ++--
 2 files changed, 2 insertions(+), 16 deletions(-)
 delete mode 100644 srcpkgs/watchexec/patches/fix-tests.patch

diff --git a/srcpkgs/watchexec/patches/fix-tests.patch b/srcpkgs/watchexec/patches/fix-tests.patch
deleted file mode 100644
index f210de15e314..000000000000
--- a/srcpkgs/watchexec/patches/fix-tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# Remove debug notice from test case
-diff --git a/crates/cli/tests/snapshots/help__help_unix.snap b/crates/cli/tests/snapshots/help__help_unix.snap
-index b55782f022..c5642f98ce 100644
---- a/crates/cli/tests/snapshots/help__help_unix.snap
-+++ b/crates/cli/tests/snapshots/help__help_unix.snap
-@@ -2,8 +2,6 @@
- source: crates/cli/tests/help.rs
- expression: "String::from_utf8(output.stdout).unwrap()"
- ---
--⚠ DEBUG BUILD ⚠
--
- watchexec 1.20.2
- Execute commands when watched files change
- 
diff --git a/srcpkgs/watchexec/template b/srcpkgs/watchexec/template
index 4bd08d626870..c6401cd925d2 100644
--- a/srcpkgs/watchexec/template
+++ b/srcpkgs/watchexec/template
@@ -1,6 +1,6 @@
 # Template file for 'watchexec'
 pkgname=watchexec
-version=1.20.2
+version=1.20.5
 revision=1
 wrksrc="${pkgname}-cli-v${version}"
 build_wrksrc="crates/cli"
@@ -10,7 +10,7 @@ maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/watchexec/watchexec"
 distfiles="https://github.com/watchexec/watchexec/archive/refs/tags/cli-v${version}.tar.gz"
-checksum=62e2e722a84475436286010edff36c56c4c6fad9e76be4b35381877e93faeac8
+checksum=2bc04c7ecf58d34a48c3eeea54a76b7e621717cb93305497bea2f6399dd119c6
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From c1c879327c25f00556647a522a6177624860a81d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Thu, 4 Aug 2022 15:39:56 +0200
Subject: [PATCH 17/20] element-desktop: update to 1.11.2.

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

diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index 4f5aae940e49..a2c70cf88a8e 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.1
+version=1.11.2
 revision=1
 create_wrksrc=yes
 conf_files="/etc/${pkgname}/config.json"
@@ -14,12 +14,10 @@ short_desc="Glossy Matrix collaboration client, desktop version"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0"
 homepage="https://element.io"
-_ghpage="https://github.com/vector-im"
-_archive="archive/v${version}.tar.gz"
-distfiles="${_ghpage}/element-desktop/${_archive}>element-desktop.tar.gz
- ${_ghpage}/element-web/${_archive}>element-web.tar.gz"
-checksum="b93c82705bde69504d201b3624bcbd5fb258c0bf20e1535c0339132e593469b4
- b223fcff42a305ce8034892e0bdcb4806e45f5fd7f902e2914bc65dbd910230b"
+distfiles="https://github.com/vector-im/element-desktop/archive/v${version}.tar.gz>element-desktop.tar.gz
+ https://github.com/vector-im/element-web/archive/v${version}.tar.gz>element-web.tar.gz"
+checksum="f8cae27b6960e58d4a78f19b8198a6452e4789e7107950d678ec88a08247f84a
+ 2e9498a910acfc78d1b5ba4beb99af05195bde664c08ec1c2da47ef0d6ef21af"
 
 export USE_SYSTEM_APP_BUILDER=true
 

From 95ed006d2e2ea1b1314d78eb94a5a5127a580af8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 5 Aug 2022 08:25:04 -0400
Subject: [PATCH 18/20] mkinitcpio: backport fix for kmod>=30

---
 srcpkgs/mkinitcpio/patches/fix-depmod.patch | 30 +++++++++++++++++++++
 srcpkgs/mkinitcpio/template                 |  2 +-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/mkinitcpio/patches/fix-depmod.patch

diff --git a/srcpkgs/mkinitcpio/patches/fix-depmod.patch b/srcpkgs/mkinitcpio/patches/fix-depmod.patch
new file mode 100644
index 000000000000..55e5e7bb3a1d
--- /dev/null
+++ b/srcpkgs/mkinitcpio/patches/fix-depmod.patch
@@ -0,0 +1,30 @@
+From e629e34f18141a6244eaac2f0288d7b2a5d669ee Mon Sep 17 00:00:00 2001
+From: Chih-Hsuan Yen <yan12125@gmail.com>
+Date: Sun, 3 Jul 2022 11:03:10 +0800
+Subject: [PATCH] Fix the warning about missing modules.builtin.modinfo
+
+> depmod: WARNING: could not open modules.builtin.modinfo at /tmp/mkinitcpio.EftMSK/root/lib/modules/5.15.52-1-lts: No such file or directory
+
+kmod wants modules.builtin.modinfo since v30 [1].
+
+Also adds modules.order as suggested by heftig. That file is used (if
+exists) since the first commit of depmod.
+
+[1] https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git/commit/?id=0246e06340df292b5dda4bc00e24cc9ae894e881
+---
+ functions | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/functions b/functions
+index 48cfd7a..e77a4c4 100644
+--- a/functions
++++ b/functions
+@@ -876,7 +876,7 @@ install_modules() {
+     (( ${#zst_comp[*]} )) && zstd -d --rm -q "${zst_comp[@]}"
+ 
+     msg "Generating module dependencies"
+-    install -m644 -t "$moduledest" "$_d_kmoduledir"/modules.builtin
++    install -m644 -t "$moduledest" "$_d_kmoduledir"/modules.{builtin,builtin.modinfo,order}
+ 
+     # we install all modules into kernel/, making the .order file incorrect for
+     # the module tree. munge it, so that we have an accurate index. This avoids
diff --git a/srcpkgs/mkinitcpio/template b/srcpkgs/mkinitcpio/template
index ddd733d5e56d..ab00be349a27 100644
--- a/srcpkgs/mkinitcpio/template
+++ b/srcpkgs/mkinitcpio/template
@@ -1,7 +1,7 @@
 # Template file for 'mkinitcpio'
 pkgname=mkinitcpio
 version=31
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="asciidoc"
 depends="busybox-static bsdtar bash"

From aaf69e37b9061a066e84cf33aafa89c6ae1cc9a4 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sat, 30 Jul 2022 22:57:27 +0200
Subject: [PATCH 19/20] apt: update to 2.5.2

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

diff --git a/srcpkgs/apt/template b/srcpkgs/apt/template
index 9e477574ead0..17f842c34843 100644
--- a/srcpkgs/apt/template
+++ b/srcpkgs/apt/template
@@ -1,24 +1,30 @@
 # Template file for 'apt'
 pkgname=apt
-version=2.1.12
+version=2.5.2
 revision=1
 build_style=cmake
 configure_args="-DDPKG_DATADIR=/usr/share/dpkg -DCURRENT_VENDOR=debian
  -DDOCBOOK_XSL=/usr/share/xsl/docbook"
 hostmakedepends="pkg-config docbook-xsl doxygen po4a w3m libxslt triehash"
 makedepends="db-devel gnutls-devel bzip2-devel liblzma-devel liblz4-devel
- libzstd-devel libseccomp-devel eudev-libudev-devel dpkg-devel gtest-devel"
+ libzstd-devel libseccomp-devel eudev-libudev-devel dpkg-devel gtest-devel
+ libgcrypt-devel xxHash-devel"
+checkdepends="dpkg runit-void tar"
 short_desc="APT package management tools"
 maintainer="Elie ROUDNINSKI <xademax@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://salsa.debian.org/apt-team/apt"
 distfiles="https://github.com/Debian/apt/archive/${version}.tar.gz"
-checksum=61f639d3d37a56de37263aaa22dfe8b3f8cc56b1d6d9a59a4ce4ce70fcb139e9
+checksum=6f8817f1091a9f8fd001e9b84185cd198f739391e89e3cabcc253f46c4cf9d68
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) broken="error: void value not ignored as it ought to be" ;;
 esac
 
+pre_check() {
+	export GTEST_FILTER="-FileUtlTest.GetTempDir"
+}
+
 apt-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision}"

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

* Re: godot: update to 3.5
  2022-08-05  0:24 [PR PATCH] godot: update to 3.4.5 Relected
                   ` (12 preceding siblings ...)
  2022-08-05 18:29 ` Relected
@ 2022-08-05 18:46 ` Relected
  2022-08-05 18:59 ` [PR PATCH] [Updated] " Relected
                   ` (14 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: Relected @ 2022-08-05 18:46 UTC (permalink / raw)
  To: ml

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

New comment by Relected on void-packages repository

https://github.com/void-linux/void-packages/pull/38473#issuecomment-1206752701

Comment:
i dont know what just happend

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

* Re: [PR PATCH] [Updated] godot: update to 3.5
  2022-08-05  0:24 [PR PATCH] godot: update to 3.4.5 Relected
                   ` (13 preceding siblings ...)
  2022-08-05 18:46 ` Relected
@ 2022-08-05 18:59 ` Relected
  2022-08-05 19:22 ` Relected
                   ` (13 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: Relected @ 2022-08-05 18:59 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Relected/void-packages master
https://github.com/void-linux/void-packages/pull/38473

godot: update to 3.5
<!-- Uncomment relevant sections and delete options which are not applicable -->

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


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

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

From 9ab49387e3eb179b48383e68fdb6e2a88246aa72 Mon Sep 17 00:00:00 2001
From: Relected <m7md11xd@gmail.com>
Date: Fri, 5 Aug 2022 02:20:32 +0200
Subject: [PATCH 01/20] godot: update to 3.4.5

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

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index c38f3f8c525a..ee19c7fa5823 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,6 +1,6 @@
 # Template file for 'godot'
 pkgname=godot
-version=3.4
+version=3.4.5
 revision=1
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 wrksrc="${pkgname}-${version}-stable"
@@ -27,7 +27,7 @@ maintainer="Nick Hahn <nick.hahn@hotmail.de>"
 license="MIT"
 homepage="https://www.godotengine.org/"
 distfiles="https://github.com/godotengine/${pkgname}/archive/${version}-stable.tar.gz"
-checksum=61749d12cb094c0be2a2c451ae2aceb8bb45f59f67fcd13fcd8f0c9114262d88
+checksum=87c988d52e7a06100d30164a18c213e022ef175a6de3bd945352bacc87d5289c
 nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio
 
 CFLAGS+=" -fPIE -fPIC"

From 836f8d10bb4c8eea00a2cbaafa7e76966343c29e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 3 Aug 2022 00:08:14 -0400
Subject: [PATCH 02/20] CONTRIBUTING.md: add instructions for testing PRs

---
 CONTRIBUTING.md | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index da3bef29c883..3f33aeb1d974 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -129,3 +129,25 @@ Please abstain from temporarily closing a pull request while revising the templa
 
 Once the reviewers have merged the pull request, our [build server](http://build.voidlinux.org) is automatically triggered and builds
 all packages in the pull request for all supported platforms. Upon completion, the packages are available to all Void Linux users.
+
+## Testing Pull Requests
+
+While it is the responsibility of the PR creator to test changes before sending it, one person can't test all configuration options, usecases, hardware, etc.
+Testing new package submissions and updates is always helpful, and is a great way to get started with contributing.
+First, [clone the repository](https://github.com/void-linux/void-packages#quick-start) if you haven't done so already.
+Then check out the pull request, either with `github-cli`:
+
+    $ gh pr checkout <number>
+
+Or with `git`:
+
+If your local void-packages repository is cloned from your fork, you may need to add the main repository as a remote first:
+
+    $ git remote add upstream https://github.com/void-linux/void-packages.git
+
+Then fetch and check out the PR (replacing `<remote>` with either `origin` or `upstream`):
+
+    $ git fetch <remote> pull/<number>/head:<branch-name>
+    $ git checkout <branch-name>
+
+Then [build and install](https://github.com/void-linux/void-packages#building-packages) the package and test its functionality.

From 4d80d0a46552e9207197a4529a0803d1880be475 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 2 Aug 2022 18:46:18 +0200
Subject: [PATCH 03/20] xcdroast: remove package

gtk2
---
 srcpkgs/removed-packages/template |  1 +
 srcpkgs/xcdroast/template         | 14 --------------
 2 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 srcpkgs/xcdroast/template

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 4a325984709b..c716bb3a0b6f 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -416,6 +416,7 @@ replaces="
  wicd-gtk<=1.7.4_6
  wireguard-go<=0.0.20181222_2
  wireshark-gtk<=3.0.7_1
+ xcdroast<=1.19_1
  xlennart<=1.1.1_1
  xmonad-contrib<=0.16_3
  xmonad<=0.15_5
diff --git a/srcpkgs/xcdroast/template b/srcpkgs/xcdroast/template
deleted file mode 100644
index a8334bbb0dd1..000000000000
--- a/srcpkgs/xcdroast/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'xcdroast'
-pkgname=xcdroast
-version=1.19
-revision=1
-build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="gtk+-devel alsa-lib-devel"
-depends="cdrtools"
-short_desc="Flexible frontend for optical disc authoring"
-maintainer="Nick Hahn <nick.hahn@hotmail.de>"
-license="GPL-2.0-only"
-homepage="http://www.xcdroast.org"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=86f52ba796d4d8ad346a4c73667f728a79d96e1045c239cf94d1529e2c271615

From 0cf096b4f7598eba21f3e4e7ebaa28e10d8f2a4e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 2 Aug 2022 18:40:40 +0200
Subject: [PATCH 04/20] yabause-gtk: remove package

gtk2, dead upstream
---
 srcpkgs/removed-packages/template            |  1 +
 srcpkgs/yabause-gtk/patches/fix-cflags.patch | 13 -------------
 srcpkgs/yabause-gtk/patches/rwx.patch        | 20 --------------------
 srcpkgs/yabause-gtk/template                 | 19 -------------------
 srcpkgs/yabause-gtk/update                   |  1 -
 5 files changed, 1 insertion(+), 53 deletions(-)
 delete mode 100644 srcpkgs/yabause-gtk/patches/fix-cflags.patch
 delete mode 100644 srcpkgs/yabause-gtk/patches/rwx.patch
 delete mode 100644 srcpkgs/yabause-gtk/template
 delete mode 100644 srcpkgs/yabause-gtk/update

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index c716bb3a0b6f..873cf9c1927d 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -422,6 +422,7 @@ replaces="
  xmonad<=0.15_5
  xnoise-devel<=0.2.21_4
  xnoise<=0.2.21_4
+ yabause-gtk<=0.9.15_2
  yt-play<=20140117_2
  yturl<=2.0.2_5
  zbackup<=1.4.4_23
diff --git a/srcpkgs/yabause-gtk/patches/fix-cflags.patch b/srcpkgs/yabause-gtk/patches/fix-cflags.patch
deleted file mode 100644
index b69426bd3016..000000000000
--- a/srcpkgs/yabause-gtk/patches/fix-cflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: src/CMakeLists.txt
-===================================================================
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -659,7 +659,7 @@ else ()
- 	set(yabause_SOURCES ${yabause_SOURCES} sock-dummy.c thr-dummy.c)
- endif ()
- 
--set(YAB_OPTIMIZATION "-O3" CACHE STRING "Override optimization level")
-+set(YAB_OPTIMIZATION "" CACHE STRING "Override optimization level")
- 
- if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i686")
- 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${YAB_OPTIMIZATION} -march=i686 -msse")
diff --git a/srcpkgs/yabause-gtk/patches/rwx.patch b/srcpkgs/yabause-gtk/patches/rwx.patch
deleted file mode 100644
index bb0491b373f8..000000000000
--- a/srcpkgs/yabause-gtk/patches/rwx.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/sh2_dynarec/linkage_x64.s	2013-03-11 20:29:53.112870900 +0100
-+++ b/src/sh2_dynarec/linkage_x64.s	2013-03-11 20:31:48.856778600 +0100
-@@ -747,3 +747,7 @@ breakpoint:
- 	ret
- 	/* Set breakpoint here for debugging */
- 	.size	breakpoint, .-breakpoint
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
---- a/src/sh2_dynarec/linkage_x86.s	2013-03-11 20:30:08.157693100 +0100
-+++ b/src/sh2_dynarec/linkage_x86.s	2013-03-11 20:32:30.993310600 +0100
-@@ -743,3 +743,7 @@ breakpoint:
- 	ret
- 	/* Set breakpoint here for debugging */
- 	.size	breakpoint, .-breakpoint
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
diff --git a/srcpkgs/yabause-gtk/template b/srcpkgs/yabause-gtk/template
deleted file mode 100644
index 841c0af36b78..000000000000
--- a/srcpkgs/yabause-gtk/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'yabause-gtk'
-pkgname=yabause-gtk
-version=0.9.15
-revision=2
-wrksrc="${pkgname%-gtk}-${version}"
-build_style=cmake
-configure_args="-DYAB_PORTS=gtk -DYAB_NETWORK=ON -DYAB_OPTIMIZED_DMA=ON"
-hostmakedepends="pkg-config"
-makedepends="libXmu-devel libfreeglut-devel gtkglext-devel libopenal-devel SDL2-devel"
-depends="desktop-file-utils"
-short_desc="Sega Saturn emulator with GTK UI)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://yabause.org/"
-distfiles="https://download.tuxfamily.org/yabause/releases/${version}/yabause-${version}.tar.gz"
-checksum=4334c43fe0f3ff297bac8e91f4e059fe5fd276291faff2489e37b5b3a4ccc2b2
-nopie=yes
-# Would need m68kmake built for the host
-nocross=yes
diff --git a/srcpkgs/yabause-gtk/update b/srcpkgs/yabause-gtk/update
deleted file mode 100644
index b93f2e9eada0..000000000000
--- a/srcpkgs/yabause-gtk/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname="${pkgname%-gtk}"

From 33c0249d165c86eab0a39a203ecd14a28459a62b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 2 Aug 2022 18:44:15 +0200
Subject: [PATCH 05/20] xnp2: remove package

gtk2, dead upstream
---
 srcpkgs/removed-packages/template           |  1 +
 srcpkgs/xnp2/INSTALL.msg                    |  7 ------
 srcpkgs/xnp2/patches/define_cplusplus.patch | 17 -------------
 srcpkgs/xnp2/template                       | 27 ---------------------
 srcpkgs/xnp2/update                         |  1 -
 5 files changed, 1 insertion(+), 52 deletions(-)
 delete mode 100644 srcpkgs/xnp2/INSTALL.msg
 delete mode 100644 srcpkgs/xnp2/patches/define_cplusplus.patch
 delete mode 100644 srcpkgs/xnp2/template
 delete mode 100644 srcpkgs/xnp2/update

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 873cf9c1927d..392f1e39e130 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -420,6 +420,7 @@ replaces="
  xlennart<=1.1.1_1
  xmonad-contrib<=0.16_3
  xmonad<=0.15_5
+ xnp2<=0.86_2
  xnoise-devel<=0.2.21_4
  xnoise<=0.2.21_4
  yabause-gtk<=0.9.15_2
diff --git a/srcpkgs/xnp2/INSTALL.msg b/srcpkgs/xnp2/INSTALL.msg
deleted file mode 100644
index 53fc91ec76da..000000000000
--- a/srcpkgs/xnp2/INSTALL.msg
+++ /dev/null
@@ -1,7 +0,0 @@
-The following packages are not required for operation, but are necessary
-to support extra features:
-
-SDL2       Required when using sound and joystick.
-SDL2_mixer Required when playing PCM such as floppy seek sound.
-libXxf86vm Required when using full screen function to change screen resolution.
-libusb     Required when supporting C86 BOX.
diff --git a/srcpkgs/xnp2/patches/define_cplusplus.patch b/srcpkgs/xnp2/patches/define_cplusplus.patch
deleted file mode 100644
index 12b24c90bb28..000000000000
--- a/srcpkgs/xnp2/patches/define_cplusplus.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/x11/compiler.h.old	2018-02-02 17:00:29.174895866 +0000
-+++ b/x11/compiler.h	2018-02-02 17:00:41.199160781 +0000
-@@ -117,12 +117,14 @@
- #define	MAX_PATH	MAXPATHLEN
- #endif
- 
-+#ifndef __cplusplus
- #ifndef	max
- #define	max(a,b)	(((a) > (b)) ? (a) : (b))
- #endif
- #ifndef	min
- #define	min(a,b)	(((a) < (b)) ? (a) : (b))
- #endif
-+#endif /* __cplusplus */
- 
- #ifndef	ZeroMemory
- #define	ZeroMemory(d,n)		memset((d), 0, (n))
diff --git a/srcpkgs/xnp2/template b/srcpkgs/xnp2/template
deleted file mode 100644
index 7ae496fc224e..000000000000
--- a/srcpkgs/xnp2/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'xnp2'
-pkgname=xnp2
-version=0.86
-revision=2
-build_wrksrc=x11
-build_style=gnu-configure
-configure_args="--enable-ia32 --enable-build-all"
-hostmakedepends="pkg-config nasm"
-makedepends="gtk+-devel SDL2-devel"
-short_desc="Port for UNIX with X11 of the Neko Project II PC-9801 emulator"
-maintainer="hipperson0 <hipperson0@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://www.nonakap.org/np2"
-distfiles="https://www.nonakap.org/np2/release/xnp2-${version}.tar.bz2"
-checksum=e0b8c93f54682a4b3373907fd9ffe78094f95f7430dffc5038eccbcc4c3f78fd
-
-do_install() {
-	vbin xnp2
-	vbin xnp21
-	vman xnp2.1
-	vman xnp2.1j
-	vman xnp21.1
-	vman xnp21.1j
-	vdoc README.ja
-	sed '/\*\//q' main.c > LICENSE
-	vlicense LICENSE
-}
diff --git a/srcpkgs/xnp2/update b/srcpkgs/xnp2/update
deleted file mode 100644
index 04584df73d29..000000000000
--- a/srcpkgs/xnp2/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="20140607"

From 7cb634b777b157976dbd0f1ec6fdf80ddc6aa4f6 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 5 Aug 2022 00:44:21 +0000
Subject: [PATCH 06/20] graphviz-x11: remove stale symlink

---
 srcpkgs/graphviz-x11 | 1 -
 1 file changed, 1 deletion(-)
 delete mode 120000 srcpkgs/graphviz-x11

diff --git a/srcpkgs/graphviz-x11 b/srcpkgs/graphviz-x11
deleted file mode 120000
index abecf5d9457d..000000000000
--- a/srcpkgs/graphviz-x11
+++ /dev/null
@@ -1 +0,0 @@
-graphviz
\ No newline at end of file

From c8271d68e65b07990ae8dbe5f19d4e94f93c7530 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 4 Aug 2022 20:06:49 -0400
Subject: [PATCH 07/20] watchexec: update to 1.20.5

---
 srcpkgs/watchexec/patches/fix-tests.patch | 14 --------------
 srcpkgs/watchexec/template                |  4 ++--
 2 files changed, 2 insertions(+), 16 deletions(-)
 delete mode 100644 srcpkgs/watchexec/patches/fix-tests.patch

diff --git a/srcpkgs/watchexec/patches/fix-tests.patch b/srcpkgs/watchexec/patches/fix-tests.patch
deleted file mode 100644
index f210de15e314..000000000000
--- a/srcpkgs/watchexec/patches/fix-tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# Remove debug notice from test case
-diff --git a/crates/cli/tests/snapshots/help__help_unix.snap b/crates/cli/tests/snapshots/help__help_unix.snap
-index b55782f022..c5642f98ce 100644
---- a/crates/cli/tests/snapshots/help__help_unix.snap
-+++ b/crates/cli/tests/snapshots/help__help_unix.snap
-@@ -2,8 +2,6 @@
- source: crates/cli/tests/help.rs
- expression: "String::from_utf8(output.stdout).unwrap()"
- ---
--⚠ DEBUG BUILD ⚠
--
- watchexec 1.20.2
- Execute commands when watched files change
- 
diff --git a/srcpkgs/watchexec/template b/srcpkgs/watchexec/template
index 4bd08d626870..c6401cd925d2 100644
--- a/srcpkgs/watchexec/template
+++ b/srcpkgs/watchexec/template
@@ -1,6 +1,6 @@
 # Template file for 'watchexec'
 pkgname=watchexec
-version=1.20.2
+version=1.20.5
 revision=1
 wrksrc="${pkgname}-cli-v${version}"
 build_wrksrc="crates/cli"
@@ -10,7 +10,7 @@ maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/watchexec/watchexec"
 distfiles="https://github.com/watchexec/watchexec/archive/refs/tags/cli-v${version}.tar.gz"
-checksum=62e2e722a84475436286010edff36c56c4c6fad9e76be4b35381877e93faeac8
+checksum=2bc04c7ecf58d34a48c3eeea54a76b7e621717cb93305497bea2f6399dd119c6
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From f245a59b1701bfaa994e17ad70157f5be03df06b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Thu, 4 Aug 2022 15:39:56 +0200
Subject: [PATCH 08/20] element-desktop: update to 1.11.2.

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

diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index 4f5aae940e49..a2c70cf88a8e 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.1
+version=1.11.2
 revision=1
 create_wrksrc=yes
 conf_files="/etc/${pkgname}/config.json"
@@ -14,12 +14,10 @@ short_desc="Glossy Matrix collaboration client, desktop version"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0"
 homepage="https://element.io"
-_ghpage="https://github.com/vector-im"
-_archive="archive/v${version}.tar.gz"
-distfiles="${_ghpage}/element-desktop/${_archive}>element-desktop.tar.gz
- ${_ghpage}/element-web/${_archive}>element-web.tar.gz"
-checksum="b93c82705bde69504d201b3624bcbd5fb258c0bf20e1535c0339132e593469b4
- b223fcff42a305ce8034892e0bdcb4806e45f5fd7f902e2914bc65dbd910230b"
+distfiles="https://github.com/vector-im/element-desktop/archive/v${version}.tar.gz>element-desktop.tar.gz
+ https://github.com/vector-im/element-web/archive/v${version}.tar.gz>element-web.tar.gz"
+checksum="f8cae27b6960e58d4a78f19b8198a6452e4789e7107950d678ec88a08247f84a
+ 2e9498a910acfc78d1b5ba4beb99af05195bde664c08ec1c2da47ef0d6ef21af"
 
 export USE_SYSTEM_APP_BUILDER=true
 

From b424ca75c311258510bb52ff77cf61fa32b74f94 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 5 Aug 2022 08:25:04 -0400
Subject: [PATCH 09/20] mkinitcpio: backport fix for kmod>=30

---
 srcpkgs/mkinitcpio/patches/fix-depmod.patch | 30 +++++++++++++++++++++
 srcpkgs/mkinitcpio/template                 |  2 +-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/mkinitcpio/patches/fix-depmod.patch

diff --git a/srcpkgs/mkinitcpio/patches/fix-depmod.patch b/srcpkgs/mkinitcpio/patches/fix-depmod.patch
new file mode 100644
index 000000000000..55e5e7bb3a1d
--- /dev/null
+++ b/srcpkgs/mkinitcpio/patches/fix-depmod.patch
@@ -0,0 +1,30 @@
+From e629e34f18141a6244eaac2f0288d7b2a5d669ee Mon Sep 17 00:00:00 2001
+From: Chih-Hsuan Yen <yan12125@gmail.com>
+Date: Sun, 3 Jul 2022 11:03:10 +0800
+Subject: [PATCH] Fix the warning about missing modules.builtin.modinfo
+
+> depmod: WARNING: could not open modules.builtin.modinfo at /tmp/mkinitcpio.EftMSK/root/lib/modules/5.15.52-1-lts: No such file or directory
+
+kmod wants modules.builtin.modinfo since v30 [1].
+
+Also adds modules.order as suggested by heftig. That file is used (if
+exists) since the first commit of depmod.
+
+[1] https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git/commit/?id=0246e06340df292b5dda4bc00e24cc9ae894e881
+---
+ functions | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/functions b/functions
+index 48cfd7a..e77a4c4 100644
+--- a/functions
++++ b/functions
+@@ -876,7 +876,7 @@ install_modules() {
+     (( ${#zst_comp[*]} )) && zstd -d --rm -q "${zst_comp[@]}"
+ 
+     msg "Generating module dependencies"
+-    install -m644 -t "$moduledest" "$_d_kmoduledir"/modules.builtin
++    install -m644 -t "$moduledest" "$_d_kmoduledir"/modules.{builtin,builtin.modinfo,order}
+ 
+     # we install all modules into kernel/, making the .order file incorrect for
+     # the module tree. munge it, so that we have an accurate index. This avoids
diff --git a/srcpkgs/mkinitcpio/template b/srcpkgs/mkinitcpio/template
index ddd733d5e56d..ab00be349a27 100644
--- a/srcpkgs/mkinitcpio/template
+++ b/srcpkgs/mkinitcpio/template
@@ -1,7 +1,7 @@
 # Template file for 'mkinitcpio'
 pkgname=mkinitcpio
 version=31
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="asciidoc"
 depends="busybox-static bsdtar bash"

From af2ce48a1ad83b344161af672feaa2b910ac88d3 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sat, 30 Jul 2022 22:57:27 +0200
Subject: [PATCH 10/20] apt: update to 2.5.2

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

diff --git a/srcpkgs/apt/template b/srcpkgs/apt/template
index 9e477574ead0..17f842c34843 100644
--- a/srcpkgs/apt/template
+++ b/srcpkgs/apt/template
@@ -1,24 +1,30 @@
 # Template file for 'apt'
 pkgname=apt
-version=2.1.12
+version=2.5.2
 revision=1
 build_style=cmake
 configure_args="-DDPKG_DATADIR=/usr/share/dpkg -DCURRENT_VENDOR=debian
  -DDOCBOOK_XSL=/usr/share/xsl/docbook"
 hostmakedepends="pkg-config docbook-xsl doxygen po4a w3m libxslt triehash"
 makedepends="db-devel gnutls-devel bzip2-devel liblzma-devel liblz4-devel
- libzstd-devel libseccomp-devel eudev-libudev-devel dpkg-devel gtest-devel"
+ libzstd-devel libseccomp-devel eudev-libudev-devel dpkg-devel gtest-devel
+ libgcrypt-devel xxHash-devel"
+checkdepends="dpkg runit-void tar"
 short_desc="APT package management tools"
 maintainer="Elie ROUDNINSKI <xademax@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://salsa.debian.org/apt-team/apt"
 distfiles="https://github.com/Debian/apt/archive/${version}.tar.gz"
-checksum=61f639d3d37a56de37263aaa22dfe8b3f8cc56b1d6d9a59a4ce4ce70fcb139e9
+checksum=6f8817f1091a9f8fd001e9b84185cd198f739391e89e3cabcc253f46c4cf9d68
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) broken="error: void value not ignored as it ought to be" ;;
 esac
 
+pre_check() {
+	export GTEST_FILTER="-FileUtlTest.GetTempDir"
+}
+
 apt-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision}"

From 5a2c77e96feddf914788cb5cb1792745b4dada52 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 3 Aug 2022 00:08:14 -0400
Subject: [PATCH 11/20] CONTRIBUTING.md: add instructions for testing PRs

---
 CONTRIBUTING.md | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index da3bef29c883..3f33aeb1d974 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -129,3 +129,25 @@ Please abstain from temporarily closing a pull request while revising the templa
 
 Once the reviewers have merged the pull request, our [build server](http://build.voidlinux.org) is automatically triggered and builds
 all packages in the pull request for all supported platforms. Upon completion, the packages are available to all Void Linux users.
+
+## Testing Pull Requests
+
+While it is the responsibility of the PR creator to test changes before sending it, one person can't test all configuration options, usecases, hardware, etc.
+Testing new package submissions and updates is always helpful, and is a great way to get started with contributing.
+First, [clone the repository](https://github.com/void-linux/void-packages#quick-start) if you haven't done so already.
+Then check out the pull request, either with `github-cli`:
+
+    $ gh pr checkout <number>
+
+Or with `git`:
+
+If your local void-packages repository is cloned from your fork, you may need to add the main repository as a remote first:
+
+    $ git remote add upstream https://github.com/void-linux/void-packages.git
+
+Then fetch and check out the PR (replacing `<remote>` with either `origin` or `upstream`):
+
+    $ git fetch <remote> pull/<number>/head:<branch-name>
+    $ git checkout <branch-name>
+
+Then [build and install](https://github.com/void-linux/void-packages#building-packages) the package and test its functionality.

From a282e80a78785e68e99593b535a8b0876e62eb5c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 2 Aug 2022 18:46:18 +0200
Subject: [PATCH 12/20] xcdroast: remove package

gtk2
---
 srcpkgs/removed-packages/template |  1 +
 srcpkgs/xcdroast/template         | 14 --------------
 2 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 srcpkgs/xcdroast/template

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 4a325984709b..c716bb3a0b6f 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -416,6 +416,7 @@ replaces="
  wicd-gtk<=1.7.4_6
  wireguard-go<=0.0.20181222_2
  wireshark-gtk<=3.0.7_1
+ xcdroast<=1.19_1
  xlennart<=1.1.1_1
  xmonad-contrib<=0.16_3
  xmonad<=0.15_5
diff --git a/srcpkgs/xcdroast/template b/srcpkgs/xcdroast/template
deleted file mode 100644
index a8334bbb0dd1..000000000000
--- a/srcpkgs/xcdroast/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'xcdroast'
-pkgname=xcdroast
-version=1.19
-revision=1
-build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="gtk+-devel alsa-lib-devel"
-depends="cdrtools"
-short_desc="Flexible frontend for optical disc authoring"
-maintainer="Nick Hahn <nick.hahn@hotmail.de>"
-license="GPL-2.0-only"
-homepage="http://www.xcdroast.org"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=86f52ba796d4d8ad346a4c73667f728a79d96e1045c239cf94d1529e2c271615

From 799f41402a6f8cad9c5bb9fc053480489cb08b64 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 2 Aug 2022 18:40:40 +0200
Subject: [PATCH 13/20] yabause-gtk: remove package

gtk2, dead upstream
---
 srcpkgs/removed-packages/template            |  1 +
 srcpkgs/yabause-gtk/patches/fix-cflags.patch | 13 -------------
 srcpkgs/yabause-gtk/patches/rwx.patch        | 20 --------------------
 srcpkgs/yabause-gtk/template                 | 19 -------------------
 srcpkgs/yabause-gtk/update                   |  1 -
 5 files changed, 1 insertion(+), 53 deletions(-)
 delete mode 100644 srcpkgs/yabause-gtk/patches/fix-cflags.patch
 delete mode 100644 srcpkgs/yabause-gtk/patches/rwx.patch
 delete mode 100644 srcpkgs/yabause-gtk/template
 delete mode 100644 srcpkgs/yabause-gtk/update

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index c716bb3a0b6f..873cf9c1927d 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -422,6 +422,7 @@ replaces="
  xmonad<=0.15_5
  xnoise-devel<=0.2.21_4
  xnoise<=0.2.21_4
+ yabause-gtk<=0.9.15_2
  yt-play<=20140117_2
  yturl<=2.0.2_5
  zbackup<=1.4.4_23
diff --git a/srcpkgs/yabause-gtk/patches/fix-cflags.patch b/srcpkgs/yabause-gtk/patches/fix-cflags.patch
deleted file mode 100644
index b69426bd3016..000000000000
--- a/srcpkgs/yabause-gtk/patches/fix-cflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: src/CMakeLists.txt
-===================================================================
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -659,7 +659,7 @@ else ()
- 	set(yabause_SOURCES ${yabause_SOURCES} sock-dummy.c thr-dummy.c)
- endif ()
- 
--set(YAB_OPTIMIZATION "-O3" CACHE STRING "Override optimization level")
-+set(YAB_OPTIMIZATION "" CACHE STRING "Override optimization level")
- 
- if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i686")
- 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${YAB_OPTIMIZATION} -march=i686 -msse")
diff --git a/srcpkgs/yabause-gtk/patches/rwx.patch b/srcpkgs/yabause-gtk/patches/rwx.patch
deleted file mode 100644
index bb0491b373f8..000000000000
--- a/srcpkgs/yabause-gtk/patches/rwx.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/sh2_dynarec/linkage_x64.s	2013-03-11 20:29:53.112870900 +0100
-+++ b/src/sh2_dynarec/linkage_x64.s	2013-03-11 20:31:48.856778600 +0100
-@@ -747,3 +747,7 @@ breakpoint:
- 	ret
- 	/* Set breakpoint here for debugging */
- 	.size	breakpoint, .-breakpoint
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
---- a/src/sh2_dynarec/linkage_x86.s	2013-03-11 20:30:08.157693100 +0100
-+++ b/src/sh2_dynarec/linkage_x86.s	2013-03-11 20:32:30.993310600 +0100
-@@ -743,3 +743,7 @@ breakpoint:
- 	ret
- 	/* Set breakpoint here for debugging */
- 	.size	breakpoint, .-breakpoint
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
diff --git a/srcpkgs/yabause-gtk/template b/srcpkgs/yabause-gtk/template
deleted file mode 100644
index 841c0af36b78..000000000000
--- a/srcpkgs/yabause-gtk/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'yabause-gtk'
-pkgname=yabause-gtk
-version=0.9.15
-revision=2
-wrksrc="${pkgname%-gtk}-${version}"
-build_style=cmake
-configure_args="-DYAB_PORTS=gtk -DYAB_NETWORK=ON -DYAB_OPTIMIZED_DMA=ON"
-hostmakedepends="pkg-config"
-makedepends="libXmu-devel libfreeglut-devel gtkglext-devel libopenal-devel SDL2-devel"
-depends="desktop-file-utils"
-short_desc="Sega Saturn emulator with GTK UI)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://yabause.org/"
-distfiles="https://download.tuxfamily.org/yabause/releases/${version}/yabause-${version}.tar.gz"
-checksum=4334c43fe0f3ff297bac8e91f4e059fe5fd276291faff2489e37b5b3a4ccc2b2
-nopie=yes
-# Would need m68kmake built for the host
-nocross=yes
diff --git a/srcpkgs/yabause-gtk/update b/srcpkgs/yabause-gtk/update
deleted file mode 100644
index b93f2e9eada0..000000000000
--- a/srcpkgs/yabause-gtk/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname="${pkgname%-gtk}"

From 5bbb705cad1b760371626fa74c1ff0359c93c48d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 2 Aug 2022 18:44:15 +0200
Subject: [PATCH 14/20] xnp2: remove package

gtk2, dead upstream
---
 srcpkgs/removed-packages/template           |  1 +
 srcpkgs/xnp2/INSTALL.msg                    |  7 ------
 srcpkgs/xnp2/patches/define_cplusplus.patch | 17 -------------
 srcpkgs/xnp2/template                       | 27 ---------------------
 srcpkgs/xnp2/update                         |  1 -
 5 files changed, 1 insertion(+), 52 deletions(-)
 delete mode 100644 srcpkgs/xnp2/INSTALL.msg
 delete mode 100644 srcpkgs/xnp2/patches/define_cplusplus.patch
 delete mode 100644 srcpkgs/xnp2/template
 delete mode 100644 srcpkgs/xnp2/update

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 873cf9c1927d..392f1e39e130 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -420,6 +420,7 @@ replaces="
  xlennart<=1.1.1_1
  xmonad-contrib<=0.16_3
  xmonad<=0.15_5
+ xnp2<=0.86_2
  xnoise-devel<=0.2.21_4
  xnoise<=0.2.21_4
  yabause-gtk<=0.9.15_2
diff --git a/srcpkgs/xnp2/INSTALL.msg b/srcpkgs/xnp2/INSTALL.msg
deleted file mode 100644
index 53fc91ec76da..000000000000
--- a/srcpkgs/xnp2/INSTALL.msg
+++ /dev/null
@@ -1,7 +0,0 @@
-The following packages are not required for operation, but are necessary
-to support extra features:
-
-SDL2       Required when using sound and joystick.
-SDL2_mixer Required when playing PCM such as floppy seek sound.
-libXxf86vm Required when using full screen function to change screen resolution.
-libusb     Required when supporting C86 BOX.
diff --git a/srcpkgs/xnp2/patches/define_cplusplus.patch b/srcpkgs/xnp2/patches/define_cplusplus.patch
deleted file mode 100644
index 12b24c90bb28..000000000000
--- a/srcpkgs/xnp2/patches/define_cplusplus.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/x11/compiler.h.old	2018-02-02 17:00:29.174895866 +0000
-+++ b/x11/compiler.h	2018-02-02 17:00:41.199160781 +0000
-@@ -117,12 +117,14 @@
- #define	MAX_PATH	MAXPATHLEN
- #endif
- 
-+#ifndef __cplusplus
- #ifndef	max
- #define	max(a,b)	(((a) > (b)) ? (a) : (b))
- #endif
- #ifndef	min
- #define	min(a,b)	(((a) < (b)) ? (a) : (b))
- #endif
-+#endif /* __cplusplus */
- 
- #ifndef	ZeroMemory
- #define	ZeroMemory(d,n)		memset((d), 0, (n))
diff --git a/srcpkgs/xnp2/template b/srcpkgs/xnp2/template
deleted file mode 100644
index 7ae496fc224e..000000000000
--- a/srcpkgs/xnp2/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'xnp2'
-pkgname=xnp2
-version=0.86
-revision=2
-build_wrksrc=x11
-build_style=gnu-configure
-configure_args="--enable-ia32 --enable-build-all"
-hostmakedepends="pkg-config nasm"
-makedepends="gtk+-devel SDL2-devel"
-short_desc="Port for UNIX with X11 of the Neko Project II PC-9801 emulator"
-maintainer="hipperson0 <hipperson0@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://www.nonakap.org/np2"
-distfiles="https://www.nonakap.org/np2/release/xnp2-${version}.tar.bz2"
-checksum=e0b8c93f54682a4b3373907fd9ffe78094f95f7430dffc5038eccbcc4c3f78fd
-
-do_install() {
-	vbin xnp2
-	vbin xnp21
-	vman xnp2.1
-	vman xnp2.1j
-	vman xnp21.1
-	vman xnp21.1j
-	vdoc README.ja
-	sed '/\*\//q' main.c > LICENSE
-	vlicense LICENSE
-}
diff --git a/srcpkgs/xnp2/update b/srcpkgs/xnp2/update
deleted file mode 100644
index 04584df73d29..000000000000
--- a/srcpkgs/xnp2/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="20140607"

From 032d290829598f66a768410f9b02ab88aee13f5f Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 5 Aug 2022 00:44:21 +0000
Subject: [PATCH 15/20] graphviz-x11: remove stale symlink

---
 srcpkgs/graphviz-x11 | 1 -
 1 file changed, 1 deletion(-)
 delete mode 120000 srcpkgs/graphviz-x11

diff --git a/srcpkgs/graphviz-x11 b/srcpkgs/graphviz-x11
deleted file mode 120000
index abecf5d9457d..000000000000
--- a/srcpkgs/graphviz-x11
+++ /dev/null
@@ -1 +0,0 @@
-graphviz
\ No newline at end of file

From 2f1ce58a19db21eeee706175863be750c6ec7c3c Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 4 Aug 2022 20:06:49 -0400
Subject: [PATCH 16/20] watchexec: update to 1.20.5

---
 srcpkgs/watchexec/patches/fix-tests.patch | 14 --------------
 srcpkgs/watchexec/template                |  4 ++--
 2 files changed, 2 insertions(+), 16 deletions(-)
 delete mode 100644 srcpkgs/watchexec/patches/fix-tests.patch

diff --git a/srcpkgs/watchexec/patches/fix-tests.patch b/srcpkgs/watchexec/patches/fix-tests.patch
deleted file mode 100644
index f210de15e314..000000000000
--- a/srcpkgs/watchexec/patches/fix-tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# Remove debug notice from test case
-diff --git a/crates/cli/tests/snapshots/help__help_unix.snap b/crates/cli/tests/snapshots/help__help_unix.snap
-index b55782f022..c5642f98ce 100644
---- a/crates/cli/tests/snapshots/help__help_unix.snap
-+++ b/crates/cli/tests/snapshots/help__help_unix.snap
-@@ -2,8 +2,6 @@
- source: crates/cli/tests/help.rs
- expression: "String::from_utf8(output.stdout).unwrap()"
- ---
--⚠ DEBUG BUILD ⚠
--
- watchexec 1.20.2
- Execute commands when watched files change
- 
diff --git a/srcpkgs/watchexec/template b/srcpkgs/watchexec/template
index 4bd08d626870..c6401cd925d2 100644
--- a/srcpkgs/watchexec/template
+++ b/srcpkgs/watchexec/template
@@ -1,6 +1,6 @@
 # Template file for 'watchexec'
 pkgname=watchexec
-version=1.20.2
+version=1.20.5
 revision=1
 wrksrc="${pkgname}-cli-v${version}"
 build_wrksrc="crates/cli"
@@ -10,7 +10,7 @@ maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/watchexec/watchexec"
 distfiles="https://github.com/watchexec/watchexec/archive/refs/tags/cli-v${version}.tar.gz"
-checksum=62e2e722a84475436286010edff36c56c4c6fad9e76be4b35381877e93faeac8
+checksum=2bc04c7ecf58d34a48c3eeea54a76b7e621717cb93305497bea2f6399dd119c6
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From c1c879327c25f00556647a522a6177624860a81d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Thu, 4 Aug 2022 15:39:56 +0200
Subject: [PATCH 17/20] element-desktop: update to 1.11.2.

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

diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index 4f5aae940e49..a2c70cf88a8e 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.1
+version=1.11.2
 revision=1
 create_wrksrc=yes
 conf_files="/etc/${pkgname}/config.json"
@@ -14,12 +14,10 @@ short_desc="Glossy Matrix collaboration client, desktop version"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0"
 homepage="https://element.io"
-_ghpage="https://github.com/vector-im"
-_archive="archive/v${version}.tar.gz"
-distfiles="${_ghpage}/element-desktop/${_archive}>element-desktop.tar.gz
- ${_ghpage}/element-web/${_archive}>element-web.tar.gz"
-checksum="b93c82705bde69504d201b3624bcbd5fb258c0bf20e1535c0339132e593469b4
- b223fcff42a305ce8034892e0bdcb4806e45f5fd7f902e2914bc65dbd910230b"
+distfiles="https://github.com/vector-im/element-desktop/archive/v${version}.tar.gz>element-desktop.tar.gz
+ https://github.com/vector-im/element-web/archive/v${version}.tar.gz>element-web.tar.gz"
+checksum="f8cae27b6960e58d4a78f19b8198a6452e4789e7107950d678ec88a08247f84a
+ 2e9498a910acfc78d1b5ba4beb99af05195bde664c08ec1c2da47ef0d6ef21af"
 
 export USE_SYSTEM_APP_BUILDER=true
 

From 95ed006d2e2ea1b1314d78eb94a5a5127a580af8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 5 Aug 2022 08:25:04 -0400
Subject: [PATCH 18/20] mkinitcpio: backport fix for kmod>=30

---
 srcpkgs/mkinitcpio/patches/fix-depmod.patch | 30 +++++++++++++++++++++
 srcpkgs/mkinitcpio/template                 |  2 +-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/mkinitcpio/patches/fix-depmod.patch

diff --git a/srcpkgs/mkinitcpio/patches/fix-depmod.patch b/srcpkgs/mkinitcpio/patches/fix-depmod.patch
new file mode 100644
index 000000000000..55e5e7bb3a1d
--- /dev/null
+++ b/srcpkgs/mkinitcpio/patches/fix-depmod.patch
@@ -0,0 +1,30 @@
+From e629e34f18141a6244eaac2f0288d7b2a5d669ee Mon Sep 17 00:00:00 2001
+From: Chih-Hsuan Yen <yan12125@gmail.com>
+Date: Sun, 3 Jul 2022 11:03:10 +0800
+Subject: [PATCH] Fix the warning about missing modules.builtin.modinfo
+
+> depmod: WARNING: could not open modules.builtin.modinfo at /tmp/mkinitcpio.EftMSK/root/lib/modules/5.15.52-1-lts: No such file or directory
+
+kmod wants modules.builtin.modinfo since v30 [1].
+
+Also adds modules.order as suggested by heftig. That file is used (if
+exists) since the first commit of depmod.
+
+[1] https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git/commit/?id=0246e06340df292b5dda4bc00e24cc9ae894e881
+---
+ functions | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/functions b/functions
+index 48cfd7a..e77a4c4 100644
+--- a/functions
++++ b/functions
+@@ -876,7 +876,7 @@ install_modules() {
+     (( ${#zst_comp[*]} )) && zstd -d --rm -q "${zst_comp[@]}"
+ 
+     msg "Generating module dependencies"
+-    install -m644 -t "$moduledest" "$_d_kmoduledir"/modules.builtin
++    install -m644 -t "$moduledest" "$_d_kmoduledir"/modules.{builtin,builtin.modinfo,order}
+ 
+     # we install all modules into kernel/, making the .order file incorrect for
+     # the module tree. munge it, so that we have an accurate index. This avoids
diff --git a/srcpkgs/mkinitcpio/template b/srcpkgs/mkinitcpio/template
index ddd733d5e56d..ab00be349a27 100644
--- a/srcpkgs/mkinitcpio/template
+++ b/srcpkgs/mkinitcpio/template
@@ -1,7 +1,7 @@
 # Template file for 'mkinitcpio'
 pkgname=mkinitcpio
 version=31
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="asciidoc"
 depends="busybox-static bsdtar bash"

From aaf69e37b9061a066e84cf33aafa89c6ae1cc9a4 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sat, 30 Jul 2022 22:57:27 +0200
Subject: [PATCH 19/20] apt: update to 2.5.2

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

diff --git a/srcpkgs/apt/template b/srcpkgs/apt/template
index 9e477574ead0..17f842c34843 100644
--- a/srcpkgs/apt/template
+++ b/srcpkgs/apt/template
@@ -1,24 +1,30 @@
 # Template file for 'apt'
 pkgname=apt
-version=2.1.12
+version=2.5.2
 revision=1
 build_style=cmake
 configure_args="-DDPKG_DATADIR=/usr/share/dpkg -DCURRENT_VENDOR=debian
  -DDOCBOOK_XSL=/usr/share/xsl/docbook"
 hostmakedepends="pkg-config docbook-xsl doxygen po4a w3m libxslt triehash"
 makedepends="db-devel gnutls-devel bzip2-devel liblzma-devel liblz4-devel
- libzstd-devel libseccomp-devel eudev-libudev-devel dpkg-devel gtest-devel"
+ libzstd-devel libseccomp-devel eudev-libudev-devel dpkg-devel gtest-devel
+ libgcrypt-devel xxHash-devel"
+checkdepends="dpkg runit-void tar"
 short_desc="APT package management tools"
 maintainer="Elie ROUDNINSKI <xademax@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://salsa.debian.org/apt-team/apt"
 distfiles="https://github.com/Debian/apt/archive/${version}.tar.gz"
-checksum=61f639d3d37a56de37263aaa22dfe8b3f8cc56b1d6d9a59a4ce4ce70fcb139e9
+checksum=6f8817f1091a9f8fd001e9b84185cd198f739391e89e3cabcc253f46c4cf9d68
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) broken="error: void value not ignored as it ought to be" ;;
 esac
 
+pre_check() {
+	export GTEST_FILTER="-FileUtlTest.GetTempDir"
+}
+
 apt-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision}"

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

* Re: godot: update to 3.5
  2022-08-05  0:24 [PR PATCH] godot: update to 3.4.5 Relected
                   ` (14 preceding siblings ...)
  2022-08-05 18:59 ` [PR PATCH] [Updated] " Relected
@ 2022-08-05 19:22 ` Relected
  2022-08-05 19:43 ` [PR PATCH] [Updated] " Relected
                   ` (12 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: Relected @ 2022-08-05 19:22 UTC (permalink / raw)
  To: ml

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

New comment by Relected on void-packages repository

https://github.com/void-linux/void-packages/pull/38473#issuecomment-1206786636

Comment:
@codingHahn would you like to help update the engine? since you were the previous maintainer

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

* Re: [PR PATCH] [Updated] godot: update to 3.5
  2022-08-05  0:24 [PR PATCH] godot: update to 3.4.5 Relected
                   ` (15 preceding siblings ...)
  2022-08-05 19:22 ` Relected
@ 2022-08-05 19:43 ` Relected
  2022-08-05 19:50 ` Relected
                   ` (11 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: Relected @ 2022-08-05 19:43 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Relected/void-packages master
https://github.com/void-linux/void-packages/pull/38473

godot: update to 3.5
<!-- Uncomment relevant sections and delete options which are not applicable -->

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


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

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

From 7d268846fdac72167ac42b382e650657fd9aa552 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sat, 30 Jul 2022 22:57:27 +0200
Subject: [PATCH] deleted commits

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

diff --git a/srcpkgs/apt/template b/srcpkgs/apt/template
index 9e477574ead0..17f842c34843 100644
--- a/srcpkgs/apt/template
+++ b/srcpkgs/apt/template
@@ -1,24 +1,30 @@
 # Template file for 'apt'
 pkgname=apt
-version=2.1.12
+version=2.5.2
 revision=1
 build_style=cmake
 configure_args="-DDPKG_DATADIR=/usr/share/dpkg -DCURRENT_VENDOR=debian
  -DDOCBOOK_XSL=/usr/share/xsl/docbook"
 hostmakedepends="pkg-config docbook-xsl doxygen po4a w3m libxslt triehash"
 makedepends="db-devel gnutls-devel bzip2-devel liblzma-devel liblz4-devel
- libzstd-devel libseccomp-devel eudev-libudev-devel dpkg-devel gtest-devel"
+ libzstd-devel libseccomp-devel eudev-libudev-devel dpkg-devel gtest-devel
+ libgcrypt-devel xxHash-devel"
+checkdepends="dpkg runit-void tar"
 short_desc="APT package management tools"
 maintainer="Elie ROUDNINSKI <xademax@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://salsa.debian.org/apt-team/apt"
 distfiles="https://github.com/Debian/apt/archive/${version}.tar.gz"
-checksum=61f639d3d37a56de37263aaa22dfe8b3f8cc56b1d6d9a59a4ce4ce70fcb139e9
+checksum=6f8817f1091a9f8fd001e9b84185cd198f739391e89e3cabcc253f46c4cf9d68
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) broken="error: void value not ignored as it ought to be" ;;
 esac
 
+pre_check() {
+	export GTEST_FILTER="-FileUtlTest.GetTempDir"
+}
+
 apt-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision}"

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

* Re: [PR PATCH] [Updated] godot: update to 3.5
  2022-08-05  0:24 [PR PATCH] godot: update to 3.4.5 Relected
                   ` (16 preceding siblings ...)
  2022-08-05 19:43 ` [PR PATCH] [Updated] " Relected
@ 2022-08-05 19:50 ` Relected
  2022-08-05 19:51 ` Relected
                   ` (10 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: Relected @ 2022-08-05 19:50 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Relected/void-packages master
https://github.com/void-linux/void-packages/pull/38473

godot: update to 3.5
<!-- Uncomment relevant sections and delete options which are not applicable -->

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


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

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

From e0748987b02625a2a20bee2a7d5443adb481d271 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sat, 30 Jul 2022 22:57:27 +0200
Subject: [PATCH] godot: update to 3.5

---
 srcpkgs/apt/template   | 12 +++++++++---
 srcpkgs/godot/template |  8 ++++----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/apt/template b/srcpkgs/apt/template
index 9e477574ead0..17f842c34843 100644
--- a/srcpkgs/apt/template
+++ b/srcpkgs/apt/template
@@ -1,24 +1,30 @@
 # Template file for 'apt'
 pkgname=apt
-version=2.1.12
+version=2.5.2
 revision=1
 build_style=cmake
 configure_args="-DDPKG_DATADIR=/usr/share/dpkg -DCURRENT_VENDOR=debian
  -DDOCBOOK_XSL=/usr/share/xsl/docbook"
 hostmakedepends="pkg-config docbook-xsl doxygen po4a w3m libxslt triehash"
 makedepends="db-devel gnutls-devel bzip2-devel liblzma-devel liblz4-devel
- libzstd-devel libseccomp-devel eudev-libudev-devel dpkg-devel gtest-devel"
+ libzstd-devel libseccomp-devel eudev-libudev-devel dpkg-devel gtest-devel
+ libgcrypt-devel xxHash-devel"
+checkdepends="dpkg runit-void tar"
 short_desc="APT package management tools"
 maintainer="Elie ROUDNINSKI <xademax@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://salsa.debian.org/apt-team/apt"
 distfiles="https://github.com/Debian/apt/archive/${version}.tar.gz"
-checksum=61f639d3d37a56de37263aaa22dfe8b3f8cc56b1d6d9a59a4ce4ce70fcb139e9
+checksum=6f8817f1091a9f8fd001e9b84185cd198f739391e89e3cabcc253f46c4cf9d68
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) broken="error: void value not ignored as it ought to be" ;;
 esac
 
+pre_check() {
+	export GTEST_FILTER="-FileUtlTest.GetTempDir"
+}
+
 apt-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index c38f3f8c525a..3863b1e3ec76 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,6 +1,6 @@
 # Template file for 'godot'
 pkgname=godot
-version=3.4
+version=3.5
 revision=1
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 wrksrc="${pkgname}-${version}-stable"
@@ -9,7 +9,7 @@ build_style=scons
 # 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
+make_build_args="platform=x11 tools=yes target=release_debug use_llvm=yes dev=no progress=no
  pulseaudio=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
@@ -21,13 +21,13 @@ makedepends="
  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"
+ miniupnpc-devel pcre2-devel yasm MesaLib-devel"
 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/${pkgname}/archive/${version}-stable.tar.gz"
-checksum=61749d12cb094c0be2a2c451ae2aceb8bb45f59f67fcd13fcd8f0c9114262d88
+checksum=c65425e1d56a7097990f231c27c9271b7159f763dc59f0eaba9273633e59da36
 nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio
 
 CFLAGS+=" -fPIE -fPIC"

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

* Re: godot: update to 3.5
  2022-08-05  0:24 [PR PATCH] godot: update to 3.4.5 Relected
                   ` (17 preceding siblings ...)
  2022-08-05 19:50 ` Relected
@ 2022-08-05 19:51 ` Relected
  2022-08-05 19:57 ` [PR PATCH] [Updated] " Relected
                   ` (9 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: Relected @ 2022-08-05 19:51 UTC (permalink / raw)
  To: ml

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

New comment by Relected on void-packages repository

https://github.com/void-linux/void-packages/pull/38473#issuecomment-1206752701

Comment:
i dont know what just happend

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

* Re: [PR PATCH] [Updated] godot: update to 3.5
  2022-08-05  0:24 [PR PATCH] godot: update to 3.4.5 Relected
                   ` (18 preceding siblings ...)
  2022-08-05 19:51 ` Relected
@ 2022-08-05 19:57 ` Relected
  2022-08-05 20:02 ` Relected
                   ` (8 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: Relected @ 2022-08-05 19:57 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Relected/void-packages master
https://github.com/void-linux/void-packages/pull/38473

godot: update to 3.5
<!-- Uncomment relevant sections and delete options which are not applicable -->

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


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

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

From 4093df8583deb89da970c74aa2c4d207f57ec910 Mon Sep 17 00:00:00 2001
From: Relected <m7md11xd@gmail.com>
Date: Fri, 5 Aug 2022 21:57:12 +0200
Subject: [PATCH] godot: update to 3.5

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

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index c38f3f8c525a..3863b1e3ec76 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,6 +1,6 @@
 # Template file for 'godot'
 pkgname=godot
-version=3.4
+version=3.5
 revision=1
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 wrksrc="${pkgname}-${version}-stable"
@@ -9,7 +9,7 @@ build_style=scons
 # 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
+make_build_args="platform=x11 tools=yes target=release_debug use_llvm=yes dev=no progress=no
  pulseaudio=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
@@ -21,13 +21,13 @@ makedepends="
  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"
+ miniupnpc-devel pcre2-devel yasm MesaLib-devel"
 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/${pkgname}/archive/${version}-stable.tar.gz"
-checksum=61749d12cb094c0be2a2c451ae2aceb8bb45f59f67fcd13fcd8f0c9114262d88
+checksum=c65425e1d56a7097990f231c27c9271b7159f763dc59f0eaba9273633e59da36
 nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio
 
 CFLAGS+=" -fPIE -fPIC"

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

* Re: godot: update to 3.5
  2022-08-05  0:24 [PR PATCH] godot: update to 3.4.5 Relected
                   ` (19 preceding siblings ...)
  2022-08-05 19:57 ` [PR PATCH] [Updated] " Relected
@ 2022-08-05 20:02 ` Relected
  2022-08-05 20:47 ` [PR PATCH] [Updated] " Relected
                   ` (7 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: Relected @ 2022-08-05 20:02 UTC (permalink / raw)
  To: ml

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

New comment by Relected on void-packages repository

https://github.com/void-linux/void-packages/pull/38473#issuecomment-1206786636

Comment:
@codingHahn would you like to help update the engine? since you were the previous maintainer
edit: since i finally dealt with the conflicting commits, would you like to stay the maintainer of the project? or would you let me take over so the package doesnt become orphaned?

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

* Re: [PR PATCH] [Updated] godot: update to 3.5
  2022-08-05  0:24 [PR PATCH] godot: update to 3.4.5 Relected
                   ` (20 preceding siblings ...)
  2022-08-05 20:02 ` Relected
@ 2022-08-05 20:47 ` Relected
  2022-08-05 20:54 ` Relected
                   ` (6 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: Relected @ 2022-08-05 20:47 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Relected/void-packages master
https://github.com/void-linux/void-packages/pull/38473

godot: update to 3.5
<!-- Uncomment relevant sections and delete options which are not applicable -->

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


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

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

From 4093df8583deb89da970c74aa2c4d207f57ec910 Mon Sep 17 00:00:00 2001
From: Relected <m7md11xd@gmail.com>
Date: Fri, 5 Aug 2022 21:57:12 +0200
Subject: [PATCH 1/2] godot: update to 3.5

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

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index c38f3f8c525a..3863b1e3ec76 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,6 +1,6 @@
 # Template file for 'godot'
 pkgname=godot
-version=3.4
+version=3.5
 revision=1
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 wrksrc="${pkgname}-${version}-stable"
@@ -9,7 +9,7 @@ build_style=scons
 # 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
+make_build_args="platform=x11 tools=yes target=release_debug use_llvm=yes dev=no progress=no
  pulseaudio=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
@@ -21,13 +21,13 @@ makedepends="
  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"
+ miniupnpc-devel pcre2-devel yasm MesaLib-devel"
 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/${pkgname}/archive/${version}-stable.tar.gz"
-checksum=61749d12cb094c0be2a2c451ae2aceb8bb45f59f67fcd13fcd8f0c9114262d88
+checksum=c65425e1d56a7097990f231c27c9271b7159f763dc59f0eaba9273633e59da36
 nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio
 
 CFLAGS+=" -fPIE -fPIC"

From 116df3ea829c4af0490fb16a65d644a5dd7d4fd7 Mon Sep 17 00:00:00 2001
From: Relected <m7md11xd@gmail.com>
Date: Fri, 5 Aug 2022 22:47:32 +0200
Subject: [PATCH 2/2] remove use_llvm from build args

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

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index 3863b1e3ec76..fac52e567b6c 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -9,7 +9,7 @@ build_style=scons
 # 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 use_llvm=yes dev=no progress=no
+make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no
  pulseaudio=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

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

* Re: [PR PATCH] [Updated] godot: update to 3.5
  2022-08-05  0:24 [PR PATCH] godot: update to 3.4.5 Relected
                   ` (21 preceding siblings ...)
  2022-08-05 20:47 ` [PR PATCH] [Updated] " Relected
@ 2022-08-05 20:54 ` Relected
  2022-08-05 21:31 ` Relected
                   ` (5 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: Relected @ 2022-08-05 20:54 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Relected/void-packages master
https://github.com/void-linux/void-packages/pull/38473

godot: update to 3.5
<!-- Uncomment relevant sections and delete options which are not applicable -->

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


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

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

From 4093df8583deb89da970c74aa2c4d207f57ec910 Mon Sep 17 00:00:00 2001
From: Relected <m7md11xd@gmail.com>
Date: Fri, 5 Aug 2022 21:57:12 +0200
Subject: [PATCH 1/3] godot: update to 3.5

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

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index c38f3f8c525a..3863b1e3ec76 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,6 +1,6 @@
 # Template file for 'godot'
 pkgname=godot
-version=3.4
+version=3.5
 revision=1
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 wrksrc="${pkgname}-${version}-stable"
@@ -9,7 +9,7 @@ build_style=scons
 # 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
+make_build_args="platform=x11 tools=yes target=release_debug use_llvm=yes dev=no progress=no
  pulseaudio=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
@@ -21,13 +21,13 @@ makedepends="
  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"
+ miniupnpc-devel pcre2-devel yasm MesaLib-devel"
 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/${pkgname}/archive/${version}-stable.tar.gz"
-checksum=61749d12cb094c0be2a2c451ae2aceb8bb45f59f67fcd13fcd8f0c9114262d88
+checksum=c65425e1d56a7097990f231c27c9271b7159f763dc59f0eaba9273633e59da36
 nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio
 
 CFLAGS+=" -fPIE -fPIC"

From 116df3ea829c4af0490fb16a65d644a5dd7d4fd7 Mon Sep 17 00:00:00 2001
From: Relected <m7md11xd@gmail.com>
Date: Fri, 5 Aug 2022 22:47:32 +0200
Subject: [PATCH 2/3] remove use_llvm from build args

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

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index 3863b1e3ec76..fac52e567b6c 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -9,7 +9,7 @@ build_style=scons
 # 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 use_llvm=yes dev=no progress=no
+make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no
  pulseaudio=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

From 710ddfcc17d4d085d523de55e8b6a734ba2fabcb Mon Sep 17 00:00:00 2001
From: Relected <m7md11xd@gmail.com>
Date: Fri, 5 Aug 2022 22:54:14 +0200
Subject: [PATCH 3/3] removed unneeded dependencies

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

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index fac52e567b6c..b1d393b582ac 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -21,7 +21,7 @@ makedepends="
  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 yasm MesaLib-devel"
+ miniupnpc-devel pcre2-devel"
 short_desc="Multiplatform 2D and 3D engine"
 maintainer="Nick Hahn <nick.hahn@hotmail.de>"
 license="MIT"

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

* Re: [PR PATCH] [Updated] godot: update to 3.5
  2022-08-05  0:24 [PR PATCH] godot: update to 3.4.5 Relected
                   ` (22 preceding siblings ...)
  2022-08-05 20:54 ` Relected
@ 2022-08-05 21:31 ` Relected
  2022-08-05 21:36 ` Relected
                   ` (4 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: Relected @ 2022-08-05 21:31 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Relected/void-packages master
https://github.com/void-linux/void-packages/pull/38473

godot: update to 3.5
<!-- Uncomment relevant sections and delete options which are not applicable -->

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


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

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

From 4093df8583deb89da970c74aa2c4d207f57ec910 Mon Sep 17 00:00:00 2001
From: Relected <m7md11xd@gmail.com>
Date: Fri, 5 Aug 2022 21:57:12 +0200
Subject: [PATCH 1/3] godot: update to 3.5

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

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index c38f3f8c525a..3863b1e3ec76 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,6 +1,6 @@
 # Template file for 'godot'
 pkgname=godot
-version=3.4
+version=3.5
 revision=1
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 wrksrc="${pkgname}-${version}-stable"
@@ -9,7 +9,7 @@ build_style=scons
 # 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
+make_build_args="platform=x11 tools=yes target=release_debug use_llvm=yes dev=no progress=no
  pulseaudio=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
@@ -21,13 +21,13 @@ makedepends="
  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"
+ miniupnpc-devel pcre2-devel yasm MesaLib-devel"
 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/${pkgname}/archive/${version}-stable.tar.gz"
-checksum=61749d12cb094c0be2a2c451ae2aceb8bb45f59f67fcd13fcd8f0c9114262d88
+checksum=c65425e1d56a7097990f231c27c9271b7159f763dc59f0eaba9273633e59da36
 nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio
 
 CFLAGS+=" -fPIE -fPIC"

From 116df3ea829c4af0490fb16a65d644a5dd7d4fd7 Mon Sep 17 00:00:00 2001
From: Relected <m7md11xd@gmail.com>
Date: Fri, 5 Aug 2022 22:47:32 +0200
Subject: [PATCH 2/3] remove use_llvm from build args

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

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index 3863b1e3ec76..fac52e567b6c 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -9,7 +9,7 @@ build_style=scons
 # 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 use_llvm=yes dev=no progress=no
+make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no
  pulseaudio=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

From 710ddfcc17d4d085d523de55e8b6a734ba2fabcb Mon Sep 17 00:00:00 2001
From: Relected <m7md11xd@gmail.com>
Date: Fri, 5 Aug 2022 22:54:14 +0200
Subject: [PATCH 3/3] removed unneeded dependencies

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

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index fac52e567b6c..b1d393b582ac 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -21,7 +21,7 @@ makedepends="
  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 yasm MesaLib-devel"
+ miniupnpc-devel pcre2-devel"
 short_desc="Multiplatform 2D and 3D engine"
 maintainer="Nick Hahn <nick.hahn@hotmail.de>"
 license="MIT"

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

* Re: [PR PATCH] [Updated] godot: update to 3.5
  2022-08-05  0:24 [PR PATCH] godot: update to 3.4.5 Relected
                   ` (23 preceding siblings ...)
  2022-08-05 21:31 ` Relected
@ 2022-08-05 21:36 ` Relected
  2022-08-05 21:37 ` Relected
                   ` (3 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: Relected @ 2022-08-05 21:36 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Relected/void-packages master
https://github.com/void-linux/void-packages/pull/38473

godot: update to 3.5
<!-- Uncomment relevant sections and delete options which are not applicable -->

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


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

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

From 5313b099b036f6cfeb12e07d01096e05bf970dea Mon Sep 17 00:00:00 2001
From: Relected <m7md11xd@gmail.com>
Date: Fri, 5 Aug 2022 21:57:12 +0200
Subject: [PATCH 01/10] godot: update to 3.5

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

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index c38f3f8c525a..b1d393b582ac 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,6 +1,6 @@
 # Template file for 'godot'
 pkgname=godot
-version=3.4
+version=3.5
 revision=1
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 wrksrc="${pkgname}-${version}-stable"
@@ -27,7 +27,7 @@ maintainer="Nick Hahn <nick.hahn@hotmail.de>"
 license="MIT"
 homepage="https://www.godotengine.org/"
 distfiles="https://github.com/godotengine/${pkgname}/archive/${version}-stable.tar.gz"
-checksum=61749d12cb094c0be2a2c451ae2aceb8bb45f59f67fcd13fcd8f0c9114262d88
+checksum=c65425e1d56a7097990f231c27c9271b7159f763dc59f0eaba9273633e59da36
 nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio
 
 CFLAGS+=" -fPIE -fPIC"

From 2637094a8c25fb0edbb97c89504a84052147e46e Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sat, 30 Jul 2022 22:57:27 +0200
Subject: [PATCH 02/10] apt: update to 2.5.2

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

diff --git a/srcpkgs/apt/template b/srcpkgs/apt/template
index 9e477574ead0..17f842c34843 100644
--- a/srcpkgs/apt/template
+++ b/srcpkgs/apt/template
@@ -1,24 +1,30 @@
 # Template file for 'apt'
 pkgname=apt
-version=2.1.12
+version=2.5.2
 revision=1
 build_style=cmake
 configure_args="-DDPKG_DATADIR=/usr/share/dpkg -DCURRENT_VENDOR=debian
  -DDOCBOOK_XSL=/usr/share/xsl/docbook"
 hostmakedepends="pkg-config docbook-xsl doxygen po4a w3m libxslt triehash"
 makedepends="db-devel gnutls-devel bzip2-devel liblzma-devel liblz4-devel
- libzstd-devel libseccomp-devel eudev-libudev-devel dpkg-devel gtest-devel"
+ libzstd-devel libseccomp-devel eudev-libudev-devel dpkg-devel gtest-devel
+ libgcrypt-devel xxHash-devel"
+checkdepends="dpkg runit-void tar"
 short_desc="APT package management tools"
 maintainer="Elie ROUDNINSKI <xademax@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://salsa.debian.org/apt-team/apt"
 distfiles="https://github.com/Debian/apt/archive/${version}.tar.gz"
-checksum=61f639d3d37a56de37263aaa22dfe8b3f8cc56b1d6d9a59a4ce4ce70fcb139e9
+checksum=6f8817f1091a9f8fd001e9b84185cd198f739391e89e3cabcc253f46c4cf9d68
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) broken="error: void value not ignored as it ought to be" ;;
 esac
 
+pre_check() {
+	export GTEST_FILTER="-FileUtlTest.GetTempDir"
+}
+
 apt-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision}"

From 7a88c53114a1641024e9500170955e72103c95c4 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 5 Aug 2022 11:53:40 -0500
Subject: [PATCH 03/10] sqlmap: update to 1.6.8.

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

diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template
index 4b6eb70fee68..312a20b710ee 100644
--- a/srcpkgs/sqlmap/template
+++ b/srcpkgs/sqlmap/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlmap'
 pkgname=sqlmap
-version=1.6.7
+version=1.6.8
 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=397472048c3b454da3e5448944002661fff376edd38f6fe902ab1db0f9fd8d2b
+checksum=35c51f4bd6f5cb8dd8efee4cf87d49bc7e7311ed6f42ffdd038394f7f98e69a2
 python_version=3
 
 do_install() {

From 2ca94dea0ce2e3c22097c0292ae7bc63f2711b84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 5 Aug 2022 17:24:47 +0200
Subject: [PATCH 04/10] cargo-deny: update to 0.12.2.

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

diff --git a/srcpkgs/cargo-deny/template b/srcpkgs/cargo-deny/template
index 7de8e764ec90..ec8ad592b9c6 100644
--- a/srcpkgs/cargo-deny/template
+++ b/srcpkgs/cargo-deny/template
@@ -1,6 +1,6 @@
 # Template file for 'cargo-deny'
 pkgname=cargo-deny
-version=0.12.1
+version=0.12.2
 revision=1
 build_style=cargo
 configure_args="--no-default-features"
@@ -12,7 +12,7 @@ license="MIT, Apache-2.0"
 homepage="https://github.com/EmbarkStudios/cargo-deny"
 changelog="https://raw.githubusercontent.com/EmbarkStudios/cargo-deny/main/CHANGELOG.md"
 distfiles="https://github.com/EmbarkStudios/cargo-deny/archive/${version}.tar.gz"
-checksum=9f77445008553b4de1f74c4f903b68f318842f769dc8bfffa5a17af2460c0963
+checksum=7d8a034fe0219f8b7adc0ab25c90f7f253b4c387d7d5c8f74f6ad79f4810dc1e
 
 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	broken="bitvec crate unimplemented for big endian"

From 625373b8250ca4acd909ad977622bac09e2fb3cb Mon Sep 17 00:00:00 2001
From: Kenneth Dodrill <hello@kennydodrill.com>
Date: Fri, 5 Aug 2022 09:53:28 -0500
Subject: [PATCH 05/10] gamemode: update to 1.7

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

diff --git a/srcpkgs/gamemode/template b/srcpkgs/gamemode/template
index 0bf9bea530ec..c70be770dee5 100644
--- a/srcpkgs/gamemode/template
+++ b/srcpkgs/gamemode/template
@@ -1,9 +1,9 @@
 # Template file for 'gamemode'
 pkgname=gamemode
-version=1.6.1
+version=1.7
 revision=1
 build_style=meson
-configure_args="-Dwith-sd-bus-provider=elogind"
+configure_args="-Dwith-sd-bus-provider=elogind -Dwith-pam-group=gamemode"
 hostmakedepends="pkg-config"
 makedepends="inih-devel dbus-devel elogind-devel"
 depends="lib${pkgname}>=${version}_${revision}"
@@ -11,8 +11,10 @@ short_desc="Optimise Linux system performance on demand"
 maintainer="Kenneth Dodrill <hello@kennydodrill.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/FeralInteractive/gamemode"
+changelog="https://raw.githubusercontent.com/FeralInteractive/gamemode/master/CHANGELOG.md"
 distfiles="https://github.com/FeralInteractive/gamemode/archive/${version}.tar.gz"
-checksum=4377b88b5147ebf8d3f9a7a1f94c6d00f1e9624cd171d5af942ce9766be3747f
+checksum=8a1718c657cb1d3c8269edfd397faf3cb41fccd885198ef0225bf8f82217c42f
+system_groups=gamemode
 
 post_install() {
 	vsconf example/gamemode.ini

From bcf85b554c8497354cba7034bc71c4bcfe7b21fa Mon Sep 17 00:00:00 2001
From: Christian Poulwey <christian.poulwey@t-online.de>
Date: Sun, 31 Jul 2022 13:50:21 +0200
Subject: [PATCH 06/10] gitlab-runner: update to 15.2.1

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

diff --git a/srcpkgs/gitlab-runner/template b/srcpkgs/gitlab-runner/template
index c79af7de41df..40337f584196 100644
--- a/srcpkgs/gitlab-runner/template
+++ b/srcpkgs/gitlab-runner/template
@@ -1,6 +1,6 @@
 # Template file for 'gitlab-runner'
 pkgname=gitlab-runner
-version=15.1.0
+version=15.2.1
 revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=go
@@ -9,8 +9,9 @@ short_desc="Official GitLab CI runner written in Go"
 maintainer="Christian Poulwey <christian.poulwey@t-online.de>"
 license="MIT"
 homepage="https://docs.gitlab.com/runner/"
+changelog="https://gitlab.com/gitlab-org/gitlab-runner/-/raw/main/CHANGELOG.md"
 distfiles="https://gitlab.com/gitlab-org/gitlab-runner/-/archive/v${version}/gitlab-runner-v${version}.tar.gz"
-checksum=b65ca751e433fd32f186d3d59f617216f3509c5f8b7089ede25aa39e40ec43f4
+checksum=@93240a62fb7e41375f2b4447c8e13c4f28c98714daa1046d209445f2a04fe2a1
 
 post_install() {
 	vsv gitlab-runner

From 9971c180b8b53c10ecaf9e5d91cc0bd53c91b9cc Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 5 Aug 2022 22:49:45 +0200
Subject: [PATCH 07/10] New package: cyanrip-0.8.1

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

diff --git a/srcpkgs/cyanrip/template b/srcpkgs/cyanrip/template
new file mode 100644
index 000000000000..2790252889c7
--- /dev/null
+++ b/srcpkgs/cyanrip/template
@@ -0,0 +1,13 @@
+# Template file for 'cyanrip'
+pkgname=cyanrip
+version=0.8.1
+revision=1
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="ffmpeg-devel libcdio-devel libcdio-paranoia-devel libcurl-devel libmusicbrainz5-devel"
+short_desc="Bule-ish CD ripper"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/cyanreg/cyanrip"
+distfiles="https://github.com/cyanreg/cyanrip/archive/refs/tags/v${version}.tar.gz"
+checksum=a65a454d111bb0852280b9410409e39e63cc7d36757e5e8a9358b4c4fba52183

From 59809030b47b65090f0b01cdda5e76561120b8e7 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 5 Aug 2022 22:51:31 +0200
Subject: [PATCH 08/10] common/travis: use https for repo-ci.voidlinux.org

This reverts commit 2233ca2edf8c029522e89be5e13801f225c8072f.

We now have a cert on repo-ci and http to https redirects so that
each request results in a redirect.
---
 common/travis/set_mirror.sh | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/common/travis/set_mirror.sh b/common/travis/set_mirror.sh
index c14f6ac70e34..5d8e47781b58 100755
--- a/common/travis/set_mirror.sh
+++ b/common/travis/set_mirror.sh
@@ -1,16 +1,8 @@
 #!/bin/sh
 
-TRAVIS_PROTO=http
 TRAVIS_MIRROR=repo-ci.voidlinux.org
 
 for _i in etc/xbps.d/repos-remote*.conf ; do
     /bin/echo -e "\x1b[32mUpdating $_i...\x1b[0m"
-    # First fix the proto, ideally we'd serve everything with HTTPS,
-    # but key management and rotation is a pain, and things are signed
-    # so we can afford to be a little lazy at times.
-    sed -i "s:https:$TRAVIS_PROTO:g" $_i
-
-    # Now set the mirror
-    sed -i "s:alpha\.de\.repo\.voidlinux\.org:$TRAVIS_MIRROR:g" $_i
-    sed -i "s:repo-default\.voidlinux\.org:$TRAVIS_MIRROR:g" $_i
+    sed -i "s:repo\.voidlinux\.org:$TRAVIS_MIRROR:g" $_i
 done

From 08ebfae438de05be3d0a5674ac91ad9b6bea6fc8 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 5 Aug 2022 22:59:41 +0200
Subject: [PATCH 09/10] common/travis: mirror replace pattern

---
 common/travis/set_mirror.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/travis/set_mirror.sh b/common/travis/set_mirror.sh
index 5d8e47781b58..8159daceb613 100755
--- a/common/travis/set_mirror.sh
+++ b/common/travis/set_mirror.sh
@@ -4,5 +4,5 @@ TRAVIS_MIRROR=repo-ci.voidlinux.org
 
 for _i in etc/xbps.d/repos-remote*.conf ; do
     /bin/echo -e "\x1b[32mUpdating $_i...\x1b[0m"
-    sed -i "s:repo\.voidlinux\.org:$TRAVIS_MIRROR:g" $_i
+    sed -i "s:repo-default\.voidlinux\.org:$TRAVIS_MIRROR:g" $_i
 done

From d0747ae4fcc97983463650110da80fd7675183fd Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 5 Aug 2022 23:06:21 +0200
Subject: [PATCH 10/10] .github/workflows: switch to repo-ci.voidlinux.org

---
 .github/workflows/build.yaml | 3 +++
 .github/workflows/cycles.yml | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index bb05364b5e74..ce995e2d9c79 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -65,6 +65,9 @@ jobs:
     steps:
       - name: Prepare container
         run: |
+          # switch to repo-ci mirror
+          mkdir -p /etc/xbps.d && cp /usr/share/xbps.d/*-repository-*.conf /etc/xbps.d/
+          sed -i 's|repo-default|repo-ci|g' /etc/xbps.d/*-repository-*.conf
           # Sync and upgrade once, assume error comes from xbps update
           xbps-install -Syu || xbps-install -yu xbps
           # Upgrade again (in case there was a xbps update)
diff --git a/.github/workflows/cycles.yml b/.github/workflows/cycles.yml
index 018c0909bdb1..3f85ac6fa74a 100644
--- a/.github/workflows/cycles.yml
+++ b/.github/workflows/cycles.yml
@@ -14,6 +14,9 @@ jobs:
     steps:
       - name: Prepare container
         run: |
+          # switch to repo-ci mirror
+          mkdir -p /etc/xbps.d && cp /usr/share/xbps.d/*-repository-*.conf /etc/xbps.d/
+          sed -i 's|repo-default|repo-ci|g' /etc/xbps.d/*-repository-*.conf
           # Sync and upgrade once, assume error comes from xbps update
           xbps-install -Syu || xbps-install -yu xbps
           # Upgrade again (in case there was a xbps update)

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

* Re: [PR PATCH] [Updated] godot: update to 3.5
  2022-08-05  0:24 [PR PATCH] godot: update to 3.4.5 Relected
                   ` (24 preceding siblings ...)
  2022-08-05 21:36 ` Relected
@ 2022-08-05 21:37 ` Relected
  2022-08-05 21:42 ` Relected
                   ` (2 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: Relected @ 2022-08-05 21:37 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Relected/void-packages master
https://github.com/void-linux/void-packages/pull/38473

godot: update to 3.5
<!-- Uncomment relevant sections and delete options which are not applicable -->

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


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

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

From 5313b099b036f6cfeb12e07d01096e05bf970dea Mon Sep 17 00:00:00 2001
From: Relected <m7md11xd@gmail.com>
Date: Fri, 5 Aug 2022 21:57:12 +0200
Subject: [PATCH 01/10] godot: update to 3.5

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

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index c38f3f8c525a..b1d393b582ac 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,6 +1,6 @@
 # Template file for 'godot'
 pkgname=godot
-version=3.4
+version=3.5
 revision=1
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 wrksrc="${pkgname}-${version}-stable"
@@ -27,7 +27,7 @@ maintainer="Nick Hahn <nick.hahn@hotmail.de>"
 license="MIT"
 homepage="https://www.godotengine.org/"
 distfiles="https://github.com/godotengine/${pkgname}/archive/${version}-stable.tar.gz"
-checksum=61749d12cb094c0be2a2c451ae2aceb8bb45f59f67fcd13fcd8f0c9114262d88
+checksum=c65425e1d56a7097990f231c27c9271b7159f763dc59f0eaba9273633e59da36
 nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio
 
 CFLAGS+=" -fPIE -fPIC"

From 2637094a8c25fb0edbb97c89504a84052147e46e Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sat, 30 Jul 2022 22:57:27 +0200
Subject: [PATCH 02/10] apt: update to 2.5.2

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

diff --git a/srcpkgs/apt/template b/srcpkgs/apt/template
index 9e477574ead0..17f842c34843 100644
--- a/srcpkgs/apt/template
+++ b/srcpkgs/apt/template
@@ -1,24 +1,30 @@
 # Template file for 'apt'
 pkgname=apt
-version=2.1.12
+version=2.5.2
 revision=1
 build_style=cmake
 configure_args="-DDPKG_DATADIR=/usr/share/dpkg -DCURRENT_VENDOR=debian
  -DDOCBOOK_XSL=/usr/share/xsl/docbook"
 hostmakedepends="pkg-config docbook-xsl doxygen po4a w3m libxslt triehash"
 makedepends="db-devel gnutls-devel bzip2-devel liblzma-devel liblz4-devel
- libzstd-devel libseccomp-devel eudev-libudev-devel dpkg-devel gtest-devel"
+ libzstd-devel libseccomp-devel eudev-libudev-devel dpkg-devel gtest-devel
+ libgcrypt-devel xxHash-devel"
+checkdepends="dpkg runit-void tar"
 short_desc="APT package management tools"
 maintainer="Elie ROUDNINSKI <xademax@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://salsa.debian.org/apt-team/apt"
 distfiles="https://github.com/Debian/apt/archive/${version}.tar.gz"
-checksum=61f639d3d37a56de37263aaa22dfe8b3f8cc56b1d6d9a59a4ce4ce70fcb139e9
+checksum=6f8817f1091a9f8fd001e9b84185cd198f739391e89e3cabcc253f46c4cf9d68
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) broken="error: void value not ignored as it ought to be" ;;
 esac
 
+pre_check() {
+	export GTEST_FILTER="-FileUtlTest.GetTempDir"
+}
+
 apt-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision}"

From 7a88c53114a1641024e9500170955e72103c95c4 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 5 Aug 2022 11:53:40 -0500
Subject: [PATCH 03/10] sqlmap: update to 1.6.8.

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

diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template
index 4b6eb70fee68..312a20b710ee 100644
--- a/srcpkgs/sqlmap/template
+++ b/srcpkgs/sqlmap/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlmap'
 pkgname=sqlmap
-version=1.6.7
+version=1.6.8
 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=397472048c3b454da3e5448944002661fff376edd38f6fe902ab1db0f9fd8d2b
+checksum=35c51f4bd6f5cb8dd8efee4cf87d49bc7e7311ed6f42ffdd038394f7f98e69a2
 python_version=3
 
 do_install() {

From 2ca94dea0ce2e3c22097c0292ae7bc63f2711b84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 5 Aug 2022 17:24:47 +0200
Subject: [PATCH 04/10] cargo-deny: update to 0.12.2.

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

diff --git a/srcpkgs/cargo-deny/template b/srcpkgs/cargo-deny/template
index 7de8e764ec90..ec8ad592b9c6 100644
--- a/srcpkgs/cargo-deny/template
+++ b/srcpkgs/cargo-deny/template
@@ -1,6 +1,6 @@
 # Template file for 'cargo-deny'
 pkgname=cargo-deny
-version=0.12.1
+version=0.12.2
 revision=1
 build_style=cargo
 configure_args="--no-default-features"
@@ -12,7 +12,7 @@ license="MIT, Apache-2.0"
 homepage="https://github.com/EmbarkStudios/cargo-deny"
 changelog="https://raw.githubusercontent.com/EmbarkStudios/cargo-deny/main/CHANGELOG.md"
 distfiles="https://github.com/EmbarkStudios/cargo-deny/archive/${version}.tar.gz"
-checksum=9f77445008553b4de1f74c4f903b68f318842f769dc8bfffa5a17af2460c0963
+checksum=7d8a034fe0219f8b7adc0ab25c90f7f253b4c387d7d5c8f74f6ad79f4810dc1e
 
 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	broken="bitvec crate unimplemented for big endian"

From 625373b8250ca4acd909ad977622bac09e2fb3cb Mon Sep 17 00:00:00 2001
From: Kenneth Dodrill <hello@kennydodrill.com>
Date: Fri, 5 Aug 2022 09:53:28 -0500
Subject: [PATCH 05/10] gamemode: update to 1.7

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

diff --git a/srcpkgs/gamemode/template b/srcpkgs/gamemode/template
index 0bf9bea530ec..c70be770dee5 100644
--- a/srcpkgs/gamemode/template
+++ b/srcpkgs/gamemode/template
@@ -1,9 +1,9 @@
 # Template file for 'gamemode'
 pkgname=gamemode
-version=1.6.1
+version=1.7
 revision=1
 build_style=meson
-configure_args="-Dwith-sd-bus-provider=elogind"
+configure_args="-Dwith-sd-bus-provider=elogind -Dwith-pam-group=gamemode"
 hostmakedepends="pkg-config"
 makedepends="inih-devel dbus-devel elogind-devel"
 depends="lib${pkgname}>=${version}_${revision}"
@@ -11,8 +11,10 @@ short_desc="Optimise Linux system performance on demand"
 maintainer="Kenneth Dodrill <hello@kennydodrill.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/FeralInteractive/gamemode"
+changelog="https://raw.githubusercontent.com/FeralInteractive/gamemode/master/CHANGELOG.md"
 distfiles="https://github.com/FeralInteractive/gamemode/archive/${version}.tar.gz"
-checksum=4377b88b5147ebf8d3f9a7a1f94c6d00f1e9624cd171d5af942ce9766be3747f
+checksum=8a1718c657cb1d3c8269edfd397faf3cb41fccd885198ef0225bf8f82217c42f
+system_groups=gamemode
 
 post_install() {
 	vsconf example/gamemode.ini

From bcf85b554c8497354cba7034bc71c4bcfe7b21fa Mon Sep 17 00:00:00 2001
From: Christian Poulwey <christian.poulwey@t-online.de>
Date: Sun, 31 Jul 2022 13:50:21 +0200
Subject: [PATCH 06/10] gitlab-runner: update to 15.2.1

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

diff --git a/srcpkgs/gitlab-runner/template b/srcpkgs/gitlab-runner/template
index c79af7de41df..40337f584196 100644
--- a/srcpkgs/gitlab-runner/template
+++ b/srcpkgs/gitlab-runner/template
@@ -1,6 +1,6 @@
 # Template file for 'gitlab-runner'
 pkgname=gitlab-runner
-version=15.1.0
+version=15.2.1
 revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=go
@@ -9,8 +9,9 @@ short_desc="Official GitLab CI runner written in Go"
 maintainer="Christian Poulwey <christian.poulwey@t-online.de>"
 license="MIT"
 homepage="https://docs.gitlab.com/runner/"
+changelog="https://gitlab.com/gitlab-org/gitlab-runner/-/raw/main/CHANGELOG.md"
 distfiles="https://gitlab.com/gitlab-org/gitlab-runner/-/archive/v${version}/gitlab-runner-v${version}.tar.gz"
-checksum=b65ca751e433fd32f186d3d59f617216f3509c5f8b7089ede25aa39e40ec43f4
+checksum=@93240a62fb7e41375f2b4447c8e13c4f28c98714daa1046d209445f2a04fe2a1
 
 post_install() {
 	vsv gitlab-runner

From 9971c180b8b53c10ecaf9e5d91cc0bd53c91b9cc Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 5 Aug 2022 22:49:45 +0200
Subject: [PATCH 07/10] New package: cyanrip-0.8.1

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

diff --git a/srcpkgs/cyanrip/template b/srcpkgs/cyanrip/template
new file mode 100644
index 000000000000..2790252889c7
--- /dev/null
+++ b/srcpkgs/cyanrip/template
@@ -0,0 +1,13 @@
+# Template file for 'cyanrip'
+pkgname=cyanrip
+version=0.8.1
+revision=1
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="ffmpeg-devel libcdio-devel libcdio-paranoia-devel libcurl-devel libmusicbrainz5-devel"
+short_desc="Bule-ish CD ripper"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/cyanreg/cyanrip"
+distfiles="https://github.com/cyanreg/cyanrip/archive/refs/tags/v${version}.tar.gz"
+checksum=a65a454d111bb0852280b9410409e39e63cc7d36757e5e8a9358b4c4fba52183

From 59809030b47b65090f0b01cdda5e76561120b8e7 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 5 Aug 2022 22:51:31 +0200
Subject: [PATCH 08/10] common/travis: use https for repo-ci.voidlinux.org

This reverts commit 2233ca2edf8c029522e89be5e13801f225c8072f.

We now have a cert on repo-ci and http to https redirects so that
each request results in a redirect.
---
 common/travis/set_mirror.sh | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/common/travis/set_mirror.sh b/common/travis/set_mirror.sh
index c14f6ac70e34..5d8e47781b58 100755
--- a/common/travis/set_mirror.sh
+++ b/common/travis/set_mirror.sh
@@ -1,16 +1,8 @@
 #!/bin/sh
 
-TRAVIS_PROTO=http
 TRAVIS_MIRROR=repo-ci.voidlinux.org
 
 for _i in etc/xbps.d/repos-remote*.conf ; do
     /bin/echo -e "\x1b[32mUpdating $_i...\x1b[0m"
-    # First fix the proto, ideally we'd serve everything with HTTPS,
-    # but key management and rotation is a pain, and things are signed
-    # so we can afford to be a little lazy at times.
-    sed -i "s:https:$TRAVIS_PROTO:g" $_i
-
-    # Now set the mirror
-    sed -i "s:alpha\.de\.repo\.voidlinux\.org:$TRAVIS_MIRROR:g" $_i
-    sed -i "s:repo-default\.voidlinux\.org:$TRAVIS_MIRROR:g" $_i
+    sed -i "s:repo\.voidlinux\.org:$TRAVIS_MIRROR:g" $_i
 done

From 08ebfae438de05be3d0a5674ac91ad9b6bea6fc8 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 5 Aug 2022 22:59:41 +0200
Subject: [PATCH 09/10] common/travis: mirror replace pattern

---
 common/travis/set_mirror.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/travis/set_mirror.sh b/common/travis/set_mirror.sh
index 5d8e47781b58..8159daceb613 100755
--- a/common/travis/set_mirror.sh
+++ b/common/travis/set_mirror.sh
@@ -4,5 +4,5 @@ TRAVIS_MIRROR=repo-ci.voidlinux.org
 
 for _i in etc/xbps.d/repos-remote*.conf ; do
     /bin/echo -e "\x1b[32mUpdating $_i...\x1b[0m"
-    sed -i "s:repo\.voidlinux\.org:$TRAVIS_MIRROR:g" $_i
+    sed -i "s:repo-default\.voidlinux\.org:$TRAVIS_MIRROR:g" $_i
 done

From 7bdcb00127c5a0f140e0802212dcbe3deb7be3e4 Mon Sep 17 00:00:00 2001
From: Relected <m7md11xd@gmail.com>
Date: Fri, 5 Aug 2022 23:36:43 +0200
Subject: [PATCH 10/10] godot: update to 3.5

---
 .github/workflows/build.yaml | 3 +++
 .github/workflows/cycles.yml | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index bb05364b5e74..ce995e2d9c79 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -65,6 +65,9 @@ jobs:
     steps:
       - name: Prepare container
         run: |
+          # switch to repo-ci mirror
+          mkdir -p /etc/xbps.d && cp /usr/share/xbps.d/*-repository-*.conf /etc/xbps.d/
+          sed -i 's|repo-default|repo-ci|g' /etc/xbps.d/*-repository-*.conf
           # Sync and upgrade once, assume error comes from xbps update
           xbps-install -Syu || xbps-install -yu xbps
           # Upgrade again (in case there was a xbps update)
diff --git a/.github/workflows/cycles.yml b/.github/workflows/cycles.yml
index 018c0909bdb1..3f85ac6fa74a 100644
--- a/.github/workflows/cycles.yml
+++ b/.github/workflows/cycles.yml
@@ -14,6 +14,9 @@ jobs:
     steps:
       - name: Prepare container
         run: |
+          # switch to repo-ci mirror
+          mkdir -p /etc/xbps.d && cp /usr/share/xbps.d/*-repository-*.conf /etc/xbps.d/
+          sed -i 's|repo-default|repo-ci|g' /etc/xbps.d/*-repository-*.conf
           # Sync and upgrade once, assume error comes from xbps update
           xbps-install -Syu || xbps-install -yu xbps
           # Upgrade again (in case there was a xbps update)

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

* Re: [PR PATCH] [Updated] godot: update to 3.5
  2022-08-05  0:24 [PR PATCH] godot: update to 3.4.5 Relected
                   ` (25 preceding siblings ...)
  2022-08-05 21:37 ` Relected
@ 2022-08-05 21:42 ` Relected
  2022-08-05 23:00 ` Relected
  2022-08-07 14:39 ` [PR PATCH] [Merged]: " classabbyamp
  28 siblings, 0 replies; 30+ messages in thread
From: Relected @ 2022-08-05 21:42 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Relected/void-packages master
https://github.com/void-linux/void-packages/pull/38473

godot: update to 3.5
<!-- Uncomment relevant sections and delete options which are not applicable -->

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


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

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

From 5313b099b036f6cfeb12e07d01096e05bf970dea Mon Sep 17 00:00:00 2001
From: Relected <m7md11xd@gmail.com>
Date: Fri, 5 Aug 2022 21:57:12 +0200
Subject: [PATCH] godot: update to 3.5

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

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index c38f3f8c525a..b1d393b582ac 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,6 +1,6 @@
 # Template file for 'godot'
 pkgname=godot
-version=3.4
+version=3.5
 revision=1
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 wrksrc="${pkgname}-${version}-stable"
@@ -27,7 +27,7 @@ maintainer="Nick Hahn <nick.hahn@hotmail.de>"
 license="MIT"
 homepage="https://www.godotengine.org/"
 distfiles="https://github.com/godotengine/${pkgname}/archive/${version}-stable.tar.gz"
-checksum=61749d12cb094c0be2a2c451ae2aceb8bb45f59f67fcd13fcd8f0c9114262d88
+checksum=c65425e1d56a7097990f231c27c9271b7159f763dc59f0eaba9273633e59da36
 nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio
 
 CFLAGS+=" -fPIE -fPIC"

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

* Re: godot: update to 3.5
  2022-08-05  0:24 [PR PATCH] godot: update to 3.4.5 Relected
                   ` (26 preceding siblings ...)
  2022-08-05 21:42 ` Relected
@ 2022-08-05 23:00 ` Relected
  2022-08-07 14:39 ` [PR PATCH] [Merged]: " classabbyamp
  28 siblings, 0 replies; 30+ messages in thread
From: Relected @ 2022-08-05 23:00 UTC (permalink / raw)
  To: ml

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

New comment by Relected on void-packages repository

https://github.com/void-linux/void-packages/pull/38473#issuecomment-1207077158

Comment:
@classabbyamp this new update should fix the audio issue some people are talking about

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

* Re: [PR PATCH] [Merged]: godot: update to 3.5
  2022-08-05  0:24 [PR PATCH] godot: update to 3.4.5 Relected
                   ` (27 preceding siblings ...)
  2022-08-05 23:00 ` Relected
@ 2022-08-07 14:39 ` classabbyamp
  28 siblings, 0 replies; 30+ messages in thread
From: classabbyamp @ 2022-08-07 14:39 UTC (permalink / raw)
  To: ml

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

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

godot: update to 3.5
https://github.com/void-linux/void-packages/pull/38473

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

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


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

end of thread, other threads:[~2022-08-07 14:39 UTC | newest]

Thread overview: 30+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-05  0:24 [PR PATCH] godot: update to 3.4.5 Relected
2022-08-05  0:33 ` abenson
2022-08-05  1:04 ` Relected
2022-08-05  1:08 ` Relected
2022-08-05 13:53 ` Relected
2022-08-05 14:51 ` [PR PATCH] [Updated] " Relected
2022-08-05 16:24 ` Relected
2022-08-05 17:01 ` [PR PATCH] [Updated] godot: update to 3.5 Relected
2022-08-05 17:09 ` classabbyamp
2022-08-05 17:22 ` [PR PATCH] [Updated] " Relected
2022-08-05 17:28 ` Relected
2022-08-05 17:32 ` Relected
2022-08-05 17:32 ` Relected
2022-08-05 18:29 ` Relected
2022-08-05 18:46 ` Relected
2022-08-05 18:59 ` [PR PATCH] [Updated] " Relected
2022-08-05 19:22 ` Relected
2022-08-05 19:43 ` [PR PATCH] [Updated] " Relected
2022-08-05 19:50 ` Relected
2022-08-05 19:51 ` Relected
2022-08-05 19:57 ` [PR PATCH] [Updated] " Relected
2022-08-05 20:02 ` Relected
2022-08-05 20:47 ` [PR PATCH] [Updated] " Relected
2022-08-05 20:54 ` Relected
2022-08-05 21:31 ` Relected
2022-08-05 21:36 ` Relected
2022-08-05 21:37 ` Relected
2022-08-05 21:42 ` Relected
2022-08-05 23:00 ` Relected
2022-08-07 14:39 ` [PR PATCH] [Merged]: " classabbyamp

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).