Re: [PR PATCH] [Updated] zig: update to 0.12.1.

[OliveThePuffin <OliveThePuffin@users.noreply.github.com>]

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

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

https://github.com/OliveThePuffin/void-packages master
https://github.com/void-linux/void-packages/pull/49935

zig: update to 0.12.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC) x86_64-glibc

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


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

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

From 3b4dc7281243ab978494ddacaecceb0bbf11d43e Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 20 Apr 2024 14:24:27 +0200
Subject: [PATCH 1/6] zig: update to 0.12.1

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

diff --git a/srcpkgs/zig/template b/srcpkgs/zig/template
index 52cda7e8e0cee7..ad8edde107ece1 100644
--- a/srcpkgs/zig/template
+++ b/srcpkgs/zig/template
@@ -1,20 +1,20 @@
 # Template file for 'zig'
 pkgname=zig
-version=0.10.1
-revision=3
+version=0.12.1
+revision=1
 archs="x86_64* aarch64*"
 build_style=cmake
 configure_args="-DZIG_TARGET_MCPU=baseline"
 make_cmd=make
 # we add xml2, zstd, zlib and ncurses
 # because our lld is static-only and requires those to work
-makedepends="clang15 llvm15 lld15-devel libxml2-devel libzstd-devel ncurses-devel zlib-devel"
+makedepends="clang17-devel llvm17-devel lld17-devel libxml2-devel libzstd-devel ncurses-devel zlib-devel"
 short_desc="Programming language designed for robustness, optimality, and clarity"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://ziglang.org"
 distfiles="https://ziglang.org/download/${version}/zig-${version}.tar.xz"
-checksum=69459bc804333df077d441ef052ffa143d53012b655a51f04cfef1414c04168c
+checksum=cca0bf5686fe1a15405bd535661811fac7663f81664d2204ea4590ce49a6e9ba
 nopie=yes
 nocross=yes
 

From 64f9155c73d4692efe7be4931dc17fafd6c7900c Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 21 Apr 2024 22:15:40 +0200
Subject: [PATCH 2/6] common/build_style/zig-build.sh: update for zig 0.12

---
 common/build-style/zig-build.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/common/build-style/zig-build.sh b/common/build-style/zig-build.sh
index 205c4cadf53f8c..6e78dd7a1ac980 100644
--- a/common/build-style/zig-build.sh
+++ b/common/build-style/zig-build.sh
@@ -30,9 +30,11 @@ do_build() {
 	# prefix used by the zig build system.
 	DESTDIR="zig-out" zig build \
 		--sysroot "${XBPS_CROSS_BASE}" \
+		--search-prefix "${XBPS_CROSS_BASE}/usr" \
+		--global-cache-dir /host/zig \
 		--libc xbps_zig_libc.txt \
 		-Dtarget="${zig_target}" -Dcpu="${zig_cpu}" \
-		-Drelease-safe --prefix /usr install \
+		--release=safe --prefix /usr install \
 		${configure_args}
 }
 

From 4a87657735bc6ada06fc42e4fc582a5b4145c97f Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 20 Apr 2024 14:49:30 +0200
Subject: [PATCH 3/6] ncdu2: update to 2.4

---
 srcpkgs/ncdu2/patches/build-pie.patch         | 12 ----------
 srcpkgs/ncdu2/patches/explicit-cast.patch     | 23 -------------------
 .../patches/no-preferred-optimize-mode.patch  | 13 +++++++++++
 srcpkgs/ncdu2/template                        |  5 ++--
 4 files changed, 16 insertions(+), 37 deletions(-)
 delete mode 100644 srcpkgs/ncdu2/patches/build-pie.patch
 delete mode 100644 srcpkgs/ncdu2/patches/explicit-cast.patch
 create mode 100644 srcpkgs/ncdu2/patches/no-preferred-optimize-mode.patch

