[PR PATCH] st: add ncurses to st-terminfo dependencies + minor fixes

[PR PATCH] st: add ncurses to st-terminfo dependencies + minor fixes

[meator]

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

There is a new pull request by meator against master on the void-packages repository

https://github.com/meator/void-packages st
https://github.com/void-linux/void-packages/pull/33116

st: add ncurses to st-terminfo dependencies + minor fixes
<!-- Mark items with [x] where applicable -->
`st-terminfo.INSTALL` uses `tic`, but `st-terminfo` doesn't depend on `ncurses` (the provider of `tic`). This PR fixes that and it add some missing terminfo entries for removal to `st-terminfo.REMOVE`.
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

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

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

From 6e9519d5dbc97ca265c36109e9166e121d667443 Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
Date: Sat, 25 Sep 2021 14:22:43 +0200
Subject: [PATCH] st: add ncurses to st-terminfo dependencies + fix

---
 srcpkgs/st/st-terminfo.REMOVE | 3 +++
 srcpkgs/st/template           | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/st/st-terminfo.REMOVE b/srcpkgs/st/st-terminfo.REMOVE
index 6911eb3e614d..ad3893f3269a 100644
--- a/srcpkgs/st/st-terminfo.REMOVE
+++ b/srcpkgs/st/st-terminfo.REMOVE
@@ -1,6 +1,9 @@
 case "${ACTION}" in
 pre)
 	rm usr/share/terminfo/s/st
+	rm usr/share/terminfo/s/st-bs
+	rm usr/share/terminfo/s/st-bs-256color
+	rm usr/share/terminfo/s/st-mono
 	rm usr/share/terminfo/s/st-meta
 	rm usr/share/terminfo/s/st-meta-256color
 	rm usr/share/terminfo/s/st-256color
diff --git a/srcpkgs/st/template b/srcpkgs/st/template
index 0041346d2b84..fe9945094ec7 100644
--- a/srcpkgs/st/template
+++ b/srcpkgs/st/template
@@ -1,7 +1,7 @@
 # Template file for 'st'
 pkgname=st
 version=0.8.4
-revision=2
+revision=3
 build_style=gnu-makefile
 make_use_env=compliant
 hostmakedepends="pkg-config"
