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

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

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

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

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

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

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

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

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

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

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

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

From 09ff8d9c88694fea5ed6704913f24900750e2292 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Fiala?= <temp.xanomes@volny.cz>
Date: Sun, 8 Nov 2020 18:26:29 +0100
Subject: [PATCH 2/8] cage: add seatd support

---
 common/options.description |  1 +
 srcpkgs/cage/template      | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/common/options.description b/common/options.description
index 360fc21bca2..afb72558ba3 100644
--- a/common/options.description
+++ b/common/options.description
@@ -100,3 +100,4 @@ desc_option_zimg="Enable support for the zimg image processing library"
 desc_option_zstd="Enable support for ZSTD compression format"
 desc_option_elogind="Enable support for elogind"
 desc_option_drm="Enable support for DRM"
+desc_option_setuid="Setuid the resulting executable"
diff --git a/srcpkgs/cage/template b/srcpkgs/cage/template
index a4085ac8483..7f92385246c 100644
--- a/srcpkgs/cage/template
+++ b/srcpkgs/cage/template
@@ -1,12 +1,12 @@
 # Template file for 'cage'
 pkgname=cage
 version=0.1.2.1
-revision=2
+revision=3
 build_style=meson
 configure_args="$(vopt_bool xwayland xwayland)"
 hostmakedepends="pkg-config wayland-devel scdoc"
 makedepends="wlroots-devel"
-depends="$(vopt_if xwayland xorg-server-xwayland) $(vopt_if elogind elogind)"
+depends="$(vopt_if xwayland xorg-server-xwayland)"
 short_desc="Kiosk compositor for Wayland"
 maintainer="Illia Shestakov <ishestakov@airmail.cc>"
 license="MIT"
@@ -14,13 +14,13 @@ 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"
+build_options="setuid xwayland"
+build_options_default="setuid xwayland"
 desc_option_xwayland="Enable Xwayland support in cage"
 
 post_install() {
-	if [ -z "$build_option_elogind" ]; then
-		# must be setuid without logind!
+	if [ "$build_option_setuid" ]; then
+		# must be setuid for direct session management
 		chmod u+s ${DESTDIR}/usr/bin/cage
 	fi
 	vlicense LICENSE

From cdab2608ff776dcdb2ec1070fce084af304a7f21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Fiala?= <temp.xanomes@volny.cz>
Date: Sun, 8 Nov 2020 18:31:14 +0100
Subject: [PATCH 3/8] hikari: bump revision number

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

diff --git a/srcpkgs/hikari/template b/srcpkgs/hikari/template
index b071ccf75bb..83d1e88e0b6 100644
--- a/srcpkgs/hikari/template
+++ b/srcpkgs/hikari/template
@@ -1,7 +1,7 @@
 # Template file for 'hikari'
 pkgname=hikari
 version=2.2.2
-revision=1
+revision=2
 build_style=gnu-makefile
 make_cmd=bmake
 make_use_env=yes

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

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

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

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

---
 srcpkgs/wayfire/template | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template
index c48069fdb11..8e23a8e88a3 100644
--- a/srcpkgs/wayfire/template
+++ b/srcpkgs/wayfire/template
@@ -1,24 +1,27 @@
 # Template file for 'wayfire'
 pkgname=wayfire
-version=0.5.0
-revision=2
-_utils_commit=f9b5eba437a04a0d1fb9f00a0fdb88c12b9f6b27
+version=0.6.0
+revision=1
+_utils_commit=f45641beef46babdc8f1b8d18a924e72beaf8ee6
+_touch_commit=b1075c54a280f913edc26b9757262f4f9d6b62b0
 build_style=meson
 hostmakedepends="pkg-config wayland-devel"
 makedepends="wf-config-devel wlroots-devel cairo-devel
  $(vopt_if image 'libjpeg-turbo-devel libpng-devel')"
-depends="xorg-server-xwayland $(vopt_if elogind elogind)"
+depends="xorg-server-xwayland"
 short_desc="3D wayland compositor"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://wayfire.org"
 distfiles="https://github.com/WayfireWM/wayfire/archive/${version}.tar.gz
- https://github.com/WayfireWM/wf-utils/archive/${_utils_commit}.tar.gz"
-checksum="24c1a2c963dac5af762f87cd024bc3dd736ec9a28a6735d357a05e8f6502e8aa
- 5c3e8bfefd74083a2548b6a95a070000cf73591bfe78335413da5c7fb82340cb"
+ https://github.com/WayfireWM/wf-utils/archive/${_utils_commit}.tar.gz
+ https://github.com/WayfireWM/wf-touch/archive/${_touch_commit}.tar.gz"
+checksum="9c2bf92e6aecc9b800b87e4c086ff7a275393f7315501b8c39196baf9d245b33
+ d172f8c21e0bac01e4116cd957fb0159c5cb39ddfdce897beb0d9c753796d5f1
+ 2b22e03d3a522baeff5798f630ffe5aa95899fd3233b291527503af5fd3e30be"
 
-build_options="elogind image"
-build_options_default="image"
+build_options="setuid image"
+build_options_default="setuid image"
 desc_option_image="Enable JPEG and PNG support"
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
@@ -27,12 +30,14 @@ fi
 
 post_extract() {
 	rmdir subprojects/wf-utils
+	rmdir subprojects/wf-touch
 	mv ../wf-utils-${_utils_commit} subprojects/wf-utils
+	mv ../wf-touch-${_touch_commit} subprojects/wf-touch
 }
 
 post_install() {
-	if [ -z "$build_option_elogind" ]; then
-		# must be setuid without logind!
+	if [ "$build_option_setuid" ]; then
+		# must be setuid for direct session management
 		chmod u+s ${DESTDIR}/usr/bin/wayfire
 	fi
 	vlicense LICENSE

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

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

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

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

---
 srcpkgs/sway/template | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template
index fa8e1850c50..c2c8315ba4c 100644
--- a/srcpkgs/sway/template
+++ b/srcpkgs/sway/template
@@ -1,21 +1,22 @@
 # Template file for 'sway'
 pkgname=sway
-version=1.5
-revision=2
+version=1.5.1
+revision=1
 build_style=meson
 conf_files="/etc/sway/config"
 hostmakedepends="pkg-config wayland-devel scdoc git"
 makedepends="wlroots-devel pcre-devel json-c-devel pango-devel cairo-devel
  gdk-pixbuf-devel"
-depends="swaybg xorg-server-xwayland $(vopt_if elogind elogind)"
+depends="swaybg xorg-server-xwayland"
 short_desc="Tiling Wayland compositor compatible with i3"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://swaywm.org"
 distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"
-checksum=c80644774d612d7d377093d4990061d36c36673862c06318a7b0e37fa47b0178
+checksum=095f983c9a5f80d761bc2fb19df8166839b9290124ccd47f3e74119a1335490f
 
-build_options="elogind"
+build_options="setuid"
+build_options_default="setuid"
 
 post_patch() {
 	vsed -e 's/werror=true/werror=false/g' -i meson.build
@@ -23,8 +24,8 @@ post_patch() {
 
 post_install() {
 	vlicense LICENSE
-	if [ -z "$build_option_elogind" ]; then
-		# must be setuid without logind!
+	if [ "$build_option_setuid" ]; then
+		# must be setuid for direct session management
 		chmod u+s ${DESTDIR}/usr/bin/sway
 	fi
 	vbin contrib/grimshot

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

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

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