diff --git a/srcpkgs/ncdu2/patches/build-pie.patch b/srcpkgs/ncdu2/patches/build-pie.patch
deleted file mode 100644
index b60fa57b912c5e..00000000000000
--- a/srcpkgs/ncdu2/patches/build-pie.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/build.zig b/build.zig
-index 45bd314..02926f0 100644
---- a/build.zig
-+++ b/build.zig
-@@ -13,6 +13,7 @@ pub fn build(b: *std.build.Builder) void {
-     exe.addCSourceFile("src/ncurses_refs.c", &[_][]const u8{});
-     exe.linkLibC();
-     exe.linkSystemLibrary("ncursesw");
-+    exe.pie = true;
-     exe.install();
- 
-     const run_cmd = exe.run();
diff --git a/srcpkgs/ncdu2/patches/explicit-cast.patch b/srcpkgs/ncdu2/patches/explicit-cast.patch
deleted file mode 100644
index bafcccfea94a38..00000000000000
--- a/srcpkgs/ncdu2/patches/explicit-cast.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From e6cfacfa068bbe05873583e68eb82e668875d48c Mon Sep 17 00:00:00 2001
-From: Yorhel <git@yorhel.nl>
-Date: Sun, 2 Apr 2023 11:57:34 +0200
-Subject: [PATCH] scan.zig: Add explicit cast for struct statfs.f_type
-
-Hopefully fixes #221.
----
- src/scan.zig | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/scan.zig b/src/scan.zig
-index 328bd86..76b8fea 100644
---- a/src/scan.zig
-+++ b/src/scan.zig
-@@ -60,7 +60,7 @@ fn isKernfs(dir: std.fs.Dir, dev: u64) bool {
-     if (kernfs_cache.get(dev)) |e| return e;
-     var buf: c_statfs.struct_statfs = undefined;
-     if (c_statfs.fstatfs(dir.fd, &buf) != 0) return false; // silently ignoring errors isn't too nice.
--    const iskern = switch (buf.f_type) {
-+    const iskern = switch (util.castTruncate(u32, buf.f_type)) {
-         // These numbers are documented in the Linux 'statfs(2)' man page, so I assume they're stable.
-         0x42494e4d, // BINFMTFS_MAGIC
-         0xcafe4a11, // BPF_FS_MAGIC
diff --git a/srcpkgs/ncdu2/patches/no-preferred-optimize-mode.patch b/srcpkgs/ncdu2/patches/no-preferred-optimize-mode.patch
new file mode 100644
index 00000000000000..87df274f5769b3
--- /dev/null
+++ b/srcpkgs/ncdu2/patches/no-preferred-optimize-mode.patch
@@ -0,0 +1,13 @@
+diff --git a/build.zig b/build.zig
+index 231c2e6..f92c70d 100644
+--- a/build.zig
++++ b/build.zig
+@@ -6,7 +6,7 @@ const std = @import("std");
+ pub fn build(b: *std.Build) void {
+     const target = b.standardTargetOptions(.{});
+     const optimize = b.standardOptimizeOption(.{
+-        .preferred_optimize_mode = .ReleaseFast,
++        //.preferred_optimize_mode = .ReleaseFast,
+     });
+ 
+     const pie = b.option(bool, "pie", "Build with PIE support (by default false)") orelse false;
diff --git a/srcpkgs/ncdu2/template b/srcpkgs/ncdu2/template
index dc6af0e5ccbbe0..6d27458b987b60 100644
--- a/srcpkgs/ncdu2/template
+++ b/srcpkgs/ncdu2/template
@@ -1,8 +1,9 @@
 # Template file for 'ncdu2'
 pkgname=ncdu2
-version=2.2.2
+version=2.4
 revision=1
 build_style=zig-build
+configure_args="-Dpie"
 makedepends="ncurses-devel"
 short_desc="NCurses Disk Usage utility version 2"
 maintainer="Marcin Puc <tranzystorek.io@protonmail.com>"
@@ -10,7 +11,7 @@ license="MIT"
 homepage="https://dev.yorhel.nl/ncdu"
 changelog="https://dev.yorhel.nl/ncdu/changes2"
 distfiles="https://dev.yorhel.nl/download/ncdu-${version}.tar.gz"
-checksum=90d920024e752318b469776ce57e03b3c702d49329ad9825aeeab36c3babf993
+checksum=4a3d0002309cf6a7cea791938dac9becdece4d529d0d6dc8d91b73b4e6855509
 conflicts="ncdu"
 
 post_install() {

From e341afbd19304004e8760da38952263f437d1a32 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 20 Apr 2024 15:30:10 +0200
Subject: [PATCH 4/6] waylock: update to 1.1.0

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

diff --git a/srcpkgs/waylock/template b/srcpkgs/waylock/template
index 18a0c1813ca98d..bbba6c4717b0ce 100644
--- a/srcpkgs/waylock/template
+++ b/srcpkgs/waylock/template
@@ -1,6 +1,6 @@
 # Template file for 'waylock'
 pkgname=waylock
-version=0.6.2
+version=1.1.0
 revision=1
 build_style=zig-build
 configure_args="-Dpie"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="ISC"
 homepage="https://codeberg.org/ifreund/waylock"
 distfiles="https://codeberg.org/ifreund/waylock/releases/download/v${version}/waylock-${version}.tar.gz"
-checksum=4a794dedd1b11f3b9bb7b46f8a93c20aac5ac1d40a851cabaa7ae84fd36686fa
+checksum=fd200ddaf416e45a8dc6e212fb8b0fba2cf7bdcfaf5f65a361d8b0313600d02e
 
 post_install() {
 	vlicense LICENSE

From add42e1297d265556d3f724c0592186084f534a1 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 20 Apr 2024 15:41:42 +0200
Subject: [PATCH 5/6] zls: update to 0.12.0

---
 srcpkgs/zls/template | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/zls/template b/srcpkgs/zls/template
index 6f2ab3d048c911..7cff92d31690ad 100644
--- a/srcpkgs/zls/template
+++ b/srcpkgs/zls/template
@@ -1,27 +1,22 @@
 # Template file for 'zls'
 pkgname=zls
-version=0.10.0
+version=0.12.0
 revision=1
 build_style=zig-build
+configure_args="-Dpie"
 short_desc="Zig language server"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/zigtools/zls"
-_known_folders_gitrev="d13ba6137084e55f873f6afb67447fe8906cc951"
-_tracy_gitrev="f493d4aa8ba8141d9680473fad007d8a6348628e"
+_tracy_gitrev="37aff70dfa50cf6307b3fee6074d627dc2929143"
 distfiles="https://github.com/zigtools/zls/archive/refs/tags/${version}.tar.gz
- https://github.com/ziglibs/known-folders/archive/${_known_folders_gitrev}.tar.gz
  https://github.com/wolfpld/tracy/archive/${_tracy_gitrev}.tar.gz"
-checksum="ad8c16721a10a55b759f0cd63243301565b948b1d48075e1fda89ccf264a2bdf
-	1fa1c5cb7da6c2ba76ae3c52602ce525ccbbf5741d1ca9c4d2687ff10333a0cf
-	84577b79a36566a777eec3cf2b596920a0c1d7b6c216d941c04ef967a727b041"
-skip_extraction="${_known_folders_gitrev}.tar.gz ${_tracy_gitrev}.tar.gz"
+checksum="c8c59dc6a708f3857ffbc1f593db4f6409e50e5ff1319b84dc65b84271e5a3d8
+ c24ce6179df7efb8a114fe409d197e26e4b937c6fc1258bea15840b15b1f79ff"
+skip_extraction="${_tracy_gitrev}.tar.gz"
 
 post_extract() {
-	bsdtar xzf "$XBPS_SRCDISTDIR/$pkgname-$version/$_known_folders_gitrev.tar.gz" \
-		--strip-components=1 -C "$wrksrc/src/known-folders"
-	bsdtar xzf "$XBPS_SRCDISTDIR/$pkgname-$version/$_tracy_gitrev.tar.gz" \
-		--strip-components=1 -C "$wrksrc/src/tracy"
+	vsrcextract -C src/tracy ${_tracy_gitrev}.tar.gz
 }
 
 post_install() {

From aca47ea80c1a7bc574e3c213ad2f85e45e3f7236 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 20 Apr 2024 15:54:28 +0200
Subject: [PATCH 6/6] river: update to 0.3.2

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

diff --git a/srcpkgs/river/template b/srcpkgs/river/template
index e766cf04716869..808080159487b7 100644
--- a/srcpkgs/river/template
+++ b/srcpkgs/river/template
@@ -1,12 +1,12 @@
 # Template file for 'river'
 pkgname=river
-version=0.2.4
-revision=3
+version=0.3.2
+revision=1
 archs="~i686* ~armv6l* ~armv7l*"
 build_style=zig-build
 configure_args="$(vopt_if xwayland -Dxwayland) -Dpie"
 hostmakedepends="pkg-config wayland-devel scdoc"
-makedepends="wlroots0.16-devel libevdev-devel pixman-devel
+makedepends="wlroots0.17-devel libevdev-devel pixman-devel
  wayland-protocols libxkbcommon-devel wayland-devel"
 depends="$(vopt_if xwayland xorg-server-xwayland)"
 short_desc="Dynamic tiling Wayland compositor"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://codeberg.org/river/river"
 distfiles="https://codeberg.org/river/river/releases/download/v${version}/river-${version}.tar.gz"
-checksum=26c1c41a65ce3804069afad6988410515cf478d2b76303ebc699766d3d4dc69f
+checksum=acb273487eb0cf9222c14e050c0faad692f426dba599b62e4c743ba43328ee9e
 
 build_options="xwayland"
 build_options_default="xwayland"