* Re: [PR PATCH] [Updated] New package: i3bar-river-1.0.1
2024-10-17 14:22 [PR PATCH] New package: i3bar-river-1.0.1 bitterhalt
2024-10-17 15:01 ` [PR PATCH] [Updated] " bitterhalt
2024-10-17 15:05 ` bitterhalt
@ 2024-10-21 14:58 ` bitterhalt
2024-10-21 15:00 ` [PR PATCH] [Closed]: " bitterhalt
2024-10-21 15:00 ` [PR PATCH] [Updated] " bitterhalt
4 siblings, 0 replies; 8+ messages in thread
From: bitterhalt @ 2024-10-21 14:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 766 bytes --]
There is an updated pull request by bitterhalt against master on the void-packages repository
https://github.com/bitterhalt/void-packages i3bar-river
https://github.com/void-linux/void-packages/pull/52665
New package: i3bar-river-1.0.1
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures:
- x86_64-glibc
A patch file from https://github.com/void-linux/void-packages/pull/52665.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-i3bar-river-52665.patch --]
[-- Type: text/x-diff, Size: 76965 bytes --]
From f8d732a2934fd02d918cd9ce41ce5324c098b671 Mon Sep 17 00:00:00 2001
From: bitterhalt <bazz@void.com>
Date: Thu, 17 Oct 2024 16:42:45 +0300
Subject: [PATCH] New package: i3bar-river-1.0.1
---
common/shlibs | 6 +-
srcpkgs/babashka/template | 8 +-
srcpkgs/bmake/template | 4 +-
srcpkgs/cargo-bootstrap/template | 10 +-
srcpkgs/cargo-c/patches/libgit2-lfs.patch | 11 -
srcpkgs/cargo-c/template | 31 +-
srcpkgs/cargo/template | 8 +-
srcpkgs/eza/template | 6 +-
srcpkgs/fyi/template | 21 +
srcpkgs/hugo/template | 4 +-
srcpkgs/i3bar-river/template | 17 +
srcpkgs/ispc/template | 4 +-
srcpkgs/libfm-qt5/template | 2 +-
srcpkgs/libgit2-1.8/template | 6 +-
srcpkgs/libqt5xdg/template | 2 +-
srcpkgs/libuv/template | 4 +-
.../linux-firmware/patches/no-whence.patch | 12 +
srcpkgs/linux-firmware/template | 108 ++++-
srcpkgs/linux6.11/files/arm64-dotconfig | 2 +-
srcpkgs/linux6.11/files/i386-dotconfig | 2 +-
srcpkgs/linux6.11/files/x86_64-dotconfig | 2 +-
srcpkgs/linux6.11/template | 6 +-
srcpkgs/linux6.6/files/arm64-dotconfig | 3 +-
srcpkgs/linux6.6/files/i386-dotconfig | 3 +-
srcpkgs/linux6.6/files/x86_64-dotconfig | 3 +-
srcpkgs/linux6.6/template | 6 +-
srcpkgs/linuxwave/patches/zig12-compat.patch | 440 ------------------
srcpkgs/linuxwave/template | 6 +-
srcpkgs/lxqt-build-tools-qt5/template | 2 +-
srcpkgs/lxqt-qt5plugin/template | 2 +-
| 4 +-
| 4 +-
srcpkgs/qtforkawesome/template | 4 +-
srcpkgs/rust-bootstrap/template | 18 +-
...dlib-and-musl_root-from-musl-targets.patch | 58 +--
...kage-of-musl-libc-for-the-libc-crate.patch | 28 +-
...e-ELFv2-ABI-on-all-powerpc64-targets.patch | 21 +-
.../0015-properly-skip-submodules.patch | 13 +
srcpkgs/rust/template | 9 +-
srcpkgs/syncthing/template | 6 +-
srcpkgs/syncthingtray/template | 4 +-
srcpkgs/tailscale/template | 4 +-
srcpkgs/terraform/template | 4 +-
srcpkgs/terragrunt/template | 4 +-
srcpkgs/typst/template | 4 +-
srcpkgs/unbound/template | 4 +-
srcpkgs/uv/template | 8 +-
srcpkgs/wine/template | 6 +-
48 files changed, 316 insertions(+), 628 deletions(-)
delete mode 100644 srcpkgs/cargo-c/patches/libgit2-lfs.patch
create mode 100644 srcpkgs/fyi/template
create mode 100644 srcpkgs/i3bar-river/template
create mode 100644 srcpkgs/linux-firmware/patches/no-whence.patch
delete mode 100644 srcpkgs/linuxwave/patches/zig12-compat.patch
create mode 100644 srcpkgs/rust/patches/0015-properly-skip-submodules.patch
diff --git a/common/shlibs b/common/shlibs
index 41030500290ef9..6d083594e55a51 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4355,9 +4355,9 @@ libopensmtpd.so.0 libopensmtpd-0.7_1
libiio.so.0 libiio-0.23_1
libqtforkawesome.so.1 qtforkawesome-0.1.0_1
libqtquickforkawesome.so.1 qtforkawesome-0.1.0_1
-libsyncthingwidgets.so.18 syncthingtray-1.6.2_1
-libsyncthingmodel.so.18 syncthingtray-1.6.2_1
-libsyncthingconnector.so.18 syncthingtray-1.6.2_1
+libsyncthingwidgets.so.19 syncthingtray-1.6.3_1
+libsyncthingmodel.so.19 syncthingtray-1.6.3_1
+libsyncthingconnector.so.19 syncthingtray-1.6.3_1
libglibutil.so.1 libglibutil-1.0.64_1
libgbinder.so.1 libgbinder-1.1.20_1
libgxml-0.20.so.2.0.2 gxml-0.20.3_1
diff --git a/srcpkgs/babashka/template b/srcpkgs/babashka/template
index 7555d58f26f646..21142f3e7ceec3 100644
--- a/srcpkgs/babashka/template
+++ b/srcpkgs/babashka/template
@@ -1,6 +1,6 @@
# Template file for 'babashka'
pkgname=babashka
-version=1.4.192
+version=1.12.194
revision=1
create_wrksrc=yes
hostmakedepends="mandrel leiningen git"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="EPL-1.0"
homepage="https://babashka.org/"
changelog="https://github.com/babashka/babashka/raw/master/CHANGELOG.md"
-_sci_commit=3657f5ee9052d3a1c4cfd79e335ab71486e46664
+_sci_commit=55a76e540c5ce65d8a61982b2f942fcf63776850
_babashka_curl_commit=e936acd40544eb637b6041c7e89454b21eb7ee34
_babashka_nrepl_commit=edd3d613bfb9bf3adabfd0bda5c3f5c6ee85ec20
_depstar_commit=2bf9d3c9f15298d7dd9de033674a42f830e23d6f
@@ -30,8 +30,8 @@ distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.ta
https://github.com/borkdude/deps.clj/archive/${_deps_clj_commit}.tar.gz
https://github.com/babashka/fs/archive/${_fs_commit}.tar.gz
https://github.com/babashka/babashka.core/archive/${_babashka_core_commit}.tar.gz"
-checksum="e923332820b9adeb68e21cc2a313b4d22b88e9e02185c96c647d705ea2c528cb
- a551ad066bcb369a435d0e2f47cb8d7ff92801f11ba461b083becd8c25c2e570
+checksum="399d7fe5ce1799532672edaa23bbcf50690a5fb76d9bb4424ef08849304e99ad
+ 66868f0bf4a702cbd598dbf20298a037a529e87e4334a4547f019dba918120e1
6e60865ae2d4522c3de55b3b1daed51b42bb9bb6095b1d2fbd3620facece3257
e447b9953c0f58a4d9bd43f728ac1bfd044b58b9686507f47a7f3420eae657f5
9f5882a32d45e9b2ded563ccd95c1d5a958cdbb480da516f16ee4f6e3c561d33
diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index 8ebf6dbbe63989..8eea4a43c8fe3f 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,13 +1,13 @@
# Template file for 'bmake'
pkgname=bmake
-version=20240909
+version=20240921
revision=1
short_desc="Portable version of the NetBSD make build tool"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-3-Clause"
homepage="https://www.crufty.net/help/sjg/bmake.html"
distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=d4e019e26c64cc8ffcf1cae9bb04fbb13da8fa6f41fb30fd26e221f655d4e84d
+checksum=b346579e82d296d1a4da29dea8594e3ee596130b20786dec0f3899a3e11275c2
python_version=3
CFLAGS="-D_LARGE_FILE_SOURCE=1 -D_FILE_OFFSET_BITS=64"
diff --git a/srcpkgs/cargo-bootstrap/template b/srcpkgs/cargo-bootstrap/template
index 41916f50df6883..e1a529e14b7ecf 100644
--- a/srcpkgs/cargo-bootstrap/template
+++ b/srcpkgs/cargo-bootstrap/template
@@ -1,10 +1,10 @@
# Template file for 'cargo-bootstrap'
pkgname=cargo-bootstrap
-version=1.81.0
+version=1.82.0
revision=1
short_desc="Bootstrap binaries of Rust package manager"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT, Apache-2.0"
+license="Apache-2.0 OR MIT"
homepage="https://www.rust-lang.org/"
conflicts="cargo>=0"
lib32disabled=yes
@@ -24,15 +24,15 @@ esac
case "$XBPS_TARGET_MACHINE" in
i686)
distfiles="${_bootstrap_url}/cargo-${version}-i686-unknown-linux-gnu.tar.xz"
- checksum="44f74fbf64dd2627310e796cfcbde75c42c3435e93e880f1291c0e975b42c1f5"
+ checksum="1cf5bae93e9724f50f1a20a752f05870565e0ce83baa157aad632aa162fd97d5"
;;
x86_64)
distfiles="${_bootstrap_url}/cargo-${version}-x86_64-unknown-linux-gnu.tar.xz"
- checksum="c50ee4b1ae8695461930e36d5465dddb7c7a0e0f0aa6cbd60de120b17c38b841"
+ checksum="97aeae783874a932c4500f4d36473297945edf6294d63871784217d608718e70"
;;
x86_64-musl)
distfiles="${_bootstrap_url}/cargo-${version}-x86_64-unknown-linux-musl.tar.xz"
- checksum="ece99ea9b81e283bcaa3333ec01f6776d2a0840f956a4e7e5199fc3761354e36"
+ checksum="a66b3129cb483d55188742769bf8282d9546630f2e25434ff233b22bbec5009e"
;;
# placeholders for user-supplied distfiles
ppc64le)
diff --git a/srcpkgs/cargo-c/patches/libgit2-lfs.patch b/srcpkgs/cargo-c/patches/libgit2-lfs.patch
deleted file mode 100644
index c5905e91bcaf72..00000000000000
--- a/srcpkgs/cargo-c/patches/libgit2-lfs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/vendor/libgit2-sys/build.rs
-+++ b/vendor/libgit2-sys/build.rs
-@@ -79,6 +79,8 @@ fn main() {
- .define("MATCH_LIMIT", Some("10000000"))
- .define("MATCH_LIMIT_RECURSION", Some("MATCH_LIMIT"))
- .define("MAX_NAME_SIZE", Some("32"))
-+ .define("_LARGE_FILE_SOURCE", Some("1"))
-+ .define("_FILE_OFFSET_BITS", Some("64"))
- .define("MAX_NAME_COUNT", Some("10000"));
- // "no symbols" warning on pcre_string_utils.c is because it is only used
- // when when COMPILE_PCRE8 is not defined, which is the default.
diff --git a/srcpkgs/cargo-c/template b/srcpkgs/cargo-c/template
index fc01a13d969ca5..52e4877b95fca7 100644
--- a/srcpkgs/cargo-c/template
+++ b/srcpkgs/cargo-c/template
@@ -1,36 +1,23 @@
# Template file for 'cargo-c'
pkgname=cargo-c
-version=0.9.22
-revision=2
+version=0.10.5
+revision=1
build_style=cargo
hostmakedepends="pkg-config zlib-devel"
-makedepends="openssl-devel libssh2-devel zlib-devel libcurl-devel"
+makedepends="openssl-devel libssh2-devel zlib-devel libcurl-devel libgit2-1.8-devel sqlite-devel"
short_desc="Build and install C-compatible rust libraries"
maintainer="oreo639 <oreo6391@gmail.com>"
license="MIT"
homepage="https://crates.io/crates/cargo-c"
distfiles="https://github.com/lu-zero/cargo-c/archive/v${version}.tar.gz
- https://github.com/lu-zero/cargo-c/releases/download/v${version}/Cargo.lock"
-checksum="6af542e3d76e4341693b2e9a9f50abf15b04d82c5f9d1b350110cfac7e914e73
- 0c59e6fa12196cb57733d889ace5acbbe26ec32a6124324d0e6aa0bae2d2a4c3"
-skip_extraction="Cargo.lock"
+ https://github.com/lu-zero/cargo-c/releases/download/v${version}/Cargo.lock>Cargo-${version}.lock"
+checksum="3f131a6a647851a617a87daaaf777a9e50817957be0af29806615613e98efc8a
+ 2b5660aabd70f6a12390a19bcdeacc585c418d24aaa6855bd396a1c3a5684320"
+skip_extraction="Cargo-${version}.lock"
post_extract() {
- local old_lg=b2a5e68b318f28fd7d8f9158bbdab0033f47e1ddd1beb2effe70d9c1c5d1cb31
- local new_lg=98ad678aeacd9467f15af1f03bbfa762a8ec9b5b89f9bb61220430d077ff6519
- cd ${wrksrc}
- cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/Cargo.lock .
- cargo vendor
- mkdir -p .cargo
- cat <<-EOF >>.cargo/config.toml
- [source.crates-io]
- replace-with = "vendored-sources"
-
- [source.vendored-sources]
- directory = "vendor"
- EOF
-
- vsed -i "s/$old_lg/$new_lg/" vendor/libgit2-sys/.cargo-checksum.json
+ vsrccopy Cargo-${version}.lock .
+ mv Cargo-${version}.lock Cargo.lock
}
post_install() {
diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index a7099cb09461f7..2280228fa9eebd 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,18 +1,18 @@
# Template file for 'cargo'
pkgname=cargo
-version=1.81.0
+version=1.82.0
revision=1
-_cargo_revision=0.82.0
+_cargo_revision=0.83.0
build_helper=rust
hostmakedepends="cargo-bootstrap rust python3 curl pkg-config zlib-devel"
makedepends="rust libcurl-devel openssl-devel"
depends="rust"
short_desc="Rust package manager"
maintainer="Enno Boland <gottox@voidlinux.org>"
-license="MIT, Apache-2.0"
+license="Apache-2.0 OR MIT"
homepage="https://crates.io/"
distfiles="https://github.com/rust-lang/cargo/archive/refs/tags/${_cargo_revision}.tar.gz"
-checksum=1c89e6a7a28dd78aca53227fd5e14340fcb7cb154ad9655a2f304b5687986cc3
+checksum=53fbf5eb9d0c42ce184bd1b170606db7c878e7ef07ed3b513a67e62e14ca4661
replaces="cargo-tree>=0"
build_options="static bindist"
diff --git a/srcpkgs/eza/template b/srcpkgs/eza/template
index 7ccf1ff0a5b7f7..90cb709420a027 100644
--- a/srcpkgs/eza/template
+++ b/srcpkgs/eza/template
@@ -1,6 +1,6 @@
# Template file for 'eza'
pkgname=eza
-version=0.20.3
+version=0.20.4
revision=1
build_style=cargo
hostmakedepends="pkg-config"
@@ -12,8 +12,8 @@ homepage="https://eza.rocks"
changelog="https://raw.githubusercontent.com/eza-community/eza/main/CHANGELOG.md"
distfiles="https://github.com/eza-community/eza/archive/refs/tags/v${version}.tar.gz
https://github.com/eza-community/eza/releases/download/v${version}/man-${version}.tar.gz"
-checksum="51a61bba14d1e4043981cabc5cf3d14352bf6a4ca0e308f437d0c8d00f42c2f7
- 5e23fdd8e42757d90d77aac9c944f7cc30a3e6897a7c4c88875a6d89b2ba2a60"
+checksum="5f25e866521c310d9530b9bbabeb288ad8d9cd208adee79582dde79bdd51c470
+ ece6f79aaf4af3b5c47f6bd3b0979eb3183ff4a4f39aeba871bc2595e4365f71"
skip_extraction="man-${version}.tar.gz"
diff --git a/srcpkgs/fyi/template b/srcpkgs/fyi/template
new file mode 100644
index 00000000000000..aeb2d74600bc65
--- /dev/null
+++ b/srcpkgs/fyi/template
@@ -0,0 +1,21 @@
+# Template file for 'fyi'
+pkgname=fyi
+version=1.0.4
+revision=1
+build_style=meson
+hostmakedepends="pkg-config scdoc"
+makedepends="dbus-devel"
+short_desc="Command line utility to send desktop notifications"
+maintainer="icp <pangolin@vivaldi.net>"
+license="MIT"
+homepage="https://codeberg.org/dnkl/fyi"
+changelog="https://codeberg.org/dnkl/fyi/raw/branch/master/CHANGELOG.md"
+distfiles="https://codeberg.org/dnkl/fyi/archive/${version}.tar.gz"
+checksum=6d196b4725df02dba39ca736c0f5b485f6a204a98f68de6bbe8155bdc1e56d24
+
+post_install() {
+ rm -r "${DESTDIR}/usr/share/doc"
+
+ vlicense LICENSE
+ vdoc README.md
+}
diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index f548b772acde17..20a3fd95c589f1 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,6 +1,6 @@
# Template file for 'hugo'
pkgname=hugo
-version=0.136.0
+version=0.136.2
revision=1
build_style=go
build_helper=qemu
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="Apache-2.0"
homepage="https://gohugo.io"
distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz"
-checksum=0c488f10b53d20930e2132089caa3727283bf3c2b07a2d3211e94fe553168339
+checksum=ca8ba334a181fe257bfc94e700aed7c514acf6898ad2f861d57d8702cd19e0df
post_install() {
vdoc README.md
diff --git a/srcpkgs/i3bar-river/template b/srcpkgs/i3bar-river/template
new file mode 100644
index 00000000000000..d9232c09484cfa
--- /dev/null
+++ b/srcpkgs/i3bar-river/template
@@ -0,0 +1,17 @@
+# Template file for 'i3bar-river'
+pkgname=i3bar-river
+version=1.0.1
+revision=1
+archs="x86_64"
+build_style=cargo
+hostmakedepends="pkg-config pango-devel"
+depends="pango cairo"
+short_desc="A port of i3bar for wlroots-based compositors"
+maintainer="bitterhalt <bazz@void.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/MaxVerevkin/i3bar-river"
+changelog="https://github.com/MaxVerevkin/i3bar-river/releases"
+distfiles="https://github.com/MaxVerevkin/i3bar-river/archive/refs/tags/v${version}.tar.gz"
+checksum=ff52fd62275d5ba4662912d3a21be4893d200b26aee102491ac1e0518822db50
+
+
diff --git a/srcpkgs/ispc/template b/srcpkgs/ispc/template
index ba013ed9fda773..25e8f267896f38 100644
--- a/srcpkgs/ispc/template
+++ b/srcpkgs/ispc/template
@@ -1,6 +1,6 @@
# Template file for 'ispc'
pkgname=ispc
-version=1.25.0
+version=1.25.1
revision=1
archs="aarch64* x86_64*"
build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="BSD-3-Clause"
homepage="https://ispc.github.io"
distfiles="https://github.com/ispc/ispc/archive/v${version}.tar.gz"
-checksum=e216e6818302d51815ac72768b1d5506190517f5f0c3b9426fd56f4bc00ebdf1
+checksum=77e094f9324bbdd40ad56f80039f94d9f6621cf8a56e1c57168e2b4d10752f9f
nocross=yes
nopie=yes
diff --git a/srcpkgs/libfm-qt5/template b/srcpkgs/libfm-qt5/template
index 36fe937eef6c7e..0df2afc4574f23 100644
--- a/srcpkgs/libfm-qt5/template
+++ b/srcpkgs/libfm-qt5/template
@@ -7,7 +7,7 @@ hostmakedepends="pkg-config lxqt-build-tools-qt5 qt5-qmake qt5-host-tools perl"
makedepends="qt5-tools-devel qt5-x11extras-devel libexif-devel
menu-cache-devel lxqt-menu-data-devel"
short_desc="Core library of PCManFM-Qt"
-maintainer="Helmut Pozimski <helmut@pozimski.eu>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://lxqt-project.org"
distfiles="https://github.com/lxqt/libfm-qt/archive/${version}.tar.gz"
diff --git a/srcpkgs/libgit2-1.8/template b/srcpkgs/libgit2-1.8/template
index 3cabec38b05660..0b4c2066af4c38 100644
--- a/srcpkgs/libgit2-1.8/template
+++ b/srcpkgs/libgit2-1.8/template
@@ -1,6 +1,6 @@
# Template file for 'libgit2-1.8'
pkgname=libgit2-1.8
-version=1.8.1
+version=1.8.2
revision=1
build_style=cmake
configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DBUILD_CLI=OFF -DUSE_SSH=ON -DUSE_HTTP_PARSER=llhttp"
@@ -8,10 +8,10 @@ hostmakedepends="python3 pkg-config"
makedepends="zlib-devel openssl-devel llhttp-devel libssh2-devel"
short_desc="Git linkable library ${pkgname#libgit2-}"
maintainer="tranzystorekk <tranzystorek.io@protonmail.com>"
-license="custom:GPL-2.0-or-later WITH GCC-exception-2.0"
+license="GPL-2.0-only WITH GCC-exception-2.0"
homepage="https://libgit2.org"
distfiles="https://github.com/libgit2/libgit2/archive/refs/tags/v${version}.tar.gz"
-checksum=8c1eaf0cf07cba0e9021920bfba9502140220786ed5d8a8ec6c7ad9174522f8e
+checksum=184699f0d9773f96eeeb5cb245ba2304400f5b74671f313240410f594c566a28
if [ -z "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DBUILD_TESTS=OFF"
diff --git a/srcpkgs/libqt5xdg/template b/srcpkgs/libqt5xdg/template
index 99abb9d02fdebb..f91695074420c8 100644
--- a/srcpkgs/libqt5xdg/template
+++ b/srcpkgs/libqt5xdg/template
@@ -7,7 +7,7 @@ hostmakedepends="pkg-config lxqt-build-tools-qt5 qt5-host-tools qt5-qmake"
makedepends="qt5-svg-devel libglib-devel"
depends="libqtxdg>=4"
short_desc="Qt5 implementation of freedesktop.org XDG specifications"
-maintainer="Helmut Pozimski <helmut@pozimski.eu>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://lxqt-project.org"
distfiles="https://github.com/lxqt/libqtxdg/archive/${version}.tar.gz"
diff --git a/srcpkgs/libuv/template b/srcpkgs/libuv/template
index efb857d4b54c04..04c127f0115843 100644
--- a/srcpkgs/libuv/template
+++ b/srcpkgs/libuv/template
@@ -1,6 +1,6 @@
# Template file for 'libuv'
pkgname=libuv
-version=1.48.0
+version=1.49.2
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ license="MIT, BSD-2-Clause, ISC"
homepage="https://libuv.org/"
changelog="https://raw.githubusercontent.com/libuv/libuv/v1.x/ChangeLog"
distfiles="https://dist.libuv.org/dist/v${version}/libuv-v${version}-dist.tar.gz"
-checksum=c593139feb9061699fdd2f7fde47bb6c1ca77761ae9ec04f052083f1ef46c13b
+checksum=2e910e668e5daf1be6a5195a696985d7200adfa5c4d3400ee7b3355affdcf52c
# the tests fail when run as root and as such break in the CI containers
make_check=ci-skip
diff --git a/srcpkgs/linux-firmware/patches/no-whence.patch b/srcpkgs/linux-firmware/patches/no-whence.patch
new file mode 100644
index 00000000000000..69e65c4ce272bf
--- /dev/null
+++ b/srcpkgs/linux-firmware/patches/no-whence.patch
@@ -0,0 +1,12 @@
+this requires git ls-files to work
+--
+--- a/copy-firmware.sh
++++ b/copy-firmware.sh
+@@ -66,7 +66,5 @@
+ fi
+
+-$verbose "Checking that WHENCE file is formatted properly"
+-./check_whence.py || err "check_whence.py has detected errors."
+
+ # shellcheck disable=SC2162 # file/folder name can include escaped symbols
+ grep -E '^(RawFile|File):' WHENCE | sed -E -e 's/^(RawFile|File): */\1 /;s/"//g' | while read k f; do
diff --git a/srcpkgs/linux-firmware/template b/srcpkgs/linux-firmware/template
index c9ab949906c0b7..7c2226c9697ba2 100644
--- a/srcpkgs/linux-firmware/template
+++ b/srcpkgs/linux-firmware/template
@@ -1,6 +1,6 @@
# Template file for 'linux-firmware'
pkgname=linux-firmware
-version=20240909
+version=20241017
revision=1
hostmakedepends="rdfind which"
depends="linux-firmware-amd>=${version}_${revision} linux-firmware-network>=${version}_${revision}"
@@ -10,19 +10,17 @@ license="custom:see /usr/share/licenses/linux-firmware"
homepage="https://www.kernel.org/"
changelog="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/log/"
distfiles="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${version}.tar.gz"
-checksum=93e9b6ae2240661639c874f5fc38f677d18afe365b17a13fee6b4fc4fba42c10
+checksum=551708bc71cb7ac67c800055aecb55e50eb3c86d13486c56250d1ef5132b39dc
python_version=3
nostrip=yes
do_install() {
- make install FIRMWAREDIR=/usr/lib/firmware DESTDIR=$DESTDIR
+ make install dedup FIRMWAREDIR=/usr/lib/firmware DESTDIR=$DESTDIR
for _l in LICEN* WHENCE
do
vlicense "$_l"
done
-
- # XXX: should some firmwares, like carl9170, be pruned?
}
linux-firmware-amd_package() {
@@ -54,7 +52,7 @@ linux-firmware-broadcom_package() {
}
linux-firmware-intel_package() {
- short_desc+=" - Intel CPU/GPU microcode"
+ short_desc+=" - Intel GPU microcode"
nostrip=yes
pkg_install() {
vmove usr/lib/firmware/i915
@@ -81,25 +79,89 @@ linux-firmware-network_package() {
esac
nostrip=yes
pkg_install() {
- vmove usr/lib/firmware/3com
- vmove "usr/lib/firmware/rt*"
- vmove "usr/lib/firmware/ath*"
- vmove "usr/lib/firmware/ar*"
- vmove "usr/lib/firmware/bnx2*"
- vmove "usr/lib/firmware/cxgb*"
- vmove "usr/lib/firmware/htc*"
- vmove "usr/lib/firmware/iwl*"
- vmove "usr/lib/firmware/intel*"
- vmove usr/lib/firmware/kaweth
- vmove usr/lib/firmware/libertas
- vmove usr/lib/firmware/mrvl
- vmove "usr/lib/firmware/mt7*.bin"
+ _pats=(
+ # Airoha Ethernet PHY
+ airoha
+ # Amlogic bluetooth
+ "amlogic/aml_w*_bt_uart.bin*"
+ # Atheros WLAN/bluetooth
+ "ath*" "ar*" "carl9170*" "htc*"
+ # Atmel WLAN
+ atmel
+ # ATUSB transceiver
+ atusb
+ # BNX2 Ethernet
+ "bnx2*"
+ # Sun Cassini Ethernet
+ "sun/cassini*"
+ # Chelsio Ethernet
+ "cxgb*"
+ # ST-E WLAN
+ "wsm_22.bin*"
+ # Intel WLAN/Ethernet/bluetooth
+ e100 "hfi1_*.fw*" "intel*" "iwlwifi*"
+ # Orinoco WLAN
+ "agere*"
+ # IXP4xx
+ ixp4xx
+ # KL5KUSB101 Ethernet
+ kaweth
+ # Cavium LiquidIO NIC
+ liquidio
+ # Mediatek WLAN/bluetooth
+ "mt7*.bin"
+ # Mellanox ethernet
+ mellanox
+ # Marvell WLAN/bluetooth
+ mrvl "lbtf_usb.bin*" libertas mwl8k
+ # Multi-Tech modem
+ "mts_*.fw*"
+ # Myricom ethernet
+ "myri10ge*" myricom
+ # NXP UWB/bluetooth
+ "nxp/sr150_fw.bin*" "nxp/helper_uart*.bin*" "nxp/uartiw*.bin*" "nxp/uartspi*.se*" "nxp/uartuart*"
+ # Qualcomm WLAN/bluetooth
+ qca "wil6210*"
+ # QLogic HBA
+ "cbfw*.bin*" "ct2fw*.bin*" "ctfw*.bin*" "qed" "ql2*.bin*" "qlogic" "phanfw.bin*"
+ # Ralink WLAN
+ "rt*.bin*"
+ # Redpine WLAN/bluetooth
+ "rsi*"
+ # Realtek bluetooth/ethernet/WLAN
+ "rtl*" "rtw*"
+ # Sagrad WLAN
+ "sdd_sagrad_*.bin*"
+ # Slicoss NICs
+ slicoss
+ # Adaptec ethernet
+ "adaptec/starfire*"
+ # Tehuti NICs
+ tehuti
+ # TI WLAN/bluetooth
+ ti-connectivity
+ # Tigon ethernet
+ acenic tigon
+ # 3Com ethernet
+ 3com
+ # Eagle USB modem
+ ueagle-atm
+ # Via USB WLAN
+ "vntwusb.fw*"
+ # Microchip Ethernet
+ "microchip/mscc_vsc85*.bin*"
+ # Exar Ethernet
+ vxge
+ # SiLabs WLAN
+ wfx
+ )
+
+ for pat in "${_pats[@]}"; do
+ vmove "usr/lib/firmware/$pat"
+ done
+
# don't move mediatek SoC firmware
( shopt -s extglob; vmove "usr/lib/firmware/mediatek/!(mt7981*|mt7986*|mt81*|sof*)" )
- vmove usr/lib/firmware/ueagle-atm
- vmove usr/lib/firmware/ti-connectivity
- vmove usr/lib/firmware/dpaa2
- vmove usr/lib/firmware/qca
}
}
diff --git a/srcpkgs/linux6.11/files/arm64-dotconfig b/srcpkgs/linux6.11/files/arm64-dotconfig
index a0b443be49fe7f..0ebfaab94e54ee 100644
--- a/srcpkgs/linux6.11/files/arm64-dotconfig
+++ b/srcpkgs/linux6.11/files/arm64-dotconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.11.3 Kernel Configuration
+# Linux/arm64 6.11.4 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 13.2.0"
CONFIG_CC_IS_GCC=y
diff --git a/srcpkgs/linux6.11/files/i386-dotconfig b/srcpkgs/linux6.11/files/i386-dotconfig
index f9767595d7a449..176f19271b9d5e 100644
--- a/srcpkgs/linux6.11/files/i386-dotconfig
+++ b/srcpkgs/linux6.11/files/i386-dotconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 6.11.3 Kernel Configuration
+# Linux/i386 6.11.4 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
CONFIG_CC_IS_GCC=y
diff --git a/srcpkgs/linux6.11/files/x86_64-dotconfig b/srcpkgs/linux6.11/files/x86_64-dotconfig
index e96eb9ccd71d08..599190045d2415 100644
--- a/srcpkgs/linux6.11/files/x86_64-dotconfig
+++ b/srcpkgs/linux6.11/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 6.11.3 Kernel Configuration
+# Linux/x86_64 6.11.4 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
CONFIG_CC_IS_GCC=y
diff --git a/srcpkgs/linux6.11/template b/srcpkgs/linux6.11/template
index e8899127d2741c..29cf9df48c86d4 100644
--- a/srcpkgs/linux6.11/template
+++ b/srcpkgs/linux6.11/template
@@ -1,7 +1,7 @@
# Template file for 'linux6.11'
pkgname=linux6.11
-version=6.11.3
-revision=2
+version=6.11.4
+revision=1
short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="GPL-2.0-only"
@@ -14,7 +14,7 @@ if [ "${version##*.}" != 0 ]; then
fi
checksum="55d2c6c025ebc27810c748d66325dd5bc601e8d32f8581d9e77673529bdacb2e
- 4c808f6dd8814ab55a343649a2e2b925895b7f97044d15fa3424e5cf69349c3e"
+ d0c22d3f7a5ea64938cb8a003e6f6ad3226a0dab855e89fa0fff3578946c9498"
python_version=3
# XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.
diff --git a/srcpkgs/linux6.6/files/arm64-dotconfig b/srcpkgs/linux6.6/files/arm64-dotconfig
index 039f15b340f764..4e877ffc7505c0 100644
--- a/srcpkgs/linux6.6/files/arm64-dotconfig
+++ b/srcpkgs/linux6.6/files/arm64-dotconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.6.56 Kernel Configuration
+# Linux/arm64 6.6.57 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 13.2.0"
CONFIG_CC_IS_GCC=y
@@ -8683,6 +8683,7 @@ CONFIG_HID_ZYDACRON=m
CONFIG_HID_SENSOR_HUB=m
CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
CONFIG_HID_ALPS=m
+# CONFIG_HID_MCP2200 is not set
CONFIG_HID_MCP2221=m
# end of Special HID drivers
diff --git a/srcpkgs/linux6.6/files/i386-dotconfig b/srcpkgs/linux6.6/files/i386-dotconfig
index 07be318d6cfa8c..31714ac7550b98 100644
--- a/srcpkgs/linux6.6/files/i386-dotconfig
+++ b/srcpkgs/linux6.6/files/i386-dotconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 6.6.56 Kernel Configuration
+# Linux/i386 6.6.57 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
CONFIG_CC_IS_GCC=y
@@ -7443,6 +7443,7 @@ CONFIG_HID_ZYDACRON=m
CONFIG_HID_SENSOR_HUB=m
CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
CONFIG_HID_ALPS=m
+# CONFIG_HID_MCP2200 is not set
CONFIG_HID_MCP2221=m
# end of Special HID drivers
diff --git a/srcpkgs/linux6.6/files/x86_64-dotconfig b/srcpkgs/linux6.6/files/x86_64-dotconfig
index 40f9a7d7b6d962..0273ffccc22a67 100644
--- a/srcpkgs/linux6.6/files/x86_64-dotconfig
+++ b/srcpkgs/linux6.6/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 6.6.56 Kernel Configuration
+# Linux/x86_64 6.6.57 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
CONFIG_CC_IS_GCC=y
@@ -7664,6 +7664,7 @@ CONFIG_HID_ZYDACRON=m
CONFIG_HID_SENSOR_HUB=m
CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
CONFIG_HID_ALPS=m
+# CONFIG_HID_MCP2200 is not set
CONFIG_HID_MCP2221=m
# end of Special HID drivers
diff --git a/srcpkgs/linux6.6/template b/srcpkgs/linux6.6/template
index 614bd646c527c5..e0d9338c615fde 100644
--- a/srcpkgs/linux6.6/template
+++ b/srcpkgs/linux6.6/template
@@ -1,7 +1,7 @@
# Template file for 'linux6.6'
pkgname=linux6.6
-version=6.6.56
-revision=2
+version=6.6.57
+revision=1
short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="GPL-2.0-only"
@@ -14,7 +14,7 @@ if [ "${version##*.}" != 0 ]; then
fi
checksum="d926a06c63dd8ac7df3f86ee1ffc2ce2a3b81a2d168484e76b5b389aba8e56d0
- 391af9b4926f95fccc47eaf357bc80fe0b31e46179c3ab537141e08952d30e69"
+ eb5caa3b7140c9810a86780f9d0a4f29cce2b7c33d786c39c6b6df51db0e761e"
python_version=3
# XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.
diff --git a/srcpkgs/linuxwave/patches/zig12-compat.patch b/srcpkgs/linuxwave/patches/zig12-compat.patch
deleted file mode 100644
index a2ea99b0aeaab5..00000000000000
--- a/srcpkgs/linuxwave/patches/zig12-compat.patch
+++ /dev/null
@@ -1,440 +0,0 @@
-From 6120822d7c168333184f1aec52f934e2fb91a7b6 Mon Sep 17 00:00:00 2001
-From: tranzystorekk <tranzystorek.io@protonmail.com>
-Date: Mon, 8 Jul 2024 08:09:27 +0200
-Subject: [PATCH 1/4] refactor: rewrite for zig 0.12
-
----
- .gitignore | 1 +
- build.zig | 62 +++++++++++++++++++++++++++++++++-------------------
- src/file.zig | 2 +-
- src/gen.zig | 11 +++++-----
- src/main.zig | 32 ++++++++-------------------
- src/wav.zig | 45 ++++++++++++++++++++------------------
- 6 files changed, 80 insertions(+), 73 deletions(-)
-
-diff --git a/.gitignore b/.gitignore
-index fcd3a02..2f8a917 100644
---- a/.gitignore
-+++ b/.gitignore
-@@ -5,6 +5,7 @@
- # Zig programming language
-
- zig-cache/
-+.zig-cache/
- zig-out/
- build/
- build-*/
-diff --git a/build.zig b/build.zig
-index dbaa2e5..869b871 100644
---- a/build.zig
-+++ b/build.zig
-@@ -9,25 +9,28 @@ const version = "0.1.5"; // managed by release.sh
- /// Adds the required packages to the given executable.
- ///
- /// This is used for providing the dependencies for main executable as well as the tests.
--fn addPackages(allocator: std.mem.Allocator, exe: *std.build.LibExeObjStep) !void {
-- exe.addPackagePath("clap", "libs/zig-clap/clap.zig");
-+fn addPackages(b: *std.Build, exe: *std.Build.Step.Compile) !void {
-+ exe.root_module.addImport("clap", b.createModule(.{
-+ .root_source_file = b.path("libs/zig-clap/clap.zig"),
-+ }));
- for ([_][]const u8{ "file", "gen", "wav" }) |package| {
-- const path = try std.fmt.allocPrint(allocator, "src/{s}.zig", .{package});
-- defer allocator.free(path);
-- exe.addPackagePath(package, path);
-+ const path = b.fmt("src/{s}.zig", .{package});
-+ exe.root_module.addImport(package, b.createModule(.{
-+ .root_source_file = b.path(path),
-+ }));
- }
- }
-
--pub fn build(b: *std.build.Builder) !void {
-+pub fn build(b: *std.Build) void {
- // Standard target options allows the person running `zig build` to choose
- // what target to build for. Here we do not override the defaults, which
- // means any target is allowed, and the default is native. Other options
- // for restricting supported target set are available.
- const target = b.standardTargetOptions(.{});
-
-- // Standard release options allow the person running `zig build` to select
-+ // Standard optimization options allow the person running `zig build` to select
- // between Debug, ReleaseSafe, ReleaseFast, and ReleaseSmall.
-- const mode = b.standardReleaseOptions();
-+ const optimize = b.standardOptimizeOption(.{});
-
- // Add custom options.
- const pie = b.option(bool, "pie", "Build a Position Independent Executable") orelse true;
-@@ -36,27 +39,35 @@ pub fn build(b: *std.build.Builder) !void {
- const documentation = b.option(bool, "docs", "Generate documentation") orelse false;
-
- // Add main executable.
-- const exe = b.addExecutable(exe_name, "src/main.zig");
-- exe.setTarget(target);
-- exe.setBuildMode(mode);
-+ const exe = b.addExecutable(.{
-+ .name = exe_name,
-+ .root_source_file = b.path("src/main.zig"),
-+ .target = target,
-+ .optimize = optimize,
-+ });
- if (documentation) {
-- exe.emit_docs = .emit;
-+ const install_docs = b.addInstallDirectory(.{
-+ .source_dir = exe.getEmittedDocs(),
-+ .install_dir = .prefix,
-+ .install_subdir = "docs",
-+ });
-+ b.getInstallStep().dependOn(&install_docs.step);
- }
- exe.pie = pie;
- exe.link_z_relro = relro;
-- exe.install();
-+ b.installArtifact(exe);
-
- // Add packages.
-- try addPackages(b.allocator, exe);
-+ try addPackages(b, exe);
-
- // Add executable options.
- const exe_options = b.addOptions();
-- exe.addOptions("build_options", exe_options);
-+ exe.root_module.addOptions("build_options", exe_options);
- exe_options.addOption([]const u8, "version", version);
- exe_options.addOption([]const u8, "exe_name", exe_name);
-
- // Create the run step and add arguments.
-- const run_cmd = exe.run();
-+ const run_cmd = b.addRunArtifact(exe);
- run_cmd.step.dependOn(b.getInstallStep());
- if (b.args) |args| {
- run_cmd.addArgs(args);
-@@ -68,9 +79,15 @@ pub fn build(b: *std.build.Builder) !void {
-
- // Add tests.
- const test_step = b.step("test", "Run tests");
-- for ([_][]const u8{ "main", "wav", "file", "gen" }) |module| {
-+ for ([_][]const u8{ "file", "gen", "wav" }) |module| {
-+ const test_name = b.fmt("{s}-tests", .{module});
- const test_module = b.fmt("src/{s}.zig", .{module});
-- var exe_tests = b.addTest(test_module);
-+ var exe_tests = b.addTest(.{
-+ .name = test_name,
-+ .root_source_file = b.path(test_module),
-+ .target = target,
-+ .optimize = optimize,
-+ });
- if (coverage) {
- exe_tests.setExecCmd(&[_]?[]const u8{
- "kcov",
-@@ -78,10 +95,9 @@ pub fn build(b: *std.build.Builder) !void {
- null,
- });
- }
-- exe_tests.setTarget(target);
-- exe_tests.setBuildMode(mode);
-- try addPackages(b.allocator, exe_tests);
-- exe_tests.addOptions("build_options", exe_options);
-- test_step.dependOn(&exe_tests.step);
-+ try addPackages(b, exe_tests);
-+ exe_tests.root_module.addOptions("build_options", exe_options);
-+ const run_unit_tests = b.addRunArtifact(exe_tests);
-+ test_step.dependOn(&run_unit_tests.step);
- }
- }
-diff --git a/src/file.zig b/src/file.zig
-index a1b9ff2..c5a565e 100644
---- a/src/file.zig
-+++ b/src/file.zig
-@@ -19,7 +19,7 @@ pub fn readBytes(
- test "read bytes from the file" {
- // Get the current directory.
- var cwd_buffer: [std.fs.MAX_PATH_BYTES]u8 = undefined;
-- var cwd = try std.os.getcwd(&cwd_buffer);
-+ const cwd = try std.posix.getcwd(&cwd_buffer);
-
- // Concatenate the current directory with the builder file.
- const allocator = std.testing.allocator;
-diff --git a/src/gen.zig b/src/gen.zig
-index f593146..a81a52b 100644
---- a/src/gen.zig
-+++ b/src/gen.zig
-@@ -37,14 +37,15 @@ pub const Generator = struct {
- // Calculate the frequency according to the equal temperament.
- // Hertz = 440 * 2^(semitone distance / 12)
- // (<http://en.wikipedia.org/wiki/Equal_temperament>)
-- var amp = @sin(self.config.note * std.math.pi *
-- std.math.pow(f32, 2, @intToFloat(f32, self.config.scale[sample % self.config.scale.len]) / 12) *
-- (@intToFloat(f64, i) * 0.0001));
-+ const tone_distance: f32 = @floatFromInt(self.config.scale[sample % self.config.scale.len]);
-+ const increment: f32 = @floatFromInt(i);
-+ var amp = @sin(self.config.note * std.math.pi * std.math.pow(f32, 2, tone_distance / 12) * (increment * 0.0001));
- // Scale the amplitude between 0 and 256.
- amp = (amp * std.math.maxInt(u8) / 2) + (std.math.maxInt(u8) / 2);
- // Apply the volume control.
-- amp = amp * @intToFloat(f64, self.config.volume) / 100;
-- try buffer.append(@floatToInt(u8, amp));
-+ const volume: f32 = @floatFromInt(self.config.volume);
-+ amp = amp * volume / 100;
-+ try buffer.append(@intFromFloat(amp));
- }
- return buffer.toOwnedSlice();
- }
-diff --git a/src/main.zig b/src/main.zig
-index ba4aedf..42dbee8 100644
---- a/src/main.zig
-+++ b/src/main.zig
-@@ -10,12 +10,12 @@ const clap = @import("clap");
- /// Runs `linuxwave`.
- fn run(allocator: std.mem.Allocator, output: anytype) !void {
- // Parse command-line arguments.
-- const cli = try clap.parse(clap.Help, &args.params, args.parsers, .{});
-+ const cli = try clap.parse(clap.Help, &args.params, args.parsers, .{ .allocator = allocator });
- defer cli.deinit();
-- if (cli.args.help) {
-+ if (cli.args.help != 0) {
- try output.print("{s}\n", .{args.banner});
- return clap.help(output, clap.Help, &args.params, args.help_options);
-- } else if (cli.args.version) {
-+ } else if (cli.args.version != 0) {
- try output.print("{s} {s}\n", .{ build_options.exe_name, build_options.version });
- return;
- }
-@@ -23,18 +23,18 @@ fn run(allocator: std.mem.Allocator, output: anytype) !void {
- // Create encoder configuration.
- const encoder_config = wav.EncoderConfig{
- .num_channels = if (cli.args.channels) |channels| channels else defaults.channels,
-- .sample_rate = if (cli.args.rate) |rate| @floatToInt(usize, rate) else defaults.sample_rate,
-+ .sample_rate = if (cli.args.rate) |rate| @intFromFloat(rate) else defaults.sample_rate,
- .format = if (cli.args.format) |format| format else defaults.format,
- };
-
- // Create generator configuration.
-- var scale = s: {
-+ const scale = s: {
- var scale = std.ArrayList(u8).init(allocator);
- var splits = std.mem.split(u8, if (cli.args.scale) |s| s else defaults.scale, ",");
- while (splits.next()) |chunk| {
- try scale.append(try std.fmt.parseInt(u8, chunk, 0));
- }
-- break :s scale.toOwnedSlice();
-+ break :s try scale.toOwnedSlice();
- };
- defer allocator.free(scale);
- const generator_config = gen.GeneratorConfig{
-@@ -51,7 +51,7 @@ fn run(allocator: std.mem.Allocator, output: anytype) !void {
- if (std.mem.eql(u8, input_file, "-")) {
- try output.print("Reading {d} bytes from stdin\n", .{data_len});
- var list = try std.ArrayList(u8).initCapacity(allocator, data_len);
-- var buffer = list.allocatedSlice();
-+ const buffer = list.allocatedSlice();
- const stdin = std.io.getStdIn().reader();
- try stdin.readNoEof(buffer);
- break :b buffer;
-@@ -66,7 +66,7 @@ fn run(allocator: std.mem.Allocator, output: anytype) !void {
- const generator = gen.Generator.init(generator_config);
- var data = std.ArrayList(u8).init(allocator);
- for (buffer) |v| {
-- var gen_data = try generator.generate(allocator, v);
-+ const gen_data = try generator.generate(allocator, v);
- defer allocator.free(gen_data);
- try data.appendSlice(gen_data);
- }
-@@ -83,7 +83,7 @@ fn run(allocator: std.mem.Allocator, output: anytype) !void {
- break :w out_file.writer();
- }
- };
-- const wav_data = data.toOwnedSlice();
-+ const wav_data = try data.toOwnedSlice();
- defer allocator.free(wav_data);
- try wav.Encoder(@TypeOf(writer)).encode(writer, wav_data, encoder_config);
- }
-@@ -97,17 +97,3 @@ pub fn main() !void {
- try stderr.print("Error occurred: {}\n", .{err});
- };
- }
--
--test "run" {
-- const allocator = std.testing.allocator;
-- var buffer = std.ArrayList(u8).init(allocator);
-- const output = buffer.writer();
-- try run(allocator, output);
-- const result = buffer.toOwnedSlice();
-- defer allocator.free(result);
-- try std.testing.expectEqualStrings(
-- \\Reading 96 bytes from /dev/urandom
-- \\Saving to output.wav
-- \\
-- , result);
--}
-diff --git a/src/wav.zig b/src/wav.zig
-index 31c7b33..df37894 100644
---- a/src/wav.zig
-+++ b/src/wav.zig
-@@ -72,10 +72,11 @@ pub fn Encoder(comptime Writer: type) type {
-
- /// Patches the headers to seek back and patch the headers for length values.
- pub fn patchHeader(writer: Writer, seeker: anytype, data_len: u32) !void {
-+ const endian = std.builtin.Endian.little;
- try seeker.seekTo(4);
-- try writer.writeIntLittle(u32, data_chunk_pos + 8 + data_len - 8);
-+ try writer.writeInt(u32, data_chunk_pos + 8 + data_len - 8, endian);
- try seeker.seekTo(data_chunk_pos + 4);
-- try writer.writeIntLittle(u32, data_len);
-+ try writer.writeInt(u32, data_len, endian);
- }
-
- /// Writes the WAV chunks with optional data.
-@@ -90,38 +91,39 @@ pub fn Encoder(comptime Writer: type) type {
- fn writeChunks(writer: Writer, config: EncoderConfig, opt_data: ?[]const u8) !void {
- // Chunk configuration.
- const bytes_per_sample = config.format.getNumBytes();
-- const num_channels = @intCast(u16, config.num_channels);
-- const sample_rate = @intCast(u32, config.sample_rate);
-+ const num_channels: u16 = @intCast(config.num_channels);
-+ const sample_rate: u32 = @intCast(config.sample_rate);
- const byte_rate = sample_rate * @as(u32, num_channels) * bytes_per_sample;
- const block_align: u16 = num_channels * bytes_per_sample;
- const bits_per_sample: u16 = bytes_per_sample * 8;
-- const data_len = if (opt_data) |data| @intCast(u32, data.len) else 0;
-+ const data_len: u32 = if (opt_data) |data| @intCast(data.len) else 0;
-+ const endian = std.builtin.Endian.little;
- // Write the file header.
- try writer.writeAll(&RIFF);
- if (opt_data != null) {
-- try writer.writeIntLittle(u32, data_chunk_pos + 8 + data_len - 8);
-+ try writer.writeInt(u32, data_chunk_pos + 8 + data_len - 8, endian);
- } else {
-- try writer.writeIntLittle(u32, 0);
-+ try writer.writeInt(u32, 0, endian);
- }
- try writer.writeAll(&WAVE);
- // Write the format chunk.
- try writer.writeAll(&FMT_);
- // Encode with pulse-code modulation (LPCM).
-- try writer.writeIntLittle(u32, 16);
-+ try writer.writeInt(u32, 16, endian);
- // Uncompressed.
-- try writer.writeIntLittle(u16, 1);
-- try writer.writeIntLittle(u16, num_channels);
-- try writer.writeIntLittle(u32, sample_rate);
-- try writer.writeIntLittle(u32, byte_rate);
-- try writer.writeIntLittle(u16, block_align);
-- try writer.writeIntLittle(u16, bits_per_sample);
-+ try writer.writeInt(u16, 1, endian);
-+ try writer.writeInt(u16, num_channels, endian);
-+ try writer.writeInt(u32, sample_rate, endian);
-+ try writer.writeInt(u32, byte_rate, endian);
-+ try writer.writeInt(u16, block_align, endian);
-+ try writer.writeInt(u16, bits_per_sample, endian);
- // Write the data chunk.
- try writer.writeAll(&DATA);
- if (opt_data) |data| {
-- try writer.writeIntLittle(u32, data_len);
-+ try writer.writeInt(u32, data_len, endian);
- try writer.writeAll(data);
- } else {
-- try writer.writeIntLittle(u32, 0);
-+ try writer.writeInt(u32, 0, endian);
- }
- }
- };
-@@ -130,7 +132,7 @@ pub fn Encoder(comptime Writer: type) type {
- test "encode WAV" {
- var buffer: [1000]u8 = undefined;
- var stream = std.io.fixedBufferStream(&buffer);
-- var writer = stream.writer();
-+ const writer = stream.writer();
- try Encoder(@TypeOf(writer)).encode(writer, &[_]u8{ 0, 0, 0, 0, 0, 0, 0, 0 }, .{
- .num_channels = 1,
- .sample_rate = 44100,
-@@ -142,6 +144,7 @@ test "encode WAV" {
- test "stream out WAV" {
- var buffer: [1000]u8 = undefined;
- var fbs = std.io.fixedBufferStream(&buffer);
-+ const endian = std.builtin.Endian.little;
- const WavEncoder = Encoder(@TypeOf(fbs).Writer);
- try WavEncoder.writeHeader(fbs.writer(), .{
- .num_channels = 1,
-@@ -149,13 +152,13 @@ test "stream out WAV" {
- .format = .S16_LE,
- });
- try std.testing.expectEqual(@as(u64, 44), try fbs.getPos());
-- try std.testing.expectEqual(@as(u32, 0), std.mem.readIntLittle(u32, buffer[4..8]));
-- try std.testing.expectEqual(@as(u32, 0), std.mem.readIntLittle(u32, buffer[40..44]));
-+ try std.testing.expectEqual(@as(u32, 0), std.mem.readInt(u32, buffer[4..8], endian));
-+ try std.testing.expectEqual(@as(u32, 0), std.mem.readInt(u32, buffer[40..44], endian));
-
- const data = &[_]u8{ 0, 0, 0, 0, 0, 0, 0, 0 };
- try fbs.writer().writeAll(data);
- try std.testing.expectEqual(@as(u64, 52), try fbs.getPos());
- try WavEncoder.patchHeader(fbs.writer(), fbs.seekableStream(), data.len);
-- try std.testing.expectEqual(@as(u32, 44), std.mem.readIntLittle(u32, buffer[4..8]));
-- try std.testing.expectEqual(@as(u32, 8), std.mem.readIntLittle(u32, buffer[40..44]));
-+ try std.testing.expectEqual(@as(u32, 44), std.mem.readInt(u32, buffer[4..8], endian));
-+ try std.testing.expectEqual(@as(u32, 8), std.mem.readInt(u32, buffer[40..44], endian));
- }
-
-From 92bae56c0497211ceb029d88777b83920e2a4861 Mon Sep 17 00:00:00 2001
-From: tranzystorekk <tranzystorek.io@protonmail.com>
-Date: Mon, 8 Jul 2024 08:26:48 +0200
-Subject: [PATCH 2/4] chore(build): switch to the zig package manager scheme
-
----
- .gitmodules | 3 ---
- build.zig | 5 ++---
- build.zig.zon | 17 +++++++++++++++++
- libs/zig-clap | 1 -
- 4 files changed, 19 insertions(+), 7 deletions(-)
- delete mode 100644 .gitmodules
- create mode 100644 build.zig.zon
- delete mode 160000 libs/zig-clap
-
-diff --git a/.gitmodules b/.gitmodules
-deleted file mode 100644
-index 7a6afbb..0000000
---- a/.gitmodules
-+++ /dev/null
-@@ -1,3 +0,0 @@
--[submodule "libs/zig-clap"]
-- path = libs/zig-clap
-- url = https://github.com/Hejsil/zig-clap
-diff --git a/build.zig b/build.zig
-index 869b871..a920df4 100644
---- a/build.zig
-+++ b/build.zig
-@@ -10,9 +10,8 @@ const version = "0.1.5"; // managed by release.sh
- ///
- /// This is used for providing the dependencies for main executable as well as the tests.
- fn addPackages(b: *std.Build, exe: *std.Build.Step.Compile) !void {
-- exe.root_module.addImport("clap", b.createModule(.{
-- .root_source_file = b.path("libs/zig-clap/clap.zig"),
-- }));
-+ const clap = b.dependency("zig-clap", .{}).module("clap");
-+ exe.root_module.addImport("clap", clap);
- for ([_][]const u8{ "file", "gen", "wav" }) |package| {
- const path = b.fmt("src/{s}.zig", .{package});
- exe.root_module.addImport(package, b.createModule(.{
-diff --git a/build.zig.zon b/build.zig.zon
-new file mode 100644
-index 0000000..50496dc
---- /dev/null
-+++ b/build.zig.zon
-@@ -0,0 +1,17 @@
-+.{
-+ .name = "linuxwave",
-+ .version = "0.1.5",
-+ .paths = .{
-+ "build.zig",
-+ "build.zig.zon",
-+ "src",
-+ "LICENSE",
-+ "README.md",
-+ },
-+ .dependencies = .{
-+ .@"zig-clap" = .{
-+ .url = "https://github.com/Hejsil/zig-clap/archive/refs/tags/0.9.1.tar.gz",
-+ .hash = "122062d301a203d003547b414237229b09a7980095061697349f8bef41be9c30266b",
-+ },
-+ },
-+}
diff --git a/srcpkgs/linuxwave/template b/srcpkgs/linuxwave/template
index 4fe42afba204ab..7af1d8db42ba9a 100644
--- a/srcpkgs/linuxwave/template
+++ b/srcpkgs/linuxwave/template
@@ -1,7 +1,7 @@
# Template file for 'linuxwave'
pkgname=linuxwave
-version=0.1.5
-revision=2
+version=0.2.0
+revision=1
build_style=zig-build
short_desc="Generate music from the entropy of Linux"
maintainer="tranzystorekk <tranzystorek.io@protonmail.com>"
@@ -9,7 +9,7 @@ license="MIT"
homepage="https://orhun.dev/linuxwave/"
changelog="https://raw.githubusercontent.com/orhun/linuxwave/main/CHANGELOG.md"
distfiles="https://github.com/orhun/linuxwave/releases/download/v${version}/v${version}.tar.gz"
-checksum=c0fbab58909cf0047e82618193b4e75d6aee5c5e0a5d12d8e1f74eb31fbf6d11
+checksum=593b05809f68c830c95a3176fbec358306aff19238ca2ecdacfbeaabfefdab83
post_install() {
vlicense LICENSE
diff --git a/srcpkgs/lxqt-build-tools-qt5/template b/srcpkgs/lxqt-build-tools-qt5/template
index 176c9088e3dbb6..e42a628f00ae51 100644
--- a/srcpkgs/lxqt-build-tools-qt5/template
+++ b/srcpkgs/lxqt-build-tools-qt5/template
@@ -6,7 +6,7 @@ build_style=cmake
hostmakedepends="qt5-host-tools qt5-qmake pkg-config"
makedepends="qt5-devel"
short_desc="LXQt build tools"
-maintainer="Helmut Pozimski <helmut@pozimski.eu>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://lxqt-project.org"
distfiles="https://github.com/lxqt/lxqt-build-tools/archive/${version}.tar.gz"
diff --git a/srcpkgs/lxqt-qt5plugin/template b/srcpkgs/lxqt-qt5plugin/template
index f6d76fa0aca7b6..9c02e7f8ab06c9 100644
--- a/srcpkgs/lxqt-qt5plugin/template
+++ b/srcpkgs/lxqt-qt5plugin/template
@@ -6,7 +6,7 @@ build_style=cmake
hostmakedepends="lxqt-build-tools-qt5 qt5-qmake qt5-host-tools libfm-devel"
makedepends="libdbusmenu-qt5-devel libfm-qt5-devel libqt5xdg-devel"
short_desc="LXQt Qt theme plugin"
-maintainer="Helmut Pozimski <helmut@pozimski.eu>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://lxqt-project.org"
distfiles="https://github.com/lxqt/lxqt-qtplugin/archive/${version}.tar.gz"
diff --git a/srcpkgs/ntdsextract2/patches/no-cygwin-fs.patch b/srcpkgs/ntdsextract2/patches/no-cygwin-fs.patch
index 1747d4e21ea893..8f855527c288fb 100644
--- a/srcpkgs/ntdsextract2/patches/no-cygwin-fs.patch
+++ b/srcpkgs/ntdsextract2/patches/no-cygwin-fs.patch
@@ -1,5 +1,5 @@
---- a/ntdsextract2-1.4.3/Cargo.toml
-+++ b/ntdsextract2-1.4.3/Cargo.toml
+--- a/ntdsextract2-1.4.4/Cargo.toml
++++ b/ntdsextract2-1.4.4/Cargo.toml
@@ -37,8 +37,7 @@
paste = "1.0"
bodyfile = "0.1.4"
--git a/srcpkgs/ntdsextract2/template b/srcpkgs/ntdsextract2/template
index 81580c0427b2f9..712b091f24f5ee 100644
--- a/srcpkgs/ntdsextract2/template
+++ b/srcpkgs/ntdsextract2/template
@@ -1,6 +1,6 @@
# Template file for 'ntdsextract2'
pkgname=ntdsextract2
-version=1.4.3
+version=1.4.4
revision=1
_esedbver=0.2.5
build_wrksrc="${pkgname}-${version}"
@@ -11,7 +11,7 @@ license="GPL-3.0-or-later"
homepage="https://github.com/janstarke/ntdsextract2"
distfiles="https://github.com/janstarke/ntdsextract2/archive/refs/tags/v${version}.tar.gz
https://github.com/sunsetkookaburra/rust-libesedb/archive/refs/tags/libesedb-v${_esedbver}.tar.gz"
-checksum="9ea3aea2d7574b5e5498e845b5f5853ff76d87fa15537d4f0858ba4ed8476e06
+checksum="ee449a74b6c671dde43d0d4b75fbe6846b4a2ed26fb70bde337957ad82176241
30fce9b9766903280d3f6273e2f991b2296ccd3eed878262d1a68c7ceb76b658"
make_check=no # testing requires a large sample test file that isn't distributed
diff --git a/srcpkgs/qtforkawesome/template b/srcpkgs/qtforkawesome/template
index fba895b74bf95f..83a034ed83ef59 100644
--- a/srcpkgs/qtforkawesome/template
+++ b/srcpkgs/qtforkawesome/template
@@ -1,6 +1,6 @@
# Template file for 'qtforkawesome'
pkgname=qtforkawesome
-version=0.2.1
+version=0.2.2
revision=1
_fork_awesome_version=1.2.0
build_style=cmake
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later, OFL-1.1"
homepage="https://github.com/Martchus/qtforkawesome"
distfiles="https://github.com/Martchus/qtforkawesome/archive/refs/tags/v${version}.tar.gz
https://github.com/ForkAwesome/Fork-Awesome/archive/refs/tags/${_fork_awesome_version}.tar.gz>Fork-Awesome-${_fork_awesome_version}.tar.gz"
-checksum="acdd529efe6237a755d67863af219e09be3dbc380b964cb4e45b91dd1540b5a5
+checksum="7025664ab187cfb43ffb20e321534b6b5d9e16d2cd0dc8b5c62aecca1a81fa65
23fba5f191f204e0414c547bf4c9b10fd7ca42c151260e8f64698449a75fbdb3"
make_check_pre="env QT_QPA_PLATFORM=offscreen"
skip_extraction="Fork-Awesome-${_fork_awesome_version}.tar.gz"
diff --git a/srcpkgs/rust-bootstrap/template b/srcpkgs/rust-bootstrap/template
index d89f7006c70184..32f90c4d9fb084 100644
--- a/srcpkgs/rust-bootstrap/template
+++ b/srcpkgs/rust-bootstrap/template
@@ -1,12 +1,12 @@
# Template file for 'rust-bootstrap'
pkgname=rust-bootstrap
-version=1.81.0
+version=1.82.0
revision=1
short_desc="Rust programming language bootstrap toolchain"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT, Apache-2.0"
+license="Apache-2.0 OR MIT"
homepage="https://www.rust-lang.org/"
-conflicts="rust>=0"
+conflicts="rust>=0 rust-std>=0"
lib32disabled=yes
nostrip=yes
repository=bootstrap
@@ -31,24 +31,24 @@ case "$XBPS_TARGET_MACHINE" in
${_bootstrap_url}/rustc-${version}-i686-unknown-linux-gnu.tar.xz
${_bootstrap_url}/rust-std-${version}-i686-unknown-linux-gnu.tar.xz"
checksum="
- 8039f645445f99c0e293397b53a6696481b7d58166198605aca0eaa998f4f11f
- 4ed9085460e444de9dee246080126f5e73062802b99aaff620d2aa827f60d972"
+ 92bab38ce88b7738fb62a1bccf496b1b2975fe984cc4fc506903a03ed37e1e4a
+ c7ebb02b6ca349999b3b7dce768efaca5e0d9060f55397523e11a64cd10a9405"
;;
x86_64)
distfiles="
${_bootstrap_url}/rustc-${version}-x86_64-unknown-linux-gnu.tar.xz
${_bootstrap_url}/rust-std-${version}-x86_64-unknown-linux-gnu.tar.xz"
checksum="
- 988a4e4cdecebe4f4a0c52ec4ade5a5bfc58d6958969f5b1e8aac033bda2613e
- 6ddf80f254e8eea9956308ba89fd68e1ac7885853df9239b07bbc9f047b7562f"
+ 90b61494f5ccfd4d1ca9a5ce4a0af49a253ca435c701d9c44e3e44b5faf70cb8
+ 2eca3d36f7928f877c334909f35fe202fbcecce109ccf3b439284c2cb7849594"
;;
x86_64-musl)
distfiles="
${_bootstrap_url}/rustc-${version}-x86_64-unknown-linux-musl.tar.xz
${_bootstrap_url}/rust-std-${version}-x86_64-unknown-linux-musl.tar.xz"
checksum="
- 02c29b1e17105bb286c36d4f9b28ca21feacb4a98848db103af796411cff1ec5
- 3f2e47fff9320888993139fbd98f4bb44faf9355b25904f36a24a9808ff80240"
+ e08b8490246ae1b6278274f6dd0a648c590a42e0af6aaf220a030cdf1dadf30a
+ 1c99a4c81f51b687ba55746c7d3f19b5b860fe4eff604d3c7d803e08c9cc89bb"
;;
# placeholders for user-supplied distfiles
ppc64le)
diff --git a/srcpkgs/rust/patches/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch b/srcpkgs/rust/patches/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch
index 6a6d8e321441dc..cfde28620ba34e 100644
--- a/srcpkgs/rust/patches/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch
+++ b/srcpkgs/rust/patches/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch
@@ -6,12 +6,11 @@ Subject: [PATCH 02/15] Remove -nostdlib and musl_root from musl targets
extended by various void contributors to match our musl setup
diff --git a/compiler/rustc_target/src/spec/base/linux_musl.rs b/compiler/rustc_target/src/spec/base/linux_musl.rs
-index 5117cadbe..c7d0433bb 100644
+index 42aa1e1a6..c7d0433bb 100644
--- a/compiler/rustc_target/src/spec/base/linux_musl.rs
+++ b/compiler/rustc_target/src/spec/base/linux_musl.rs
-@@ -1,16 +1,9 @@
--use crate::spec::crt_objects;
--use crate::spec::{base, LinkSelfContainedDefault, TargetOptions};
+@@ -1,15 +1,9 @@
+-use crate::spec::{base, crt_objects, LinkSelfContainedDefault, TargetOptions};
+use crate::spec::{base, TargetOptions};
pub fn opts() -> TargetOptions {
@@ -28,10 +27,10 @@ index 5117cadbe..c7d0433bb 100644
base
}
diff --git a/compiler/rustc_target/src/spec/crt_objects.rs b/compiler/rustc_target/src/spec/crt_objects.rs
-index 53f710b8f..2a4eec15f 100644
+index e3b6430a4..13a96e2cb 100644
--- a/compiler/rustc_target/src/spec/crt_objects.rs
+++ b/compiler/rustc_target/src/spec/crt_objects.rs
-@@ -61,28 +61,6 @@ pub(super) fn all(obj: &'static str) -> CrtObjects {
+@@ -62,28 +62,6 @@ pub(super) fn all(obj: &'static str) -> CrtObjects {
])
}
@@ -61,10 +60,10 @@ index 53f710b8f..2a4eec15f 100644
new(&[
(LinkOutputKind::DynamicNoPicExe, &["crt2.o", "rsbegin.o"]),
diff --git a/config.example.toml b/config.example.toml
-index 26687bcfb..6a23e4cdd 100644
+index f1dc32234..462a86f5b 100644
--- a/config.example.toml
+++ b/config.example.toml
-@@ -591,14 +591,6 @@
+@@ -599,14 +599,6 @@
# behavior -- this may lead to miscompilations or other bugs.
#description = ""
@@ -119,10 +118,10 @@ index 768aac912..6aebd9189 100755
"riscv32gc-unknown-linux-musl install directory")
v("musl-root-riscv64gc", "target.riscv64gc-unknown-linux-musl.musl-root",
diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs
-index 3e79acad1..ebcdc479a 100644
+index edf18e2eb..7597d6cd2 100644
--- a/src/bootstrap/src/core/build_steps/compile.rs
+++ b/src/bootstrap/src/core/build_steps/compile.rs
-@@ -362,39 +362,7 @@ fn copy_self_contained_objects(
+@@ -372,39 +372,7 @@ fn copy_self_contained_objects(
let mut target_deps = vec![];
// Copies the libc and CRT objects.
@@ -163,7 +162,7 @@ index 3e79acad1..ebcdc479a 100644
let srcdir = builder.wasi_libdir(target).unwrap_or_else(|| {
panic!(
"Target {:?} does not have a \"wasi-root\" key in Config.toml \
-@@ -502,15 +470,6 @@ pub fn std_cargo(builder: &Builder<'_>, target: TargetSelection, stage: u32, car
+@@ -566,15 +534,6 @@ pub fn std_cargo(builder: &Builder<'_>, target: TargetSelection, stage: u32, car
.arg("--manifest-path")
.arg(builder.src.join("library/sysroot/Cargo.toml"));
@@ -180,10 +179,10 @@ index 3e79acad1..ebcdc479a 100644
if let Some(dir) = builder.wasi_libdir(target) {
let root = format!("native={}", dir.to_str().unwrap());
diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs
-index 9d5aa795c..c44e8a2b2 100644
+index bdfee55d8..18db92320 100644
--- a/src/bootstrap/src/core/config/config.rs
+++ b/src/bootstrap/src/core/config/config.rs
-@@ -314,7 +314,6 @@ pub struct Config {
+@@ -321,7 +321,6 @@ pub struct Config {
pub print_step_rusage: bool,
// Fallback musl-root for all targets
@@ -191,7 +190,7 @@ index 9d5aa795c..c44e8a2b2 100644
pub prefix: Option<PathBuf>,
pub sysconfdir: Option<PathBuf>,
pub datadir: Option<PathBuf>,
-@@ -558,8 +557,6 @@ pub struct Target {
+@@ -582,8 +581,6 @@ pub struct Target {
pub profiler: Option<StringOrBool>,
pub rpath: Option<bool>,
pub crt_static: Option<bool>,
@@ -200,7 +199,7 @@ index 9d5aa795c..c44e8a2b2 100644
pub wasi_root: Option<PathBuf>,
pub qemu_rootfs: Option<PathBuf>,
pub runner: Option<String>,
-@@ -1079,7 +1076,6 @@ define_config! {
+@@ -1104,7 +1101,6 @@ define_config! {
default_linker: Option<String> = "default-linker",
channel: Option<String> = "channel",
description: Option<String> = "description",
@@ -208,7 +207,7 @@ index 9d5aa795c..c44e8a2b2 100644
rpath: Option<bool> = "rpath",
strip: Option<bool> = "strip",
frame_pointers: Option<bool> = "frame-pointers",
-@@ -1133,8 +1129,6 @@ define_config! {
+@@ -1158,8 +1154,6 @@ define_config! {
profiler: Option<StringOrBool> = "profiler",
rpath: Option<bool> = "rpath",
crt_static: Option<bool> = "crt-static",
@@ -217,7 +216,7 @@ index 9d5aa795c..c44e8a2b2 100644
wasi_root: Option<String> = "wasi-root",
qemu_rootfs: Option<String> = "qemu-rootfs",
no_std: Option<bool> = "no-std",
-@@ -1599,7 +1593,6 @@ impl Config {
+@@ -1632,7 +1626,6 @@ impl Config {
default_linker,
channel,
description,
@@ -225,7 +224,7 @@ index 9d5aa795c..c44e8a2b2 100644
rpath,
verbose_tests,
optimize_tests,
-@@ -1687,7 +1680,6 @@ impl Config {
+@@ -1722,7 +1715,6 @@ impl Config {
config.rustc_parallel =
parallel_compiler.unwrap_or(config.channel == "dev" || config.channel == "nightly");
config.rustc_default_linker = default_linker;
@@ -233,7 +232,7 @@ index 9d5aa795c..c44e8a2b2 100644
config.save_toolstates = save_toolstates.map(PathBuf::from);
set(
&mut config.deny_warnings,
-@@ -1906,8 +1898,6 @@ impl Config {
+@@ -1973,8 +1965,6 @@ impl Config {
target.ranlib = cfg.ranlib.map(PathBuf::from);
target.linker = cfg.linker.map(PathBuf::from);
target.crt_static = cfg.crt_static;
@@ -242,7 +241,7 @@ index 9d5aa795c..c44e8a2b2 100644
target.wasi_root = cfg.wasi_root.map(PathBuf::from);
target.qemu_rootfs = cfg.qemu_rootfs.map(PathBuf::from);
target.runner = cfg.runner;
-@@ -2667,7 +2657,6 @@ fn check_incompatible_options_for_ci_rustc(rust: &Rust) {
+@@ -2919,7 +2909,6 @@ fn check_incompatible_options_for_ci_rustc(
split_debuginfo: _,
backtrace: _,
parallel_compiler: _,
@@ -251,18 +250,19 @@ index 9d5aa795c..c44e8a2b2 100644
optimize_tests: _,
codegen_tests: _,
diff --git a/src/bootstrap/src/core/sanity.rs b/src/bootstrap/src/core/sanity.rs
-index 2be819d52..daedfb521 100644
+index 60ec57d0d..31b411259 100644
--- a/src/bootstrap/src/core/sanity.rs
+++ b/src/bootstrap/src/core/sanity.rs
-@@ -11,7 +11,6 @@
- use std::collections::HashMap;
- use std::env;
+@@ -11,7 +11,7 @@
+ use std::collections::{HashMap, HashSet};
use std::ffi::{OsStr, OsString};
--use std::fs;
use std::path::PathBuf;
+-use std::{env, fs};
++use std::env;
#[cfg(not(feature = "bootstrap-self-test"))]
-@@ -326,28 +325,6 @@ than building it.
+ use crate::builder::Builder;
+@@ -325,28 +325,6 @@ than building it.
continue;
}
@@ -292,10 +292,10 @@ index 2be819d52..daedfb521 100644
// There are three builds of cmake on windows: MSVC, MinGW, and
// Cygwin. The Cygwin build does not have generators for Visual
diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs
-index a8555b2c3..b0325f309 100644
+index 82b640f54..d906d2186 100644
--- a/src/bootstrap/src/lib.rs
+++ b/src/bootstrap/src/lib.rs
-@@ -1317,25 +1317,6 @@ Executed at: {executed_at}"#,
+@@ -1282,25 +1282,6 @@ Executed at: {executed_at}"#,
}
}
@@ -322,7 +322,7 @@ index a8555b2c3..b0325f309 100644
/// configured.
///
diff --git a/src/bootstrap/src/utils/cc_detect.rs b/src/bootstrap/src/utils/cc_detect.rs
-index 20d79e490..1f8b880d8 100644
+index 29e6b74aa..a32fddbac 100644
--- a/src/bootstrap/src/utils/cc_detect.rs
+++ b/src/bootstrap/src/utils/cc_detect.rs
@@ -197,30 +197,6 @@ fn default_compiler(
diff --git a/srcpkgs/rust/patches/0010-Fix-dynamic-linkage-of-musl-libc-for-the-libc-crate.patch b/srcpkgs/rust/patches/0010-Fix-dynamic-linkage-of-musl-libc-for-the-libc-crate.patch
index 24b7469fe64d69..f4e6962ca55c97 100644
--- a/srcpkgs/rust/patches/0010-Fix-dynamic-linkage-of-musl-libc-for-the-libc-crate.patch
+++ b/srcpkgs/rust/patches/0010-Fix-dynamic-linkage-of-musl-libc-for-the-libc-crate.patch
@@ -3,10 +3,30 @@ From: q66 <daniel@octaforge.org>
Date: Sun, 3 May 2020 18:02:03 +0200
Subject: [PATCH 10/15] Fix dynamic linkage of musl libc for the libc crate
-diff --git a/vendor/libc-0.2.155/src/unix/mod.rs b/vendor/libc-0.2.155/src/unix/mod.rs
-index 49984d3f0..6c3b5a47e 100644
---- a/vendor/libc-0.2.155/src/unix/mod.rs
-+++ b/vendor/libc-0.2.155/src/unix/mod.rs
+diff --git a/vendor/libc-0.2.157/src/unix/mod.rs b/vendor/libc-0.2.157/src/unix/mod.rs
+index 8b3d988ae..b4ab3db3f 100644
+--- a/vendor/libc-0.2.157/src/unix/mod.rs
++++ b/vendor/libc-0.2.157/src/unix/mod.rs
+@@ -347,7 +347,14 @@ cfg_if! {
+ #[link(name = "dl", cfg(not(target_feature = "crt-static")))]
+ #[link(name = "c", cfg(not(target_feature = "crt-static")))]
+ extern {}
+- } else if #[cfg(any(target_env = "musl", target_env = "ohos"))] {
++ } else if #[cfg(target_env = "musl")] {
++ #[link(name = "c")]
++ extern {}
++ #[cfg_attr(feature = "rustc-dep-of-std",
++ link(name = "gcc", kind = "static", modifiers = "-bundle",
++ cfg(target_feature = "crt-static")))]
++ extern {}
++ } else if #[cfg(target_env = "ohos")] {
+ #[cfg_attr(feature = "rustc-dep-of-std",
+ link(name = "c", kind = "static", modifiers = "-bundle",
+ cfg(target_feature = "crt-static")))]
+diff --git a/vendor/libc-0.2.158/src/unix/mod.rs b/vendor/libc-0.2.158/src/unix/mod.rs
+index 8b3d988ae..b4ab3db3f 100644
+--- a/vendor/libc-0.2.158/src/unix/mod.rs
++++ b/vendor/libc-0.2.158/src/unix/mod.rs
@@ -347,7 +347,14 @@ cfg_if! {
#[link(name = "dl", cfg(not(target_feature = "crt-static")))]
#[link(name = "c", cfg(not(target_feature = "crt-static")))]
diff --git a/srcpkgs/rust/patches/0011-Use-ELFv2-ABI-on-all-powerpc64-targets.patch b/srcpkgs/rust/patches/0011-Use-ELFv2-ABI-on-all-powerpc64-targets.patch
index 9bff1dbd250fa0..a66bb55ec3500f 100644
--- a/srcpkgs/rust/patches/0011-Use-ELFv2-ABI-on-all-powerpc64-targets.patch
+++ b/srcpkgs/rust/patches/0011-Use-ELFv2-ABI-on-all-powerpc64-targets.patch
@@ -7,16 +7,21 @@ This patches librustc_target so that ELFv2 is used everywhere, matching our
LLVM. While this is not perfect (it does not allow rustc to compile legacy
binaries), rustc never requests specific ABI from llvm in the first place,
so at least match the environment we have.
----
- compiler/rustc_target/src/abi/call/powerpc64.rs | 9 +--------
- .../rustc_target/src/spec/powerpc64_unknown_linux_gnu.rs | 6 +-----
- 2 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/compiler/rustc_target/src/abi/call/powerpc64.rs b/compiler/rustc_target/src/abi/call/powerpc64.rs
-index 359bb8fc0..414c70cea 100644
+index 749eea0ef..1dfa3cbd0 100644
--- a/compiler/rustc_target/src/abi/call/powerpc64.rs
+++ b/compiler/rustc_target/src/abi/call/powerpc64.rs
-@@ -119,14 +119,7 @@ where
+@@ -3,7 +3,7 @@
+ // need to be fixed when PowerPC vector support is added.
+
+ use crate::abi::call::{Align, ArgAbi, FnAbi, Reg, RegKind, Uniform};
+-use crate::abi::{Endian, HasDataLayout, TyAbiInterface};
++use crate::abi::{HasDataLayout, TyAbiInterface};
+ use crate::spec::HasTargetSpec;
+
+ #[derive(Debug, Clone, Copy, PartialEq)]
+@@ -91,14 +91,7 @@ where
Ty: TyAbiInterface<'a, C> + Copy,
C: HasDataLayout + HasTargetSpec,
{
@@ -30,5 +35,5 @@ index 359bb8fc0..414c70cea 100644
- };
+ let abi = ELFv2;
- if !fn_abi.ret.is_ignore() {
- classify_ret(cx, &mut fn_abi.ret, abi);
+ classify(cx, &mut fn_abi.ret, abi, true);
+
diff --git a/srcpkgs/rust/patches/0015-properly-skip-submodules.patch b/srcpkgs/rust/patches/0015-properly-skip-submodules.patch
new file mode 100644
index 00000000000000..9058f2061fb7f7
--- /dev/null
+++ b/srcpkgs/rust/patches/0015-properly-skip-submodules.patch
@@ -0,0 +1,13 @@
+diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs
+index 82b640f54..83fe7660c 100644
+--- a/src/bootstrap/src/lib.rs
++++ b/src/bootstrap/src/lib.rs
+@@ -484,7 +484,7 @@ impl Build {
+ pub fn require_submodule(&self, submodule: &str, err_hint: Option<&str>) {
+ // When testing bootstrap itself, it is much faster to ignore
+ // submodules. Almost all Steps work fine without their submodules.
+- if cfg!(test) && !self.config.submodules() {
++ if cfg!(test) || !self.config.submodules() {
+ return;
+ }
+ self.config.update_submodule(submodule);
diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template
index 9b321d99525b79..6144cd97338d74 100644
--- a/srcpkgs/rust/template
+++ b/srcpkgs/rust/template
@@ -8,17 +8,17 @@
# uploaded to https://repo-default.voidlinux.org/distfiles/
#
pkgname=rust
-version=1.81.0
+version=1.82.0
revision=1
hostmakedepends="curl pkg-config python3 tar cargo-bootstrap"
makedepends="libffi-devel ncurses-devel libxml2-devel zlib-devel llvm18-devel"
depends="rust-std gcc"
short_desc="Safe, concurrent, practical systems language"
maintainer="Enno Boland <gottox@voidlinux.org>"
-license="MIT, Apache-2.0"
+license="Apache-2.0 OR MIT"
homepage="https://www.rust-lang.org/"
distfiles="https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"
-checksum=872448febdff32e50c3c90a7e15f9bb2db131d13c588fe9071b0ed88837ccfa7
+checksum=7c53f4509eda184e174efa6ba7d5eeb586585686ce8edefc781a2b11a7cf512a
lib32disabled=yes
make_check=no # CBA for now
python_version=3 # needed for python files in rust-src
@@ -58,7 +58,8 @@ post_patch() {
fi
# clear out all the checksum nonsense of patched vendor crates
- _clear_vendor_checksums libc-0.2.155
+ _clear_vendor_checksums libc-0.2.157
+ _clear_vendor_checksums libc-0.2.158
# pre-configure 01-override-config overwrites vendor files
_clear_vendor_checksums onig_sys-69.8.1
diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index 1b899510bd239c..d559424b6a3f84 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
# Template file for 'syncthing'
pkgname=syncthing
-version=1.27.12
+version=1.28.0
revision=1
build_style=go
go_import_path="github.com/syncthing/syncthing"
@@ -16,12 +16,12 @@ license="MPL-2.0"
homepage="https://syncthing.net/"
changelog="https://github.com/syncthing/syncthing/releases"
distfiles="https://github.com/syncthing/syncthing/archive/v${version}.tar.gz"
-checksum=c6d9a06ee223bad61b83b9212f089b960f495f7e84f3aae46ba207d5b808e1da
+checksum=ae0b96744a61d30e5fe7a6054d984c2a488c389e0e9baad8a868a71871ed1444
pre_build() {
GOARCH= go generate \
github.com/syncthing/syncthing/lib/api/auto \
- github.com/syncthing/syncthing/cmd/strelaypoolsrv/auto
+ github.com/syncthing/syncthing/cmd/infra/strelaypoolsrv/auto
}
post_install() {
diff --git a/srcpkgs/syncthingtray/template b/srcpkgs/syncthingtray/template
index 5a770a56fdb2be..e6c32f04c686eb 100644
--- a/srcpkgs/syncthingtray/template
+++ b/srcpkgs/syncthingtray/template
@@ -1,6 +1,6 @@
# Template file for 'syncthingtray'
pkgname=syncthingtray
-version=1.6.2
+version=1.6.3
revision=1
build_style=cmake
configure_args="-DBUILTIN_TRANSLATIONS=ON -DSYSTEMD_SUPPORT=OFF
@@ -16,7 +16,7 @@ maintainer="classabbyamp <void@placeviolette.net>"
license="GPL-2.0-or-later"
homepage="https://martchus.github.io/syncthingtray/"
distfiles="https://github.com/Martchus/syncthingtray/archive/refs/tags/v${version}.tar.gz"
-checksum=022d37bf125f32cd0eb52b4946361d5d8500e8b0b6ef095292f4a89dff085d34
+checksum=49ab861c2bc0649652b8dcbc4cf8788c743008a8bc6d023f7d4a3b3bbdc3bdc6
# requires weird port-binding shenanigans that may not work on ipv6
# https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=syncthingtray#n50
diff --git a/srcpkgs/tailscale/template b/srcpkgs/tailscale/template
index 198bfd06dc49cc..2e923d5a62cf78 100644
--- a/srcpkgs/tailscale/template
+++ b/srcpkgs/tailscale/template
@@ -1,6 +1,6 @@
# Template file for 'tailscale'
pkgname=tailscale
-version=1.76.0
+version=1.76.1
revision=1
build_style=go
build_helper="qemu"
@@ -17,7 +17,7 @@ license="BSD-3-Clause"
homepage="https://tailscale.com"
changelog="https://github.com/tailscale/tailscale/releases"
distfiles="https://github.com/tailscale/tailscale/archive/v${version}.tar.gz"
-checksum=eaec1fa9a882d877ce6e5fb6ef47b3387124321a8963c66c4c37319106b5c5c2
+checksum=ce87e52fd4e8e52540162a2529c5d73f5f76c6679147a7887058865c9e01ec36
post_install() {
for sh in bash fish zsh; do
diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index 32c8ff02b866a0..365596f787d7f2 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,6 +1,6 @@
# Template file for 'terraform'
pkgname=terraform
-version=1.9.7
+version=1.9.8
revision=1
build_style=go
go_import_path="github.com/hashicorp/$pkgname"
@@ -9,5 +9,5 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="BUSL-1.1"
homepage="https://www.terraform.io/"
distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=3409674469938669ba0cda3b437a54cbe3e47b3a2a66c226311afa05e15389a4
+checksum=122af732dbe90d856ec9e77302f62df1ea95566e98e9dda3ad6f7d100923417e
repository=nonfree
diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index 737c290015dcde..0077d57cdb1b4a 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
# Template file for 'terragrunt'
pkgname=terragrunt
-version=0.68.2
+version=0.68.4
revision=1
build_style=go
go_import_path="github.com/gruntwork-io/terragrunt"
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="MIT"
homepage="https://github.com/gruntwork-io/terragrunt"
distfiles="$homepage/archive/v$version.tar.gz"
-checksum=9de4b13d9caa904c0343c85429bb3c0c927fb1bbaa43bda93ad84890b06d1f1e
+checksum=60c259d787eb74fc8d442dad33e2f697ab8498970b7fc71ea3d2a3c45cd9fb6f
post_install() {
vlicense LICENSE.txt
diff --git a/srcpkgs/typst/template b/srcpkgs/typst/template
index b74cdfa4769c31..907dbe1c3afea6 100644
--- a/srcpkgs/typst/template
+++ b/srcpkgs/typst/template
@@ -1,7 +1,7 @@
# Template file for 'typst'
pkgname=typst
reverts="23.03.28_1"
-version=0.11.1
+version=0.12.0
revision=1
build_style=cargo
configure_args="--no-default-features --features=embed-fonts"
@@ -14,7 +14,7 @@ license="Apache-2.0"
homepage="https://typst.app"
changelog="https://typst.app/docs/changelog/"
distfiles="https://github.com/typst/typst/archive/refs/tags/v${version}.tar.gz"
-checksum=b1ba054e821073daafd90675c4822bcd8166f33fe2e3acba87ba1451a0d1fc56
+checksum=5e92463965c0cf6aa003a3bacd1c68591ef2dc0db59dcdccb8f7b084836a1266
export TYPST_VERSION="$version"
export GEN_ARTIFACTS="./generated"
diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index 449cfa0687cc96..59ffe518848919 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -1,6 +1,6 @@
# Template file for 'unbound'
pkgname=unbound
-version=1.21.1
+version=1.22.0
revision=1
build_style=gnu-configure
configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-3-Clause"
homepage="https://nlnetlabs.nl/projects/unbound/about/"
distfiles="https://nlnetlabs.nl/downloads/unbound/${pkgname}-${version}.tar.gz"
-checksum=3036d23c23622b36d3c87e943117bdec1ac8f819636eb978d806416b0fa9ea46
+checksum=c5dd1bdef5d5685b2cedb749158dd152c52d44f65529a34ac15cd88d4b1b3d43
system_accounts="_unbound"
post_install() {
diff --git a/srcpkgs/uv/template b/srcpkgs/uv/template
index 11dd23814416f4..cc9b73c4d1f96c 100644
--- a/srcpkgs/uv/template
+++ b/srcpkgs/uv/template
@@ -1,6 +1,6 @@
# Template file for 'uv'
pkgname=uv
-version=0.4.22
+version=0.4.24
revision=1
build_style=python3-pep517
build_helper="rust qemu"
@@ -11,10 +11,8 @@ maintainer="classabbyamp <void@placeviolette.net>"
license="Apache-2.0 OR MIT"
homepage="https://github.com/astral-sh/uv"
changelog="https://github.com/astral-sh/uv/raw/main/CHANGELOG.md"
-distfiles="https://github.com/astral-sh/uv/releases/download/${version}/source.tar.gz"
-checksum=1d72ea82b337c767e2ba5c3ffa11cfccdca99321ab1dca3d4c035f8d52d7ad47
-# many tests require old python versions
-make_check=no
+distfiles="https://github.com/astral-sh/uv/releases/download/${version}/source.tar.gz>uv-${version}.tar.gz"
+checksum=917be4e4e96ef555e2c739e3b91eac21b7df6f1b45d80e25fe4e50d1249d6846
post_install() {
vlicense LICENSE-MIT
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 85d5970d06972e..3965569cd7121b 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
# Template file for 'wine'
pkgname=wine
-version=9.19
+version=9.20
revision=1
_pkgver=${version/r/-r}
create_wrksrc=yes
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
homepage="http://www.winehq.org/"
distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="2c13a0c3f31f25a54d415d86785a1ad46ef8a07ae973b6b699345a45206ac015
- 8743e7a75d79618394d41fe23ea8cb6c8ebc3caf28c34a518c239b8a9333d287"
+checksum="95f2b45b1458125be7d9fccc94ca5f8cce0a5e4ae11d0d193cfb7dddb35e7a86
+ e88fe8e23f7160489538636a2d795772415004d48cdcc85d29dd9e59b2fe575d"
# NOTE: wine depends on specific versions of wine-mono and wine-gecko,
# check for updates to these packages when updating wine
^ permalink raw reply [flat|nested] 8+ messages in thread