Re: [PR PATCH] [Updated] [WIP] wlroots: update to 0.12.0

[ofiala-a51 <ofiala-a51@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 764 bytes --]

There is an updated pull request by ofiala-a51 against master on the void-packages repository

https://github.com/ofiala-a51/void-packages master
https://github.com/void-linux/void-packages/pull/26224

[WIP] wlroots: update to 0.12.0
~~There have been some important changes to wlroots that add support for the seat management daemon seatd. Since~~
1. ~~seatd still isn't available in Void repos~~
2. ~~the issue can be approached differently, which will require some discussion~~

~~this PR only updates wlroots without dealing with any of this to get the new version to end users asap. The changes required to add support for seatd shall be added in a separate PR.~~

A patch file from https://github.com/void-linux/void-packages/pull/26224.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-26224.patch --]
[-- Type: text/x-diff, Size: 19115 bytes --]

From 39137bff44a61bb5663a9585224aa6898fc0dcb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Fiala?= <temp.xanomes@volny.cz>
Date: Sun, 8 Nov 2020 16:24:31 +0100
Subject: [PATCH 01/11] wlroots: update to 0.12.0

---
 common/shlibs            |  2 +-
 srcpkgs/wlroots/template | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 9a576f18d0f..1179303d5c5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3565,7 +3565,7 @@ libcodecore.so.0 libio.elementary.code-3.0_1
 libio.elementary.music-core.so.0 libio.elementary.music-5.0_1
 libpantheon-files-core.so.4 libio.elementary.files-4.1.4_1
 libpantheon-files-widgets.so.4 libio.elementary.files-4.1.4_1
-libwlroots.so.6 wlroots-0.11.0_1
+libwlroots.so.7 wlroots-0.12.0_1
 libbaseencode.so.1 libbaseencode-1.0.9_1
 libcotp.so.12 libcotp-1.2.1_1
 libunarr.so.1 libunarr-1.0.1_1
diff --git a/srcpkgs/wlroots/template b/srcpkgs/wlroots/template
index 8968bba8cef..a73b5f21a13 100644
--- a/srcpkgs/wlroots/template
+++ b/srcpkgs/wlroots/template
@@ -1,13 +1,13 @@
 # Template file for 'wlroots'
 pkgname=wlroots
-version=0.11.0
-revision=2
+version=0.12.0
+revision=1
 build_style=meson
-configure_args="-Dlogind=enabled -Dlogind-provider=elogind
+configure_args="-Dlogind=disabled -Dlibseat=enabled
  -Dxcb-errors=enabled -Dxcb-icccm=enabled -Dxwayland=enabled
  -Dx11-backend=enabled -Dexamples=false"
 hostmakedepends="pkg-config wayland-devel"
-_devel_depends="MesaLib-devel elogind-devel eudev-libudev-devel libdrm-devel
+_devel_depends="MesaLib-devel libseat-devel eudev-libudev-devel libdrm-devel
  libinput-devel libxkbcommon-devel pixman-devel wayland-devel wayland-protocols
  xcb-util-errors-devel xcb-util-wm-devel"
 makedepends="${_devel_depends}
@@ -18,7 +18,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://github.com/swaywm/wlroots"
 distfiles="https://github.com/swaywm/wlroots/archive/${version}.tar.gz"
