Re: [PR PATCH] [Updated] update river and waylock

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

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

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

https://github.com/dkwo/void-packages river
https://github.com/void-linux/void-packages/pull/43143

update river and waylock
- I tested the changes in this PR: yes. been running them for months, built with zig-static
- I built this PR locally for my native architecture, (x86_64-musl)

cc maintainer @ifreund 

[ci skip]

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

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

From 326dc50c5751a86fef6747fc84e7821245accb78 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 28 Dec 2022 18:11:24 +0100
Subject: [PATCH 1/2] river: update to 0.2.4

---
 srcpkgs/river/template | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/river/template b/srcpkgs/river/template
index 2f0b210485ae..8639ddb34a5b 100644
--- a/srcpkgs/river/template
+++ b/srcpkgs/river/template
@@ -1,27 +1,25 @@
 # Template file for 'river'
 pkgname=river
-version=0.2.3
+version=0.2.4
 revision=1
 build_style=zig-build
 configure_args="$(vopt_if xwayland -Dxwayland) -Dpie"
 hostmakedepends="pkg-config wayland-devel scdoc"
-makedepends="wlroots-devel libevdev-devel"
+makedepends="wlroots-devel libevdev-devel pixman-devel
+ wayland-protocols libxkbcommon-devel wayland-devel"
 depends="$(vopt_if xwayland xorg-server-xwayland)"
 short_desc="Dynamic tiling Wayland compositor"
 maintainer="Isaac Freund <mail@isaacfreund.com>"
-license="GPL-3.0-or-later"
+license="GPL-3.0-only"
 homepage="https://github.com/riverwm/river"
-distfiles="${homepage}/releases/download/v${version}/river-${version}.tar.gz"
-checksum=7acdd2b929e16a20006b4baf1f29e7a8dc7f70cf5747e1503a610a90d1637132
+distfiles="https://github.com/riverwm/river/releases/download/v${version}/river-${version}.tar.gz"
+checksum=26c1c41a65ce3804069afad6988410515cf478d2b76303ebc699766d3d4dc69f
 
 build_options="xwayland"
 build_options_default="xwayland"
 desc_option_xwayland="Enable Xwayland support"
 
-if [ -n "$CROSS_BUILD" ]; then
-	broken="https://build.voidlinux.org/builders/armv7l_builder/builds/43055/steps/shell_3/logs/stdio"
-fi
-
 post_install() {
 	vsconf example/init
 }
+

From 3807c29ad8ed8e51b87f5c9d24fe27f6814a4f8c Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Sun, 1 Jan 2023 13:22:41 +0100
Subject: [PATCH 2/2] waylock: update to 0.6.2

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

diff --git a/srcpkgs/waylock/template b/srcpkgs/waylock/template
index 75878edae943..2ead43a53c02 100644
--- a/srcpkgs/waylock/template
+++ b/srcpkgs/waylock/template
@@ -1,16 +1,17 @@
 # Template file for 'waylock'
 pkgname=waylock
-version=0.3.5
+version=0.6.2
 revision=1
-build_style=cargo
-hostmakedepends="pkg-config"
-makedepends="libxkbcommon-devel pam-devel"
+build_style=zig-build
+configure_args="-Dpie"
+hostmakedepends="pkg-config wayland-devel scdoc"
+makedepends="libxkbcommon-devel pam-devel wayland-protocols wayland-devel"
 short_desc="Simple screenlocker for wayland compositors"
 maintainer="Isaac Freund <ifreund@ifreund.xyz>"
-license="MIT"
+license="ISC"
 homepage="https://github.com/ifreund/waylock"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=60abf78ae8aa9c28f3230f157607fbd74250a51322776ad1b7abed1408432b87
+distfiles="https://github.com/ifreund/waylock/releases/download/v${version}/waylock-${version}.tar.gz"
+checksum=4a794dedd1b11f3b9bb7b46f8a93c20aac5ac1d40a851cabaa7ae84fd36686fa
 
 post_install() {
 	vlicense LICENSE