Re: [PR PATCH] [Updated] wlroots: update to 0.15.1.

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

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

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

https://github.com/ifreund/void-packages wlroots
https://github.com/void-linux/void-packages/pull/35017

wlroots: update to 0.15.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO**



TODO:
- [x] Get wayland 1.20.0 update merged: #34448
- [x] river
- [x] sway
- [ ] wayfire: https://github.com/WayfireWM/wayfire/issues/1386
- [x] hikari
- [ ] cage https://github.com/Hjdskes/cage/issues/232

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

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

From c60bac50c8ad46d8c45064e07513ed62474c817b Mon Sep 17 00:00:00 2001
From: Isaac Freund <mail@isaacfreund.com>
Date: Wed, 12 Jan 2022 19:56:09 +0100
Subject: [PATCH 1/8] wlroots: update to 0.15.1.

---
 common/shlibs            |  2 +-
 srcpkgs/wlroots/template | 22 ++++++++++++----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 39df7de5cd5a..0dfaddf9b69d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3526,7 +3526,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.9 wlroots-0.14.0_1
+libwlroots.so.10 wlroots-0.15.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 8fdc2ba6ab40..d767d7d80e54 100644
--- a/srcpkgs/wlroots/template
+++ b/srcpkgs/wlroots/template
@@ -1,24 +1,26 @@
 # Template file for 'wlroots'
 pkgname=wlroots
-version=0.14.1
+version=0.15.1
 revision=1
 build_style=meson
 # Follow upstream packaging recommendations:
 # https://github.com/swaywm/wlroots/wiki/Packaging-recommendations
-configure_args="--auto-features=enabled -Dexamples=false -Dwerror=false -Db_ndebug=false"
-hostmakedepends="pkg-config wayland-devel"
-_devel_depends="libgbm-devel libglvnd-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 xcb-util-renderutil-devel"
+configure_args="--auto-features=enabled -Dexamples=false -Dwerror=false
+ -Db_ndebug=false"
+hostmakedepends="pkg-config wayland-devel glslang"
+_devel_depends="libgbm-devel libglvnd-devel libseat-devel eudev-libudev-devel
+ libdrm-devel libinput-devel libxkbcommon-devel pixman-devel wayland-devel
+ wayland-protocols vulkan-loader Vulkan-Headers xcb-util-errors-devel
+ xcb-util-wm-devel xcb-util-renderutil-devel "
 makedepends="${_devel_depends}
  libxcb-devel xcb-util-cursor-devel xcb-util-devel xcb-util-image-devel
  xcb-util-keysyms-devel xcb-util-xrm-devel xorg-server-xwayland"
 short_desc="Modular Wayland compositor library"
-maintainer="Isaac Freund <ifreund@ifreund.xyz>"
+maintainer="Isaac Freund <mail@isaacfreund.com>"
 license="MIT"