-checksum=a7645e77229aab4942748c621be8bdb8b073d94f35f3e032b867246862bf2d01
+checksum=c9e9f4f6d2f526d0b2886daf3ec37e64831773059aa669fb98a88522a1626bdb
 
 post_install() {
 	vlicense LICENSE

From 5cb7b0c59534d87e0c36308ea7a042220ab17a2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Fiala?= <temp.xanomes@volny.cz>
Date: Sun, 8 Nov 2020 18:26:29 +0100
Subject: [PATCH 02/11] cage: disable SUID

---
 srcpkgs/cage/INSTALL.msg |  6 ++++++
 srcpkgs/cage/template    | 10 +++-------
 2 files changed, 9 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/cage/INSTALL.msg

diff --git a/srcpkgs/cage/INSTALL.msg b/srcpkgs/cage/INSTALL.msg
new file mode 100644
index 00000000000..05274ffcc3a
--- /dev/null
+++ b/srcpkgs/cage/INSTALL.msg
@@ -0,0 +1,6 @@
+Setting the SUID bit after install has been retired for all Wayland
+compositors. It is recommended that users use a session management daemon
+such as elogind or seatd and do not rely on compositors dropping privileges.
+
+All users who require this functionality will need to set the SUID bit manually
+after each update going forward.
diff --git a/srcpkgs/cage/template b/srcpkgs/cage/template
index a4085ac8483..960ccfac215 100644
--- a/srcpkgs/cage/template
+++ b/srcpkgs/cage/template
@@ -1,12 +1,12 @@
 # Template file for 'cage'
 pkgname=cage
 version=0.1.2.1
-revision=2
+revision=3
 build_style=meson
 configure_args="$(vopt_bool xwayland xwayland)"
 hostmakedepends="pkg-config wayland-devel scdoc"
 makedepends="wlroots-devel"
-depends="$(vopt_if xwayland xorg-server-xwayland) $(vopt_if elogind elogind)"
+depends="$(vopt_if xwayland xorg-server-xwayland)"
 short_desc="Kiosk compositor for Wayland"
 maintainer="Illia Shestakov <ishestakov@airmail.cc>"
 license="MIT"
@@ -14,14 +14,10 @@ homepage="https://www.hjdskes.nl/projects/cage/"
 distfiles="https://github.com/Hjdskes/cage/archive/v${version}.tar.gz"
 checksum=38a3e3968f00cc58fe1d9448e972cfac7d1efa30c48699f09032f264101a55ac
 
-build_options="elogind xwayland"
+build_options="xwayland"
 build_options_default="xwayland"
 desc_option_xwayland="Enable Xwayland support in cage"
 
 post_install() {
-	if [ -z "$build_option_elogind" ]; then
-		# must be setuid without logind!
-		chmod u+s ${DESTDIR}/usr/bin/cage
-	fi
 	vlicense LICENSE
 }

From 12907ef8db69ec1ca0bb3cf5ec17fdb35aad0041 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Fiala?= <temp.xanomes@volny.cz>
Date: Sun, 8 Nov 2020 18:31:14 +0100
Subject: [PATCH 03/11] hikari: disable suid

---
 srcpkgs/hikari/INSTALL.msg | 6 ++++++
 srcpkgs/hikari/template    | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/hikari/INSTALL.msg

diff --git a/srcpkgs/hikari/INSTALL.msg b/srcpkgs/hikari/INSTALL.msg
new file mode 100644
index 00000000000..05274ffcc3a
--- /dev/null
+++ b/srcpkgs/hikari/INSTALL.msg
@@ -0,0 +1,6 @@
+Setting the SUID bit after install has been retired for all Wayland
+compositors. It is recommended that users use a session management daemon
+such as elogind or seatd and do not rely on compositors dropping privileges.
+
+All users who require this functionality will need to set the SUID bit manually
+after each update going forward.
diff --git a/srcpkgs/hikari/template b/srcpkgs/hikari/template
index b071ccf75bb..0828aa3aade 100644
--- a/srcpkgs/hikari/template
+++ b/srcpkgs/hikari/template
@@ -1,13 +1,13 @@
 # Template file for 'hikari'
 pkgname=hikari
 version=2.2.2
-revision=1
+revision=2
 build_style=gnu-makefile
 make_cmd=bmake
 make_use_env=yes
 make_build_args="WITH_POSIX_C_SOURCE=YES WITH_XWAYLAND=YES
  WITH_SCREENCOPY=YES WITH_GAMMACONTROL=YES WITH_LAYERSHELL=YES ETC_PREFIX="
-make_install_args="ETC_PREFIX="
+make_install_args="ETC_PREFIX= WITHOUT_SUID=YES"
 hostmakedepends="bmake pkg-config wayland-devel"
 makedepends="wlroots-devel pango-devel cairo-devel pam-devel glib-devel libucl-devel"
 short_desc="Stacking Wayland compositor with tiling features"

From 835abe96cbd82bcd00bbdc509d3d1e947fcb1bd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Fiala?= <temp.xanomes@volny.cz>
Date: Sun, 8 Nov 2020 19:01:36 +0100
Subject: [PATCH 04/11] wf-config: update to 0.6.0

---
 srcpkgs/wf-config/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wf-config/template b/srcpkgs/wf-config/template
index ce7fce82dc1..bc6a2c8b870 100644
--- a/srcpkgs/wf-config/template
+++ b/srcpkgs/wf-config/template
@@ -1,6 +1,6 @@
 # Template file for 'wf-config'
 pkgname=wf-config
-version=0.5.0
+version=0.6.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Young Jin Park <youngjinpark20@gmail.com>"
 license="MIT"
 homepage="https://wayfire.org"
 distfiles="https://github.com/WayfireWM/wf-config/archive/${version}.tar.gz"
-checksum=bf690477ff0d8928ddeca6a278b9153a39ade1e13fd32cc6d04552db4d65cbf0
+checksum=73af6d803044d4e5907974ece019ae0d1b4020a057f6c27be0594fb70d86653b
 
 post_install() {
 	vlicense LICENSE

From d2adb31fb5dcb0b1e82fb7e5d3e119a401a9bc06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Fiala?= <temp.xanomes@volny.cz>
Date: Sun, 8 Nov 2020 19:38:01 +0100
Subject: [PATCH 05/11] wayfire: update to 0.6.0

---
 srcpkgs/wayfire/INSTALL.msg |  9 +++++----
 srcpkgs/wayfire/template    | 25 +++++++++++++------------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/srcpkgs/wayfire/INSTALL.msg b/srcpkgs/wayfire/INSTALL.msg
index 164d23c2b3a..05274ffcc3a 100644
--- a/srcpkgs/wayfire/INSTALL.msg
+++ b/srcpkgs/wayfire/INSTALL.msg
@@ -1,5 +1,6 @@
-Before running Wayfire, copy the default configuration file to your user:
+Setting the SUID bit after install has been retired for all Wayland
+compositors. It is recommended that users use a session management daemon
+such as elogind or seatd and do not rely on compositors dropping privileges.
 
-  cp /usr/share/examples/wayfire/wayfire.ini ~/.config/wayfire.ini
-
-You also probably want to install elogind, then restart your computer
+All users who require this functionality will need to set the SUID bit manually
+after each update going forward.
diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template
index c48069fdb11..d2d1414c6a8 100644
--- a/srcpkgs/wayfire/template
+++ b/srcpkgs/wayfire/template
@@ -1,23 +1,26 @@
 # Template file for 'wayfire'
 pkgname=wayfire
-version=0.5.0
-revision=2
-_utils_commit=f9b5eba437a04a0d1fb9f00a0fdb88c12b9f6b27
+version=0.6.0
+revision=1
+_utils_commit=f45641beef46babdc8f1b8d18a924e72beaf8ee6
+_touch_commit=b1075c54a280f913edc26b9757262f4f9d6b62b0
 build_style=meson
 hostmakedepends="pkg-config wayland-devel"
 makedepends="wf-config-devel wlroots-devel cairo-devel
  $(vopt_if image 'libjpeg-turbo-devel libpng-devel')"
-depends="xorg-server-xwayland $(vopt_if elogind elogind)"
+depends="xorg-server-xwayland"
 short_desc="3D wayland compositor"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://wayfire.org"
 distfiles="https://github.com/WayfireWM/wayfire/archive/${version}.tar.gz
- https://github.com/WayfireWM/wf-utils/archive/${_utils_commit}.tar.gz"
-checksum="24c1a2c963dac5af762f87cd024bc3dd736ec9a28a6735d357a05e8f6502e8aa
- 5c3e8bfefd74083a2548b6a95a070000cf73591bfe78335413da5c7fb82340cb"
+ https://github.com/WayfireWM/wf-utils/archive/${_utils_commit}.tar.gz
+ https://github.com/WayfireWM/wf-touch/archive/${_touch_commit}.tar.gz"
+checksum="9c2bf92e6aecc9b800b87e4c086ff7a275393f7315501b8c39196baf9d245b33
+ d172f8c21e0bac01e4116cd957fb0159c5cb39ddfdce897beb0d9c753796d5f1
+ 2b22e03d3a522baeff5798f630ffe5aa95899fd3233b291527503af5fd3e30be"
 
-build_options="elogind image"
+build_options="image"
 build_options_default="image"
 desc_option_image="Enable JPEG and PNG support"
 
@@ -27,14 +30,12 @@ fi
 
 post_extract() {
 	rmdir subprojects/wf-utils
+	rmdir subprojects/wf-touch
 	mv ../wf-utils-${_utils_commit} subprojects/wf-utils
+	mv ../wf-touch-${_touch_commit} subprojects/wf-touch
 }
 
 post_install() {
-	if [ -z "$build_option_elogind" ]; then
-		# must be setuid without logind!
-		chmod u+s ${DESTDIR}/usr/bin/wayfire
-	fi
 	vlicense LICENSE
 	vsconf wayfire.ini
 	vinstall wayfire.desktop 0644 usr/share/wayland-sessions

From 6f7d917408dddff7e94d9e22947bccf5ecb60d87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Fiala?= <temp.xanomes@volny.cz>
Date: Sun, 8 Nov 2020 19:45:24 +0100
Subject: [PATCH 06/11] wayfire-plugins-extra: update to 0.6.0

---
 srcpkgs/wayfire-plugins-extra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wayfire-plugins-extra/template b/srcpkgs/wayfire-plugins-extra/template
index 2eaa4bbbea6..ff0e06c655c 100644
--- a/srcpkgs/wayfire-plugins-extra/template
+++ b/srcpkgs/wayfire-plugins-extra/template
@@ -1,6 +1,6 @@
 # Template file for 'wayfire-plugins-extra'
 pkgname=wayfire-plugins-extra
-version=0.5.0
+version=0.6.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config wayland-devel"
@@ -11,7 +11,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://wayfire.org/"
 distfiles="https://github.com/WayfireWM/wayfire-plugins-extra/archive/${version}.tar.gz"
-checksum=64c56ffa66df26a7cbee1af41c34ae123abe8252deeaf02687237688a8281a9e
+checksum=d1ac42c0b2d212a7523f2aeb63285ab8b95ffb6efd564bf27877310eeab1ab0e
 
 post_install() {
 	vlicense LICENSE

From d39f504f430d960f9e229b280c58a4da5570807d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Fiala?= <temp.xanomes@volny.cz>
Date: Tue, 10 Nov 2020 17:43:47 +0100
Subject: [PATCH 07/11] sway: update to 1.5.1

---
 srcpkgs/sway/INSTALL.msg |  6 ++++++
 srcpkgs/sway/template    | 14 ++++----------
 2 files changed, 10 insertions(+), 10 deletions(-)
 create mode 100644 srcpkgs/sway/INSTALL.msg

diff --git a/srcpkgs/sway/INSTALL.msg b/srcpkgs/sway/INSTALL.msg
new file mode 100644
index 00000000000..05274ffcc3a
--- /dev/null
+++ b/srcpkgs/sway/INSTALL.msg
@@ -0,0 +1,6 @@
+Setting the SUID bit after install has been retired for all Wayland
+compositors. It is recommended that users use a session management daemon
+such as elogind or seatd and do not rely on compositors dropping privileges.
+
+All users who require this functionality will need to set the SUID bit manually
+after each update going forward.
diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template
index fa8e1850c50..0ce2ad1f027 100644
--- a/srcpkgs/sway/template
+++ b/srcpkgs/sway/template
@@ -1,21 +1,19 @@
 # Template file for 'sway'
 pkgname=sway
-version=1.5
-revision=2
+version=1.5.1
+revision=1
 build_style=meson
 conf_files="/etc/sway/config"
 hostmakedepends="pkg-config wayland-devel scdoc git"
 makedepends="wlroots-devel pcre-devel json-c-devel pango-devel cairo-devel
  gdk-pixbuf-devel"
-depends="swaybg xorg-server-xwayland $(vopt_if elogind elogind)"
+depends="swaybg xorg-server-xwayland"
 short_desc="Tiling Wayland compositor compatible with i3"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://swaywm.org"
 distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"
-checksum=c80644774d612d7d377093d4990061d36c36673862c06318a7b0e37fa47b0178
-
-build_options="elogind"
+checksum=095f983c9a5f80d761bc2fb19df8166839b9290124ccd47f3e74119a1335490f
 
 post_patch() {
 	vsed -e 's/werror=true/werror=false/g' -i meson.build
@@ -23,10 +21,6 @@ post_patch() {
 
 post_install() {
 	vlicense LICENSE
-	if [ -z "$build_option_elogind" ]; then
-		# must be setuid without logind!
-		chmod u+s ${DESTDIR}/usr/bin/sway
-	fi
 	vbin contrib/grimshot
 	vman contrib/grimshot.1
 }

From b5ebc69bde0775b599edbbcfad16be43465fb8f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Fiala?= <temp.xanomes@volny.cz>
Date: Tue, 10 Nov 2020 20:21:04 +0100
Subject: [PATCH 08/11] wcm: update to 0.6.0

---
 srcpkgs/wcm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wcm/template b/srcpkgs/wcm/template
index d74eba5e556..b32e76ccff1 100644
--- a/srcpkgs/wcm/template
+++ b/srcpkgs/wcm/template
@@ -1,6 +1,6 @@
 # Template file for 'wcm'
 pkgname=wcm
-version=0.5.0
+version=0.6.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config wayland-devel"
@@ -10,7 +10,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://wayfire.org/"
 distfiles="https://github.com/WayfireWM/wcm/archive/v${version}.tar.gz"
-checksum=9cfcceefc838c8a0d547f5e40206901b282680da02a96490f756f7ad7da79341
+checksum=bfead0b617f46306ad3bc15b8e9c7e8f13996de6b5bdd3f2d18f066a9033740f
 
 post_install() {
 	vlicense LICENSE

From fe3a9321b8bf311af86ea8c240d4e6a11e429a8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Fiala?= <temp.xanomes@volny.cz>
Date: Fri, 13 Nov 2020 11:19:28 +0100
Subject: [PATCH 09/11] wofi: update to 1.2.3

---
 srcpkgs/wofi/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/wofi/template b/srcpkgs/wofi/template
index 4c21a047785..80863c765ef 100644
--- a/srcpkgs/wofi/template
+++ b/srcpkgs/wofi/template
@@ -1,7 +1,7 @@
 # Template file for 'wofi'
 pkgname=wofi
-version=1.2.2
-revision=2
+version=1.2.3
+revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=meson
 hostmakedepends="pkg-config"
@@ -11,4 +11,4 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://hg.sr.ht/~scoopta/wofi"
 distfiles="https://hg.sr.ht/~scoopta/wofi/archive/v${version}.tar.gz"
-checksum=@4e5193fe7eb29d08ee0249aa1d6dbb343b9b1fe54b11abfeb06f7c2015270431
+checksum=@3ef3ff39eb6c72f20a70486a40f0060150044b701db84489f9773f309673f8e7

From 11930d43c0f8b98f56c6bf4f5170a72e723fb9a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Fiala?= <temp.xanomes@volny.cz>
Date: Wed, 18 Nov 2020 15:21:02 +0100
Subject: [PATCH 10/11] wf-shell: update to 0.6.1

---
 srcpkgs/wf-shell/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/wf-shell/template b/srcpkgs/wf-shell/template
index f88d967d172..de1a64b372c 100644
--- a/srcpkgs/wf-shell/template
+++ b/srcpkgs/wf-shell/template
@@ -1,9 +1,10 @@
 # Template file for 'wf-shell'
 pkgname=wf-shell
-version=0.5.0
+version=0.6.1
 revision=1
 build_style=meson
 build_helper="gir"
+configureargs="-Dwayland-logout:implementation=c"
 hostmakedepends="gobject-introspection pkg-config wayland-devel"
 makedepends="alsa-lib-devel pulseaudio-devel gtkmm-devel wayfire-devel
  gtk+3-devel gtk-layer-shell-devel"
@@ -11,8 +12,8 @@ short_desc="Wayfire shell with GTK-based panel and background client"
 maintainer="Young Jin Park <youngjinpark20@gmail.com>"
 license="MIT"
 homepage="https://wayfire.org"
-distfiles="https://github.com/WayfireWM/wf-shell/releases/download/${version}/wf-shell-${version}.tar.xz"
-checksum=fa481e867784b94b08857ec7bd27bf43251490d5d50c1e834e7ea64d908792f0
+distfiles="https://github.com/WayfireWM/wf-shell/releases/download/v${version}/wf-shell-${version}.tar.xz"
+checksum=da8e5a16dde8f44966d41449452bcc7bc2466d5945324aca714ecc82827c884a
 
 post_install() {
 	vlicense LICENSE

From bac25f84ceebafe787d7261425f729e48b69bf9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Fiala?= <temp.xanomes@volny.cz>
Date: Wed, 18 Nov 2020 15:47:31 +0100
Subject: [PATCH 11/11] wayfire: fix switcher bug when using b_ndebug=true

---
 srcpkgs/wayfire/patches/fix_switcher.patch | 30 ++++++++++++++++++++++
 srcpkgs/wayfire/template                   |  2 +-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/wayfire/patches/fix_switcher.patch

diff --git a/srcpkgs/wayfire/patches/fix_switcher.patch b/srcpkgs/wayfire/patches/fix_switcher.patch
new file mode 100644
index 00000000000..a09e43d12e6
--- /dev/null
+++ b/srcpkgs/wayfire/patches/fix_switcher.patch
@@ -0,0 +1,30 @@
+--- plugins/single_plugins/switcher.cpp	2020-11-18 15:30:44.970379825 +0100
++++ plugins/single_plugins/switcher.cpp	2020-11-18 15:30:31.068223026 +0100
+@@ -201,7 +201,8 @@ class WayfireSwitcher : public wf::plugi
+             active = true;
+ 
+             // grabs shouldn't fail if we could successfully activate plugin
+-            assert(grab_interface->grab());
++            auto grab = grab_interface->grab();
++            assert(grab);
+ 
+             focus_next(dir);
+             arrange();
+--- src/view/layer-shell.cpp	2020-11-18 15:30:44.970379825 +0100
++++ src/view/layer-shell.cpp	2020-11-18 15:30:40.404328323 +0100
+@@ -1,5 +1,6 @@
+ #include <algorithm>
+ #include <cstring>
++#include <cstdlib>
+ 
+ #include "xdg-shell.hpp"
+ #include "wayfire/core.hpp"
+@@ -69,7 +70,7 @@ wf::workspace_manager::anchored_edge anc
+         return wf::workspace_manager::ANCHORED_EDGE_RIGHT;
+     }
+ 
+-    assert(false);
++    abort();
+ }
+ 
+ struct wf_layer_shell_manager
diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template
index d2d1414c6a8..22c5494af07 100644
--- a/srcpkgs/wayfire/template
+++ b/srcpkgs/wayfire/template
@@ -1,7 +1,7 @@
 # Template file for 'wayfire'
 pkgname=wayfire
 version=0.6.0
-revision=1
+revision=2
 _utils_commit=f45641beef46babdc8f1b8d18a924e72beaf8ee6
 _touch_commit=b1075c54a280f913edc26b9757262f4f9d6b62b0
 build_style=meson