diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2021-04-21 14:51:53 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2021-04-22 01:00:02 +0000 |
| commit | 427c5836171d765e3a76da2f718d5b5d604b6abe (patch) | |
| tree | a1e5bd0537a7244152489ebc0bacaf4b05ccbd5e | |
| parent | 85a65c9557ca41cc459b7488eb161e6a91335e68 (diff) | |
| download | ports-427c5836171d765e3a76da2f718d5b5d604b6abe.tar.gz ports-427c5836171d765e3a76da2f718d5b5d604b6abe.zip | |
x11-wm/river: update to s20210421
| -rw-r--r-- | x11-wm/river/Makefile | 8 | ||||
| -rw-r--r-- | x11-wm/river/distinfo | 10 | ||||
| -rw-r--r-- | x11-wm/river/files/patch-sigset | 16 |
3 files changed, 17 insertions, 17 deletions
diff --git a/x11-wm/river/Makefile b/x11-wm/river/Makefile index c80b8fb9bb87..1080df96aa1b 100644 --- a/x11-wm/river/Makefile +++ b/x11-wm/river/Makefile @@ -1,5 +1,5 @@ PORTNAME= river -PORTVERSION= s20210407 +PORTVERSION= s20210421 CATEGORIES= x11-wm MAINTAINER= jbeich@FreeBSD.org @@ -20,8 +20,8 @@ USES= pkgconfig xorg USE_GITHUB= yes USE_XORG= pixman GH_ACCOUNT= ifreund -GH_TAGNAME= 9e3e920 -GH_TUPLE= ifreund:zig-pixman:7847fd1:zig_pixman/deps/zig-pixman \ +GH_TAGNAME= 891eb38 +GH_TUPLE= ifreund:zig-pixman:f8e682a:zig_pixman/deps/zig-pixman \ ifreund:zig-wayland:f170fe0:zig_wayland/deps/zig-wayland \ ifreund:zig-xkbcommon:9e4d41f:zig_xkbcommon/deps/zig-xkbcommon \ swaywm:zig-wlroots:6c62568:zig_wlroots/deps/zig-wlroots @@ -48,7 +48,7 @@ MANPAGES_CONFIGURE_OFF= -Dman-pages=false MANPAGES_PLIST_FILES= share/man/man1/${PORTNAME}.1.gz \ share/man/man1/${PORTNAME}ctl.1.gz \ share/man/man1/${PORTNAME}tile.1.gz \ - share/man/man7/${PORTNAME}-layouts.7.gz + ${NULL} X11_CONFIGURE_ON= -Dxwayland=true X11_CONFIGURE_OFF= -Dxwayland=false diff --git a/x11-wm/river/distinfo b/x11-wm/river/distinfo index be75703bfe7b..fd54ab68485c 100644 --- a/x11-wm/river/distinfo +++ b/x11-wm/river/distinfo @@ -1,8 +1,8 @@ -TIMESTAMP = 1617834077 -SHA256 (ifreund-river-s20210407-9e3e920_GH0.tar.gz) = a502b32b50bb0a957500b70685a1a0487f857acadcf14b6fc1d0d78735cb4647 -SIZE (ifreund-river-s20210407-9e3e920_GH0.tar.gz) = 105558 -SHA256 (ifreund-zig-pixman-7847fd1_GH0.tar.gz) = d2f5eef6d8566565c25f0df08aac7d537f303f6ab2b7e7a2aca3a556df60053c -SIZE (ifreund-zig-pixman-7847fd1_GH0.tar.gz) = 6548 +TIMESTAMP = 1619016713 +SHA256 (ifreund-river-s20210421-891eb38_GH0.tar.gz) = 8371f8cdd181225074401b2de1774a116d8a42fa7d044ed43ea2bd805d8452b4 +SIZE (ifreund-river-s20210421-891eb38_GH0.tar.gz) = 114435 +SHA256 (ifreund-zig-pixman-f8e682a_GH0.tar.gz) = 1e040e7652861d7064e2997f5f6397483dca87261621318c9a06d7701bae67aa +SIZE (ifreund-zig-pixman-f8e682a_GH0.tar.gz) = 7052 SHA256 (ifreund-zig-wayland-f170fe0_GH0.tar.gz) = 5ab51c15c56921a1e1269da469bbbd2ac5d8b9bb01e09b9db9409d06a76d5014 SIZE (ifreund-zig-wayland-f170fe0_GH0.tar.gz) = 52945 SHA256 (ifreund-zig-xkbcommon-9e4d41f_GH0.tar.gz) = 3af5c9a448cf311d9cc819c8fd1dba114fbd7a4407f4174f95e4c82bb37f447b diff --git a/x11-wm/river/files/patch-sigset b/x11-wm/river/files/patch-sigset index dc0fa5a7baaa..317b7c999c0a 100644 --- a/x11-wm/river/files/patch-sigset +++ b/x11-wm/river/files/patch-sigset @@ -18,14 +18,14 @@ https://github.com/ziglang/zig/issues/5892 const pid2 = std.os.fork() catch c._exit(1); if (pid2 == 0) std.os.execveZ("/bin/sh", &child_args, std.c.environ) catch c._exit(1); ---- river/main.zig.orig 2020-11-04 14:30:50 UTC +--- river/main.zig.orig 2021-04-21 14:51:53 UTC +++ river/main.zig -@@ -79,7 +79,7 @@ pub fn main() anyerror!void { - const child_args = [_:null]?[*:0]const u8{ "/bin/sh", "-c", cmd, null }; - const pid = try std.os.fork(); +@@ -146,7 +146,7 @@ pub fn main() anyerror!void { + const pid = try os.fork(); if (pid == 0) { -- if (std.os.system.sigprocmask(std.os.SIG_SETMASK, &std.os.empty_sigset, null) < 0) unreachable; -+ if (std.os.system.sigprocmask(std.os.SIG_SETMASK, &std.os.sigset_t{ .__bits = [_]u32{0} ** std.os._SIG_WORDS }, null) < 0) unreachable; - std.os.execveZ("/bin/sh", &child_args, std.c.environ) catch c._exit(1); + if (c.setsid() < 0) unreachable; +- if (os.system.sigprocmask(os.SIG_SETMASK, &os.empty_sigset, null) < 0) unreachable; ++ if (os.system.sigprocmask(os.SIG_SETMASK, &os.sigset_t{ .__bits = [_]u32{0} ** std.os._SIG_WORDS }, null) < 0) unreachable; + os.execveZ("/bin/sh", &child_args, std.c.environ) catch c._exit(1); } - break :blk pid; + util.gpa.free(cmd); |