x11-wm/wayfire: update to 0.8.1

Changes:	https://github.com/WayfireWM/wayfire/releases/tag/v0.8.1
Reported by:	GitHub (watch releases)

7 files changed, 15 insertions, 15 deletions

diff --git a/x11-wm/wayfire-plugins-extra/Makefile b/x11-wm/wayfire-plugins-extra/Makefile
index c14b4017334d..0ed8af9a5d9e 100644
--- a/x11-wm/wayfire-plugins-extra/Makefile
+++ b/x11-wm/wayfire-plugins-extra/Makefile
@@ -1,9 +1,12 @@
 PORTNAME=	wayfire-plugins-extra
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.8.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm wayland
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES+=	cc4d177de89f.patch:-p1 # https://github.com/WayfireWM/wayfire-plugins-extra/pull/206
+
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Additional plugins for Wayfire
 WWW=		https://wayfire.org/
@@ -41,5 +44,4 @@ post-patch:
 	@${REINPLACE_CMD} 's,/usr/share,${DATADIR:H},' \
 		${WRKSRC}/subprojects/windecor/deco-icontheme.cpp
 
-.include "${.CURDIR:H:H}/x11-toolkits/wlroots016/override.mk"
 .include <bsd.port.mk>
diff --git a/x11-wm/wayfire-plugins-extra/distinfo b/x11-wm/wayfire-plugins-extra/distinfo
index 2599c41d5c75..67cbf74f32cf 100644
--- a/x11-wm/wayfire-plugins-extra/distinfo
+++ b/x11-wm/wayfire-plugins-extra/distinfo
@@ -7,3 +7,5 @@ SHA256 (focus-request-bc41d54.tar.bz2) = da114547ed0b3ccca593d44e4a01f6d86a45ff2
 SIZE (focus-request-bc41d54.tar.bz2) = 1740
 SHA256 (windecor-f609ac0.tar.bz2) = 2b10209bb6e787af69b6115291330c37dfc8f1c39fb9f91a650cf3ad1c586c10
 SIZE (windecor-f609ac0.tar.bz2) = 32244
+SHA256 (cc4d177de89f.patch) = c05b79384ea18f51f7d7157b4c2fcc8fa687c1ef98255c6a779a70de07e1430c
+SIZE (cc4d177de89f.patch) = 6410
diff --git a/x11-wm/wayfire/Makefile b/x11-wm/wayfire/Makefile
index f258ef48b628..60c78445397e 100644
--- a/x11-wm/wayfire/Makefile
+++ b/x11-wm/wayfire/Makefile
@@ -1,12 +1,10 @@
 PORTNAME=	wayfire
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.8.0
-PORTREVISION=	3
+DISTVERSION=	0.8.1
 CATEGORIES=	x11-wm wayland
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES+=	dd479c06bf84.patch:-p1 # https://github.com/WayfireWM/wayfire/issues/599
-PATCHFILES+=	564b75a45d7c.patch:-p1 # https://github.com/WayfireWM/wayfire/pull/1943
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	3D Wayland compositor
@@ -74,6 +72,4 @@ pre-test:
 		${TOUCH} ${WRKDIR}/.meson_build_tests; \
 	fi
 
-# Keep override.mk in sync with x11/wcm + x11/wf-shell
-.include "${.CURDIR:H:H}/x11-toolkits/wlroots016/override.mk"
 .include <bsd.port.mk>
diff --git a/x11-wm/wayfire/distinfo b/x11-wm/wayfire/distinfo
index 07ff91c909a8..4a280aec7593 100644
--- a/x11-wm/wayfire/distinfo
+++ b/x11-wm/wayfire/distinfo
@@ -1,11 +1,9 @@
-TIMESTAMP = 1696673372
-SHA256 (WayfireWM-wayfire-v0.8.0_GH0.tar.gz) = 3b67dd03a9370a0c0a2d9b98d77d9184d62b25ca13844cfdbb0cac788cb9d4b6
-SIZE (WayfireWM-wayfire-v0.8.0_GH0.tar.gz) = 433417
+TIMESTAMP = 1710332286
+SHA256 (WayfireWM-wayfire-v0.8.1_GH0.tar.gz) = 04f43df21167db15d266f7e01085b111680d57779ebc27a410201f995b33c6df
+SIZE (WayfireWM-wayfire-v0.8.1_GH0.tar.gz) = 454813
 SHA256 (WayfireWM-wf-touch-8974eb0_GH0.tar.gz) = 3d66a67b35452741135420caf43ba349d35fc64643b8e223e6cdf74dbcef33aa
 SIZE (WayfireWM-wf-touch-8974eb0_GH0.tar.gz) = 9881
 SHA256 (WayfireWM-wf-utils-15f8e16_GH0.tar.gz) = 8f32164bb2c620252aa5ca74f03f25d808cce01809a9eddd4b13a4b83ecfa94d
 SIZE (WayfireWM-wf-utils-15f8e16_GH0.tar.gz) = 48505
 SHA256 (dd479c06bf84.patch) = c58562defa005b8b3188d8a64003f0ee5444fef7449ed0a5f899d70b1901fb6d
 SIZE (dd479c06bf84.patch) = 2086