@@ -18,7 +18,7 @@ pre_build() {
 	sed -i 's|Liberation Mono|Monospace|g' config.def.h
 	[ -e ${FILESDIR}/config.h ] && cp ${FILESDIR}/config.h config.h
 	# We will use tic after install. See INSTALL.
-	sed -i '/tic/d' Makefile
+	vsed -i Makefile -e '/tic/d'
 }
 
 post_install() {
@@ -29,6 +29,7 @@ post_install() {
 
 st-terminfo_package() {
 	short_desc+=" - terminfo data"
+	depends="ncurses"
 	pkg_install() {
 		vmove usr/share/terminfo
 	}

Re: [PR REVIEW] st: add ncurses to st-terminfo dependencies + minor fixes

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/33116#discussion_r718929239

Comment:
Can you document in the man page the purpose of this change? It's rather unclear to me.

Re: [PR REVIEW] st: add ncurses to st-terminfo dependencies + minor fixes

[meator]

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

New review comment by meator on void-packages repository

https://github.com/void-linux/void-packages/pull/33116#discussion_r719495831

Comment:
In what manpage?

Re: [PR REVIEW] st: add ncurses to st-terminfo dependencies + minor fixes

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/33116#discussion_r720476178

Comment:
Don't review PRs while sleepy >.<

I meant the commit message.

Re: [PR REVIEW] st: add ncurses to st-terminfo dependencies + minor fixes

[Vaelatern]

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

New review comment by Vaelatern on void-packages repository

https://github.com/void-linux/void-packages/pull/33116#discussion_r720584483

Comment:
You are allowed to use more than 1 line

- 1 line
- blank line
- more text

Re: [PR REVIEW] st: add ncurses to st-terminfo dependencies + minor fixes

[Vaelatern]

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

New review comment by Vaelatern on void-packages repository

https://github.com/void-linux/void-packages/pull/33116#discussion_r720584483

Comment:
You are allowed to use more than 1 line (in your commit message)

- 1 line
- blank line
- more text

Re: [PR PATCH] [Updated] st: add ncurses to st-terminfo dependencies + minor fixes

[meator]

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

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

https://github.com/meator/void-packages st
https://github.com/void-linux/void-packages/pull/33116

st: add ncurses to st-terminfo dependencies + minor fixes
<!-- Mark items with [x] where applicable -->
`st-terminfo.INSTALL` uses `tic`, but `st-terminfo` doesn't depend on `ncurses` (the provider of `tic`). This PR fixes that and it add some missing terminfo entries for removal to `st-terminfo.REMOVE`.
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

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

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

From 9bf3b781e3fef91dd43604efdbbdead6c7fcc37d Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
Date: Sat, 25 Sep 2021 14:22:43 +0200
Subject: [PATCH] st: add ncurses to st-terminfo dependencies + fix

st-terminfo.INSTALL uses tic to compile terminfo entries, but there's no
guarantee that tic is actually installed. This commit adds ncurses (the
provider of tic) to the dependencies of st-terminfo. It also adds
missing terminfo entries to st-terminfo.REMOVE and replaces sed with
vsed.
---
 srcpkgs/st/st-terminfo.REMOVE | 3 +++
 srcpkgs/st/template           | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/st/st-terminfo.REMOVE b/srcpkgs/st/st-terminfo.REMOVE
index 6911eb3e614d..ad3893f3269a 100644
--- a/srcpkgs/st/st-terminfo.REMOVE
+++ b/srcpkgs/st/st-terminfo.REMOVE
@@ -1,6 +1,9 @@
 case "${ACTION}" in
 pre)
 	rm usr/share/terminfo/s/st
+	rm usr/share/terminfo/s/st-bs
+	rm usr/share/terminfo/s/st-bs-256color
+	rm usr/share/terminfo/s/st-mono
 	rm usr/share/terminfo/s/st-meta
 	rm usr/share/terminfo/s/st-meta-256color
 	rm usr/share/terminfo/s/st-256color
diff --git a/srcpkgs/st/template b/srcpkgs/st/template
index 0041346d2b84..fe9945094ec7 100644
--- a/srcpkgs/st/template
+++ b/srcpkgs/st/template
@@ -1,7 +1,7 @@
 # Template file for 'st'
 pkgname=st
 version=0.8.4
-revision=2
+revision=3
 build_style=gnu-makefile
 make_use_env=compliant
 hostmakedepends="pkg-config"
@@ -18,7 +18,7 @@ pre_build() {
 	sed -i 's|Liberation Mono|Monospace|g' config.def.h
 	[ -e ${FILESDIR}/config.h ] && cp ${FILESDIR}/config.h config.h
 	# We will use tic after install. See INSTALL.
-	sed -i '/tic/d' Makefile
+	vsed -i Makefile -e '/tic/d'
 }
 
 post_install() {
@@ -29,6 +29,7 @@ post_install() {
 
 st-terminfo_package() {
 	short_desc+=" - terminfo data"
+	depends="ncurses"
 	pkg_install() {
 		vmove usr/share/terminfo
 	}

Re: [PR REVIEW] st: add ncurses to st-terminfo dependencies + minor fixes

[meator]

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

New review comment by meator on void-packages repository

https://github.com/void-linux/void-packages/pull/33116#discussion_r720653816

Comment:
Done.

Re: st: add ncurses to st-terminfo dependencies + minor fixes

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/33116#issuecomment-932811444

Comment:
Thanks, I appreciate it :)

Re: [PR PATCH] [Merged]: st: add ncurses to st-terminfo dependencies + minor fixes

[ericonr]

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

There's a merged pull request on the void-packages repository

st: add ncurses to st-terminfo dependencies + minor fixes
https://github.com/void-linux/void-packages/pull/33116

Description:
<!-- Mark items with [x] where applicable -->
`st-terminfo.INSTALL` uses `tic`, but `st-terminfo` doesn't depend on `ncurses` (the provider of `tic`). This PR fixes that and it add some missing terminfo entries for removal to `st-terminfo.REMOVE`.
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR