From: Relected <Relected@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] godot: update to 3.5
Date: Fri, 05 Aug 2022 19:28:11 +0200 [thread overview]
Message-ID: <20220805172811.LTxtj_e-WYyXvn_t-eRiQzp9-q-EgYg6B1j7JFBk0SY@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-38473@inbox.vuxu.org>
[-- 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"
next prev parent reply other threads:[~2022-08-05 17:28 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220805172811.LTxtj_e-WYyXvn_t-eRiQzp9-q-EgYg6B1j7JFBk0SY@z \
--to=relected@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).