[PR PATCH] Clean up wlroots build

[PR PATCH] Clean up wlroots build

[ericonr]

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

There is a new 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 into `wlroots-devel`. 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.

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: 7792 bytes --]

From ebd137345c08aa7cb9787995c7b7d929525335b9 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/6] 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.
---
 srcpkgs/wlroots/template | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/wlroots/template b/srcpkgs/wlroots/template
index 5a171277978..b0dfac594a7 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
  -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 libcap-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="wlroots-${version}_${revision} ${_devel_depends}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From e61fbc021456da0a5802f76c23623bf83a9a3bc1 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/6] sway: clean up makedepends.

---
 srcpkgs/sway/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template
index 6e191ba70e5..af50ab91379 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>"

From 6b1ca281fdd5eadf045fb38d4e7026a1d20be0c5 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/6] hikari: 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 | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/hikari/template b/srcpkgs/hikari/template
index 754f052de2f..76c77eb795a 100644
--- a/srcpkgs/hikari/template
+++ b/srcpkgs/hikari/template
@@ -8,10 +8,8 @@ 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"
@@ -21,11 +19,6 @@ distfiles="${homepage}/releases/${pkgname}-${version}.tar.gz"
 checksum=6a1f14a73119b227b7d2c364c0627aade2630b080fe730bb11e9854d3408b59b
 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 c42d38112241d23e97286ef826aa4cb0e23dce39 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/6] cage: clean up makedepends.

---
 srcpkgs/cage/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cage/template b/srcpkgs/cage/template
index 76ba731cc58..2857720b73f 100644
--- a/srcpkgs/cage/template
+++ b/srcpkgs/cage/template
@@ -4,7 +4,7 @@ version=0.1.2.1
 revision=1
 build_style=meson
 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"
 short_desc="Kiosk compositor for Wayland"
 maintainer="Illia Shestakov <ishestakov@airmail.cc>"
 license="MIT"

From 9d5ac8eafa60a383391eb57839099bd43b8e153f 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/6] wf-config: include correct devel deps.

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

diff --git a/srcpkgs/wf-config/template b/srcpkgs/wf-config/template
index 0da874c532a..075f283d6a4 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
+revision=4
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="glm libevdev-devel libxml2-devel"
@@ -17,8 +17,7 @@ post_install() {
 }
 
 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 b137cbbe1fc5f99d141916b9d7a574cc2210fa38 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/6] wayfire: clean up makedepends.

---
 srcpkgs/wayfire/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template
index ee4f3199a00..df2b9d9db8f 100644
--- a/srcpkgs/wayfire/template
+++ b/srcpkgs/wayfire/template
@@ -4,8 +4,7 @@ version=0.4.0
 revision=3
 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"
+makedepends="cairo-devel wf-config-devel wlroots-devel"
 depends="xorg-server-xwayland"
 short_desc="3D wayland compositor"
 maintainer="Young Jin Park <youngjinpark20@gmail.com>"

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

[ericonr]

[-- 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: 8880 bytes --]

From ebd137345c08aa7cb9787995c7b7d929525335b9 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/7] 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.
---
 srcpkgs/wlroots/template | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/wlroots/template b/srcpkgs/wlroots/template
index 5a171277978..b0dfac594a7 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
  -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 libcap-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="wlroots-${version}_${revision} ${_devel_depends}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From e61fbc021456da0a5802f76c23623bf83a9a3bc1 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/7] sway: clean up makedepends.

---
 srcpkgs/sway/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template
index 6e191ba70e5..af50ab91379 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>"

From 6b1ca281fdd5eadf045fb38d4e7026a1d20be0c5 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/7] hikari: 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 | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/hikari/template b/srcpkgs/hikari/template
index 754f052de2f..76c77eb795a 100644
--- a/srcpkgs/hikari/template
+++ b/srcpkgs/hikari/template
@@ -8,10 +8,8 @@ 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"
@@ -21,11 +19,6 @@ distfiles="${homepage}/releases/${pkgname}-${version}.tar.gz"
 checksum=6a1f14a73119b227b7d2c364c0627aade2630b080fe730bb11e9854d3408b59b
 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 c42d38112241d23e97286ef826aa4cb0e23dce39 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/7] cage: clean up makedepends.

---
 srcpkgs/cage/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cage/template b/srcpkgs/cage/template
index 76ba731cc58..2857720b73f 100644
--- a/srcpkgs/cage/template
+++ b/srcpkgs/cage/template
@@ -4,7 +4,7 @@ version=0.1.2.1
 revision=1
 build_style=meson
 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"
 short_desc="Kiosk compositor for Wayland"
 maintainer="Illia Shestakov <ishestakov@airmail.cc>"
 license="MIT"

From 9d5ac8eafa60a383391eb57839099bd43b8e153f 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/7] wf-config: include correct devel deps.

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

diff --git a/srcpkgs/wf-config/template b/srcpkgs/wf-config/template
index 0da874c532a..075f283d6a4 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
+revision=4
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="glm libevdev-devel libxml2-devel"
@@ -17,8 +17,7 @@ post_install() {
 }
 
 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 b137cbbe1fc5f99d141916b9d7a574cc2210fa38 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/7] wayfire: clean up makedepends.

