From 2e4b7e31c3b39e5cfd3c71cc5ae008d795617eea Mon Sep 17 00:00:00 2001
From: tranzystorekk <tranzystorek.io@protonmail.com>
Date: Wed, 5 Mar 2025 10:56:36 +0100
Subject: [PATCH 1/3] zig: update to 0.16.0

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

diff --git a/srcpkgs/zig/template b/srcpkgs/zig/template
index c70e908c3842be..07d6acf88ad7da 100644
--- a/srcpkgs/zig/template
+++ b/srcpkgs/zig/template
@@ -1,25 +1,23 @@
 # Template file for 'zig'
 pkgname=zig
-version=0.13.0
+version=0.16.0
 revision=1
 archs="x86_64* aarch64*"
 build_style=cmake
-configure_args="-DZIG_TARGET_MCPU=baseline"
-make_cmd=make
+configure_args="-DZIG_TARGET_MCPU=baseline -DZIG_PIE=ON"
+_llvmver=21
 # we add xml2, zstd, zlib and ncurses
 # because our lld is static-only and requires those to work
-makedepends="clang18-devel llvm18-devel lld18-devel libxml2-devel libzstd-devel ncurses-devel zlib-devel"
+makedepends="clang${_llvmver}-devel llvm${_llvmver}-devel lld${_llvmver}-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=06c73596beeccb71cc073805bdb9c0e05764128f16478fa53bf17dfabc1d4318
-nopie=yes
+checksum=43186959edc87d5c7a1be7b7d2a25efffd22ce5807c7af99067f86f99641bfdf
 nocross=yes
 
-export CMAKE_GENERATOR="Unix Makefiles"
-
 post_install() {
 	vlicense LICENSE
 }

From c9ceeb6d057549367340a0450c889077175b8b80 Mon Sep 17 00:00:00 2001
From: tranzystorekk <tranzystorek.io@protonmail.com>
Date: Fri, 25 Apr 2025 11:34:47 +0200
Subject: [PATCH 2/3] common/build-style/zig-build: adjust sysroot and search
 path for zig 0.16

---
 common/build-style/zig-build.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/common/build-style/zig-build.sh b/common/build-style/zig-build.sh
index 5c334b1e1e5110..c888a9b5eb7ff4 100644
--- a/common/build-style/zig-build.sh
+++ b/common/build-style/zig-build.sh
@@ -1,5 +1,5 @@
 do_build() {
-	local zig_target zig_cpu
+	local zig_target zig_cpu zig_search_prefix
 
 	# TODO: This duplication between build-profiles and cross-profiles
 	# is totally unnecessary. It would be nice if there was some way to
@@ -7,9 +7,11 @@ do_build() {
 	if [ "$CROSS_BUILD" ]; then
 		zig_target="${XBPS_CROSS_ZIG_TARGET}"
 		zig_cpu="${XBPS_CROSS_ZIG_CPU}"
+		zig_search_prefix=/
 	else
 		zig_target="${XBPS_ZIG_TARGET}"
 		zig_cpu="${XBPS_ZIG_CPU}"
+		zig_search_prefix=/usr
 	fi
 
 	# Inform zig of the required libc include paths.
@@ -30,8 +32,8 @@ do_build() {
 	# prefix used by the zig build system.
 	DESTDIR="zig-out" zig build \
 		-j"${XBPS_MAKEJOBS}" \
-		--sysroot "${XBPS_CROSS_BASE}" \
-		--search-prefix "${XBPS_CROSS_BASE}/usr" \
+		--sysroot "${XBPS_CROSS_BASE:-/}" \
+		--search-prefix "${zig_search_prefix}" \
 		--prefix /usr \
 		--global-cache-dir /host/zig \
 		--libc xbps_zig_libc.txt \

From 96e5b52eb4025cb924aabd7d8a0a0677dfe69930 Mon Sep 17 00:00:00 2001
From: tranzystorekk <tranzystorek.io@protonmail.com>
Date: Sat, 18 Apr 2026 20:25:51 +0200
Subject: [PATCH 3/3] zls: update to 0.16.0

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

diff --git a/srcpkgs/zls/template b/srcpkgs/zls/template
index 887475ed8d2eab..7937121b187cb2 100644
--- a/srcpkgs/zls/template
+++ b/srcpkgs/zls/template
@@ -1,23 +1,19 @@
 # Template file for 'zls'
 pkgname=zls
-version=0.13.0
+version=0.16.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"
-_tracy_gitrev="37aff70dfa50cf6307b3fee6074d627dc2929143"
-distfiles="https://github.com/zigtools/zls/archive/refs/tags/${version}.tar.gz
- https://github.com/wolfpld/tracy/archive/${_tracy_gitrev}.tar.gz"
-checksum="2e8046b6b0de765a4bf4bb828345e2badc8b828bc257dc931d0f56b147684d9f
- c24ce6179df7efb8a114fe409d197e26e4b937c6fc1258bea15840b15b1f79ff"
-skip_extraction="${_tracy_gitrev}.tar.gz"
+distfiles="https://github.com/zigtools/zls/archive/refs/tags/${version}.tar.gz"
+checksum=e7c5936f5b3a057ce851be0876e4e259b5c4d02f9aae038cd24a5d6b586b029f
 
-post_extract() {
-	vsrcextract -C src/tracy ${_tracy_gitrev}.tar.gz
-}
+case "${XBPS_TARGET_MACHINE}" in
+	armv[67]*) nopie=yes ;;
+	*) configure_args+=" -Dpie" ;;
+esac
 
 post_install() {
 	vlicense LICENSE