[PR PATCH] xst: fix terminfo and xresources

[PR PATCH] xst: fix terminfo and xresources

[dotnetfox]

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

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

https://github.com/dotnetfox/void-packages xst
https://github.com/void-linux/void-packages/pull/27196

xst: fix terminfo and xresources
Fixes "unknown capability" during terminfo generation and removes replacing TERM name in xresources since it is unneeded anymore.

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

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

From 5665479ee24433dbcd2df863a1deae21ec5ed88f Mon Sep 17 00:00:00 2001
From: Ranme Fritzvilliams <me@dotnetfox.tk>
Date: Wed, 16 Dec 2020 13:01:35 +0300
Subject: [PATCH 1/2] 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 <me@dotnetfox.tk>
Date: Wed, 16 Dec 2020 13:05:41 +0300
Subject: [PATCH 2/2] 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
 }

Re: [PR REVIEW] xst: fix terminfo and xresources

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/27196#discussion_r545109070

Comment:
I believe this change was made by @ndowens , iirc? Why remove it?

Re: xst: fix terminfo and xresources

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/27196#issuecomment-747454342

Comment:
Please make it a single commit per package :)

Re: [PR REVIEW] xst: fix terminfo and xresources

[Piraty]

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

New review comment by Piraty on void-packages repository

https://github.com/void-linux/void-packages/pull/27196#discussion_r545113437

Comment:
no, 271d64c5de1526e5cbfbf474ef56149ab2274193. @ericonr the second commit seems to clarify it already (`Replacing st-256color to xst-256color became unnecessary since it has been fixed in the upstream code.`)
@dotnetfox please squash the commits so you offer one commit per package

Re: [PR REVIEW] xst: fix terminfo and xresources

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/27196#discussion_r545117208

Comment:
Ah, thanks.

Re: [PR PATCH] [Updated] xst: fix terminfo and xresources

[dotnetfox]

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

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

https://github.com/dotnetfox/void-packages xst
https://github.com/void-linux/void-packages/pull/27196

xst: fix terminfo and xresources
Fixes "unknown capability" during terminfo generation and removes replacing TERM name in xresources since it is unneeded anymore.

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

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

From 5665479ee24433dbcd2df863a1deae21ec5ed88f Mon Sep 17 00:00:00 2001
From: Ranme Fritzvilliams <me@dotnetfox.tk>
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 <me@dotnetfox.tk>
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 <me@dotnetfox.tk>
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
 }

Re: [PR REVIEW] xst: fix terminfo and xresources

[ndowens]

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

New review comment by ndowens on void-packages repository

https://github.com/void-linux/void-packages/pull/27196#discussion_r545224823

Comment:
> I believe this change was made by @ndowens , iirc? Why remove it?

Nah it was already in previous version, but I left in in case removing would have conflicted with st

Re: [PR PATCH] [Closed]: xst: fix terminfo and xresources

[dotnetfox]

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

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

xst: fix terminfo and xresources
https://github.com/void-linux/void-packages/pull/27196

Description:
Fixes "unknown capability" during terminfo generation and removes replacing TERM name in xresources since it is unneeded anymore.

Re: xst: fix terminfo and xresources

[dotnetfox]

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

New comment by dotnetfox on void-packages repository

https://github.com/void-linux/void-packages/pull/27196#issuecomment-747552804

Comment:
> Please make it a single commit per package :)

Please accept my apologies for flooding the request.

I barely know how to use git, unfortunately.

Re: [PR PATCH] [Closed]: xst: fix terminfo and xresources

[dotnetfox]

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

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

xst: fix terminfo and xresources
https://github.com/void-linux/void-packages/pull/27196

Description:
Fixes "unknown capability" during terminfo generation and removes replacing TERM name in xresources since it is unneeded anymore.

Re: xst: fix terminfo and xresources

[dotnetfox]

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

New comment by dotnetfox on void-packages repository

https://github.com/void-linux/void-packages/pull/27196#issuecomment-747558357

Comment:
I messed up with commit. I will open a new one.

Please excuse me.

Re: xst: fix terminfo and xresources

[dotnetfox]

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

New comment by dotnetfox on void-packages repository

https://github.com/void-linux/void-packages/pull/27196#issuecomment-747558357

Comment:
I messed up with the branch. I will open a new one.

Please excuse me.

Re: xst: fix terminfo and xresources

[Piraty]

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

New comment by Piraty on void-packages repository

https://github.com/void-linux/void-packages/pull/27196#issuecomment-747716616

Comment:
read the guide https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md
then, force-push to this branch instead of opening a new PR

Re: xst: fix terminfo and xresources

[dotnetfox]

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

New comment by dotnetfox on void-packages repository

https://github.com/void-linux/void-packages/pull/27196#issuecomment-747747995

Comment:
@Piraty,

my apologies.


I was not careful at that point.