---
 srcpkgs/wayfire/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template
index ee4f3199a00..df2b9d9db8f 100644
--- a/srcpkgs/wayfire/template
+++ b/srcpkgs/wayfire/template
@@ -4,8 +4,7 @@ version=0.4.0
 revision=3
 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"
+makedepends="cairo-devel wf-config-devel wlroots-devel"
 depends="xorg-server-xwayland"
 short_desc="3D wayland compositor"
 maintainer="Young Jin Park <youngjinpark20@gmail.com>"

From e31c80bbb13c2f286db7a09873c57ea6498138b7 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/7] wf-shell: clean up makedepends.

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

diff --git a/srcpkgs/wf-shell/template b/srcpkgs/wf-shell/template
index af62c3c5207..d5568edf252 100644
--- a/srcpkgs/wf-shell/template
+++ b/srcpkgs/wf-shell/template
@@ -5,10 +5,8 @@ revision=3
 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
+ gtk+3-devel wlroots-devel wf-config-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"

Re: Clean up wlroots build

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/23793#issuecomment-663336726

Comment:
Also wayfire should be split into a devel package, but I will do that when it's updated.

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

[ericonr]

[-- 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: 8880 bytes --]

From ebd137345c08aa7cb9787995c7b7d929525335b9 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/7] 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.
---
 srcpkgs/wlroots/template | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/wlroots/template b/srcpkgs/wlroots/template
index 5a171277978..b0dfac594a7 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
  -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 libcap-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="wlroots-${version}_${revision} ${_devel_depends}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From e61fbc021456da0a5802f76c23623bf83a9a3bc1 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/7] sway: clean up makedepends.

---
 srcpkgs/sway/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template
index 6e191ba70e5..af50ab91379 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>"

From 6b1ca281fdd5eadf045fb38d4e7026a1d20be0c5 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/7] hikari: 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 | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/hikari/template b/srcpkgs/hikari/template
index 754f052de2f..76c77eb795a 100644
--- a/srcpkgs/hikari/template
+++ b/srcpkgs/hikari/template
@@ -8,10 +8,8 @@ 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"
@@ -21,11 +19,6 @@ distfiles="${homepage}/releases/${pkgname}-${version}.tar.gz"
 checksum=6a1f14a73119b227b7d2c364c0627aade2630b080fe730bb11e9854d3408b59b
 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 c42d38112241d23e97286ef826aa4cb0e23dce39 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/7] cage: clean up makedepends.

---
 srcpkgs/cage/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cage/template b/srcpkgs/cage/template
index 76ba731cc58..2857720b73f 100644
--- a/srcpkgs/cage/template
+++ b/srcpkgs/cage/template
@@ -4,7 +4,7 @@ version=0.1.2.1
 revision=1
 build_style=meson
 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"
 short_desc="Kiosk compositor for Wayland"
 maintainer="Illia Shestakov <ishestakov@airmail.cc>"
 license="MIT"

From 9d5ac8eafa60a383391eb57839099bd43b8e153f 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/7] wf-config: include correct devel deps.

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

diff --git a/srcpkgs/wf-config/template b/srcpkgs/wf-config/template
index 0da874c532a..075f283d6a4 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
+revision=4
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="glm libevdev-devel libxml2-devel"
@@ -17,8 +17,7 @@ post_install() {
 }
 
 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 b137cbbe1fc5f99d141916b9d7a574cc2210fa38 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/7] wayfire: clean up makedepends.

---
 srcpkgs/wayfire/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template
index ee4f3199a00..df2b9d9db8f 100644
--- a/srcpkgs/wayfire/template
+++ b/srcpkgs/wayfire/template
@@ -4,8 +4,7 @@ version=0.4.0
 revision=3
 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"
+makedepends="cairo-devel wf-config-devel wlroots-devel"
 depends="xorg-server-xwayland"
 short_desc="3D wayland compositor"
 maintainer="Young Jin Park <youngjinpark20@gmail.com>"

From e31c80bbb13c2f286db7a09873c57ea6498138b7 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/7] wf-shell: clean up makedepends.

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

diff --git a/srcpkgs/wf-shell/template b/srcpkgs/wf-shell/template
index af62c3c5207..d5568edf252 100644
--- a/srcpkgs/wf-shell/template
+++ b/srcpkgs/wf-shell/template
@@ -5,10 +5,8 @@ revision=3
 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
+ gtk+3-devel wlroots-devel wf-config-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"

Re: [PR REVIEW] Clean up wlroots build

[ahesford]

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/23793#discussion_r459843754

Comment:
Better to use `>=` rather than a specific version.

Re: [PR REVIEW] Clean up wlroots build

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/23793#discussion_r459844301

Comment:
I was wondering, thanks.

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

[ericonr]

[-- 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: 8886 bytes --]

From 635dead40cbe40c9df2aff3e58b7cf4222358749 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/7] 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.
---
 srcpkgs/wlroots/template | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/wlroots/template b/srcpkgs/wlroots/template
