From cadb263d8482d6bbf14d6327ce53987dc9f7ec63 Mon Sep 17 00:00:00 2001 From: Samuel Clay Date: Wed, 22 May 2024 18:52:20 -0600 Subject: [PATCH 1/2] zig: update to 0.12.0. --- common/build-style/zig-build.sh | 4 +++- srcpkgs/zig/template | 10 +++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/common/build-style/zig-build.sh b/common/build-style/zig-build.sh index 205c4cadf53f8c..e0245e8cd7eb63 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 /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} } diff --git a/srcpkgs/zig/template b/srcpkgs/zig/template index 52cda7e8e0cee7..9cebec03ddb286 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.0 +revision=1 archs="x86_64* aarch64*" build_style=cmake -configure_args="-DZIG_TARGET_MCPU=baseline" +configure_args="-DZIG_TARGET_MCPU=baseline -DZIG_STATIC_ZLIB=ON" 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 " license="MIT" homepage="https://ziglang.org" distfiles="https://ziglang.org/download/${version}/zig-${version}.tar.xz" -checksum=69459bc804333df077d441ef052ffa143d53012b655a51f04cfef1414c04168c +checksum=a6744ef84b6716f976dad923075b2f54dc4f785f200ae6c8ea07997bd9d9bd9a nopie=yes nocross=yes From b5fe235b4540a30d7c196ca00f341a932a3d4811 Mon Sep 17 00:00:00 2001 From: Samuel Clay Date: Tue, 11 Jun 2024 20:04:24 -0600 Subject: [PATCH 2/2] river: update to 0.3.2. --- srcpkgs/river/template | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/srcpkgs/river/template b/srcpkgs/river/template index e766cf04716869..58dcf9164930bf 100644 --- a/srcpkgs/river/template +++ b/srcpkgs/river/template @@ -1,26 +1,27 @@ # 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" +configure_args="-Dpie -Dxwayland" 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)" +depends="xorg-server-xwayland" short_desc="Dynamic tiling Wayland compositor" maintainer="Orphaned " 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" -desc_option_xwayland="Enable Xwayland support" +do_check() { + zig build --system /host/zig/p test +} post_install() { vinstall contrib/river.desktop 644 usr/share/wayland-sessions vsconf example/init } +