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

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

[-- Attachment #1: Type: text/plain, Size: 697 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.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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



TODO:
- [ ] Get wayland 1.20.0 update merged: #34448
- [x] river
- [ ] sway: https://github.com/swaywm/sway/releases/tag/1.7-rc2
- [ ] wayfire: https://github.com/WayfireWM/wayfire/issues/1386
- [x] hikari
- [ ] cage

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: 8287 bytes --]

From 020bf235b72f2f1e98d6b58b6fc675a8e18b8b69 Mon Sep 17 00:00:00 2001
From: Isaac Freund <mail@isaacfreund.com>
Date: Thu, 9 Dec 2021 17:47:15 +0100
Subject: [PATCH 1/6] wayland: update to 1.20.0.

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

diff --git a/srcpkgs/wayland/template b/srcpkgs/wayland/template
index 624441d48a86..5ea25eaad1ce 100644
--- a/srcpkgs/wayland/template
+++ b/srcpkgs/wayland/template
@@ -1,6 +1,6 @@
 # Template file for 'wayland'
 pkgname=wayland
-version=1.19.0
+version=1.20.0
 revision=1
 build_style=meson
 # "Tests must not be built with NDEBUG defined, they rely on assert()."
@@ -12,7 +12,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://wayland.freedesktop.org/"
 distfiles="https://wayland.freedesktop.org/releases/wayland-${version}.tar.xz"
-checksum=baccd902300d354581cd5ad3cc49daa4921d55fb416a5883e218750fef166d15
+checksum=b8a034154c7059772e0fdbd27dbfcda6c732df29cae56a82274f6ec5d7cd8725
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wayland-devel"

From 9ca6d44781dc7fc4614a04c431cc15a8f68fd04b Mon Sep 17 00:00:00 2001
From: Isaac Freund <mail@isaacfreund.com>
Date: Wed, 12 Jan 2022 19:16:43 +0100
Subject: [PATCH 2/6] SDL2: update to 2.0.20.

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

diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template
index 68e459178fe1..db3afefab3ce 100644
--- a/srcpkgs/SDL2/template
+++ b/srcpkgs/SDL2/template
@@ -1,6 +1,6 @@
 # Template file for 'SDL2'
 pkgname=SDL2
-version=2.0.18
+version=2.0.20
 revision=1
 build_style=gnu-configure
 configure_args="--enable-alsa --disable-esd --disable-rpath --enable-libudev
@@ -15,7 +15,7 @@ license="Zlib"
 homepage="https://www.libsdl.org/"
 changelog="https://raw.githubusercontent.com/libsdl-org/SDL/main/WhatsNew.txt"
 distfiles="https://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
-checksum=94d40cd73dbfa10bb6eadfbc28f355992bb2d6ef6761ad9d4074eff95ee5711c
+checksum=c56aba1d7b5b0e7e999e4a7698c70b63a3394ff9704b5f6e1c57e0c16f04dd06
 
 # Package build options
 build_options="gles opengl pulseaudio pipewire sndio vulkan wayland x11"

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

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

diff --git a/common/shlibs b/common/shlibs
index 83d8c3f16c9e..a7d62ec75d92 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3521,7 +3521,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..ff56bad71728 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.0
 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=2921a38cea79dbb6f1da895a4dbe1faedba8d7ff2c0c2468dad94ccba12e4278
 
 post_install() {
 	vlicense LICENSE

From 4c7abc99482fae99b9884f6004fe10ede1f1b94c Mon Sep 17 00:00:00 2001
From: Isaac Freund <mail@isaacfreund.com>
Date: Wed, 12 Jan 2022 20:00:10 +0100
Subject: [PATCH 4/6] 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 63f623c0f5efd9032dabede0f2fd686a161e0236 Mon Sep 17 00:00:00 2001
From: Isaac Freund <mail@isaacfreund.com>
Date: Thu, 13 Jan 2022 20:19:34 +0100
Subject: [PATCH 5/6] 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 74d3f77ce2a94358602a54730d265802d3da22a1 Mon Sep 17 00:00:00 2001
From: Isaac Freund <mail@isaacfreund.com>
Date: Fri, 28 Jan 2022 16:47:11 +0100
Subject: [PATCH 6/6] 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