index 5a171277978..7e94c4ce562 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
  -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 libcap-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 cb4ce716a1e402e81edc44a41cef8849905aa624 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/7] sway: clean up makedepends.

---
 srcpkgs/sway/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template
index 6e191ba70e5..af50ab91379 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>"

From bd01e693562f45b1a44a59a47d810d9222d9ad27 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/7] hikari: 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 | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/hikari/template b/srcpkgs/hikari/template
index 754f052de2f..76c77eb795a 100644
--- a/srcpkgs/hikari/template
+++ b/srcpkgs/hikari/template
@@ -8,10 +8,8 @@ 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"
@@ -21,11 +19,6 @@ distfiles="${homepage}/releases/${pkgname}-${version}.tar.gz"
 checksum=6a1f14a73119b227b7d2c364c0627aade2630b080fe730bb11e9854d3408b59b
 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 05630d22c47d25f2c2f76526e7eaa93dd2d84c9c 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/7] cage: clean up makedepends.

---
 srcpkgs/cage/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cage/template b/srcpkgs/cage/template
index 76ba731cc58..2857720b73f 100644
--- a/srcpkgs/cage/template
+++ b/srcpkgs/cage/template
@@ -4,7 +4,7 @@ version=0.1.2.1
 revision=1
 build_style=meson
 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"
 short_desc="Kiosk compositor for Wayland"
 maintainer="Illia Shestakov <ishestakov@airmail.cc>"
 license="MIT"

From cd3b4e7b6901dd10fecde3d77637972e5660899f 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/7] wf-config: include correct devel deps.

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

diff --git a/srcpkgs/wf-config/template b/srcpkgs/wf-config/template
index 0da874c532a..075f283d6a4 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
+revision=4
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="glm libevdev-devel libxml2-devel"
@@ -17,8 +17,7 @@ post_install() {
 }
 
 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 86063735163d8603e0375eb72fd27a0eb7006e00 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/7] wayfire: clean up makedepends.

---
 srcpkgs/wayfire/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template
index ee4f3199a00..df2b9d9db8f 100644
--- a/srcpkgs/wayfire/template
+++ b/srcpkgs/wayfire/template
@@ -4,8 +4,7 @@ version=0.4.0
 revision=3
 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"
+makedepends="cairo-devel wf-config-devel wlroots-devel"
 depends="xorg-server-xwayland"
 short_desc="3D wayland compositor"
 maintainer="Young Jin Park <youngjinpark20@gmail.com>"

From 9551d756628187d25c2d92b4eb03265d9928b0e6 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/7] wf-shell: clean up makedepends.

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

diff --git a/srcpkgs/wf-shell/template b/srcpkgs/wf-shell/template
index af62c3c5207..d5568edf252 100644
--- a/srcpkgs/wf-shell/template
+++ b/srcpkgs/wf-shell/template
@@ -5,10 +5,8 @@ revision=3
 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
+ gtk+3-devel wlroots-devel wf-config-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"

Re: Clean up wlroots build

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/23793#issuecomment-663527620

Comment:
@ifreund the packages I added were all packages the build system was complaining about, because they weren't found during the configuration step and were a _requirement_ for wlroots, not its dependants, but all dependants had them.

Re: [PR REVIEW] Clean up wlroots build

[travankor]

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

New review comment by travankor on void-packages repository

https://github.com/void-linux/void-packages/pull/23793#discussion_r460807398

Comment:
I think libcap was dropped.

Re: Clean up wlroots build

[travankor]

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

New comment by travankor on void-packages repository

https://github.com/void-linux/void-packages/pull/23793#issuecomment-664317196

Comment:
Aren't all the xcb dependencies only required for Xwayland? Maybe we can make Xwayland a build option?

Re: [PR REVIEW] Clean up wlroots build

[ifreund]

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

New review comment by ifreund on void-packages repository

https://github.com/void-linux/void-packages/pull/23793#discussion_r460815196

Comment:
Indeed it was

Re: Clean up wlroots build

[ifreund]

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

New comment by ifreund on void-packages repository

https://github.com/void-linux/void-packages/pull/23793#issuecomment-664334882

Comment:
> Aren't all the xcb dependencies only required for Xwayland? Maybe we can make Xwayland a build option?

There are two separate parts here, one is Xwayland and the other is the X11 backend allowing nesting a wlroots-based compositor in an X11 session. We could make these both optional, but I'm not sure it's really worth it. We would then need parallel build options for sway, cage, hikari, and wayfire.

Re: [PR REVIEW] Clean up wlroots build

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/23793#discussion_r460854351

Comment:
Oh cool, will fix.

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

[ericonr]

[-- 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: 8987 bytes --]

From 6e9e8e64577d5c1dbc8b22d45248b54337440342 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/7] 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 f0503e925b2f67ab170929dde605d1dbe0d7f61a 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/7] sway: clean up makedepends.

---
 srcpkgs/sway/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template
index 6e191ba70e5..af50ab91379 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>"

