diff --git a/x11-wm/river/Makefile b/x11-wm/river/Makefile index 5c3e8a7a423f..5fbc0c364cfa 100644 --- a/x11-wm/river/Makefile +++ b/x11-wm/river/Makefile @@ -1,72 +1,72 @@ PORTNAME= river -PORTVERSION= s20210531 +PORTVERSION= s20210605 CATEGORIES= x11-wm MAINTAINER= jbeich@FreeBSD.org COMMENT= Dynamic tiling Wayland compositor LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= wayland-protocols>0:graphics/wayland-protocols \ wlroots>=0.13.0:x11-toolkits/wlroots \ - zig>=0.7.1:lang/zig + zig>=0.8.0:lang/zig LIB_DEPENDS= libevdev.so:devel/libevdev \ libwayland-server.so:graphics/wayland \ libwlroots.so:x11-toolkits/wlroots \ libxkbcommon.so:x11/libxkbcommon USES= pkgconfig xorg USE_GITHUB= yes USE_XORG= pixman GH_ACCOUNT= ifreund -GH_TAGNAME= ca4abd2 +GH_TAGNAME= 0e9dc08 GH_TUPLE= ifreund:zig-pixman:135f223:zig_pixman/deps/zig-pixman \ - ifreund:zig-wayland:a453b26:zig_wayland/deps/zig-wayland \ - ifreund:zig-xkbcommon:9e4d41f:zig_xkbcommon/deps/zig-xkbcommon \ - swaywm:zig-wlroots:6c62568:zig_wlroots/deps/zig-wlroots + ifreund:zig-wayland:a8e1efc:zig_wayland/deps/zig-wayland \ + ifreund:zig-xkbcommon:10cdca6:zig_xkbcommon/deps/zig-xkbcommon \ + swaywm:zig-wlroots:d6444e7:zig_wlroots/deps/zig-wlroots MAKE_ENV= DESTDIR="${STAGEDIR}" CONFIGURE_ARGS= --prefix "${PREFIX}" \ ${WITH_DEBUG:U-Drelease-fast=true} \ --verbose NO_INSTALL= yes # strip(1) breaks runtime PLIST_FILES= bin/${PORTNAME} \ bin/${PORTNAME}ctl \ bin/${PORTNAME}tile \ "@sample ${ETCDIR}/init.sample" \ share/bash-completion/completions/${PORTNAME}ctl \ share/fish/vendor_completions.d/${PORTNAME}ctl.fish \ share/zsh/site-functions/_${PORTNAME}ctl \ ${NULL} OPTIONS_DEFINE= MANPAGES X11 OPTIONS_DEFAULT=MANPAGES X11 MANPAGES_BUILD_DEPENDS= scdoc:textproc/scdoc MANPAGES_CONFIGURE_ON= -Dman-pages=true 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 \ ${NULL} X11_CONFIGURE_ON= -Dxwayland=true X11_CONFIGURE_OFF= -Dxwayland=false post-patch: # Respect PREFIX for system-wide config (a la sysconfdir in Meson) @${REINPLACE_CMD} -e 's,/etc,${PREFIX}&,' \ ${WRKSRC}/doc/${PORTNAME}.1.scd \ ${WRKSRC}/doc/${PORTNAME}ctl.1.scd do-build: @(cd ${WRKSRC} && ${MAKE_ENV} zig build ${CONFIGURE_ARGS}) do-test: @(cd ${WRKSRC} && ${TEST_ENV} zig build test ${CONFIGURE_ARGS}) post-install: # Let @sample handle default files under etc/ @${MV} ${STAGEDIR}${ETCDIR}/init ${STAGEDIR}${ETCDIR}/init.sample .include diff --git a/x11-wm/river/distinfo b/x11-wm/river/distinfo index e4345e53cafb..478201e5b638 100644 --- a/x11-wm/river/distinfo +++ b/x11-wm/river/distinfo @@ -1,11 +1,11 @@ -TIMESTAMP = 1622475999 -SHA256 (ifreund-river-s20210531-ca4abd2_GH0.tar.gz) = 152b7e6d9dae4a040af034df797c884735369958220b1cde8b23681e357b31c6 -SIZE (ifreund-river-s20210531-ca4abd2_GH0.tar.gz) = 108270 +TIMESTAMP = 1622921443 +SHA256 (ifreund-river-s20210605-0e9dc08_GH0.tar.gz) = 7c194632d94c319746f8f98e0b5efab60b04a9088b3ac1ba8c38d9433a33ff79 +SIZE (ifreund-river-s20210605-0e9dc08_GH0.tar.gz) = 108505 SHA256 (ifreund-zig-pixman-135f223_GH0.tar.gz) = a83a37ff55483f61db0d70f778ebb4cd149da5c427ab55c391478425f43f584d SIZE (ifreund-zig-pixman-135f223_GH0.tar.gz) = 7155 -SHA256 (ifreund-zig-wayland-a453b26_GH0.tar.gz) = 607d53b7d53ad86bfef3ada5d81a7d3a111bbc33f19a88af816ea8c982d1b643 -SIZE (ifreund-zig-wayland-a453b26_GH0.tar.gz) = 53438 -SHA256 (ifreund-zig-xkbcommon-9e4d41f_GH0.tar.gz) = 3af5c9a448cf311d9cc819c8fd1dba114fbd7a4407f4174f95e4c82bb37f447b -SIZE (ifreund-zig-xkbcommon-9e4d41f_GH0.tar.gz) = 19025 -SHA256 (swaywm-zig-wlroots-6c62568_GH0.tar.gz) = 85acd43b8cfdc448734ef1fc4f78e5114a16533bcebd32933e089eaf87444d6f -SIZE (swaywm-zig-wlroots-6c62568_GH0.tar.gz) = 33930 +SHA256 (ifreund-zig-wayland-a8e1efc_GH0.tar.gz) = 6320eb68e6cdf0f44720423c39db6dc831c64511b03ad9543654d284282f869e +SIZE (ifreund-zig-wayland-a8e1efc_GH0.tar.gz) = 53425 +SHA256 (ifreund-zig-xkbcommon-10cdca6_GH0.tar.gz) = 9fee1bef4d7886977578519a2f59ca8c9fdca135a2f98b84d4fbae52588415af +SIZE (ifreund-zig-xkbcommon-10cdca6_GH0.tar.gz) = 19027 +SHA256 (swaywm-zig-wlroots-d6444e7_GH0.tar.gz) = bce442065576fe8043cbbce9889431f51ef35418c770f5ec8aefa35cc2a3e184 +SIZE (swaywm-zig-wlroots-d6444e7_GH0.tar.gz) = 34579 diff --git a/x11-wm/river/files/patch-sigset b/x11-wm/river/files/patch-sigset deleted file mode 100644 index 317b7c999c0a..000000000000 --- a/x11-wm/river/files/patch-sigset +++ /dev/null @@ -1,31 +0,0 @@ -https://github.com/ziglang/zig/issues/5892 - -./river/main.zig:82:70: error: container 'std.os' has no member called 'empty_sigset' - if (std.os.system.sigprocmask(std.os.SIG_SETMASK, &std.os.empty_sigset, null) < 0) unreachable; - ^ -./river/command/spawn.zig:49:66: error: container 'std.os' has no member called 'empty_sigset' - if (std.os.system.sigprocmask(std.os.SIG_SETMASK, &std.os.empty_sigset, null) < 0) unreachable; - ^ - ---- river/command/spawn.zig.orig 2020-11-04 14:30:50 UTC -+++ river/command/spawn.zig -@@ -46,7 +46,7 @@ pub fn spawn( - if (pid == 0) { - // Clean things up for the child in an intermediate fork - if (c.setsid() < 0) unreachable; -- 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; - - 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 2021-04-21 14:51:53 UTC -+++ river/main.zig -@@ -146,7 +146,7 @@ pub fn main() anyerror!void { - const pid = try os.fork(); - if (pid == 0) { - 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); - } - util.gpa.free(cmd); diff --git a/x11-wm/river/files/patch-types b/x11-wm/river/files/patch-types deleted file mode 100644 index c4e442b08876..000000000000 --- a/x11-wm/river/files/patch-types +++ /dev/null @@ -1,40 +0,0 @@ -https://github.com/ziglang/zig/issues/7550 - -./deps/zig-wlroots/src/backend/session.zig:8:12: error: container 'std.os' has no member called 'dev_t' - dev: os.dev_t, - ^ -./deps/zig-wlroots/src/xwayland.zig:40:21: error: container 'std.os' has no member called 'time_t' - server_start: os.time_t, - ^ -./deps/zig-wlroots/src/xwayland.zig:70:5: note: while checking this field - server: *XwaylandServer, - ^ -./river/Server.zig:56:1: note: while checking this field -xwayland: if (build_options.xwayland) *wlr.Xwayland else void, -^ -./river/main.zig:116:26: note: referenced here - var server: Server = undefined; - ^ - ---- deps/zig-wlroots/src/backend/session.zig.orig 2021-04-07 22:14:45 UTC -+++ deps/zig-wlroots/src/backend/session.zig -@@ -5,7 +5,7 @@ const wl = wayland.server.wl; - - pub const Device = extern struct { - fd: c_int, -- dev: os.dev_t, -+ dev: u64, - /// Session.devices - link: wl.list.Link, - ---- deps/zig-wlroots/src/xwayland.zig.orig 2020-12-24 11:19:51 UTC -+++ deps/zig-wlroots/src/xwayland.zig -@@ -37,7 +37,7 @@ pub const XwaylandServer = extern struct { - wm_fd: [2]c_int, - wl_fd: [2]c_int, - -- server_start: os.time_t, -+ server_start: i64, - display: c_int, - display_name: [16]u8, - x_fd: [2]c_int,