hi,

here's the diff updating wayfire port to the branch supporting wlroots
0.18 in https://github.com/WayfireWM/wayfire/pull/2452
i've reused what was there previously when wlroots had been updated to
0.17 and the wayfire port was at 0.8.1. Yay DIST_TUPLE!

typing this mail from it.. so i guess "it works".

Landry
? wayfire-0.8.1-libwf-utils.so.0.0
? wayfire-0.9.0-libwf-utils.so.0.0
Index: Makefile
===================================================================
RCS file: /cvs/ports/wayland/wayfire/Makefile,v
diff -u -r1.8 Makefile
--- Makefile	27 Aug 2024 17:25:22 -0000	1.8
+++ Makefile	5 Nov 2024 16:18:08 -0000
@@ -1,6 +1,9 @@
 COMMENT =	modular and extensible wayland compositor
 
-V =		0.9.0
+V =		0.9.0pl18
+GH_ACCOUNT =	WayfireWM
+GH_PROJECT =	wayfire
+GH_COMMIT =	3d3f426f7de8a24117f6c1d33c8dead1bc80b7e9
 DISTNAME =	wayfire-${V}
 
 SHARED_LIBS +=	wf-utils 0.0 # 0.0
@@ -10,8 +13,14 @@
 # MIT
 PERMIT_PACKAGE =	Yes
 
-SITES =		https://github.com/WayfireWM/wayfire/releases/download/v${V}/
-EXTRACT_SUFX =	.tar.xz
+# git submodules when not building a release
+DIST_TUPLE +=	github ${GH_ACCOUNT} wf-utils 08553c418f164bf5e84613d27447a32e380b75f0 subprojects/wf-utils
+DIST_TUPLE +=	github ${GH_ACCOUNT} wf-touch caa156921c6be1dff9c2ccd851330c96de7928bf subprojects/wf-touch
+
+#support for wlroots 0.18
+#https://github.com/WayfireWM/wayfire/pull/2452
+#SITES =		https://github.com/WayfireWM/wayfire/releases/download/v${V}/
+#EXTRACT_SUFX =	.tar.xz
 HOMEPAGE =	https://wayfire.org
 
 MODULES =	devel/meson
@@ -36,12 +45,12 @@
 		wayland/libinput-openbsd \
 		wayland/wayland \
 		wayland/wf-config \
-		wayland/wlroots \
+		wayland/wlroots>=0.18 \
 		x11/xkbcommon
 
 WANTLIB += ${COMPILER_LIBCXX} EGL GLESv2 c cairo evdev execinfo
 WANTLIB += gobject-2.0 input jpeg m pango-1.0 pangocairo-1.0 pixman-1
-WANTLIB += png wayland-client wayland-server wf-config wlroots xcb xkbcommon
+WANTLIB += png wayland-client wayland-server wf-config wlroots-0.18 xcb xkbcommon
 WANTLIB += lib/inotify/inotify
 
 # hack for gbm getting -I/usr/local/lib and failing build in wf-touch ?
Index: distinfo
===================================================================
RCS file: /cvs/ports/wayland/wayfire/distinfo,v
diff -u -r1.3 distinfo
--- distinfo	27 Aug 2024 17:25:22 -0000	1.3
+++ distinfo	5 Nov 2024 16:18:08 -0000
@@ -1,2 +1,6 @@
-SHA256 (wayfire-0.9.0.tar.xz) = 3QycCLinKi2MMxfIvmxCsXpJPCWrqx0CrAnCTqqVIp0=
-SIZE (wayfire-0.9.0.tar.xz) = 875584
+SHA256 (WayfireWM-wf-touch-caa156921c6be1dff9c2ccd851330c96de7928bf.tar.gz) = q0/N0ruU9TxJNXxBK/vj+VET2GtSaqrffIoenIdDFIo=
+SHA256 (WayfireWM-wf-utils-08553c418f164bf5e84613d27447a32e380b75f0.tar.gz) = onGlZ7RRKlI8B+mP5yTuLTDJA3Uebr7ke4DtWMRowHM=
+SHA256 (wayfire-0.9.0pl18-3d3f426f.tar.gz) = isN/WJt+0taOds+N8ri/kNuEb8bGzUm3cCYY6Es/+mA=
+SIZE (WayfireWM-wf-touch-caa156921c6be1dff9c2ccd851330c96de7928bf.tar.gz) = 10571
+SIZE (WayfireWM-wf-utils-08553c418f164bf5e84613d27447a32e380b75f0.tar.gz) = 48541
+SIZE (wayfire-0.9.0pl18-3d3f426f.tar.gz) = 481872
Index: patches/patch-meson_build
===================================================================
RCS file: /cvs/ports/wayland/wayfire/patches/patch-meson_build,v
diff -u -r1.3 patch-meson_build
--- patches/patch-meson_build	27 Aug 2024 17:25:22 -0000	1.3
+++ patches/patch-meson_build	5 Nov 2024 16:18:08 -0000
@@ -9,6 +9,15 @@
  json           = dependency('nlohmann_json', version: '>= 3.11.2')
  
  # We're not to use system wlroots: So we'll use the subproject
+@@ -94,7 +93,7 @@ if get_option('use_system_wfconfig').disabled()
+ 
+ elif get_option('use_system_wfconfig').enabled()
+ 	use_system_wfconfig = true
+-	wfconfig = dependency('wf-config', version: ['>=0.10.0', '<0.11.0'], required: true)
++	wfconfig = dependency('wf-config', version: ['>=0.9.0', '<0.10.0'], required: true)
+ 
+ elif get_option('use_system_wfconfig').auto()
+ 	wfconfig = dependency('wf-config', version: ['>=0.10.0', '<0.11.0'], required: false)
 @@ -114,7 +113,7 @@ backtrace = meson.get_compiler('cpp').find_library('ex
  wfutils = subproject('wf-utils').get_variable('wfutils')
  wftouch = subproject('wf-touch').get_variable('wftouch')
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/wayland/wayfire/pkg/PLIST,v
diff -u -r1.3 PLIST
--- pkg/PLIST	27 Aug 2024 17:25:22 -0000	1.3
+++ pkg/PLIST	5 Nov 2024 16:18:08 -0000
@@ -67,6 +67,7 @@
 include/wayfire/plugins/ipc/ipc-activator.hpp
 include/wayfire/plugins/ipc/ipc-helpers.hpp
 include/wayfire/plugins/ipc/ipc-method-repository.hpp
+include/wayfire/plugins/ipc/ipc-rules-common.hpp
 include/wayfire/plugins/scale-signal.hpp
 include/wayfire/plugins/vswitch.hpp
 include/wayfire/plugins/wm-actions-signals.hpp

• wayfire-0.9.0pl18.diff (4K)