From 096bad8251a6be01801d9ef6029071171687fbfd 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/7] hikari: 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 | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/hikari/template b/srcpkgs/hikari/template
index 754f052de2f..76c77eb795a 100644
--- a/srcpkgs/hikari/template
+++ b/srcpkgs/hikari/template
@@ -8,10 +8,8 @@ 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"
@@ -21,11 +19,6 @@ distfiles="${homepage}/releases/${pkgname}-${version}.tar.gz"
 checksum=6a1f14a73119b227b7d2c364c0627aade2630b080fe730bb11e9854d3408b59b
 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 777189011596723e83247af941c7fc25a2764d21 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/7] cage: clean up makedepends.

---
 srcpkgs/cage/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cage/template b/srcpkgs/cage/template
index 76ba731cc58..2857720b73f 100644
--- a/srcpkgs/cage/template
+++ b/srcpkgs/cage/template
@@ -4,7 +4,7 @@ version=0.1.2.1
 revision=1
 build_style=meson
 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"
 short_desc="Kiosk compositor for Wayland"
 maintainer="Illia Shestakov <ishestakov@airmail.cc>"
 license="MIT"

From 95219360601d63d35a31556da50994367a3ef8fc 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/7] wf-config: include correct devel deps.

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

diff --git a/srcpkgs/wf-config/template b/srcpkgs/wf-config/template
index 0da874c532a..075f283d6a4 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
+revision=4
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="glm libevdev-devel libxml2-devel"
@@ -17,8 +17,7 @@ post_install() {
 }
 
 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 ba88813814235dc8a6e010e1d6ecddb218225d26 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/7] wayfire: clean up makedepends.

---
 srcpkgs/wayfire/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template
index ee4f3199a00..df2b9d9db8f 100644
--- a/srcpkgs/wayfire/template
+++ b/srcpkgs/wayfire/template
@@ -4,8 +4,7 @@ version=0.4.0
 revision=3
 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"
+makedepends="cairo-devel wf-config-devel wlroots-devel"
 depends="xorg-server-xwayland"
 short_desc="3D wayland compositor"
 maintainer="Young Jin Park <youngjinpark20@gmail.com>"

From e96063d2ac979b9a24f0b3d0b44501bfb22e7a21 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/7] wf-shell: clean up makedepends.

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

diff --git a/srcpkgs/wf-shell/template b/srcpkgs/wf-shell/template
index af62c3c5207..d5568edf252 100644
--- a/srcpkgs/wf-shell/template
+++ b/srcpkgs/wf-shell/template
@@ -5,10 +5,8 @@ revision=3
 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
+ gtk+3-devel wlroots-devel wf-config-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"

Re: [PR REVIEW] Clean up wlroots build

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/23793#discussion_r460856105

Comment:
Updated, thanks!

Re: Clean up wlroots build

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/23793#issuecomment-664531722

Comment:
Wayfire should be released in a few days, might as well wait for it.

Re: Clean up wlroots build

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/23793#issuecomment-664578932

Comment:
@yjp20 are you still using Wayfire?

Re: Clean up wlroots build

[ahesford]

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/23793#issuecomment-665041586

Comment:
Please roll the latest hikari into this, which is 2.1.1 for now.

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

[ericonr]

[-- 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: 9325 bytes --]

From 6e9e8e64577d5c1dbc8b22d45248b54337440342 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/7] 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 f0503e925b2f67ab170929dde605d1dbe0d7f61a 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/7] sway: clean up makedepends.

---
 srcpkgs/sway/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template
index 6e191ba70e5..af50ab91379 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>"

From 6702148e93fb80fbd433297f6bc8efff822c3876 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/7] 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 d79b4dfbf6c8ecbb5b37cc28973a308bc18d9d47 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/7] cage: clean up makedepends.

---
 srcpkgs/cage/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cage/template b/srcpkgs/cage/template
index 76ba731cc58..2857720b73f 100644
--- a/srcpkgs/cage/template
+++ b/srcpkgs/cage/template
@@ -4,7 +4,7 @@ version=0.1.2.1
 revision=1
 build_style=meson
 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"
 short_desc="Kiosk compositor for Wayland"
 maintainer="Illia Shestakov <ishestakov@airmail.cc>"
 license="MIT"

From e9a8cb7021a29d8620a7f7e44ebe49e8a72eeaee 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/7] wf-config: include correct devel deps.

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

diff --git a/srcpkgs/wf-config/template b/srcpkgs/wf-config/template
index 0da874c532a..075f283d6a4 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
+revision=4
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="glm libevdev-devel libxml2-devel"
@@ -17,8 +17,7 @@ post_install() {
 }
 
 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 13e9e47b55701a98bb563c810b844ef1bfcea40c 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/7] wayfire: clean up makedepends.

---
 srcpkgs/wayfire/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template
index ee4f3199a00..df2b9d9db8f 100644
--- a/srcpkgs/wayfire/template
+++ b/srcpkgs/wayfire/template
@@ -4,8 +4,7 @@ version=0.4.0
 revision=3
 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"
+makedepends="cairo-devel wf-config-devel wlroots-devel"
 depends="xorg-server-xwayland"
 short_desc="3D wayland compositor"
 maintainer="Young Jin Park <youngjinpark20@gmail.com>"

From f2bb02d0bfe9e6ffb18565e437a7376a5d78ddf0 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/7] wf-shell: clean up makedepends.

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

