Github messages for voidlinux
 help / color / mirror / Atom feed
From: meator <meator@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] st: add ncurses to st-terminfo dependencies + minor fixes
Date: Sat, 02 Oct 2021 11:16:03 +0200	[thread overview]
Message-ID: <20211002091603.K-I8TAuDa56APqq3K1pxmQf9EYMUclPWMhtTmWt5_so@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-33116@inbox.vuxu.org>

[-- 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
 	}

  parent reply	other threads:[~2021-10-02  9:16 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-25 13:19 [PR PATCH] " meator
2021-09-29 22:31 ` [PR REVIEW] " ericonr
2021-09-30 14:59 ` meator
2021-10-01 18:59 ` ericonr
2021-10-01 23:19 ` Vaelatern
2021-10-01 23:19 ` Vaelatern
2021-10-02  9:16 ` meator [this message]
2021-10-02  9:19 ` meator
2021-10-02 19:48 ` ericonr
2021-10-02 19:48 ` [PR PATCH] [Merged]: " ericonr

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211002091603.K-I8TAuDa56APqq3K1pxmQf9EYMUclPWMhtTmWt5_so@z \
    --to=meator@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).