-SHA256 (564b75a45d7c.patch) = 723750d0a09cdf5a806af5563385f510f16c7dc16c582ba81a4c49fbce389c88
-SIZE (564b75a45d7c.patch) = 684
diff --git a/x11-wm/wayfire/pkg-plist b/x11-wm/wayfire/pkg-plist
index 539dd6426eb9..87380d737eb9 100644
--- a/x11-wm/wayfire/pkg-plist
+++ b/x11-wm/wayfire/pkg-plist
@@ -41,7 +41,6 @@ include/wayfire/plugins/grid.hpp
 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.hpp
 include/wayfire/plugins/scale-signal.hpp
 include/wayfire/plugins/vswitch.hpp
 include/wayfire/plugins/wm-actions-signals.hpp
@@ -62,6 +61,7 @@ include/wayfire/txn/transaction-object.hpp
 include/wayfire/txn/transaction.hpp
 include/wayfire/unstable/translation-node.hpp
 include/wayfire/unstable/wlr-surface-node.hpp
+include/wayfire/unstable/wlr-text-input-v3-popup.hpp
 include/wayfire/unstable/wlr-view-events.hpp
 include/wayfire/unstable/wlr-view-keyboard-interaction.hpp
 include/wayfire/unstable/xdg-toplevel-base.hpp
@@ -93,6 +93,7 @@ lib/wayfire/libforeign-toplevel.so
 lib/wayfire/libgrid.so
 lib/wayfire/libgtk-shell.so
 lib/wayfire/libidle.so
+lib/wayfire/libinput-method-v1.so
 lib/wayfire/libinvert.so
 lib/wayfire/libipc-rules.so
 lib/wayfire/libipc.so
@@ -103,6 +104,7 @@ lib/wayfire/libpreserve-output.so
 lib/wayfire/libresize.so
 lib/wayfire/libscale-title-filter.so
 lib/wayfire/libscale.so
+lib/wayfire/libshortcuts-inhibit.so
 lib/wayfire/libsimple-tile.so
 lib/wayfire/libstipc.so
 lib/wayfire/libswitcher.so
@@ -136,6 +138,7 @@ share/man/man1/wayfire.1.gz
 %%DATADIR%%/metadata/gtk-shell.xml
 %%DATADIR%%/metadata/idle.xml
 %%DATADIR%%/metadata/input-device.xml
+%%DATADIR%%/metadata/input-method-v1.xml
 %%DATADIR%%/metadata/input.xml
 %%DATADIR%%/metadata/invert.xml
 %%DATADIR%%/metadata/ipc-rules.xml
@@ -148,6 +151,7 @@ share/man/man1/wayfire.1.gz
 %%DATADIR%%/metadata/resize.xml
 %%DATADIR%%/metadata/scale-title-filter.xml
 %%DATADIR%%/metadata/scale.xml
+%%DATADIR%%/metadata/shortcuts-inhibit.xml
 %%DATADIR%%/metadata/simple-tile.xml
 %%DATADIR%%/metadata/switcher.xml
 %%DATADIR%%/metadata/vswipe.xml
diff --git a/x11/wcm/Makefile b/x11/wcm/Makefile
index f4964719bf27..075d4786306c 100644
--- a/x11/wcm/Makefile
+++ b/x11/wcm/Makefile
@@ -42,5 +42,4 @@ WFSHELL_DESC=			Build with wf-shell support
 WFSHELL_BUILD_DEPENDS=		wf-shell>0:x11/wf-shell
 WFSHELL_MESON_ENABLED=		wf_shell
 
-.include "${.CURDIR:H:H}/x11-toolkits/wlroots016/override.mk"
 .include <bsd.port.mk>
diff --git a/x11/wf-shell/Makefile b/x11/wf-shell/Makefile
index b86edcf2edfc..a2419eb48bd1 100644
--- a/x11/wf-shell/Makefile
+++ b/x11/wf-shell/Makefile
@@ -47,5 +47,4 @@ post-patch:
 		${WRKSRC}/src/dock/toplevel-icon.cpp \
 		${WRKSRC}/src/panel/widgets/window-list/toplevel.cpp
 
-.include "${.CURDIR:H:H}/x11-toolkits/wlroots016/override.mk"
 .include <bsd.port.mk>