Picking up this thread again ... what about this diff pulling in 0.8.1 plus a
pretty reasonable looking fix, and installing the manpage?
https://github.com/Supreeeme/xwayland-satellite/commit/a879e5e0896a326adc79c474bf457b8b99011027
On 4/17/26 8:37 PM, Lydia Sobot wrote:
On April 17, 2026 20:31:21 GMT+02:00, Volker Schlecht
<[email protected]> wrote:
lgtm - I'm wondering what's the benefit of adding the patches with the version
bump, though.
I'm not sure if this controls the exposed version in the binary or whatever,
so I just did as upstream did, especially because it was very confusing to me in
the build logs
Plus, it seems an 0.8.2 release with the right version (and not
much else) is imminent:
https://github.com/Supreeeme/xwayland-satellite/issues/418#issuecomment-4264329723
Didn't catch that one, honestly if 0.8.2 can make it for the release then that's
great, otherwise it may be better to just put this one in methinks
Index: Makefile
===================================================================
RCS file: /cvs/ports/wayland/xwayland-satellite/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile 5 Apr 2026 10:45:08 -0000 1.2
+++ Makefile 17 May 2026 21:02:16 -0000
@@ -1,17 +1,8 @@
COMMENT = rootless Xwayland integration for any Wayland compositor
-V = 0.8
-
-GH_ACCOUNT = Supreeeme
-GH_PROJECT = xwayland-satellite
-GH_TAGNAME = v${V}
-DISTNAME = ${GH_PROJECT}-${V}
-
-# Bundled dependencies
-SITES += ${SITES_GITHUB}
-DISTFILES = ${GH_DISTFILE}
-
-EXTRACT_SUFX = .tar.gz
+XWS_COMMIT = a879e5e0896a326adc79c474bf457b8b99011027
+DIST_TUPLE = github Supreeeme xwayland-satellite ${XWS_COMMIT} .
+PKGNAME = xwayland-satellite-0.8.1pl20260316
MODCARGO_NO_DEFAULT_FEATURES = Yes
MODCARGO_FEATURES =
@@ -34,6 +25,11 @@ WANTLIB += m xcb xcb-cursor
CONFIGURE_STYLE = cargo
MAKE_ENV += LIBCLANG_PATH=${LOCALBASE}/llvm${MODCLANG_VERSION}/lib
+
+post-install:
+ ${INSTALL_DATA_DIR} ${PREFIX}/man/man1
+ ${INSTALL_DATA} ${WRKSRC}/xwayland-satellite.man \
+ ${PREFIX}/man/man1/xwayland-satellite.1
.include "crates.inc"
.include <bsd.port.mk>
Index: crates.inc
===================================================================
RCS file: /cvs/ports/wayland/xwayland-satellite/crates.inc,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 crates.inc
--- crates.inc 18 Feb 2026 20:01:27 -0000 1.1.1.1
+++ crates.inc 17 May 2026 21:02:16 -0000
@@ -24,6 +24,7 @@ MODCARGO_CRATES += deranged 0.5.5 # MIT
MODCARGO_CRATES += derive_builder 0.20.2 # MIT OR Apache-2.0
MODCARGO_CRATES += derive_builder_core 0.20.2 # MIT OR Apache-2.0
MODCARGO_CRATES += derive_builder_macro 0.20.2 # MIT OR Apache-2.0
+MODCARGO_CRATES += dlib 0.5.2 # MIT
MODCARGO_CRATES += downcast-rs 1.2.1 # MIT/Apache-2.0
MODCARGO_CRATES += either 1.15.0 # MIT OR Apache-2.0
MODCARGO_CRATES += env_logger 0.10.2 # MIT OR Apache-2.0
@@ -34,6 +35,7 @@ MODCARGO_CRATES += find-msvc-tools 0.1.5
MODCARGO_CRATES += flate2 1.1.5 # MIT OR Apache-2.0
MODCARGO_CRATES += fnv 1.0.7 # Apache-2.0 / MIT
MODCARGO_CRATES += foldhash 0.1.5 # Zlib
+MODCARGO_CRATES += fontconfig 0.10.0 # MIT
MODCARGO_CRATES += fontdue 0.9.3 # MIT OR Apache-2.0 OR Zlib
MODCARGO_CRATES += glob 0.3.3 # MIT OR Apache-2.0
MODCARGO_CRATES += hashbrown 0.14.5 # MIT OR Apache-2.0
@@ -124,10 +126,11 @@ MODCARGO_CRATES += winapi-util 0.1.11 #
MODCARGO_CRATES += windows-link 0.2.1 # MIT OR Apache-2.0
MODCARGO_CRATES += windows-sys 0.61.2 # MIT OR Apache-2.0
MODCARGO_CRATES += winnow 0.7.14 # MIT
-MODCARGO_CRATES += xcb 1.6.0 # MIT
-MODCARGO_CRATES += xcb-util-cursor 0.3.5 # MIT/Apache-2.0
-MODCARGO_CRATES += xcb-util-cursor-sys 0.1.6 # MIT/Apache-2.0
+MODCARGO_CRATES += xcb 1.7.0 # MIT
+MODCARGO_CRATES += xcb-util-cursor 0.4.0 # MIT/Apache-2.0
+MODCARGO_CRATES += xcb-util-cursor-sys 0.2.0 # MIT/Apache-2.0
MODCARGO_CRATES += xcursor 0.3.10 # MIT
MODCARGO_CRATES += xkeysym 0.2.1 # MIT OR Apache-2.0 OR Zlib
+MODCARGO_CRATES += yeslogic-fontconfig-sys 6.0.0 # MIT
MODCARGO_CRATES += zerocopy 0.8.31 # BSD-2-Clause OR Apache-2.0 OR MIT
MODCARGO_CRATES += zerocopy-derive 0.8.31 # BSD-2-Clause OR Apache-2.0 OR MIT
Index: distinfo
===================================================================
RCS file: /cvs/ports/wayland/xwayland-satellite/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 18 Feb 2026 20:01:27 -0000 1.1.1.1
+++ distinfo 17 May 2026 21:02:16 -0000
@@ -1,3 +1,4 @@
+SHA256 (Supreeeme-xwayland-satellite-a879e5e0896a326adc79c474bf457b8b99011027.tar.gz) = Jkm5FUa6f8rBbQO6ROckZS3/TJc8rpX33TjmDsvWx6c=
SHA256 (cargo/ab_glyph-0.2.32.tar.gz) = AcBFdHLDjqW9HDta2l42gnHLVQvnpMpKC0Y06ZE/bMI=
SHA256 (cargo/ab_glyph_rasterizer-0.1.10.tar.gz) = Nm/7qkRC9GhNkeLNfF6nxO2K3UGVmjFEcGbieeQythg=
SHA256 (cargo/adler2-2.0.1.tar.gz) = MgEZV5/K2cIYhPXEhh0WF00OBiUGJSZvUP5omDQKvvo=
@@ -24,6 +25,7 @@ SHA256 (cargo/deranged-0.5.5.tar.gz) = 7
SHA256 (cargo/derive_builder-0.20.2.tar.gz) = UH37CeqLf6YY/PdulT9PXhklR5RYFtU1jt/+Ofb5SUc=
SHA256 (cargo/derive_builder_core-0.20.2.tar.gz) = LVvPewJNaDXPs9RziHzZZplJB+/76SJ+jIIZgk0GxOg=
SHA256 (cargo/derive_builder_macro-0.20.2.tar.gz) = q2Ow4r9NWSiv9y6Dp9rOhde7pf4S3MPFpXLXjK/9Pzw=
+SHA256 (cargo/dlib-0.5.2.tar.gz) = MwxgCB3MTHITH463BRDxrAciPl1BY9tIGgSgvvz/pBI=
SHA256 (cargo/downcast-rs-1.2.1.tar.gz) = dbMlxdvTf4A1lyGtOaylop+wTIknllfP/dqHNtDAudI=
SHA256 (cargo/either-1.15.0.tar.gz) = SMdXlIxe3g5GF3t63S5nFV9w4zwH/qgoTfZXbacLNxk=
SHA256 (cargo/env_logger-0.10.2.tar.gz) = TNQFqrFxy4XWc15cjZ2wOMF9PKAHpNLCXzN5NcPZBYA=
@@ -34,6 +36,7 @@ SHA256 (cargo/find-msvc-tools-0.1.5.tar.
SHA256 (cargo/flate2-1.1.5.tar.gz) = v+M+3Y6FoSpnRU43+Mdecwgw2D4xNVarnr+e5/vrO/s=
SHA256 (cargo/fnv-1.0.7.tar.gz) = P57skY0/JAad7LmvFVTK18iA4tokqa/YisoABTGrgsE=
SHA256 (cargo/foldhash-0.1.5.tar.gz) = 2cT12sXhXCTrmZwmGBpspAs5/pRsvkwmPHIJRnvIOvI=
+SHA256 (cargo/fontconfig-0.10.0.tar.gz) = sZxLyoxwXqI7+z40A6nmmTRNHuMgW2MfA/5Nvx5SQp8=
SHA256 (cargo/fontdue-0.9.3.tar.gz) = Llfhaz/o/0NkwGYf2qxUP7OLKeqbycL0VhLZCt+THSs=
SHA256 (cargo/glob-0.3.3.tar.gz) = DMIycPbhgI4wqSi9yE3qC5tBNqi8gjOFdPI7r0e70oA=
SHA256 (cargo/hashbrown-0.14.5.tar.gz) = 5SdEI+F7fJ/CC25+IIUy+bGYJdgt/WFXCLcO3YPfQfE=
@@ -124,14 +127,15 @@ SHA256 (cargo/winapi-util-0.1.11.tar.gz)
SHA256 (cargo/windows-link-0.2.1.tar.gz) = 8IBSIuV/dSHWpi42+pFjvIkazUIvlx3v6X1k5w0KT+U=
SHA256 (cargo/windows-sys-0.61.2.tar.gz) = rhNyKby9bN8Pe4CjHfYXZhRQd930lBanKLAss5If8/w=
SHA256 (cargo/winnow-0.7.14.tar.gz) = WlNk6dd/ze6qYGLO2SbuM4H6ou4C0+uDpcJ6iCVUCCk=
-SHA256 (cargo/xcb-1.6.0.tar.gz) = 8HwSO3lhOb/gYD5lTq8I4TLlI4e6lbJSx4utNkC6N+o=
-SHA256 (cargo/xcb-util-cursor-0.3.5.tar.gz) = v2QXxRofXtpJFWBhF1AhvTzPCnWbx8QCu+pqahrhQjk=
-SHA256 (cargo/xcb-util-cursor-sys-0.1.6.tar.gz) = THissTFkdofuYvnmTJiEV/I+y486B4o3oxL5ibMgy0c=
+SHA256 (cargo/xcb-1.7.0.tar.gz) = 7kxYDYIFq7Clz0636Se9Zk5CW2wyY/nFMQWD2paXDPY=
+SHA256 (cargo/xcb-util-cursor-0.4.0.tar.gz) = wlbRAnDmeJ677XUuwX/PmKBDY9yXqpt7kqsa86e8V0Q=
+SHA256 (cargo/xcb-util-cursor-sys-0.2.0.tar.gz) = g0b2ytXLazhkXFNDH/41vQY06BVPUp+p0/X3YsA8mLY=
SHA256 (cargo/xcursor-0.3.10.tar.gz) = vsnkpQDKiGTFtHuLSCpz1i5CN2cOW18da548rlDyjys=
SHA256 (cargo/xkeysym-0.2.1.tar.gz) = ucwAJRViooR1HJlzus52DYbAJ2xHG0vlaf5rBo7pelY=
+SHA256 (cargo/yeslogic-fontconfig-sys-6.0.0.tar.gz) = UDoGa0wDfEQBadmVuGkEaCfbxxJj9ujzvm131PMinb0=
SHA256 (cargo/zerocopy-0.8.31.tar.gz) = /XTsmLklCts8pVS93iaa32MVSfUdio+PChC1DxyymMM=
SHA256 (cargo/zerocopy-derive-0.8.31.tar.gz) = 2KjSCf30XPUTjLtaUG9rUlIqJa/MxTTRR12tjjEQXGo=
-SHA256 (xwayland-satellite-0.8.tar.gz) = yTuuL5499ctVEaZWhM1uz4VZwWYxY+ihm0iU5EJOc8M=
+SIZE (Supreeeme-xwayland-satellite-a879e5e0896a326adc79c474bf457b8b99011027.tar.gz) = 214954
SIZE (cargo/ab_glyph-0.2.32.tar.gz) = 20967
SIZE (cargo/ab_glyph_rasterizer-0.1.10.tar.gz) = 11206
SIZE (cargo/adler2-2.0.1.tar.gz) = 13366
@@ -158,6 +162,7 @@ SIZE (cargo/deranged-0.5.5.tar.gz) = 244
SIZE (cargo/derive_builder-0.20.2.tar.gz) = 36661
SIZE (cargo/derive_builder_core-0.20.2.tar.gz) = 31397
SIZE (cargo/derive_builder_macro-0.20.2.tar.gz) = 6360
+SIZE (cargo/dlib-0.5.2.tar.gz) = 5806
SIZE (cargo/downcast-rs-1.2.1.tar.gz) = 11821
SIZE (cargo/either-1.15.0.tar.gz) = 20114
SIZE (cargo/env_logger-0.10.2.tar.gz) = 36402
@@ -168,6 +173,7 @@ SIZE (cargo/find-msvc-tools-0.1.5.tar.gz
SIZE (cargo/flate2-1.1.5.tar.gz) = 77015
SIZE (cargo/fnv-1.0.7.tar.gz) = 11266
SIZE (cargo/foldhash-0.1.5.tar.gz) = 21901
+SIZE (cargo/fontconfig-0.10.0.tar.gz) = 9891
SIZE (cargo/fontdue-0.9.3.tar.gz) = 141337
SIZE (cargo/glob-0.3.3.tar.gz) = 22861
SIZE (cargo/hashbrown-0.14.5.tar.gz) = 141498
@@ -258,11 +264,11 @@ SIZE (cargo/winapi-util-0.1.11.tar.gz) =
SIZE (cargo/windows-link-0.2.1.tar.gz) = 6133
SIZE (cargo/windows-sys-0.61.2.tar.gz) = 2517186
SIZE (cargo/winnow-0.7.14.tar.gz) = 184718
-SIZE (cargo/xcb-1.6.0.tar.gz) = 210819
-SIZE (cargo/xcb-util-cursor-0.3.5.tar.gz) = 12096
-SIZE (cargo/xcb-util-cursor-sys-0.1.6.tar.gz) = 8729
+SIZE (cargo/xcb-1.7.0.tar.gz) = 216164
+SIZE (cargo/xcb-util-cursor-0.4.0.tar.gz) = 12102
+SIZE (cargo/xcb-util-cursor-sys-0.2.0.tar.gz) = 8730
SIZE (cargo/xcursor-0.3.10.tar.gz) = 7768
SIZE (cargo/xkeysym-0.2.1.tar.gz) = 103129
+SIZE (cargo/yeslogic-fontconfig-sys-6.0.0.tar.gz) = 6677
SIZE (cargo/zerocopy-0.8.31.tar.gz) = 257633
SIZE (cargo/zerocopy-derive-0.8.31.tar.gz) = 90835
-SIZE (xwayland-satellite-0.8.tar.gz) = 206817
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/wayland/xwayland-satellite/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 18 Feb 2026 20:01:27 -0000 1.1.1.1
+++ pkg/PLIST 17 May 2026 21:02:16 -0000
@@ -1 +1,2 @@
@bin bin/xwayland-satellite
+@man man/man1/xwayland-satellite.1
