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

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

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

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

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

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

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

I guess @ifreund @ahesford @travankor 

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wlroots-23793.patch --]
[-- Type: text/x-diff, Size: 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
+}