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 deleted file mode 100644 index ecc68302db0..00000000000 --- a/srcpkgs/river/patches/0001-Enable-PIE-for-river-riverctl-rivertile.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 759c1c7a915083f3da46960ff82fa2a3566a7065 Mon Sep 17 00:00:00 2001 -From: Isaac Freund -Date: Wed, 3 Nov 2021 14:21:35 +0100 -Subject: [PATCH] Enable PIE for river, riverctl, rivertile - -There is sadly not yet a standard way to do this exposed by the zig -build system. See: https://github.com/ziglang/zig/issues/7201 ---- - build.zig | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/build.zig b/build.zig -index d561f49..8ac9a4e 100644 ---- a/build.zig -+++ b/build.zig -@@ -85,6 +85,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); - -@@ -97,6 +98,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.step.dependOn(&scanner.step); -@@ -114,6 +116,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.step.dependOn(&scanner.step); --- -2.33.1 - diff --git a/srcpkgs/river/template b/srcpkgs/river/template index 3906858d507..431aa4bd8e8 100644 --- a/srcpkgs/river/template +++ b/srcpkgs/river/template @@ -1,18 +1,18 @@ # Template file for 'river' pkgname=river -version=0.1.1 -revision=2 +version=0.2.3 +revision=1 build_style=zig-build -configure_args="$(vopt_if xwayland -Dxwayland)" +configure_args="$(vopt_if xwayland -Dxwayland) -Dpie" hostmakedepends="pkg-config wayland-devel scdoc" -makedepends="wlroots0.15-devel libevdev-devel" +makedepends="wlroots-devel libevdev-devel" depends="$(vopt_if xwayland xorg-server-xwayland)" short_desc="Dynamic tiling Wayland compositor" 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=7acdd2b929e16a20006b4baf1f29e7a8dc7f70cf5747e1503a610a90d1637132 build_options="xwayland" build_options_default="xwayland"