Re: [PR PATCH] [Updated] Clean up wlroots build

[ericonr <ericonr@users.noreply.github.com>]

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

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

https://github.com/ericonr/void-packages wlroots
https://github.com/void-linux/void-packages/pull/23793

Clean up wlroots build
Include all dependencies needed for building wlroots based applications into `wlroots-devel`. If they aren't included, `meson` complains about missing deps. Clean up templates accordingly.

I am only revbumping the packages that actually change, so wlroots and wf-config. The rest are unchanged, because it's only how the dependencies are pulled in that changes.

I guess @ifreund @ahesford @travankor 

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

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

From 88def4698a629a29c7237182040104d854b876a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 24 Jul 2020 00:03:29 -0300
Subject: [PATCH 1/9] wlroots: provide all dependencies in wlroots-devel.

These dependencies are all required when building applications that use
wlroots, so it doesn't make sense to include them individually into each
application's template.

Also remove libcap, which was dropped by upstream.
---
 srcpkgs/wlroots/template | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/wlroots/template b/srcpkgs/wlroots/template
index 5a171277978..8968bba8cef 100644
--- a/srcpkgs/wlroots/template
+++ b/srcpkgs/wlroots/template
@@ -1,17 +1,18 @@
 # Template file for 'wlroots'
 pkgname=wlroots
 version=0.11.0
-revision=1
+revision=2
 build_style=meson
-configure_args="-Dlibcap=enabled -Dlogind=enabled -Dlogind-provider=elogind
+configure_args="-Dlogind=enabled -Dlogind-provider=elogind
  -Dxcb-errors=enabled -Dxcb-icccm=enabled -Dxwayland=enabled
  -Dx11-backend=enabled -Dexamples=false"
 hostmakedepends="pkg-config wayland-devel"
-makedepends="elogind-devel libcap-devel wayland-devel wayland-protocols
- MesaLib-devel libinput-devel libxkbcommon-devel libdrm-devel pixman-devel
+_devel_depends="MesaLib-devel elogind-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}
  libxcb-devel xcb-util-cursor-devel xcb-util-devel xcb-util-image-devel
- xcb-util-keysyms-devel xcb-util-renderutil-devel xcb-util-wm-devel
- xcb-util-errors-devel xcb-util-xrm-devel"
+ xcb-util-keysyms-devel xcb-util-renderutil-devel xcb-util-xrm-devel"
 short_desc="Modular Wayland compositor library"
 maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