diff --git a/srcpkgs/wf-shell/template b/srcpkgs/wf-shell/template
index af62c3c5207..d5568edf252 100644
--- a/srcpkgs/wf-shell/template
+++ b/srcpkgs/wf-shell/template
@@ -5,10 +5,8 @@ revision=3
 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
+ gtk+3-devel wlroots-devel wf-config-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"

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

[ericonr]

[-- 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: 14467 bytes --]

From 6e9e8e64577d5c1dbc8b22d45248b54337440342 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 f0503e925b2f67ab170929dde605d1dbe0d7f61a 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.

---
 srcpkgs/sway/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template
index 6e191ba70e5..af50ab91379 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>"

From 6702148e93fb80fbd433297f6bc8efff822c3876 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 ece15b71eee11b417300fb411726ea1315fa9753 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 | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cage/template b/srcpkgs/cage/template
index 76ba731cc58..fe58a6b0b41 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,15 @@ 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_elogind="Uses elogind instead of setuid for privilege escalation"
+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 4f2aeb63c5984854b52dd5fa31fb2306ab2c119d 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.

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

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 51638c19773ab12c68eabfa4af4e5e60b861fcbb 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 package.

- Also cleaned up make depends.
- Added elogind build option.
---
 srcpkgs/wayfire-devel    |  1 +
 srcpkgs/wayfire/template | 28 ++++++++++++++++++++++------
 2 files changed, 23 insertions(+), 6 deletions(-)
 create mode 120000 srcpkgs/wayfire-devel

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/template b/srcpkgs/wayfire/template
index ee4f3199a00..93230b06848 100644
--- a/srcpkgs/wayfire/template
+++ b/srcpkgs/wayfire/template
@@ -1,24 +1,40 @@
 # Template file for 'wayfire'
 pkgname=wayfire
-version=0.4.0
-revision=3
+version=0.5.0
+revision=1
 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>"
 license="MIT"
 homepage="https://wayfire.org"
 distfiles="https://github.com/WayfireWM/wayfire/archive/${version}.tar.gz"
-checksum=9c009c01bccce97149d0695b5429cf44787fdc1423c58425ba8e8de601019e97
+checksum=c99520e4bea7008a326c3f808a7bcd255d5c8515070458f8366684b1366fb0be
+
+build_options="elogind"
+desc_option_elogind="Uses elogind instead of setuid for privilege escalation"
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" libexecinfo-devel"
 fi
 
 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 4dc1be9f9a894a7f7f60f2b6459e444af58f97d6 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 ffc95075bbdfd9d40a79d259f91aaa37055057aa 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: clean up makedepends.

---
 srcpkgs/wcm/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/wcm/template b/srcpkgs/wcm/template
index 2ac36a3e6ac..6743389b16f 100644
--- a/srcpkgs/wcm/template
+++ b/srcpkgs/wcm/template
@@ -4,8 +4,7 @@ version=0.4.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"

From d5d51436766cc243c284d96f8b125f6d459fd094 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.

---
 srcpkgs/wayfire-plugins-extra/template | 22 ++++++++++++++++++++++
 1 file changed, 22 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..a429d42dd2e
--- /dev/null
+++ b/srcpkgs/wayfire-plugins-extra/template
@@ -0,0 +1,22 @@
+# Template file for 'wayfire-plugins-extra'
+pkgname=wayfire-plugins-extra
+version=0.0.1
+revision=1
+build_style=meson
+hostmakedepends="pkg-config git"
+makedepends="wayfire-devel glibmm-devel"
+depends=""
+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=badbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadb
+
+do_fetch() {
+	git clone https://github.com/WayfireWM/wayfire-plugins-extra ${wrksrc} --depth 1
+}
+
+post_install() {
+	vlicense LICENSE
+}

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

[ericonr]

