New comment by ifreund on void-packages repository https://github.com/void-linux/void-packages/pull/35895#issuecomment-1057342674 Comment: Patches needed as a result of the zig bump:
river: update to 0.13 ```diff commit 713780d64422e9ed3388c403075f4b77ed04c73f Author: Isaac Freund Date: Wed Mar 2 21:10:46 2022 +0100 river: update to 0.1.3. diff --git a/srcpkgs/river/patches/0001-Enable-PIE-for-river-riverctl-rivertile.patch b/srcpkgs/river/patches/0001-Enable-PIE-for-river-riverctl-rivertile.patch index ecc68302db..9da0e5d5d0 100644 --- a/srcpkgs/river/patches/0001-Enable-PIE-for-river-riverctl-rivertile.patch +++ b/srcpkgs/river/patches/0001-Enable-PIE-for-river-riverctl-rivertile.patch @@ -10,33 +10,33 @@ build system. See: https://github.com/ziglang/zig/issues/7201 1 file changed, 3 insertions(+) diff --git a/build.zig b/build.zig -index d561f49..8ac9a4e 100644 +index 9829633..180179f 100644 --- a/build.zig +++ b/build.zig -@@ -85,6 +85,7 @@ pub fn build(b: *zbs.Builder) !void { +@@ -89,6 +89,7 @@ pub fn build(b: *zbs.Builder) !void { const river = b.addExecutable("river", "river/main.zig"); river.setTarget(target); river.setBuildMode(mode); + river.pie = true; - river.addBuildOption(bool, "xwayland", xwayland); - river.addBuildOption([:0]const u8, "version", full_version); + river.addOptions("build_options", options); -@@ -97,6 +98,7 @@ pub fn build(b: *zbs.Builder) !void { + addServerDeps(river, scanner); +@@ -100,6 +101,7 @@ pub fn build(b: *zbs.Builder) !void { const riverctl = b.addExecutable("riverctl", "riverctl/main.zig"); riverctl.setTarget(target); riverctl.setBuildMode(mode); + riverctl.pie = true; - riverctl.addBuildOption([:0]const u8, "version", full_version); + riverctl.addOptions("build_options", options); riverctl.step.dependOn(&scanner.step); -@@ -114,6 +116,7 @@ pub fn build(b: *zbs.Builder) !void { +@@ -120,6 +122,7 @@ pub fn build(b: *zbs.Builder) !void { const rivertile = b.addExecutable("rivertile", "rivertile/main.zig"); rivertile.setTarget(target); rivertile.setBuildMode(mode); + rivertile.pie = true; - rivertile.addBuildOption([:0]const u8, "version", full_version); + rivertile.addOptions("build_options", options); rivertile.step.dependOn(&scanner.step); -- -2.33.1 +2.35.1 diff --git a/srcpkgs/river/template b/srcpkgs/river/template index 9cf3abe4b8..ae09ae54b3 100644 --- a/srcpkgs/river/template +++ b/srcpkgs/river/template @@ -1,6 +1,6 @@ # Template file for 'river' pkgname=river -version=0.1.1 +version=0.1.3 revision=1 build_style=zig-build configure_args="$(vopt_if xwayland -Dxwayland)" @@ -12,7 +12,7 @@ maintainer="Isaac Freund " license="GPL-3.0-or-later" homepage="https://github.com/riverwm/river" distfiles="${homepage}/releases/download/v${version}/river-${version}.tar.gz" -checksum=2a0bcd4670ed9ebd39c279f2bf10803fc65c9f3ee2307ce40728df23ce914d18 +checksum=f63444c300ab554ef3ca0d904a6b124a832c8397d474ef067bdde911c981c79f build_options="xwayland" build_options_default="xwayland" ```
rundird: remove package ```diff commit 55f59385194c019dad7bba67c5aaab6f5e168c34 Author: Isaac Freund Date: Wed Mar 2 21:15:30 2022 +0100 rundird: remove package This has been deprecated by upstream which recommends using dumb_runtime_dir (already packaged for void) instead. Removing now since rundird 0.2.0 is not compatible with zig 0.9 and there won't be any new rundird releases. diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 6edc8e0064..6177d7b253 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -337,6 +337,7 @@ replaces=" rkt-stage1-coreos<=1.30.0_3 rkt-stage1-fly<=1.30.0_3 rkt<=1.30.0_3 + rundird<=0.2.0_1 scantailor<=0.9.12.1_2 seahorse-sharing<=3.8.0_4 seriespl<=2.3.5_2 diff --git a/srcpkgs/rundird/files/rundird/run b/srcpkgs/rundird/files/rundird/run deleted file mode 100644 index e4aae8c83b..0000000000 --- a/srcpkgs/rundird/files/rundird/run +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec rundird diff --git a/srcpkgs/rundird/template b/srcpkgs/rundird/template deleted file mode 100644 index 5ff897abd4..0000000000 --- a/srcpkgs/rundird/template +++ /dev/null @@ -1,17 +0,0 @@ -# Template file for 'rundird' -pkgname=rundird -version=0.2.0 -revision=1 -build_style=zig-build -makedepends="pam-devel" -short_desc="Simple daemon + PAM module providing an XDG_RUNTIME_DIR" -maintainer="Isaac Freund " -license="GPL-3.0-or-later" -homepage="https://github.com/ifreund/rundird" -distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=1dea207f39388e8c2c275b8a9aada0166d1f587a806f2e5e4486d98259e23e4c - -post_install() { - vsv rundird - vdoc README.md -} ```