@@ -24,9 +25,7 @@ post_install() {
 }
 
 wlroots-devel_package() {
-	depends="MesaLib-devel elogind-devel eudev-libudev-devel libcap-devel
-	 libdrm-devel libinput-devel libxkbcommon-devel pixman-devel wayland-devel
-	 wayland-protocols wlroots-${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision} ${_devel_depends}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From f0bb47df6dcee4415d8b9e72c5a165e77df46498 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 24 Jul 2020 00:05:24 -0300
Subject: [PATCH 2/9] sway: clean up makedepends.

Drop elogind description.
---
 srcpkgs/sway/template | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template
index 6e191ba70e5..fa8e1850c50 100644
--- a/srcpkgs/sway/template
+++ b/srcpkgs/sway/template
@@ -5,9 +5,8 @@ revision=2
 build_style=meson
 conf_files="/etc/sway/config"
 hostmakedepends="pkg-config wayland-devel scdoc git"
-makedepends="xcb-util-wm-devel xcb-util-errors-devel wlroots-devel
- wayland-devel wayland-protocols pcre-devel
- json-c-devel pango-devel cairo-devel gdk-pixbuf-devel"
+makedepends="wlroots-devel pcre-devel json-c-devel pango-devel cairo-devel
+ gdk-pixbuf-devel"
 depends="swaybg xorg-server-xwayland $(vopt_if elogind elogind)"
 short_desc="Tiling Wayland compositor compatible with i3"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
@@ -17,7 +16,6 @@ distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"
 checksum=c80644774d612d7d377093d4990061d36c36673862c06318a7b0e37fa47b0178
 
 build_options="elogind"
-desc_option_elogind="Uses elogind instead of setuid for privilege escalation"
 
 post_patch() {
 	vsed -e 's/werror=true/werror=false/g' -i meson.build

From c852600b4ff0dda32b3f4d0951e205d8714f42f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 24 Jul 2020 00:05:47 -0300
Subject: [PATCH 3/9] hikari: update to 2.1.1, clean up makedepends.

Removed the dependencies provided by wlroots, removed libevdev-devel,
which isn't required, and put wayland-devel unconditionally in
hostmakedepends, to follow the pattern of the other templates.
---
 srcpkgs/hikari/template | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/hikari/template b/srcpkgs/hikari/template
index 754f052de2f..4d71b69622b 100644
--- a/srcpkgs/hikari/template
+++ b/srcpkgs/hikari/template
@@ -1,6 +1,6 @@
 # Template file for 'hikari'
 pkgname=hikari
-version=2.1.0
+version=2.1.1
 revision=1
 build_style=gnu-makefile
 make_cmd=bmake
@@ -8,24 +8,17 @@ 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="
-hostmakedepends="bmake pkg-config"
-makedepends="wlroots-devel pango-devel cairo-devel pam-devel glib-devel
- libinput-devel xcb-util-errors-devel xcb-util-wm-devel libucl-devel
- libxkbcommon-devel pixman-devel libevdev-devel"
+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"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-2-Clause"
 homepage="https://hikari.acmelabs.space"
 changelog="https://hub.darcs.net/raichoo/hikari/browse/CHANGELOG.md"
 distfiles="${homepage}/releases/${pkgname}-${version}.tar.gz"
-checksum=6a1f14a73119b227b7d2c364c0627aade2630b080fe730bb11e9854d3408b59b
+checksum=ab75c4563aa57ae3f207b05cbb6e023cad9fd2f96cabafa1b16ed7eaf22f546d
 conf_files="/etc/pam.d/hikari-unlocker /etc/hikari/hikari.conf"
 
-if [ "$CROSS_BUILD" ]; then
-	# Makefile executes wayland-scanner
-	hostmakedepends+=" wayland-devel"
-fi
-
 pre_build() {
 	# The hikari Makefile appends to the CFLAGS and LDFLAGS variables;
 	# bmake ignores these appends altogether when passing variables on the

From 98638f4aa720571c7ea31c5e89f99062f544c30b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 24 Jul 2020 00:06:55 -0300
Subject: [PATCH 4/9] cage: clean makedeps, add xwayland,elogind options

Partly by @travankor
closes #20755
---
 srcpkgs/cage/template | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cage/template b/srcpkgs/cage/template
index 76ba731cc58..a4085ac8483 100644
--- a/srcpkgs/cage/template
+++ b/srcpkgs/cage/template
@@ -1,10 +1,12 @@
 # Template file for 'cage'
 pkgname=cage
 version=0.1.2.1
-revision=1
+revision=2
 build_style=meson
+configure_args="$(vopt_bool xwayland xwayland)"
 hostmakedepends="pkg-config wayland-devel scdoc"
-makedepends="xcb-util-wm-devel xcb-util-errors-devel libxkbcommon-devel pixman-devel wayland-devel wlroots-devel"
+makedepends="wlroots-devel"
+depends="$(vopt_if xwayland xorg-server-xwayland) $(vopt_if elogind elogind)"
 short_desc="Kiosk compositor for Wayland"
 maintainer="Illia Shestakov <ishestakov@airmail.cc>"
 license="MIT"
@@ -12,6 +14,14 @@ 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_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 9b86d5cc138605dac003200dbaaaf6ee7ad2a6ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 24 Jul 2020 00:12:36 -0300
Subject: [PATCH 5/9] wf-config: update to 0.5.0, use correct makedeps.

---
 common/shlibs              | 2 +-
 srcpkgs/wf-config/template | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 8451b640bb5..871a96d8a6a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3653,7 +3653,7 @@ libsnore-qt5.so.0.7 snorenotify-0.7.0_1
 libsnoresettings-qt5.so.0.7 snorenotify-0.7.0_1
 libTECkit.so.0 libteckit-2.5.8_1
 libTECkit_Compiler.so.0 libteckit-2.5.8_1
-libwf-config.so.0 wf-config-0.3_1
+libwf-config.so.1 wf-config-0.5.0_1
 libQt5Pas.so.1 qt5pas-2.6~beta_1
 libClp.so.1 libClp-1.16.11_1
 libCoinUtils.so.3 libClp-1.16.11_1
diff --git a/srcpkgs/wf-config/template b/srcpkgs/wf-config/template
index 0da874c532a..ce7fce82dc1 100644
--- a/srcpkgs/wf-config/template
+++ b/srcpkgs/wf-config/template
@@ -1,7 +1,7 @@
 # Template file for 'wf-config'
 pkgname=wf-config
-version=0.4.0
-revision=3
+version=0.5.0
+revision=1
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="glm libevdev-devel libxml2-devel"
@@ -10,15 +10,14 @@ 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=78a922074138c2324ed242e8bf5791a599dfc96bbb2ee677685ae43657629333
+checksum=bf690477ff0d8928ddeca6a278b9153a39ade1e13fd32cc6d04552db4d65cbf0
 
 post_install() {
 	vlicense LICENSE
 }
 
 wf-config-devel_package() {
-	depends="libevdev-devel wlroots-devel libxml2-devel
-	 ${sourcepkg}>=${version}_${revision}"
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 223cb4d55f06735354320367f540b83a34403275 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 24 Jul 2020 00:13:48 -0300
Subject: [PATCH 6/9] wayfire: update to 0.5.0, split devel, adopt.

- Also cleaned up make depends.
- Added elogind build option.
- Added wf-utils subproject
---
 srcpkgs/wayfire-devel                        |   1 +
 srcpkgs/wayfire/patches/wlroots_0.11.0.patch | 149 -------------------
 srcpkgs/wayfire/template                     |  39 ++++-
 3 files changed, 32 insertions(+), 157 deletions(-)
 create mode 120000 srcpkgs/wayfire-devel
 delete mode 100644 srcpkgs/wayfire/patches/wlroots_0.11.0.patch

diff --git a/srcpkgs/wayfire-devel b/srcpkgs/wayfire-devel
new file mode 120000
index 00000000000..f1a81be0cc8
--- /dev/null
+++ b/srcpkgs/wayfire-devel
@@ -0,0 +1 @@
+wayfire
\ No newline at end of file
diff --git a/srcpkgs/wayfire/patches/wlroots_0.11.0.patch b/srcpkgs/wayfire/patches/wlroots_0.11.0.patch
deleted file mode 100644
index d619a785898..00000000000
--- a/srcpkgs/wayfire/patches/wlroots_0.11.0.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-Thanks to jbeich and FreeBSD:
-https://github.com/freebsd/freebsd-ports/commit/c920e5595b69a5a550bd452015634630a5374822
-
-https://github.com/WayfireWM/wayfire/commit/0d6cecd27799
-https://github.com/WayfireWM/wayfire/commit/187b525c16d1
-https://github.com/WayfireWM/wayfire/commit/29dcd1387700
-https://github.com/WayfireWM/wayfire/commit/0e4e29acb3e9
-
---- meson.build.orig	2020-03-21 19:10:27 UTC
-+++ meson.build
-@@ -29,7 +29,7 @@ libinput       = dependency('libinput', version: '>=1.
- pixman         = dependency('pixman-1')
- threads        = dependency('threads')
- xkbcommon      = dependency('xkbcommon')
--wlroots        = dependency('wlroots', version: ['>=0.9.0', '<0.11.0'], required: get_option('use_system_wlroots'))
-+wlroots        = dependency('wlroots', version: ['>=0.11.0', '<0.12.0'], required: get_option('use_system_wlroots'))
- wfconfig       = dependency('wf-config', version: ['>=0.4.0', '<0.5.0'], required: get_option('use_system_wfconfig'))
- 
- use_system_wlroots = not get_option('use_system_wlroots').disabled() and wlroots.found()
---- src/api/wayfire/core.hpp.orig	2020-03-21 19:10:27 UTC
-+++ src/api/wayfire/core.hpp
-@@ -226,11 +226,12 @@ class compositor_core_t : public wf::object_base_t
-     std::string wayland_display;
- 
-     /**
--     * Return the xwayland display number.
-+     * Return the xwayland display name.
-      *
--     * This returns -1 if xwayland is not available
-+     * @return The xwayland display name, or empty string if xwayland is not
-+     *   available.
-      */
--    virtual int get_xwayland_display() = 0;
-+    virtual std::string get_xwayland_display() = 0;
- 
-     /**
-      * Execute the given command in a bash shell.
---- src/core/core-impl.hpp.orig	2020-03-21 19:10:27 UTC
-+++ src/core/core-impl.hpp
-@@ -75,7 +75,7 @@ class compositor_core_impl_t : public compositor_core_
-     int focus_layer(uint32_t layer, int request) override;
-     void unfocus_layer(int request) override;
-     uint32_t get_focused_layer() override;
--    int get_xwayland_display() override;
-+    std::string get_xwayland_display() override;
-     void run(std::string command) override;
- 
-   private:
---- src/core/core.cpp.orig	2020-03-21 19:10:27 UTC
-+++ src/core/core.cpp
-@@ -548,9 +548,8 @@ void wf::compositor_core_impl_t::run(std::string comma
-             setenv("_JAVA_AWT_WM_NONREPARENTING", "1", 1);
-             setenv("WAYLAND_DISPLAY", wayland_display.c_str(), 1);
- #if WLR_HAS_XWAYLAND
--            if (xwayland_get_display() >= 0) {
--                auto xdisp = ":" + std::to_string(xwayland_get_display());
--                setenv("DISPLAY", xdisp.c_str(), 1);
-+            if (!xwayland_get_display().empty()) {
-+                setenv("DISPLAY", xwayland_get_display().c_str(), 1);
-             }
- #endif
-             int dev_null = open("/dev/null", O_WRONLY);
-@@ -567,7 +566,7 @@ void wf::compositor_core_impl_t::run(std::string comma
-     }
- }
- 
--int wf::compositor_core_impl_t::get_xwayland_display()
-+std::string wf::compositor_core_impl_t::get_xwayland_display()
- {
-     return xwayland_get_display();
- }
---- src/core/seat/keyboard.cpp.orig	2020-03-21 19:10:27 UTC
-+++ src/core/seat/keyboard.cpp
-@@ -113,15 +113,20 @@ void input_manager::set_keyboard_focus(wayfire_view vi
-     if (!active_grab)
-     {
-         auto kbd = wlr_seat_get_keyboard(seat);
--        wlr_seat_keyboard_notify_enter(seat, surface,
--            kbd ? kbd->keycodes : NULL,
--            kbd ? kbd->num_keycodes : 0,
--            kbd ? &kbd->modifiers : NULL);
-+        if (surface)
-+        {
-+            wlr_seat_keyboard_notify_enter(seat, surface,
-+                kbd ? kbd->keycodes : NULL,
-+                kbd ? kbd->num_keycodes : 0,
-+                kbd ? &kbd->modifiers : NULL);
-+        } else {
-+            wlr_seat_keyboard_clear_focus(seat);
-+        }
-         keyboard_focus = view;
-     }
-     else
-     {
--        wlr_seat_keyboard_notify_enter(seat, NULL, NULL, 0, NULL);
-+        wlr_seat_keyboard_clear_focus(seat);
-         keyboard_focus = nullptr;
-     }
- }
---- src/core/seat/pointer.cpp.orig	2020-03-21 19:10:27 UTC
-+++ src/core/seat/pointer.cpp
-@@ -116,7 +116,7 @@ void wf::LogicalPointer::update_cursor_focus(wf::surfa
- 
-     cursor_focus = focus;
-     wlr_surface *next_focus_wlr_surface = nullptr;
--    if (focus && !compositor_surface_from_surface(focus))
-+    if (focus && focus->get_wlr_surface())
-     {
-         next_focus_wlr_surface = focus->get_wlr_surface();
-         wlr_seat_pointer_notify_enter(input->seat, next_focus_wlr_surface,
---- src/view/surface.cpp.orig	2020-03-21 19:10:27 UTC
-+++ src/view/surface.cpp
-@@ -322,7 +322,7 @@ void wf::wlr_surface_base_t::unmap()
- wlr_buffer* wf::wlr_surface_base_t::get_buffer()
- {
-     if (surface && wlr_surface_has_buffer(surface))
--        return surface->buffer;
-+        return &surface->buffer->base;
- 
-     return nullptr;
- }
---- src/view/view-impl.hpp.orig	2020-03-21 19:10:27 UTC
-+++ src/view/view-impl.hpp
-@@ -204,7 +204,7 @@ void init_xwayland();
- void init_layer_shell();
- 
- void xwayland_set_seat(wlr_seat *seat);
--int xwayland_get_display();
-+std::string xwayland_get_display();
- 
- void init_desktop_apis();
- }
---- src/view/xwayland.cpp.orig	2020-03-21 19:10:27 UTC
-+++ src/view/xwayland.cpp
-@@ -567,11 +567,11 @@ void wf::xwayland_set_seat(wlr_seat *seat)
- #endif
- }
- 
--int wf::xwayland_get_display()
-+std::string wf::xwayland_get_display()
- {
- #if WLR_HAS_XWAYLAND
--    return xwayland_handle ? xwayland_handle->display : -1;
-+    return xwayland_handle ? nonull(xwayland_handle->display_name) : "";
- #else
--    return -1;
-+    return "";
- #endif
- }
diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template
index ee4f3199a00..97cee3c6f98 100644
--- a/srcpkgs/wayfire/template
+++ b/srcpkgs/wayfire/template
@@ -1,24 +1,47 @@
 # Template file for 'wayfire'
 pkgname=wayfire
-version=0.4.0
-revision=3
+version=0.5.0
+revision=1
+_utils_commit=f9b5eba437a04a0d1fb9f00a0fdb88c12b9f6b27
 build_style=meson
 hostmakedepends="pkg-config wayland-devel"
-makedepends="xcb-util-wm-devel xcb-util-errors-devel glm cairo-devel
- wf-config-devel wlroots-devel"
-depends="xorg-server-xwayland"
+makedepends="wf-config-devel wlroots-devel cairo-devel"
+depends="xorg-server-xwayland $(vopt_if elogind elogind)"
 short_desc="3D wayland compositor"
-maintainer="Young Jin Park <youngjinpark20@gmail.com>"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://wayfire.org"
-distfiles="https://github.com/WayfireWM/wayfire/archive/${version}.tar.gz"
-checksum=9c009c01bccce97149d0695b5429cf44787fdc1423c58425ba8e8de601019e97
+distfiles="https://github.com/WayfireWM/wayfire/archive/${version}.tar.gz
+ https://github.com/WayfireWM/wf-utils/archive/${_utils_commit}.tar.gz"
+checksum="24c1a2c963dac5af762f87cd024bc3dd736ec9a28a6735d357a05e8f6502e8aa
+ 5c3e8bfefd74083a2548b6a95a070000cf73591bfe78335413da5c7fb82340cb"
+
+build_options="elogind"
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" libexecinfo-devel"
 fi
 
+post_extract() {
+	rmdir subprojects/wf-utils
+	mv ../wf-utils-${_utils_commit} subprojects/wf-utils
+}
+
 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
 }
+
+wayfire-devel_package() {
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From ce11aaf11e3601db1cd85f58722bfbefd3e9c278 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 24 Jul 2020 00:37:03 -0300
Subject: [PATCH 7/9] wf-shell: update to 0.5.0, clean up makedepends.

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

diff --git a/srcpkgs/wf-shell/template b/srcpkgs/wf-shell/template
index af62c3c5207..f88d967d172 100644
--- a/srcpkgs/wf-shell/template
+++ b/srcpkgs/wf-shell/template
@@ -1,20 +1,18 @@
 # Template file for 'wf-shell'
 pkgname=wf-shell
-version=0.4.0
-revision=3
+version=0.5.0
+revision=1
 build_style=meson
 build_helper="gir"
 hostmakedepends="gobject-introspection pkg-config wayland-devel"
-makedepends="alsa-lib-devel pulseaudio-devel gtkmm-devel
- gtk+3-devel libevdev-devel wlroots-devel wf-config-devel
- xcb-util-errors-devel xcb-util-wm-devel gtk-layer-shell-devel
- glm wayfire"
+makedepends="alsa-lib-devel pulseaudio-devel gtkmm-devel wayfire-devel
+ gtk+3-devel gtk-layer-shell-devel"
 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="bc03e5232d72f69bf6ba634f688f5e896715d846b7b6344136e9eb88dd6a9aa0"
+checksum=fa481e867784b94b08857ec7bd27bf43251490d5d50c1e834e7ea64d908792f0
 
 post_install() {
 	vlicense LICENSE

From 71540eb1a2b221244b0178a65f6010d75c441bd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 28 Jul 2020 10:45:20 -0300
Subject: [PATCH 8/9] wcm: update to 0.5.0, clean up makedepends.

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

diff --git a/srcpkgs/wcm/template b/srcpkgs/wcm/template
index 2ac36a3e6ac..d74eba5e556 100644
--- a/srcpkgs/wcm/template
+++ b/srcpkgs/wcm/template
@@ -1,17 +1,16 @@
 # Template file for 'wcm'
 pkgname=wcm
-version=0.4.0
+version=0.5.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config wayland-devel"
-makedepends="wayfire wf-config-devel libevdev-devel libxml2-devel gtk+3-devel
- wayland-protocols glm"
+makedepends="wayfire-devel gtk+3-devel wf-shell"
 short_desc="Wayfire Config Manager"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://wayfire.org/"
 distfiles="https://github.com/WayfireWM/wcm/archive/v${version}.tar.gz"
-checksum=8b03dbc9fad184c8e3277e8f5da68707148b3df9df6e042d848b80ee1c53b701
+checksum=9cfcceefc838c8a0d547f5e40206901b282680da02a96490f756f7ad7da79341
 
 post_install() {
 	vlicense LICENSE

From e3ff54be0a922c63d34ce88c7f8ff6f8145b3135 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 28 Jul 2020 10:45:39 -0300
Subject: [PATCH 9/9] New package: wayfire-plugins-extra-0.5.0.

---
 srcpkgs/wayfire-plugins-extra/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/wayfire-plugins-extra/template

diff --git a/srcpkgs/wayfire-plugins-extra/template b/srcpkgs/wayfire-plugins-extra/template
new file mode 100644
index 00000000000..fb5c5260585
--- /dev/null
+++ b/srcpkgs/wayfire-plugins-extra/template
@@ -0,0 +1,18 @@
+# Template file for 'wayfire-plugins-extra'
+pkgname=wayfire-plugins-extra
+version=0.5.0
+revision=1
+build_style=meson
+hostmakedepends="pkg-config git"
+makedepends="wayfire-devel glibmm-devel"
+depends="wayfire"
+short_desc="Additional plugins for Wayfire"
+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
+
+post_install() {
+	vlicense LICENSE
+}