From: ofiala-a51 <ofiala-a51@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] [WIP] wlroots: update to 0.12.0
Date: Tue, 10 Nov 2020 23:39:25 +0100 [thread overview]
Message-ID: <20201110223925.NTNfFIoWPJAZIsXd4f1QP8DSwcOjfCetkHyw3M7aYdg@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26224@inbox.vuxu.org>
[-- 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: 13004 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 38d95959ba77bf9b2552566d144658484a3398be 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: add suid build option
---
srcpkgs/hikari/template | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/hikari/template b/srcpkgs/hikari/template
index b071ccf75bb..a886df6a94b 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
@@ -19,6 +19,9 @@ distfiles="${homepage}/releases/${pkgname}-${version}.tar.gz"
checksum=df9b8cb6c6b2b995a5dd4bbf32c43b374d689eabfda1620a9444d845160e4de3
conf_files="/etc/pam.d/hikari-unlocker /etc/hikari/hikari.conf"
+build_options="setuid"
+build_options_default="setuid"
+
pre_build() {
# The hikari Makefile appends to the CFLAGS and LDFLAGS variables;
# bmake ignores these appends altogether when passing variables on the
@@ -33,5 +36,9 @@ pre_build() {
}
post_install() {
+ if [ "$build_option_setuid" ]; then
+ # must be setuid for direct session management
+ chmod u+s ${DESTDIR}/usr/bin/hikari
+ fi
vlicense LICENSE
}
From be07d3a1a39e4a29e3501455fcc1bfa4395f0431 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 2af17b725a13e0fd4dd2a000660aa68eb8e198a5 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 86a71cad07a06debfdb2b4400c4c789cf9fea9b2 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 6bec53606737386404991244f9fffae5cbbafa77 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..b83e03b1854 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 [ -z "$build_option_setuid" ]; then
+ # must be setuid for direct session management
chmod u+s ${DESTDIR}/usr/bin/sway
fi
vbin contrib/grimshot
From 99b73d59f3378c9a1dd75c76affad221b2f95d0c 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
next prev parent reply other threads:[~2020-11-10 22:39 UTC|newest]
Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-08 15:36 [PR PATCH] " ofiala-a51
2020-11-08 15:46 ` ericonr
2020-11-08 17:04 ` [PR PATCH] [Updated] " ofiala-a51
2020-11-08 17:16 ` ofiala-a51
2020-11-08 17:46 ` [WIP] " ericonr
2020-11-08 17:53 ` ofiala-a51
2020-11-08 18:14 ` ofiala-a51
2020-11-08 18:21 ` jbeich
2020-11-08 18:22 ` jbeich
2020-11-08 18:28 ` ofiala-a51
2020-11-08 18:48 ` [PR PATCH] [Updated] " ofiala-a51
2020-11-08 19:05 ` ofiala-a51
2020-11-08 19:43 ` ofiala-a51
2020-11-10 15:23 ` ifreund
2020-11-10 16:45 ` [PR PATCH] [Updated] " ofiala-a51
2020-11-10 16:48 ` ofiala-a51
2020-11-10 16:53 ` ofiala-a51
2020-11-10 16:54 ` ofiala-a51
2020-11-10 18:21 ` [PR REVIEW] " ericonr
2020-11-10 18:29 ` ericonr
2020-11-10 18:30 ` [PR REVIEW] " ahesford
2020-11-10 18:34 ` ericonr
2020-11-10 19:53 ` st3r4g
2020-11-10 19:53 ` st3r4g
2020-11-10 19:54 ` st3r4g
2020-11-10 20:02 ` st3r4g
2020-11-10 20:04 ` st3r4g
2020-11-10 20:12 ` st3r4g
2020-11-10 20:38 ` st3r4g
2020-11-10 20:39 ` st3r4g
2020-11-10 20:55 ` st3r4g
2020-11-10 21:08 ` ifreund
2020-11-10 21:25 ` [PR PATCH] [Updated] " ofiala-a51
2020-11-10 21:28 ` [PR REVIEW] " ofiala-a51
2020-11-10 21:28 ` ofiala-a51
2020-11-10 22:04 ` [PR REVIEW] " ifreund
2020-11-10 22:04 ` ifreund
2020-11-10 22:39 ` ofiala-a51 [this message]
2020-11-10 22:40 ` ofiala-a51
2020-11-10 22:40 ` ofiala-a51
2020-11-10 23:22 ` ahesford
2020-11-10 23:23 ` st3r4g
2020-11-10 23:23 ` st3r4g
2020-11-10 23:25 ` st3r4g
2020-11-10 23:38 ` [PR REVIEW] " st3r4g
2020-11-10 23:40 ` ofiala-a51
2020-11-10 23:52 ` ifreund
2020-11-10 23:54 ` ifreund
2020-11-10 23:57 ` [PR REVIEW] " ofiala-a51
2020-11-11 0:02 ` ifreund
2020-11-11 0:03 ` sgn
2020-11-11 0:08 ` [PR PATCH] [Updated] " ofiala-a51
2020-11-11 0:08 ` [PR REVIEW] " ofiala-a51
2020-11-11 0:34 ` sgn
2020-11-11 0:55 ` [PR REVIEW] " travankor
2020-11-11 1:13 ` ericonr
2020-11-11 1:24 ` [PR REVIEW] " ofiala-a51
2020-11-11 1:44 ` travankor
2020-11-11 14:03 ` ofiala-a51
2020-11-11 14:14 ` ahesford
2020-11-11 14:52 ` [PR PATCH] [Updated] " ofiala-a51
2020-11-11 15:43 ` ofiala-a51
2020-11-12 22:28 ` ericonr
2020-11-13 10:19 ` [PR PATCH] [Updated] " ofiala-a51
2020-11-13 10:20 ` ofiala-a51
2020-11-17 3:14 ` ericonr
2020-11-17 3:14 ` ericonr
2020-11-17 3:39 ` ericonr
2020-11-17 3:56 ` ericonr
2020-11-17 13:10 ` ericonr
2020-11-17 13:11 ` ericonr
2020-11-17 13:17 ` ericonr
2020-11-17 14:11 ` ericonr
2020-11-17 15:06 ` ericonr
2020-11-17 15:13 ` ericonr
2020-11-17 15:36 ` ericonr
2020-11-17 18:28 ` ericonr
2020-11-18 14:49 ` [PR PATCH] [Updated] " ofiala-a51
2020-11-18 14:51 ` ofiala-a51
2020-11-18 15:02 ` ofiala-a51
2020-11-18 15:04 ` ofiala-a51
2020-11-19 13:12 ` ericonr
2020-11-19 17:00 ` [PR PATCH] [Updated] " ofiala-a51
2020-11-20 21:50 ` [PR PATCH] [Merged]: " ericonr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201110223925.NTNfFIoWPJAZIsXd4f1QP8DSwcOjfCetkHyw3M7aYdg@z \
--to=ofiala-a51@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).