[-- 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: 14467 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 2e106c7f96be25da22a964a04a9fd09caa9c1bb7 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.

---
 srcpkgs/sway/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template
index 6e191ba70e5..af50ab91379 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>"

From 78c7169e17058a8491f698a0508f55920db7d7c3 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 6a5ebf3dc7b73205aca8fdc111c439276b99c0cb 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 | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cage/template b/srcpkgs/cage/template
index 76ba731cc58..fe58a6b0b41 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,15 @@ 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_elogind="Uses elogind instead of setuid for privilege escalation"
+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 73fd312aa593791f2f7d0546b987f3333b559209 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.

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

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 ae2a7ab2560f3696c2630435062edcbd99cac088 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 package.

- Also cleaned up make depends.
- Added elogind build option.
---
 srcpkgs/wayfire-devel    |  1 +
 srcpkgs/wayfire/template | 28 ++++++++++++++++++++++------
 2 files changed, 23 insertions(+), 6 deletions(-)
 create mode 120000 srcpkgs/wayfire-devel

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/template b/srcpkgs/wayfire/template
index ee4f3199a00..93230b06848 100644
--- a/srcpkgs/wayfire/template
+++ b/srcpkgs/wayfire/template
@@ -1,24 +1,40 @@
 # Template file for 'wayfire'
 pkgname=wayfire
-version=0.4.0
-revision=3
+version=0.5.0
+revision=1
 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>"
 license="MIT"
 homepage="https://wayfire.org"
 distfiles="https://github.com/WayfireWM/wayfire/archive/${version}.tar.gz"
-checksum=9c009c01bccce97149d0695b5429cf44787fdc1423c58425ba8e8de601019e97
+checksum=c99520e4bea7008a326c3f808a7bcd255d5c8515070458f8366684b1366fb0be
+
+build_options="elogind"
+desc_option_elogind="Uses elogind instead of setuid for privilege escalation"
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" libexecinfo-devel"
 fi
 
 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 b079c4837c6aa82ad9218c23ac8df772b103054a 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 65a4168700010a271a3dd67fb96f657c8b5d6c98 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: clean up makedepends.

---
 srcpkgs/wcm/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/wcm/template b/srcpkgs/wcm/template
index 2ac36a3e6ac..6743389b16f 100644
--- a/srcpkgs/wcm/template
+++ b/srcpkgs/wcm/template
@@ -4,8 +4,7 @@ version=0.4.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"

From 27993e472c8f977b426a3a0867db6a78a23cc1d1 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.

---
 srcpkgs/wayfire-plugins-extra/template | 22 ++++++++++++++++++++++
 1 file changed, 22 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..a429d42dd2e
--- /dev/null
+++ b/srcpkgs/wayfire-plugins-extra/template
@@ -0,0 +1,22 @@
+# Template file for 'wayfire-plugins-extra'
+pkgname=wayfire-plugins-extra
+version=0.0.1
+revision=1
+build_style=meson
+hostmakedepends="pkg-config git"
+makedepends="wayfire-devel glibmm-devel"
+depends=""
+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=badbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadb
+
+do_fetch() {
+	git clone https://github.com/WayfireWM/wayfire-plugins-extra ${wrksrc} --depth 1
+}
+
+post_install() {
+	vlicense LICENSE
+}

Re: Clean up wlroots build

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/23793#issuecomment-668678793

Comment:
Temporary git versions for wcm and wayfire-plugins-extra, waiting on their releases.

Re: [PR REVIEW] Clean up wlroots build

[ahesford]

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/23793#discussion_r465167253

Comment:
Unecessary

Re: [PR REVIEW] Clean up wlroots build

[ahesford]

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/23793#discussion_r465169504

Comment:
Use specific commit in `distfiles`, drop `git` from `hostmakedepends` and drop `do_fetch`.

Also: I pinged the "Release" issue over at `wayfire-plugins-extra` to hopefully get the maintainers to drop the release.

Re: [PR REVIEW] Clean up wlroots build

[ahesford]

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/23793#discussion_r465166944

Comment:
Unnecessary, just rely on `desc_option_wayland` in `common/options.description`

Re: [PR REVIEW] Clean up wlroots build

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/23793#discussion_r465195377

Comment:
It is going to get a release along with this batch, the main maintainer didn't do it yet. The temporary git versions is for this PR, when merged into void-packages it will be the released version.

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

[ericonr]

[-- 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: 20861 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 620c9e3fab728b70d1d8ea9719276423a2a13a1d 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.

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

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 d45f53b43dc768c1561bd3822f58327a8a056181 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.
---
 srcpkgs/wayfire-devel                        |   1 +
 srcpkgs/wayfire/patches/wlroots_0.11.0.patch | 149 -------------------
 srcpkgs/wayfire/template                     |  29 +++-
 3 files changed, 23 insertions(+), 156 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..64ae7a98656 100644
--- a/srcpkgs/wayfire/template
+++ b/srcpkgs/wayfire/template
@@ -1,24 +1,39 @@
 # Template file for 'wayfire'
 pkgname=wayfire
-version=0.4.0
-revision=3
+version=0.5.0
+revision=1
 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
+checksum=c99520e4bea7008a326c3f808a7bcd255d5c8515070458f8366684b1366fb0be
+
+build_options="elogind"
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" libexecinfo-devel"
 fi
 
 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 05d42942ff6089352d7114c46738ebf4804e2b16 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 a76fa262730104e40a2ec0b87f8de5b95bca472b 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: clean up makedepends.

---
 srcpkgs/wcm/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/wcm/template b/srcpkgs/wcm/template
index 2ac36a3e6ac..6743389b16f 100644
--- a/srcpkgs/wcm/template
+++ b/srcpkgs/wcm/template
@@ -4,8 +4,7 @@ version=0.4.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"

From 3af656e4b4e697ef32afc9dadaccf6150488ae17 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.

---
 srcpkgs/wayfire-plugins-extra/template | 22 ++++++++++++++++++++++
 1 file changed, 22 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..a429d42dd2e
--- /dev/null
+++ b/srcpkgs/wayfire-plugins-extra/template
@@ -0,0 +1,22 @@
+# Template file for 'wayfire-plugins-extra'
+pkgname=wayfire-plugins-extra
+version=0.0.1
+revision=1
+build_style=meson
+hostmakedepends="pkg-config git"
+makedepends="wayfire-devel glibmm-devel"
+depends=""
+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=badbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadb
+
+do_fetch() {
+	git clone https://github.com/WayfireWM/wayfire-plugins-extra ${wrksrc} --depth 1
+}
+
+post_install() {
+	vlicense LICENSE
+}

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

[ericonr]

[-- 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: 21378 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 6b77e54540103fa4dfd3f6300621712ff06ff981 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.
---
 srcpkgs/wayfire-devel                        |   1 +
 srcpkgs/wayfire/patches/wlroots_0.11.0.patch | 149 -------------------
 srcpkgs/wayfire/template                     |  29 +++-
 3 files changed, 23 insertions(+), 156 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..64ae7a98656 100644
--- a/srcpkgs/wayfire/template
+++ b/srcpkgs/wayfire/template
@@ -1,24 +1,39 @@
 # Template file for 'wayfire'
 pkgname=wayfire
-version=0.4.0
-revision=3
+version=0.5.0
+revision=1
 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
+checksum=c99520e4bea7008a326c3f808a7bcd255d5c8515070458f8366684b1366fb0be
+
+build_options="elogind"
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" libexecinfo-devel"
 fi
 
 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 88a29238691ccb5f291d58b8cdadccf69c3c375f 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 b4a0226a37b2771119450c80d450cb450fc39ba3 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: clean up makedepends.

---
 srcpkgs/wcm/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/wcm/template b/srcpkgs/wcm/template
index 2ac36a3e6ac..6743389b16f 100644
--- a/srcpkgs/wcm/template
+++ b/srcpkgs/wcm/template
@@ -4,8 +4,7 @@ version=0.4.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"

From c9921d1d879f7efdeb879c429bc9b7e7ea966163 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.

---
 srcpkgs/wayfire-plugins-extra/template | 22 ++++++++++++++++++++++
 1 file changed, 22 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..a429d42dd2e
--- /dev/null
+++ b/srcpkgs/wayfire-plugins-extra/template
@@ -0,0 +1,22 @@
+# Template file for 'wayfire-plugins-extra'
+pkgname=wayfire-plugins-extra
+version=0.0.1
+revision=1
+build_style=meson
+hostmakedepends="pkg-config git"
+makedepends="wayfire-devel glibmm-devel"
+depends=""
+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=badbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadb
+
+do_fetch() {
+	git clone https://github.com/WayfireWM/wayfire-plugins-extra ${wrksrc} --depth 1
+}
+
+post_install() {
+	vlicense LICENSE
+}

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

[ericonr]

[-- 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: 21473 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 a2320b89753159ae6b191ebf2e46d4617c147c33 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.
---
 srcpkgs/wayfire-devel                        |   1 +
 srcpkgs/wayfire/patches/wlroots_0.11.0.patch | 149 -------------------
 srcpkgs/wayfire/template                     |  34 ++++-
 3 files changed, 28 insertions(+), 156 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..6ee654c69e9 100644
--- a/srcpkgs/wayfire/template
+++ b/srcpkgs/wayfire/template
@@ -1,24 +1,44 @@
 # Template file for 'wayfire'
 pkgname=wayfire
-version=0.4.0
-revision=3
+version=0.5.0
+revision=1
 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
+checksum=c99520e4bea7008a326c3f808a7bcd255d5c8515070458f8366684b1366fb0be
+
+build_options="elogind"
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" libexecinfo-devel"
 fi
 
+pre_configure() {
+	# fix wf-config version
+	vsed -e 's/<0.5.0/<0.6.0/' -i meson.build
+}
+
 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 a5b0a158383c88f776ae4a1e3bd7688d1c13b7ff 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 cce7f04e45d54ac842a186d84d93346e05978bb9 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: clean up makedepends.

---
 srcpkgs/wcm/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/wcm/template b/srcpkgs/wcm/template
index 2ac36a3e6ac..6743389b16f 100644
--- a/srcpkgs/wcm/template
+++ b/srcpkgs/wcm/template
@@ -4,8 +4,7 @@ version=0.4.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"

From eadc69ab241b3b341ae71526ea60c26193ba673b 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.

---
 srcpkgs/wayfire-plugins-extra/template | 22 ++++++++++++++++++++++
 1 file changed, 22 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..a429d42dd2e
--- /dev/null
+++ b/srcpkgs/wayfire-plugins-extra/template
@@ -0,0 +1,22 @@
+# Template file for 'wayfire-plugins-extra'
+pkgname=wayfire-plugins-extra
+version=0.0.1
+revision=1
+build_style=meson
+hostmakedepends="pkg-config git"
+makedepends="wayfire-devel glibmm-devel"
+depends=""
+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=badbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadb
+
+do_fetch() {
+	git clone https://github.com/WayfireWM/wayfire-plugins-extra ${wrksrc} --depth 1
+}
+
+post_install() {
+	vlicense LICENSE
+}

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

[ericonr]

[-- 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: 21882 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 80eebf205cadbb875e749677a500baebcfb52388 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                     |  44 +++++-
 3 files changed, 37 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..6c840626bc4 100644
--- a/srcpkgs/wayfire/template
+++ b/srcpkgs/wayfire/template
@@ -1,24 +1,52 @@
 # 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="c99520e4bea7008a326c3f808a7bcd255d5c8515070458f8366684b1366fb0be
+ 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
+}
+
+pre_configure() {
+	# fix wf-config version
+	vsed -e 's/<0.5.0/<0.6.0/' -i meson.build
+}
+
 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 300b70bd8cf5ab8e8aa73518f56874be62bf01e9 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 3f00503dc84327fb208c9e364819c4b3902ae488 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: clean up makedepends.

---
 srcpkgs/wcm/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/wcm/template b/srcpkgs/wcm/template
index 2ac36a3e6ac..6743389b16f 100644
--- a/srcpkgs/wcm/template
+++ b/srcpkgs/wcm/template
@@ -4,8 +4,7 @@ version=0.4.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"

From c896acbdd4e6e20e04cbbcfde998a53df777cbcc 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.

---
 srcpkgs/wayfire-plugins-extra/template | 22 ++++++++++++++++++++++
 1 file changed, 22 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..a429d42dd2e
--- /dev/null
+++ b/srcpkgs/wayfire-plugins-extra/template
@@ -0,0 +1,22 @@
+# Template file for 'wayfire-plugins-extra'
+pkgname=wayfire-plugins-extra
+version=0.0.1
+revision=1
+build_style=meson
+hostmakedepends="pkg-config git"
+makedepends="wayfire-devel glibmm-devel"
+depends=""
+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=badbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadb
+
+do_fetch() {
+	git clone https://github.com/WayfireWM/wayfire-plugins-extra ${wrksrc} --depth 1
+}
+
+post_install() {
+	vlicense LICENSE
+}

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

[ericonr]

[-- 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: 21889 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 80eebf205cadbb875e749677a500baebcfb52388 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                     |  44 +++++-
 3 files changed, 37 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..6c840626bc4 100644
--- a/srcpkgs/wayfire/template
+++ b/srcpkgs/wayfire/template
@@ -1,24 +1,52 @@
 # 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="c99520e4bea7008a326c3f808a7bcd255d5c8515070458f8366684b1366fb0be
+ 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
+}
+
+pre_configure() {
+	# fix wf-config version
+	vsed -e 's/<0.5.0/<0.6.0/' -i meson.build
+}
+
 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 300b70bd8cf5ab8e8aa73518f56874be62bf01e9 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 3f00503dc84327fb208c9e364819c4b3902ae488 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: clean up makedepends.

---
 srcpkgs/wcm/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/wcm/template b/srcpkgs/wcm/template
index 2ac36a3e6ac..6743389b16f 100644
--- a/srcpkgs/wcm/template
+++ b/srcpkgs/wcm/template
@@ -4,8 +4,7 @@ version=0.4.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"

From 7080d66e2c5dcc5e92143b7d29824f67991d53f6 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.

---
 srcpkgs/wayfire-plugins-extra/template | 22 ++++++++++++++++++++++
 1 file changed, 22 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..b28cfa0c97f
--- /dev/null
+++ b/srcpkgs/wayfire-plugins-extra/template
@@ -0,0 +1,22 @@
+# Template file for 'wayfire-plugins-extra'
+pkgname=wayfire-plugins-extra
+version=0.0.1
+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=badbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadb
+
+do_fetch() {
+	git clone https://github.com/WayfireWM/wayfire-plugins-extra ${wrksrc} --depth 1
+}
+
+post_install() {
+	vlicense LICENSE
+}

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

[ericonr]

[-- 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: 21794 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 46d8eb4490ffb68a8baa7b3f203ff8659ad4e017 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: clean up makedepends.

---
 srcpkgs/wcm/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/wcm/template b/srcpkgs/wcm/template
index 2ac36a3e6ac..6743389b16f 100644
--- a/srcpkgs/wcm/template
+++ b/srcpkgs/wcm/template
@@ -4,8 +4,7 @@ version=0.4.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"

From c06d0ef1138a30de9985bb1fcc3618a1be8ef977 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.

---
 srcpkgs/wayfire-plugins-extra/template | 22 ++++++++++++++++++++++
 1 file changed, 22 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..b28cfa0c97f
--- /dev/null
+++ b/srcpkgs/wayfire-plugins-extra/template
@@ -0,0 +1,22 @@
+# Template file for 'wayfire-plugins-extra'
+pkgname=wayfire-plugins-extra
+version=0.0.1
+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=badbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadb
+
+do_fetch() {
+	git clone https://github.com/WayfireWM/wayfire-plugins-extra ${wrksrc} --depth 1
+}
+
+post_install() {
+	vlicense LICENSE
+}

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

[ericonr]

[-- 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
+}

Re: Clean up wlroots build

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/23793#issuecomment-668806668

Comment:
@ahesford pending CI, this is good to go.

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

[ericonr]

[-- 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: 22078 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 e0e5cdf83abd557a756c6276cefa254cb7c4144c 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..2eaa4bbbea6
--- /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 wayland-devel"
+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
+}

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

[ahesford]

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

There's a closed pull request on the void-packages repository

Clean up wlroots build
https://github.com/void-linux/void-packages/pull/23793

Description:
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