-homepage="https://github.com/swaywm/wlroots"
-distfiles="https://github.com/swaywm/wlroots/archive/${version}.tar.gz"
-checksum=448a83d579ac280357c8a4e902b9477bacbab81cc4d9c140e443642d458869db
+homepage="https://gitlab.freedesktop.org/wlroots/wlroots"
+distfiles="${homepage}/-/releases/${version}/downloads/wlroots-${version}.tar.gz"
+checksum=5b92f11a52d978919ed1306e0d54c9d59f1762b28d44f0a2da3ef3b351305373
 
 post_install() {
 	vlicense LICENSE

From 5be09d80267a57c4b657b47605adfc394fbaa95b Mon Sep 17 00:00:00 2001
From: Isaac Freund <mail@isaacfreund.com>
Date: Wed, 12 Jan 2022 20:00:10 +0100
Subject: [PATCH 2/8] river: update to 0.1.1.

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

diff --git a/srcpkgs/river/template b/srcpkgs/river/template
index 314ed6c53146..9cf3abe4b85b 100644
--- a/srcpkgs/river/template
+++ b/srcpkgs/river/template
@@ -1,6 +1,6 @@
 # Template file for 'river'
 pkgname=river
-version=0.1.0
+version=0.1.1
 revision=1
 build_style=zig-build
 configure_args="$(vopt_if xwayland -Dxwayland)"
@@ -12,7 +12,7 @@ maintainer="Isaac Freund <mail@isaacfreund.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/riverwm/river"
 distfiles="${homepage}/releases/download/v${version}/river-${version}.tar.gz"
-checksum=4153a5511a1008e87a2251fc4510a43d6f6085f41b040222506355ff6d4bd10f
+checksum=2a0bcd4670ed9ebd39c279f2bf10803fc65c9f3ee2307ce40728df23ce914d18
 
 build_options="xwayland"
 build_options_default="xwayland"

From 9c1d3e6d6db9a706cda99bed504e8e9aed5c5d32 Mon Sep 17 00:00:00 2001
From: Isaac Freund <mail@isaacfreund.com>
Date: Thu, 13 Jan 2022 20:19:34 +0100
Subject: [PATCH 3/8] hikari: update to 2.3.3.

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

diff --git a/srcpkgs/hikari/template b/srcpkgs/hikari/template
index 246167366188..7bd6ffa4bf51 100644
--- a/srcpkgs/hikari/template
+++ b/srcpkgs/hikari/template
@@ -1,6 +1,6 @@
 # Template file for 'hikari'
 pkgname=hikari
-version=2.3.2
+version=2.3.3
 revision=1
 build_style=gnu-makefile
 make_cmd=bmake
@@ -16,7 +16,7 @@ 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=9e8f135b4b31ae1267ae4fdf0c25932b62aeaf1e6642e1dc67471b9863107ecb
+checksum=40736ff326e11a51128c1739051a692ad2c79173fc4b695c8be5ec7a614b4de2
 conf_files="/etc/pam.d/hikari-unlocker /etc/hikari/hikari.conf"
 # bmake's -q flag seems to differ in behavior from gnu make which causes the
 # build style's handling of the check target not existing to fail.

From 5c3e4191d61fd0e29c4caaadbdeee144e01dd304 Mon Sep 17 00:00:00 2001
From: Isaac Freund <mail@isaacfreund.com>
Date: Fri, 28 Jan 2022 16:47:11 +0100
Subject: [PATCH 4/8] sway: update to 1.7.

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

diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template
index aa29ee172a4f..bafc9fdeeff2 100644
--- a/srcpkgs/sway/template
+++ b/srcpkgs/sway/template
@@ -1,6 +1,6 @@
 # Template file for 'sway'
 pkgname=sway
-version=1.6.1
+version=1.7
 revision=1
 build_style=meson
 configure_args="-Dwerror=false -Db_ndebug=false"
@@ -14,7 +14,7 @@ maintainer="Olaf Mersmann <olafm@p-value.net>"
 license="MIT"
 homepage="https://swaywm.org"
 distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"
-checksum=8b138867cd83217de07138144b1279fe58e0421eb10c91122aa33c8770fe7391
+checksum=0c64536fb2883ec518e75cfb119f9300115fb49b084e3fde62b794fe2c6c8d84
 
 post_install() {
 	vlicense LICENSE

From efecb688ac023886f0c0059278f92f4dd82328cc Mon Sep 17 00:00:00 2001
From: Isaac Freund <mail@isaacfreund.com>
Date: Sat, 26 Feb 2022 22:00:59 +0100
Subject: [PATCH 5/8] New package: wlroots0.14-0.14.1

---
 common/shlibs                |  1 +
 srcpkgs/wlroots0.14-devel    |  1 +
 srcpkgs/wlroots0.14/template | 38 ++++++++++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+)
 create mode 120000 srcpkgs/wlroots0.14-devel
 create mode 100644 srcpkgs/wlroots0.14/template

diff --git a/common/shlibs b/common/shlibs
index 0dfaddf9b69d..8f171c85d99b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3526,6 +3526,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.9 wlroots0.14-0.14.1_1
 libwlroots.so.10 wlroots-0.15.0_1
 libbaseencode.so.1 libbaseencode-1.0.9_1
 libcotp.so.12 libcotp-1.2.1_1
diff --git a/srcpkgs/wlroots0.14-devel b/srcpkgs/wlroots0.14-devel
new file mode 120000
index 000000000000..06618e9d46ac
--- /dev/null
+++ b/srcpkgs/wlroots0.14-devel
@@ -0,0 +1 @@
+wlroots0.14
\ No newline at end of file
diff --git a/srcpkgs/wlroots0.14/template b/srcpkgs/wlroots0.14/template
new file mode 100644
index 000000000000..2a51ea463f6b
--- /dev/null
+++ b/srcpkgs/wlroots0.14/template
@@ -0,0 +1,38 @@
+# Template file for 'wlroots0.14'
+pkgname=wlroots0.14
+version=0.14.1
+revision=1
+wrksrc="wlroots-${version}"
+build_style=meson
+# Follow upstream packaging recommendations:
+# https://github.com/swaywm/wlroots/wiki/Packaging-recommendations
+configure_args="--auto-features=enabled -Dexamples=false -Dwerror=false
+ -Db_ndebug=false"
+hostmakedepends="pkg-config wayland-devel"
+_devel_depends="libgbm-devel libglvnd-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
+ xcb-util-renderutil-devel"
+makedepends="${_devel_depends}
+ libxcb-devel xcb-util-cursor-devel xcb-util-devel xcb-util-image-devel
+ xcb-util-keysyms-devel xcb-util-xrm-devel xorg-server-xwayland"
+short_desc="Modular Wayland compositor library"
+maintainer="Isaac Freund <mail@isaacfreund.com>"
+license="MIT"
+homepage="https://github.com/swaywm/wlroots"
+distfiles="https://github.com/swaywm/wlroots/archive/${version}.tar.gz"
+checksum=448a83d579ac280357c8a4e902b9477bacbab81cc4d9c140e443642d458869db
+
+post_install() {
+	vlicense LICENSE
+}
+
+wlroots0.14-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} ${_devel_depends}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From 2dbf85317e9030f77fe60e16468551ba03120509 Mon Sep 17 00:00:00 2001
From: Isaac Freund <mail@isaacfreund.com>
Date: Sat, 26 Feb 2022 22:31:48 +0100
Subject: [PATCH 6/8] cage: switch to wlroots0.14 and revbump.

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

