git: 17d06c51dbe5 - main - x11-wm/wayfire: install submodules

The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=17d06c51dbe5f82c9b2a9868e61e156a332ca3cf

commit 17d06c51dbe5f82c9b2a9868e61e156a332ca3cf
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2025-08-29 13:43:33 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2025-08-29 14:22:32 +0000

    x11-wm/wayfire: install submodules
    
    Required by showtouch plugin from wayfire-plugins-extra >= 0.10.
---
 x11-wm/wayfire/Makefile  | 12 +++---------
 x11-wm/wayfire/pkg-plist | 23 +++++++++++++++++++++++
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/x11-wm/wayfire/Makefile b/x11-wm/wayfire/Makefile
index c8af247557e0..6eaa712762fe 100644
--- a/x11-wm/wayfire/Makefile
+++ b/x11-wm/wayfire/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	wayfire
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.9.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-wm wayland
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -38,7 +38,6 @@ GH_TUPLE=	WayfireWM:wf-touch:b8b844f:wftouch/subprojects/wf-touch \
 		WayfireWM:wf-utils:08553c4:wfutils/subprojects/wf-utils
 MESON_ARGS=	-Dtests=disabled \
 		-Dwf-touch:tests=disabled \
-		-Dwf-utils:default_library=static \
 		${NULL}
 
 .if !exists(/usr/include/omp.h)
@@ -58,12 +57,6 @@ post-patch:
 		-e '/project_version/s/@0@/${DISTVERSIONFULL}/' \
 		${WRKSRC}/meson.build
 
-.ifdef GH_TUPLE
-post-configure:
-	@${REINPLACE_CMD} 's/meson install/& \
-		--skip-subprojects/' ${BUILD_WRKSRC}/build.ninja
-.endif
-
 post-install:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.ini ${STAGEDIR}${EXAMPLESDIR}
@@ -71,7 +64,8 @@ post-install:
 pre-test:
 	@if [ ! -e ${WRKDIR}/.meson_build_tests ]; then \
 		${RM} ${CONFIGURE_COOKIE} ${BUILD_COOKIE}; \
-		${MAKE} -C${.CURDIR} build MESON_ARGS="${MESON_ARGS} --reconfigure -Dtests=enabled"; \
+		${MAKE} -C${.CURDIR} build MESON_ARGS="${MESON_ARGS} --reconfigure \
+			${MESON_ARGS:M*tests*:S/=dis/=en/}"; \
 		${TOUCH} ${WRKDIR}/.meson_build_tests; \
 	fi
 
diff --git a/x11-wm/wayfire/pkg-plist b/x11-wm/wayfire/pkg-plist
index 8775999874d7..dd2bbc5eb275 100644
--- a/x11-wm/wayfire/pkg-plist
+++ b/x11-wm/wayfire/pkg-plist
@@ -1,7 +1,13 @@
 bin/wayfire
+include/wayfire/action/action.hpp
+include/wayfire/action/action_interface.hpp
 include/wayfire/bindings-repository.hpp
 include/wayfire/bindings.hpp
 include/wayfire/compositor-view.hpp
+include/wayfire/condition/access_interface.hpp
+include/wayfire/condition/condition.hpp
+include/wayfire/condition/logic_condition.hpp
+include/wayfire/condition/test_condition.hpp
 include/wayfire/config-backend.hpp
 include/wayfire/config.h
 include/wayfire/core.hpp
@@ -11,6 +17,9 @@ include/wayfire/geometry.hpp
 include/wayfire/idle.hpp
 include/wayfire/img.hpp
 include/wayfire/input-device.hpp
+include/wayfire/lexer/lexer.hpp
+include/wayfire/lexer/literal.hpp
+include/wayfire/lexer/symbol.hpp
 include/wayfire/matcher.hpp
 include/wayfire/nonstd/observer_ptr.h
 include/wayfire/nonstd/reverse.hpp
@@ -23,6 +32,10 @@ include/wayfire/opengl.hpp
 include/wayfire/option-wrapper.hpp
 include/wayfire/output-layout.hpp
 include/wayfire/output.hpp
+include/wayfire/parser/action_parser.hpp
+include/wayfire/parser/condition_parser.hpp
+include/wayfire/parser/lambda_rule_parser.hpp
+include/wayfire/parser/rule_parser.hpp
 include/wayfire/per-output-plugin.hpp
 include/wayfire/plugin.hpp
 include/wayfire/plugins/blur/blur.hpp
@@ -49,6 +62,8 @@ include/wayfire/plugins/wm-actions-signals.hpp
 include/wayfire/plugins/wobbly/wobbly-signal.hpp
 include/wayfire/region.hpp
 include/wayfire/render-manager.hpp
+include/wayfire/rule/lambda_rule.hpp
+include/wayfire/rule/rule.hpp
 include/wayfire/scene-input.hpp
 include/wayfire/scene-operations.hpp
 include/wayfire/scene-render.hpp
@@ -58,6 +73,7 @@ include/wayfire/signal-definitions.hpp
 include/wayfire/signal-provider.hpp
 include/wayfire/toplevel-view.hpp
 include/wayfire/toplevel.hpp
+include/wayfire/touch/touch.hpp
 include/wayfire/txn/transaction-manager.hpp
 include/wayfire/txn/transaction-object.hpp
 include/wayfire/txn/transaction.hpp
@@ -71,6 +87,8 @@ include/wayfire/unstable/wlr-view-keyboard-interaction.hpp
 include/wayfire/unstable/xdg-toplevel-base.hpp
 include/wayfire/unstable/xwl-toplevel-base.hpp
 include/wayfire/util.hpp
+include/wayfire/utils.hpp
+include/wayfire/variant.hpp
 include/wayfire/view-access-interface.hpp
 include/wayfire/view-helpers.hpp
 include/wayfire/view-transform.hpp
@@ -80,6 +98,10 @@ include/wayfire/workarea.hpp
 include/wayfire/workspace-set.hpp
 include/wayfire/workspace-stream.hpp
 lib/libwayfire-blur-base.so
+lib/libwf-utils.so
+lib/libwf-utils.so.0
+lib/libwf-utils.so.0.4.0
+lib/libwftouch.a
 lib/wayfire/libalpha.so
 lib/wayfire/libanimate.so
 lib/wayfire/libautostart.so
@@ -125,6 +147,7 @@ lib/wayfire/libxdg-activation.so
 lib/wayfire/libxkb-bindings.so
 lib/wayfire/libzoom.so
 libdata/pkgconfig/wayfire.pc
+libdata/pkgconfig/wf-utils.pc
 share/man/man1/wayfire.1.gz
 %%EXAMPLESDIR%%/wayfire.ini
 %%DATADIR%%/metadata/alpha.xml