På torsdag 4. juni 2026 kl. 11:14, skrev Volker Schlecht <[email protected]>:
> On 6/4/26 10:56 AM, Robert Lillack wrote: > > Am Do, 4. Jun 2026, um 10:41, schrieb [email protected]: > > > >> portswise i had a quick look, the only thing im unsure about is > >> > >> +@conflict wlroots->=0.19,<0.20 > >> +@conflict wlroots->=0.19v0,<0.20v0 > >> > >> why both ? > > > > Probably a simple oversight? In my diff there's only the > > wlroots->=0.19v0,<0.20v0 version. > > In truth I simply wasn't too certain about that. I remember that for > lang/erlang > both were needed, though. > > Missing a Makefile with: SUBDIR = SUBDIR += 0.19 SUBDIR += 0.20 .include <bsd.port.subdir.mk> Or else the wlroots subpackages are not linked I think? Using this command from the sqlports package: $ show-reverse-deps wayland/wlroots ╭──────────────────────────╮ │ FullPkgPath │ ╞══════════════════════════╡ │ wayland/cage │ │ wayland/cagebreak │ │ wayland/greetd │ │ wayland/gtkgreet │ │ wayland/labwc │ │ wayland/mango │ │ wayland/regreet │ │ wayland/scenefx │ │ wayland/sway │ │ wayland/wayback │ │ wayland/wayfire │ │ wayland/wcm │ │ wayland/wf-shell │ │ x11/lxqt/wayland-session │ ╰──────────────────────────╯ Am building and giving a quick test. Did this for packages laying around: TRUSTED_PKG_PATH=/usr/ports/packages/amd64/all/ pkg_add -Dsnap wlroots-0.19.3v0 wlroots-0.20.1v0 cage-0.3.0 labwc-0.20.0 river-0.4.5 sway-1.12 greetd-0.10.3p6 gtkgreet-0.8 regreet-0.2.0 wlroots-0.19.3v0: ok wlroots-0.20.1v0: ok Can't install cage-0.3.0 because of libraries |library wlroots-0.20.0.0 not found | /usr/local/lib/libwlroots-0.20.so.0.0 (wlroots-0.20.1v0): not reachable Direct dependencies for cage-0.3.0 resolve to wlroots-0.19.3v0 Full dependency tree is libxkbcommon-1.13.2 libxml-2.15.3 epoll-shim-0.0.20240608 vulkan-loader-1.4.341.0 bzip2-1.0.8p0 jpeg-3.1.4.1v0 tiff-4.7.1p2 libudev-openbsd-20230921p0 libei-1.6.0 gettext-runtime-1.0 vulkan-headers-1.4.341.0 xwayland-24.1.11 wayland-1.25.0 lcms2-2.18pl20260420 wlroots-0.19.3v0 lerc-4.1.0 python-3.14.4p1 glib2-2.88.1 libinput-openbsd-1.30.2p1 libiconv-1.19 libffi-3.5.2p0 libliftoff-0.5.0 pcre2-10.47 xcb-util-errors-1.0.1p2 libdisplay-info-0.3.0 desktop-file-utils-0.28p0 lz4-1.10.0 zstd-1.5.7p0 py3-packaging-26.2 seatd-0.9.3p0 sqlite3-3.53.1p0 xz-5.8.3 Can't install labwc-0.20.0 because of libraries Direct dependencies for labwc-0.20.0 resolve to librsvg-2.62.2v0 libxkbcommon-1.13.2 swaylock-1.8.5 gtk4-update-icon-cache-4.22.4 havoc-0.7.0 libsfdo-0.1.3 swayidle-1.9.0 wayland-1.25.0 wlroots-0.19.3v0 swaybg-1.2.2 Full dependency tree is librsvg-2.62.2v0 wayland-1.25.0 wlroots-0.19.3v0 libxkbcommon-1.13.2 libxml-2.15.3 vulkan-loader-1.4.341.0 swaybg-1.2.2 libsfdo-0.1.3 gettext-runtime-1.0 cairo-1.18.4 py3-packaging-26.2 seatd-0.9.3p0 shared-mime-info-2.4p1 hicolor-icon-theme-0.18 xz-5.8.3 pango-1.57.1 gtk4-update-icon-cache-4.22.4 libinput-openbsd-1.30.2p1 libiconv-1.19 glew-2.3.1 libffi-3.5.2p0 desktop-file-utils-0.28p0 libdisplay-info-0.3.0 lz4-1.10.0 xcb-util-errors-1.0.1p2 fribidi-1.0.16p0 vulkan-headers-1.4.341.0 swaylock-1.8.5 xwayland-24.1.11 lcms2-2.18pl20260420 harfbuzz-14.2.0 glib2-2.88.1 python-3.14.4p1 lerc-4.1.0 glfw-3.4p2 epoll-shim-0.0.20240608 graphite2-1.3.14 libudev-openbsd-20230921p0 libei-1.6.0 bzip2-1.0.8p0 tiff-4.7.1p2 jpeg-3.1.4.1v0 gdk-pixbuf-2.44.6 png-1.6.58 sqlite3-3.53.1p0 dav1d-1.5.3 libliftoff-0.5.0 swayidle-1.9.0 pcre2-10.47 havoc-0.7.0 zstd-1.5.7p0 lzo2-2.10p2 Can't install river-0.4.5 because of libraries Direct dependencies for river-0.4.5 resolve to libxkbcommon-1.13.2 libinput-openbsd-1.30.2p1 wayland-1.25.0 libevdev-openbsd-20231111p0 wlroots-0.19.3v0 Full dependency tree is libinput-openbsd-1.30.2p1 libliftoff-0.5.0 libiconv-1.19 libffi-3.5.2p0 desktop-file-utils-0.28p0 libdisplay-info-0.3.0 lz4-1.10.0 pcre2-10.47 xcb-util-errors-1.0.1p2 zstd-1.5.7p0 py3-packaging-26.2 libevdev-openbsd-20231111p0 seatd-0.9.3p0 sqlite3-3.53.1p0 xz-5.8.3 libxkbcommon-1.13.2 libxml-2.15.3 epoll-shim-0.0.20240608 vulkan-loader-1.4.341.0 libudev-openbsd-20230921p0 gettext-runtime-1.0 libei-1.6.0 bzip2-1.0.8p0 jpeg-3.1.4.1v0 tiff-4.7.1p2 vulkan-headers-1.4.341.0 xwayland-24.1.11 lcms2-2.18pl20260420 wayland-1.25.0 wlroots-0.19.3v0 glib2-2.88.1 lerc-4.1.0 python-3.14.4p1 Can't install sway-1.12 because of libraries Direct dependencies for sway-1.12 resolve to gdk-pixbuf-2.44.6 wmenu-0.2.0 wayland-1.25.0 wlroots-0.19.3v0 libevdev-openbsd-20231111p0 libinput-openbsd-1.30.2p1 libxkbcommon-1.13.2 pango-1.57.1 json-c-0.18 pcre2-10.47 swaybg-1.2.2 Full dependency tree is swaybg-1.2.2 vulkan-loader-1.4.341.0 gettext-runtime-1.0 json-c-0.18 libxkbcommon-1.13.2 libxml-2.15.3 wayland-1.25.0 wlroots-0.19.3v0 libdisplay-info-0.3.0 desktop-file-utils-0.28p0 lz4-1.10.0 xcb-util-errors-1.0.1p2 fribidi-1.0.16p0 pango-1.57.1 libinput-openbsd-1.30.2p1 glew-2.3.1 libiconv-1.19 libffi-3.5.2p0 seatd-0.9.3p0 libevdev-openbsd-20231111p0 shared-mime-info-2.4p1 xz-5.8.3 cairo-1.18.4 py3-packaging-26.2 libudev-openbsd-20230921p0 libei-1.6.0 bzip2-1.0.8p0 tiff-4.7.1p2 jpeg-3.1.4.1v0 glfw-3.4p2 epoll-shim-0.0.20240608 graphite2-1.3.14 lcms2-2.18pl20260420 harfbuzz-14.2.0 glib2-2.88.1 python-3.14.4p1 lerc-4.1.0 vulkan-headers-1.4.341.0 wmenu-0.2.0 xwayland-24.1.11 pcre2-10.47 zstd-1.5.7p0 lzo2-2.10p2 libliftoff-0.5.0 sqlite3-3.53.1p0 gdk-pixbuf-2.44.6 png-1.6.58 Can't install cage-0.3.0 because of libraries Direct dependencies for cage-0.3.0 resolve to wlroots-0.19.3v0 Full dependency tree is py3-packaging-26.2 sqlite3-3.53.1p0 seatd-0.9.3p0 xz-5.8.3 libinput-openbsd-1.30.2p1 libffi-3.5.2p0 libiconv-1.19 libliftoff-0.5.0 xcb-util-errors-1.0.1p2 pcre2-10.47 lz4-1.10.0 desktop-file-utils-0.28p0 libdisplay-info-0.3.0 zstd-1.5.7p0 vulkan-headers-1.4.341.0 xwayland-24.1.11 wlroots-0.19.3v0 wayland-1.25.0 lcms2-2.18pl20260420 python-3.14.4p1 lerc-4.1.0 glib2-2.88.1 libxkbcommon-1.13.2 epoll-shim-0.0.20240608 libxml-2.15.3 vulkan-loader-1.4.341.0 jpeg-3.1.4.1v0 tiff-4.7.1p2 bzip2-1.0.8p0 gettext-runtime-1.0 libei-1.6.0 libudev-openbsd-20230921p0 Can't install greetd-0.10.3p6: can't resolve cage-0.3.0 Can't install greetd-0.10.3p6: can't resolve cage-0.3.0 Can't install gtkgreet-0.8: can't resolve greetd-0.10.3p6 Can't install regreet-0.2.0: can't resolve greetd-0.10.3p6 Couldn't install cage-0.3.0 greetd-0.10.3p6 gtkgreet-0.8 labwc-0.20.0 regreet-0.2.0 river-0.4.5 sway-1.12 -- May I ask someone to write a quirks upgrade path for wlroots --> wlroots/0.19 please? If that is indeed the correct path. Wlroots 0.20 was missing stuff in the PLIST. A 'make update-plist' fixed that and allowed the 0.20 dependent packages build. Otherwise: [84/173] cc -Ilabwc.p -I. -I../labwc-0.20.0 -Iinclude -I../labwc-0.20.0/include -I/usr/local/include -I/usr/local/include/libepoll-shim -I/usr/local/include/wlroots-0.20 -I/usr/X11R6/include/pixman-1 -I/usr/X11R6/include -I/usr/X11R6/include/libdrm -I/usr/local/include/libxml2 -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include -I/usr/local/include/cairo -I/usr/local/include/libpng16 -I/usr/X11R6/include/freetype2 -I/usr/local/include/pango-1.0 -I/usr/local/include/fribidi -I/usr/local/include/harfbuzz -I/usr/local/include/librsvg-2.0 -I/usr/local/include/gdk-pixbuf-2.0 -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=c11 -DWLR_USE_UNSTABLE -Wundef -Wmissing-include-dirs -Wold-style-definition -Wpointer-arith -Winit-self -Wstrict-prototypes -Wendif-labels -Wstrict-aliasing=2 -Woverflow -Wmissing-prototypes -Walloca -Wunused-macros -Wshadow -Wno-unused-parameter -Wno-expansion-to-defined '-DLABWC_VERSION="0.20.0"' '-DGETTEXT_PACKAGE="labwc"' '-DLOCALEDIR="/usr/local/share/locale"' -O2 -pipe -g -pthread -MD -MQ labwc.p/src_output.c.o -MF labwc.p/src_output.c.o.d -o labwc.p/src_output.c.o -c ../labwc-0.20.0/src/output.c FAILED: labwc.p/src_output.c.o cc -Ilabwc.p -I. -I../labwc-0.20.0 -Iinclude -I../labwc-0.20.0/include -I/usr/local/include -I/usr/local/include/libepoll-shim -I/usr/local/include/wlroots-0.20 -I/usr/X11R6/include/pixman-1 -I/usr/X11R6/include -I/usr/X11R6/include/libdrm -I/usr/local/include/libxml2 -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include -I/usr/local/include/cairo -I/usr/local/include/libpng16 -I/usr/X11R6/include/freetype2 -I/usr/local/include/pango-1.0 -I/usr/local/include/fribidi -I/usr/local/include/harfbuzz -I/usr/local/include/librsvg-2.0 -I/usr/local/include/gdk-pixbuf-2.0 -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=c11 -DWLR_USE_UNSTABLE -Wundef -Wmissing-include-dirs -Wold-style-definition -Wpointer-arith -Winit-self -Wstrict-prototypes -Wendif-labels -Wstrict-aliasing=2 -Woverflow -Wmissing-prototypes -Walloca -Wunused-macros -Wshadow -Wno-unused-parameter -Wno-expansion-to-defined '-DLABWC_VERSION="0.20.0"' '-DGETTEXT_PACKAGE="labwc"' '-DLOCALEDIR="/usr/local/share/locale"' -O2 -pipe -g -pthread -MD -MQ labwc.p/src_output.c.o -MF labwc.p/src_output.c.o.d -o labwc.p/src_output.c.o -c ../labwc-0.20.0/src/output.c ../labwc-0.20.0/src/output.c:18:10: fatal error: 'wlr/types/wlr_ext_workspace_v1.h' file not found 18 | #include <wlr/types/wlr_ext_workspace_v1.h> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 1 error generated. ninja: build stopped: subcommand failed. *** Error 1 in . (/usr/ports/devel/meson/meson.port.mk:67 'do-build') *** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:3075 '/usr/ports/pobj/labwc-0.20.0/build-amd64/.build_done': @cd /usr/ports/wayla...) *** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2722 'build': @lock=labwc-0.20.0; export _LOCKS_HELD=" labwc-0.20.0"; doas -u _...) *** Error 2 in /usr/ports/wayland/labwc (/usr/ports/infrastructure/mk/bsd.port.mk:3786 'rebuild': @cd /usr/ports/wayland/labwc && PKGPATH=wa...) -- Here is an attempt at a patch with some REVISION bumps and explicit MODWLROOTS_VERSION declarations. Has the missing wlroots/Makefile and regen PLIST for wlroots/0.20. Built fine(twice now after restoring from cvs and applying the attached patch) with this. River built also. I apologize if I should have separated the patches instead of a mega patch. This is more for demonstration and testing than as a final patch. I may have missed some space or formatting nits. Or maybe missed some package that would also need a bump? Please let me know. Hope this helps. Good tidings and may you all have a good one.
wlroots-19-20-take2.diff
Description: Binary data