diff --git a/srcpkgs/cage/template b/srcpkgs/cage/template
index 6b6c6044d945..0bb61bf97059 100644
--- a/srcpkgs/cage/template
+++ b/srcpkgs/cage/template
@@ -1,11 +1,11 @@
 # Template file for 'cage'
 pkgname=cage
 version=0.1.4
-revision=1
+revision=2
 build_style=meson
 configure_args="$(vopt_bool xwayland xwayland)"
 hostmakedepends="pkg-config wayland-devel scdoc"
-makedepends="wlroots-devel"
+makedepends="wlroots0.14-devel"
 depends="$(vopt_if xwayland xorg-server-xwayland)"
 short_desc="Kiosk compositor for Wayland"
 maintainer="Illia Shestakov <ishestakov@airmail.cc>"

From ea395c9fea718b15c5d59506de12233100843b0b Mon Sep 17 00:00:00 2001
From: Isaac Freund <mail@isaacfreund.com>
Date: Sat, 26 Feb 2022 22:36:22 +0100
Subject: [PATCH 7/8] wayfire: switch to wlroots0.14 and revbump.

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

diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template
index 0480204ed5c4..9b0026c58565 100644
--- a/srcpkgs/wayfire/template
+++ b/srcpkgs/wayfire/template
@@ -1,13 +1,13 @@
 # Template file for 'wayfire'
 pkgname=wayfire
 version=0.7.2
-revision=1
+revision=2
 _utils_commit=889fdafa7b09fc6ce70313fd3f067cfc8c21a2ac
 _touch_commit=8974eb0f6a65464b63dd03b842795cb441fb6403
 build_style=meson
 configure_args="-Dprint_trace=false"
 hostmakedepends="pkg-config wayland-devel"
-makedepends="wf-config-devel wlroots-devel cairo-devel
+makedepends="wf-config-devel wlroots0.14-devel cairo-devel
  $(vopt_if image 'libjpeg-turbo-devel libpng-devel')"
 depends="xorg-server-xwayland"
 short_desc="3D wayland compositor"

From dec349f6bd06b2887d91a35e95f12f7575a166b3 Mon Sep 17 00:00:00 2001
From: Isaac Freund <mail@isaacfreund.com>
Date: Sat, 26 Feb 2022 22:36:31 +0100
Subject: [PATCH 8/8] wayfire-plugins-extra: revbump for wayfire-0.7.2_2.

---
 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 d364e01ce2a8..79b40857cf0e 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.7.0
-revision=4
+revision=5
 build_style=meson
 hostmakedepends="pkg-config wayland-devel"
 makedepends="wayfire-devel glibmm-devel"