From 5665479ee24433dbcd2df863a1deae21ec5ed88f Mon Sep 17 00:00:00 2001 From: Ranme Fritzvilliams Date: Wed, 16 Dec 2020 13:01:35 +0300 Subject: [PATCH 1/3] xst: fix generation of terminfo files Allow tic compile with custom-defined variables such as rmxx, smxx, Tc, Ms, Se, Ss. This commit fixes "unknown capability" error caused by custom variables added in the upstream code since the release 0.8.4. --- srcpkgs/xst/INSTALL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/xst/INSTALL b/srcpkgs/xst/INSTALL index c73ae7337bb..fcad0563b68 100644 --- a/srcpkgs/xst/INSTALL +++ b/srcpkgs/xst/INSTALL @@ -1,5 +1,5 @@ case "${ACTION}" in post) - tic -s usr/share/terminfo/x/xst.terminfo + tic -sx usr/share/terminfo/x/xst.terminfo ;; esac From a47a88cfb5c0072b24553f4e996f69c73c10e064 Mon Sep 17 00:00:00 2001 From: Ranme Fritzvilliams Date: Wed, 16 Dec 2020 13:05:41 +0300 Subject: [PATCH 2/3] xst: fix replacing default TERM name in Xresources Replacing st-256color to xst-256color became unnecessary since it has been fixed in the upstream code. Leaving it as is will change "xst-256color" to "xxst-256color". --- srcpkgs/xst/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/xst/template b/srcpkgs/xst/template index b3743d1547d..8600c680ae3 100644 --- a/srcpkgs/xst/template +++ b/srcpkgs/xst/template @@ -1,7 +1,7 @@ # Template file for 'xst' pkgname=xst version=0.8.4.1 -revision=1 +revision=2 build_style=gnu-makefile make_use_env=compliant hostmakedepends="pkg-config" @@ -21,7 +21,6 @@ do_install() { vinstall st.info 644 usr/share/terminfo/x xst.terminfo vdoc README vdoc FAQ - vsed -i 's/st-256color/xst-256color/' .Xresources vdoc .Xresources Xresources vlicense LICENSE } From 17966339a75a1f158dc2f5ca7b1cfeacf13c39a5 Mon Sep 17 00:00:00 2001 From: Ranme Fritzvilliams Date: Thu, 17 Dec 2020 19:04:25 +0300 Subject: [PATCH 3/3] Revert "xst: fix replacing default TERM name in Xresources" This reverts commit a47a88cfb5c0072b24553f4e996f69c73c10e064. --- srcpkgs/xst/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/xst/template b/srcpkgs/xst/template index 8600c680ae3..b3743d1547d 100644 --- a/srcpkgs/xst/template +++ b/srcpkgs/xst/template @@ -1,7 +1,7 @@ # Template file for 'xst' pkgname=xst version=0.8.4.1 -revision=2 +revision=1 build_style=gnu-makefile make_use_env=compliant hostmakedepends="pkg-config" @@ -21,6 +21,7 @@ do_install() { vinstall st.info 644 usr/share/terminfo/x xst.terminfo vdoc README vdoc FAQ + vsed -i 's/st-256color/xst-256color/' .Xresources vdoc .Xresources Xresources vlicense LICENSE }