Re: [PR PATCH] [Updated] lsd: update to 0.22.0 and adopt

[tranzystorek-io <tranzystorek-io@users.noreply.github.com>]

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

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

https://github.com/tranzystorek-io/void-packages lsd
https://github.com/void-linux/void-packages/pull/37904

lsd: update to 0.22.0 and adopt
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From 3dc01f73e321e6ac16fe79b5e9471fe07e4ef588 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 6 Jul 2022 21:08:21 +0200
Subject: [PATCH 1/2] lsd: update to 0.22.0 and adopt

---
 srcpkgs/lsd/template | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/lsd/template b/srcpkgs/lsd/template
index 40af9eef7652..a1c3fda999ea 100644
--- a/srcpkgs/lsd/template
+++ b/srcpkgs/lsd/template
@@ -1,12 +1,20 @@
 # Template file for 'lsd'
 pkgname=lsd
-version=0.20.1
+version=0.22.0
 revision=1
 build_style=cargo
 short_desc="Next gen ls command with lots of pretty colors and awesome icons"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Marcin Puc <tranzystorek.io@protonmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/Peltoche/lsd"
 changelog="https://raw.githubusercontent.com/Peltoche/lsd/master/CHANGELOG.md"
 distfiles="https://github.com/Peltoche/lsd/archive/${version}.tar.gz"
-checksum=a2086aa049b8bd21c880f23b21b0e9ef21d3c3829d40641aa8810c08be936c19
+checksum=30ad1b1d014c7b6a2fca44c6de3b17198c84168d34fc946245d67094ebc0f7ed
+
+export SHELL_COMPLETIONS_DIR="${wrksrc}"
+
+post_install() {
+	vcompletion lsd.bash bash
+	vcompletion lsd.fish fish
+	vcompletion _lsd zsh
+}

From 9c01bcdd073b650c5295b416785797d2363c1e78 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 7 Jul 2022 22:57:39 +0200
Subject: [PATCH 2/2] disputils: change binary names to avoid conflict

---
 srcpkgs/disputils/template | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/disputils/template b/srcpkgs/disputils/template
index 9416f2c4de5e..9109bbeb1b58 100644
--- a/srcpkgs/disputils/template
+++ b/srcpkgs/disputils/template
@@ -1,7 +1,7 @@
 # Template file for 'disputils'
 pkgname=disputils
 version=1.0.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_use_env=yes
 hostmakedepends="pkg-config"
@@ -20,4 +20,10 @@ post_extract() {
 
 post_install() {
 	vlicense LICENSE
+
+	# avoid conflict with lsd
+	mv ${DESTDIR}/usr/bin/{lsd,lsdsp}
+	mv ${DESTDIR}/usr/bin/{pfd,pfdsp}
+	mv ${DESTDIR}/usr/bin/{phd,phdsp}
+	mv ${DESTDIR}/usr/bin/{ppd,ppdsp}
 }