Date: Wed, 01 Apr 2026 15:21:51 +0000 From: Siva Mahadevan <siva@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: c986a6162ef5 - main - x11-wm/river: take maintainership and update to 0.4.2 Message-ID: <69cd380f.383f6.5a136eaa@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by siva: URL: https://cgit.FreeBSD.org/ports/commit/?id=c986a6162ef551c1d6f7a03b007ce22cb65fe1b2 commit c986a6162ef551c1d6f7a03b007ce22cb65fe1b2 Author: Siva Mahadevan <siva@FreeBSD.org> AuthorDate: 2026-03-18 03:33:53 +0000 Commit: Siva Mahadevan <siva@FreeBSD.org> CommitDate: 2026-04-01 15:21:36 +0000 x11-wm/river: take maintainership and update to 0.4.2 Notable changes: * Move MASTER_SITES to correct upstream https://codeberg.org/river/river * Switch to USES=zig for fetching, building, and installing * Move pkg-plist to dedicated file * Remove stale post-patch target * Change description and COMMENT to reflect new goal of the project Approved by: lwhsu (mentor, implicitly) Differential Revision: https://reviews.freebsd.org/D55906 --- x11-wm/river/Makefile | 54 ++++++++--------------------------------------- x11-wm/river/Makefile.zig | 6 ++++++ x11-wm/river/distinfo | 26 +++++++++++++---------- x11-wm/river/pkg-descr | 6 ++++-- x11-wm/river/pkg-message | 19 +++++++++++++++++ x11-wm/river/pkg-plist | 9 ++++++++ 6 files changed, 62 insertions(+), 58 deletions(-) diff --git a/x11-wm/river/Makefile b/x11-wm/river/Makefile index 9186df9bbbc7..339cd074c788 100644 --- a/x11-wm/river/Makefile +++ b/x11-wm/river/Makefile @@ -1,75 +1,39 @@ PORTNAME= river -DISTVERSIONPREFIX= v -DISTVERSION= 0.3.12 +DISTVERSION= 0.4.2 CATEGORIES= x11-wm wayland +MASTER_SITES= https://codeberg.org/river/river/releases/download/v${DISTVERSION}/ +DISTFILES= river-${DISTVERSIONFULL}${EXTRACT_SUFX} -MAINTAINER= ports@FreeBSD.org -COMMENT= Dynamic tiling Wayland compositor +MAINTAINER= siva@FreeBSD.org +COMMENT= Non-monolithic Wayland compositor WWW= https://isaacfreund.com/software/river/ LICENSE= GPLv3 -LICENSE_FILE= ${WRKSRC}/LICENSE +LICENSE_FILE= ${WRKSRC}/LICENSES/GPL-3.0-only.txt BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ wayland-protocols>0:graphics/wayland-protocols \ zig>=0.15.1:lang/zig LIB_DEPENDS= libevdev.so:devel/libevdev \ libwayland-server.so:graphics/wayland \ - libwlroots-0.19.so:x11-toolkits/wlroots019 \ + libwlroots-0.20.so:x11-toolkits/wlroots020 \ libinput.so:x11/libinput \ libxkbcommon.so:x11/libxkbcommon -USES= pkgconfig xorg -USE_GITHUB= yes -GH_ACCOUNT= riverwm -GH_TUPLE= ifreund:zig-pixman:v0.3.0:zig_pixman/../.cache/zig/p/pixman-0.3.0-LClMnz2VAAAs7QSCGwLimV5VUYx0JFnX5xWU6HwtMuDX \ - ifreund:zig-wayland:v0.4.0:zig_wayland/../.cache/zig/p/wayland-0.4.0-lQa1khbMAQAsLS2eBR7M5lofyEGPIbu2iFDmoz8lPC27 \ - ifreund:zig-xkbcommon:v0.3.0:zig_xkbcommon/../.cache/zig/p/xkbcommon-0.3.0-VDqIe3K9AQB2fG5ZeRcMC9i7kfrp5m2rWgLrmdNn9azr \ - swaywm:zig-wlroots:v0.19.3:zig_wlroots/../.cache/zig/p/wlroots-0.19.3-jmOlcuL_AwBHhLCwpFsXbTizE3q9BugFmGX-XIxqcPMc +USES= pkgconfig xorg zig USE_XORG= pixman -CONFIGURE_ARGS= --prefix "${PREFIX}" \ - ${WITH_DEBUG:D:U-Doptimize=ReleaseFast} \ - ${WITH_PIE:D-Dpie} \ - ${STRIP:C/.+/-Dstrip/} \ - -Dcpu=${CPUTYPE:Ubaseline} \ - --verbose -MAKE_ENV= DESTDIR="${STAGEDIR}" -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 +OPTIONS_SUB= yes 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}) diff --git a/x11-wm/river/Makefile.zig b/x11-wm/river/Makefile.zig new file mode 100644 index 000000000000..0994ecfb86b0 --- /dev/null +++ b/x11-wm/river/Makefile.zig @@ -0,0 +1,6 @@ +ZIG_TUPLE= pixman:codeberg.org/ifreund/zig-pixman/archive/v0.3.0.tar.gz?dummy=/pixman-0.3.0.tar.gz:pixman-0.3.0-LClMnz2VAAAs7QSCGwLimV5VUYx0JFnX5xWU6HwtMuDX \ + wayland:codeberg.org/ifreund/zig-wayland/archive/v0.4.0.tar.gz?dummy=/wayland-0.4.0.tar.gz:wayland-0.4.0-lQa1khbMAQAsLS2eBR7M5lofyEGPIbu2iFDmoz8lPC27 \ + wayland:codeberg.org/ifreund/zig-wayland/archive/v0.5.0.tar.gz?dummy=/wayland-0.5.0.tar.gz:wayland-0.5.0-lQa1knz8AQCh08NA8BeQrwJB9U3CfqcVAdHZYGRKIGuu \ + wlroots:codeberg.org/ifreund/zig-wlroots/archive/v0.20.0.tar.gz?dummy=/wlroots-0.20.0.tar.gz:wlroots-0.20.0-jmOlcmtCBADS6eoJ6mkeiSNZkibrhD-c5Qwn-LiM86r1 \ + xkbcommon:codeberg.org/ifreund/zig-xkbcommon/archive/v0.3.0.tar.gz?dummy=/xkbcommon-0.3.0.tar.gz:xkbcommon-0.3.0-VDqIe3K9AQB2fG5ZeRcMC9i7kfrp5m2rWgLrmdNn9azr \ + xkbcommon:codeberg.org/ifreund/zig-xkbcommon/archive/v0.4.0.tar.gz?dummy=/xkbcommon-0.4.0.tar.gz:xkbcommon-0.4.0-VDqIe0i2AgDRsok2GpMFYJ8SVhQS10_PI2M_CnHXsJJZ diff --git a/x11-wm/river/distinfo b/x11-wm/river/distinfo index 8c4ee585bcd9..bfe88e25371b 100644 --- a/x11-wm/river/distinfo +++ b/x11-wm/river/distinfo @@ -1,11 +1,15 @@ -TIMESTAMP = 1764665794 -SHA256 (riverwm-river-v0.3.12_GH0.tar.gz) = 4752d8585419f57b3e0edd2b9b270e85d3fa38d2ee2ff92835c8050324946f30 -SIZE (riverwm-river-v0.3.12_GH0.tar.gz) = 171041 -SHA256 (ifreund-zig-pixman-v0.3.0_GH0.tar.gz) = b09b4d733430d3341c9fa340b13b84da058068764b9239452b5161c015ac3b08 -SIZE (ifreund-zig-pixman-v0.3.0_GH0.tar.gz) = 7976 -SHA256 (ifreund-zig-wayland-v0.4.0_GH0.tar.gz) = a001733a3a2a71f64b9cd136b60219bd5d0e870e1974159ae9102951a31bd940 -SIZE (ifreund-zig-wayland-v0.4.0_GH0.tar.gz) = 111961 -SHA256 (ifreund-zig-xkbcommon-v0.3.0_GH0.tar.gz) = 492b670d9bddc596184b2ec46d06dbcafdfb9c4b6b6fa7ad9ba98a4d2f921d59 -SIZE (ifreund-zig-xkbcommon-v0.3.0_GH0.tar.gz) = 22520 -SHA256 (swaywm-zig-wlroots-v0.19.3_GH0.tar.gz) = 93c7e410dbfc3d3fe03ca3cc5e2599557eab963357016b9c8b2ca9d6fafb8214 -SIZE (swaywm-zig-wlroots-v0.19.3_GH0.tar.gz) = 59843 +TIMESTAMP = 1775052172 +SHA256 (zig/river-0.4.2.tar.gz) = f1878c2468ed607163d0b362f7d1056271f1729c38a8178c58f904c2c73ce2d3 +SIZE (zig/river-0.4.2.tar.gz) = 163548 +SHA256 (zig/pixman-0.3.0.tar.gz) = cd7fe3415d4d58685a94fdedd308e9994a37f012828940cfb603461de7f2c6ad +SIZE (zig/pixman-0.3.0.tar.gz) = 7966 +SHA256 (zig/wayland-0.4.0.tar.gz) = 907fdd18c7ede1ab1f249c618ba5dce3b8a72c26e50090b4ae7010033a419ba9 +SIZE (zig/wayland-0.4.0.tar.gz) = 111219 +SHA256 (zig/wayland-0.5.0.tar.gz) = fa9705e83613b5555d7117ce5c602f10591d6598e69a73fba2e6039200db4f4b +SIZE (zig/wayland-0.5.0.tar.gz) = 149548 +SHA256 (zig/wlroots-0.20.0.tar.gz) = 75af3510386c639582693d01788579abde4dca9ce1ae6703c1e877ec8123d106 +SIZE (zig/wlroots-0.20.0.tar.gz) = 63670 +SHA256 (zig/xkbcommon-0.3.0.tar.gz) = 1e185423e6b23ed9729614e66751ab7522db4487df4e0dcc7a2b06375aacda23 +SIZE (zig/xkbcommon-0.3.0.tar.gz) = 22730 +SHA256 (zig/xkbcommon-0.4.0.tar.gz) = e6df77d511cf9402f6ac08455c8d1fb727b6c3d66191e246671f62e5db083c49 +SIZE (zig/xkbcommon-0.4.0.tar.gz) = 25404 diff --git a/x11-wm/river/pkg-descr b/x11-wm/river/pkg-descr index 5b256de3c0de..e1218548de47 100644 --- a/x11-wm/river/pkg-descr +++ b/x11-wm/river/pkg-descr @@ -1,5 +1,7 @@ -River is a dynamic tiling Wayland compositor with flexible runtime -configuration. +River is a non-monolithic Wayland compositor. Unlike other Wayland compositors, +river does not combine the compositor and window manager into one program. +Instead, users can choose any window manager implementing the +river-window-management-v1 protocol. Note: river is currently early in development. Expect breaking changes and missing features. Bugs should however be rare at this point, if diff --git a/x11-wm/river/pkg-message b/x11-wm/river/pkg-message new file mode 100644 index 000000000000..008ab1f9d0dc --- /dev/null +++ b/x11-wm/river/pkg-message @@ -0,0 +1,19 @@ +[ +{ + type: upgrade + maximum_version: "0.4.0" + message: <<EOM +river 0.4.0+ is a breaking release and splits the compositor and window +manager into separate processes. The river compositor no longer includes +a window manager, instead users can choose any window manager implementing +the protocol. + +If you are happy with how river 0.3 works and do not want to change your +setup, please consider switching to x11-wm/river-classic, a maintained +fork of river 0.3. + +For more info, see https://isaacfreund.com/blog/river-window-management/ + +EOM +} +] diff --git a/x11-wm/river/pkg-plist b/x11-wm/river/pkg-plist new file mode 100644 index 000000000000..2229ebe09669 --- /dev/null +++ b/x11-wm/river/pkg-plist @@ -0,0 +1,9 @@ +bin/river +%%MANPAGES%%share/man/man1/river.1.gz +share/pkgconfig/river-protocols.pc +share/river-protocols/stable/river-input-management-v1.xml +share/river-protocols/stable/river-layer-shell-v1.xml +share/river-protocols/stable/river-libinput-config-v1.xml +share/river-protocols/stable/river-window-management-v1.xml +share/river-protocols/stable/river-xkb-bindings-v1.xml +share/river-protocols/stable/river-xkb-config-v1.xmlhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69cd380f.383f6.5a136eaa>