diff options
author | Jan Beich <jbeich@FreeBSD.org> | 2020-12-26 00:24:15 +0000 |
---|---|---|
committer | Jan Beich <jbeich@FreeBSD.org> | 2020-12-26 00:24:15 +0000 |
commit | 8e727a5933ec2952204ce6a784ff118a9f9a1625 (patch) | |
tree | 65e3fc8cc68b412ccd21b8d2379ea722cf2cd2aa /x11-wm | |
parent | f0ee421e31601d3be307b26ec41049ce1f2350b7 (diff) | |
download | ports-8e727a5933ec2952204ce6a784ff118a9f9a1625.tar.gz ports-8e727a5933ec2952204ce6a784ff118a9f9a1625.zip |
x11-wm/river: update to s20201224
Notes
Notes:
svn path=/head/; revision=559266
Diffstat (limited to 'x11-wm')
-rw-r--r-- | x11-wm/river/Makefile | 8 | ||||
-rw-r--r-- | x11-wm/river/distinfo | 14 | ||||
-rw-r--r-- | x11-wm/river/files/patch-types | 40 |
3 files changed, 51 insertions, 11 deletions
diff --git a/x11-wm/river/Makefile b/x11-wm/river/Makefile index f8498a1784ed..bd9c751d1818 100644 --- a/x11-wm/river/Makefile +++ b/x11-wm/river/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= river -PORTVERSION= s20201221 +PORTVERSION= s20201224 CATEGORIES= x11-wm MAINTAINER= jbeich@FreeBSD.org @@ -22,11 +22,11 @@ USES= pkgconfig xorg USE_GITHUB= yes USE_XORG= pixman GH_ACCOUNT= ifreund -GH_TAGNAME= 386316b +GH_TAGNAME= 760c88b GH_TUPLE= ifreund:zig-pixman:7847fd1:zig_pixman/deps/zig-pixman \ - ifreund:zig-wayland:52326e7:zig_wayland/deps/zig-wayland \ + ifreund:zig-wayland:d693b37:zig_wayland/deps/zig-wayland \ ifreund:zig-xkbcommon:9e4d41f:zig_xkbcommon/deps/zig-xkbcommon \ - swaywm:zig-wlroots:16d9039:zig_wlroots/deps/zig-wlroots + swaywm:zig-wlroots:10ddf02:zig_wlroots/deps/zig-wlroots CONFIGURE_ARGS= --prefix "${STAGEDIR}${PREFIX}" \ ${WITH_DEBUG:U-Drelease-fast=true} \ --verbose diff --git a/x11-wm/river/distinfo b/x11-wm/river/distinfo index fec1ad4ce070..d399726d5b31 100644 --- a/x11-wm/river/distinfo +++ b/x11-wm/river/distinfo @@ -1,11 +1,11 @@ -TIMESTAMP = 1608563984 -SHA256 (ifreund-river-s20201221-386316b_GH0.tar.gz) = d727fb4f37d61ede280ee0e09376632eabd356242d79999b6fc63b41c436f361 -SIZE (ifreund-river-s20201221-386316b_GH0.tar.gz) = 90813 +TIMESTAMP = 1608811679 +SHA256 (ifreund-river-s20201224-760c88b_GH0.tar.gz) = d370cad167c296c26e4b28043178a7bd2abb263047bfa62f26e7ace37050b81b +SIZE (ifreund-river-s20201224-760c88b_GH0.tar.gz) = 91675 SHA256 (ifreund-zig-pixman-7847fd1_GH0.tar.gz) = d2f5eef6d8566565c25f0df08aac7d537f303f6ab2b7e7a2aca3a556df60053c SIZE (ifreund-zig-pixman-7847fd1_GH0.tar.gz) = 6548 -SHA256 (ifreund-zig-wayland-52326e7_GH0.tar.gz) = bed6192e9dcc2f72649eb3660885cd54130526e15d737a25768773e995d6f2b3 -SIZE (ifreund-zig-wayland-52326e7_GH0.tar.gz) = 52773 +SHA256 (ifreund-zig-wayland-d693b37_GH0.tar.gz) = 6ac9307869a9233ff56e75b3b2830dd4bb976ecf694839bb45ac6dd6d5a350cf +SIZE (ifreund-zig-wayland-d693b37_GH0.tar.gz) = 52809 SHA256 (ifreund-zig-xkbcommon-9e4d41f_GH0.tar.gz) = 3af5c9a448cf311d9cc819c8fd1dba114fbd7a4407f4174f95e4c82bb37f447b SIZE (ifreund-zig-xkbcommon-9e4d41f_GH0.tar.gz) = 19025 -SHA256 (swaywm-zig-wlroots-16d9039_GH0.tar.gz) = 8bc19d6653ae3ae8c7edfadbdbc6155649c8d1d875795680c47245b569123f8f -SIZE (swaywm-zig-wlroots-16d9039_GH0.tar.gz) = 31126 +SHA256 (swaywm-zig-wlroots-10ddf02_GH0.tar.gz) = bf3973b22108ffa69cd7e586625f5ba0bc84f5db77087c7bd75d7891b2005e07 +SIZE (swaywm-zig-wlroots-10ddf02_GH0.tar.gz) = 31799 diff --git a/x11-wm/river/files/patch-types b/x11-wm/river/files/patch-types new file mode 100644 index 000000000000..492149f3eab4 --- /dev/null +++ b/x11-wm/river/files/patch-types @@ -0,0 +1,40 @@ +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 2020-12-24 11:19:51 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, + signal: wl.Signal(*Session), + + /// Session.devices +--- 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, |