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: 10092 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/7] 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 c64fbf2e0b6c27165a78270fdec6ee973f2026f4 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/7] cage: add seatd support

---
 srcpkgs/cage/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/cage/template b/srcpkgs/cage/template
index a4085ac8483..08cb2948e8b 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) $(vopt_if elogind elogind) $(vopt_if seatd seatd)"
 short_desc="Kiosk compositor for Wayland"
 maintainer="Illia Shestakov <ishestakov@airmail.cc>"
 license="MIT"
@@ -14,12 +14,12 @@ 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="elogind seatd xwayland"
 build_options_default="xwayland"
 desc_option_xwayland="Enable Xwayland support in cage"
 
 post_install() {
-	if [ -z "$build_option_elogind" ]; then
+	if [ -z "$build_option_elogind" && -z "$build_option_seatd" ]; then
 		# must be setuid without logind!
 		chmod u+s ${DESTDIR}/usr/bin/cage
 	fi

From 316c119d4a339834181c602a85068229392dc0ae 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/7] hikari: revision bump

---
 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 d9b9dc418d7c591a080f617cfa6c989a21e16f49 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/7] 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 16a83d7c93b306dc32ecbc485044ed09b51280ae 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/7] wayfire: update to 0.6.0

---
 srcpkgs/wayfire/template | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template
index c48069fdb11..aee804964d4 100644
--- a/srcpkgs/wayfire/template
+++ b/srcpkgs/wayfire/template
@@ -1,23 +1,26 @@
 # Template file for 'wayfire'
 pkgname=wayfire
-version=0.5.0
-revision=2
-_utils_commit=f9b5eba437a04a0d1fb9f00a0fdb88c12b9f6b27
+version=0.6.0
+revision=1
+_utils_commit=f45641beef46babdc8f1b8d18a924e72beaf8ee6
+_touch_commit=b1075c54a280f913edc26b9757262f4f9d6b62b0
 build_style=meson
 hostmakedepends="pkg-config wayland-devel"
 makedepends="wf-config-devel wlroots-devel cairo-devel
  $(vopt_if image 'libjpeg-turbo-devel libpng-devel')"
-depends="xorg-server-xwayland $(vopt_if elogind elogind)"
+depends="xorg-server-xwayland $(vopt_if elogind elogind) $(vopt_if seatd seatd)"
 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="elogind seatd image"
 build_options_default="image"
 desc_option_image="Enable JPEG and PNG support"
 
@@ -27,11 +30,13 @@ 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
+	if [ -z "$build_option_elogind" && -z "$build_option_seatd" ]; then
 		# must be setuid without logind!
 		chmod u+s ${DESTDIR}/usr/bin/wayfire
 	fi

From 719d6fbfb5c555e20871ae47b0c23a79525fd359 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/7] wayfire-plugins-extra: revision bump

---
 srcpkgs/wayfire-plugins-extra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wayfire-plugins-extra/template b/srcpkgs/wayfire-plugins-extra/template
index 2eaa4bbbea6..00c46f02bb9 100644
--- a/srcpkgs/wayfire-plugins-extra/template
+++ b/srcpkgs/wayfire-plugins-extra/template
@@ -1,7 +1,7 @@
 # Template file for 'wayfire-plugins-extra'
 pkgname=wayfire-plugins-extra
 version=0.5.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config wayland-devel"
 makedepends="wayfire-devel glibmm-devel"

From 64f23ee270e6a89a39a87a88e7448ac5efd1a405 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/7] sway: rebuild for wlroots-0.12.0

---
 srcpkgs/sway/patches/wlroots_bump.patch | 11 +++++++++++
 srcpkgs/sway/template                   |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/sway/patches/wlroots_bump.patch

diff --git a/srcpkgs/sway/patches/wlroots_bump.patch b/srcpkgs/sway/patches/wlroots_bump.patch
new file mode 100644
index 00000000000..e241775272d
--- /dev/null
+++ b/srcpkgs/sway/patches/wlroots_bump.patch
@@ -0,0 +1,11 @@
+--- meson.build	2020-11-10 16:50:46.311362730 +0100
++++ meson.build	2020-11-10 16:51:09.656053076 +0100
+@@ -60,7 +60,7 @@
+ rt             = cc.find_library('rt')
+ 
+ # Try first to find wlroots as a subproject, then as a system dependency
+-wlroots_version = ['>=0.11.0', '<0.12.0']
++wlroots_version = ['>=0.12.0', '<0.13.0']
+ wlroots_proj = subproject(
+ 	'wlroots',
+ 	default_options: ['examples=false'],
diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template
index fa8e1850c50..72603468102 100644
--- a/srcpkgs/sway/template
+++ b/srcpkgs/sway/template
@@ -1,7 +1,7 @@
 # Template file for 'sway'
 pkgname=sway
 version=1.5
-revision=2
+revision=3
 build_style=meson
 conf_files="/etc/sway/config"
 hostmakedepends="pkg-config wayland-devel scdoc git"