diff --git a/x11-wm/river/Makefile b/x11-wm/river/Makefile index 5ba4c5e55a9e..98db90ce4ba2 100644 --- a/x11-wm/river/Makefile +++ b/x11-wm/river/Makefile @@ -1,79 +1,79 @@ PORTNAME= river DISTVERSIONPREFIX= v DISTVERSION= 0.1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= 0cbe2b9fc34f.patch:-p1 # docs: remove reference to /etc/river/init +PATCHFILES+= 2e22741bc78b.patch:-p1 # wlroots 0.15 +PATCHFILES+= c9d9b5cdb197.patch:-p1 # wlroots 0.15 MAINTAINER= jbeich@FreeBSD.org COMMENT= Dynamic tiling Wayland compositor LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN= fails to build with wlroots 0.15: outdated Zig bindings - BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ wayland-protocols>0:graphics/wayland-protocols \ - wlroots>=0.14.0:x11-toolkits/wlroots \ + wlroots>=0.15.0:x11-toolkits/wlroots \ zig>=0.8.0:lang/zig LIB_DEPENDS= libevdev.so:devel/libevdev \ libwayland-server.so:graphics/wayland \ libwlroots.so:x11-toolkits/wlroots \ libinput.so:x11/libinput \ libxkbcommon.so:x11/libxkbcommon USES= pkgconfig xorg USE_GITHUB= yes USE_XORG= pixman GH_ACCOUNT= riverwm GH_TUPLE= ifreund:zig-pixman:88520f2:zig_pixman/deps/zig-pixman \ ifreund:zig-wayland:a8e1efc:zig_wayland/deps/zig-wayland \ ifreund:zig-xkbcommon:10cdca6:zig_xkbcommon/deps/zig-xkbcommon \ - swaywm:zig-wlroots:9bb6b03:zig_wlroots/deps/zig-wlroots + swaywm:zig-wlroots:a813d6c: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 \ libdata/pkgconfig/${PORTNAME}-protocols.pc \ share/${PORTNAME}-protocols/${PORTNAME}-layout-v3.xml \ 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 devel/pkgconf default search @${REINPLACE_CMD} -e '/pkgconfig/s/share/libdata/' \ ${WRKSRC}/build.zig # Respect PREFIX in path references @${REINPLACE_CMD} -e 's,/usr,${LOCALBASE},' \ ${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}) .include diff --git a/x11-wm/river/distinfo b/x11-wm/river/distinfo index a4040ac134bc..a35112e7088d 100644 --- a/x11-wm/river/distinfo +++ b/x11-wm/river/distinfo @@ -1,13 +1,17 @@ TIMESTAMP = 1635894091 SHA256 (riverwm-river-v0.1.0_GH0.tar.gz) = 03d0e90978663652daed5d80521c879af745e2663b1a9bc38d08f1c37c58ac6c SIZE (riverwm-river-v0.1.0_GH0.tar.gz) = 120978 SHA256 (ifreund-zig-pixman-88520f2_GH0.tar.gz) = 8c5538c3f150870c8c898578365c3c909b0b1a7170d61b728eaf47b973338be3 SIZE (ifreund-zig-pixman-88520f2_GH0.tar.gz) = 7158 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-9bb6b03_GH0.tar.gz) = 504f888b75a54f79a7d677ca9d95ffb791369fa9326108e1307dc77c6c7df66e -SIZE (swaywm-zig-wlroots-9bb6b03_GH0.tar.gz) = 46084 +SHA256 (swaywm-zig-wlroots-a813d6c_GH0.tar.gz) = 8359ba9118947ca561c7f6cc5e249d120e95de1f84b5b3e4cf8617b493e1ba9d +SIZE (swaywm-zig-wlroots-a813d6c_GH0.tar.gz) = 45509 SHA256 (0cbe2b9fc34f.patch) = 64b283e1033f3d320a411b6ac4994aa953747167b76f59ed8899a517f82378d4 SIZE (0cbe2b9fc34f.patch) = 985 +SHA256 (2e22741bc78b.patch) = 7f9460bded3435e3698e862bb075774eaab7549faf81339375b676441b53c1fb +SIZE (2e22741bc78b.patch) = 23950 +SHA256 (c9d9b5cdb197.patch) = f78d4734a55c0ef72ddb7e083a5d8bbcfd15a2903d6b34da139a47513d8c73b7 +SIZE (c9d9b5cdb197.patch) = 4160