From 388f5634469c8ee8829340da6e8f55d01a12ffc5 Mon Sep 17 00:00:00 2001 From: meator Date: Thu, 21 Jul 2022 19:58:31 +0200 Subject: [PATCH 1/7] alacritty: generate terminfo when building This commit also fixes a xlint warning about including the specific version of autocfg in cargo update. --- srcpkgs/alacritty/alacritty-terminfo.INSTALL | 6 ------ srcpkgs/alacritty/alacritty-terminfo.REMOVE | 7 ------- srcpkgs/alacritty/template | 5 ++--- 3 files changed, 2 insertions(+), 16 deletions(-) delete mode 100644 srcpkgs/alacritty/alacritty-terminfo.INSTALL delete mode 100644 srcpkgs/alacritty/alacritty-terminfo.REMOVE diff --git a/srcpkgs/alacritty/alacritty-terminfo.INSTALL b/srcpkgs/alacritty/alacritty-terminfo.INSTALL deleted file mode 100644 index 71e122147942..000000000000 --- a/srcpkgs/alacritty/alacritty-terminfo.INSTALL +++ /dev/null @@ -1,6 +0,0 @@ -case "$ACTION" in -post) - # Compile the terminfo description. - tic -xe alacritty,alacritty-direct usr/share/terminfo/a/alacritty.info - ;; -esac diff --git a/srcpkgs/alacritty/alacritty-terminfo.REMOVE b/srcpkgs/alacritty/alacritty-terminfo.REMOVE deleted file mode 100644 index 572df4e79ba9..000000000000 --- a/srcpkgs/alacritty/alacritty-terminfo.REMOVE +++ /dev/null @@ -1,7 +0,0 @@ -case "$ACTION" in -pre) - # Remove compiled terminfo files. - rm -f usr/share/terminfo/a/alacritty - rm -f usr/share/terminfo/a/alacritty-direct - ;; -esac diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template index 354614c35545..9e6180a05a6d 100644 --- a/srcpkgs/alacritty/template +++ b/srcpkgs/alacritty/template @@ -17,7 +17,7 @@ checksum=e48d4b10762c2707bb17fd8f89bd98f0dcccc450d223cade706fdd9cfaefb308 post_patch() { # fixes an indexmap error when cross compiling - cargo update --package autocfg --precise 1.1.0 + cargo update --package autocfg:1.0.1 --precise 1.1.0 } case "$XBPS_TARGET_MACHINE" in @@ -31,14 +31,13 @@ post_install() { vinstall ../extra/completions/alacritty.bash 644 usr/share/bash-completion/completions alacritty vinstall ../extra/completions/_alacritty 644 usr/share/zsh/site-functions vinstall ../extra/completions/alacritty.fish 644 usr/share/fish/vendor_completions.d - vinstall ../extra/alacritty.info 644 usr/share/terminfo/a + tic -o ${DESTDIR}/usr/share/terminfo -xe alacritty,alacritty-direct ../extra/alacritty.info vman ../extra/alacritty.man alacritty.1 vsconf ../alacritty.yml } alacritty-terminfo_package() { short_desc+=" - terminfo data" - depends="ncurses" pkg_install() { vmove usr/share/terminfo } From aab094752fe7acb3b710358a503a3a8955c164d4 Mon Sep 17 00:00:00 2001 From: meator Date: Thu, 21 Jul 2022 10:56:03 +0200 Subject: [PATCH 2/7] dvtm: generate terminfo when building & simplify Generating terminfo in INSTALL is unnecessary and leaves .info file in /usr/share/terminfo which can confuse some programs. Dvtm now also uses proper build_style=gnu_makefile instead of calling make explicitly. --- srcpkgs/dvtm/INSTALL | 6 ------ srcpkgs/dvtm/REMOVE | 7 ------- srcpkgs/dvtm/template | 15 +++++---------- 3 files changed, 5 insertions(+), 23 deletions(-) delete mode 100644 srcpkgs/dvtm/INSTALL delete mode 100644 srcpkgs/dvtm/REMOVE diff --git a/srcpkgs/dvtm/INSTALL b/srcpkgs/dvtm/INSTALL deleted file mode 100644 index 61fb79d9537d..000000000000 --- a/srcpkgs/dvtm/INSTALL +++ /dev/null @@ -1,6 +0,0 @@ -case "$ACTION" in -post) - # Compile the terminfo description. - tic -s usr/share/terminfo/d/dvtm.info - ;; -esac diff --git a/srcpkgs/dvtm/REMOVE b/srcpkgs/dvtm/REMOVE deleted file mode 100644 index 7ea17f65f6c1..000000000000 --- a/srcpkgs/dvtm/REMOVE +++ /dev/null @@ -1,7 +0,0 @@ -case "$ACTION" in -pre) - # Remove compiled terminfo files. - rm -f usr/share/terminfo/d/dvtm-256color - rm -f usr/share/terminfo/d/dvtm - ;; -esac diff --git a/srcpkgs/dvtm/template b/srcpkgs/dvtm/template index a65c17c2d9c2..e16b36bd8677 100644 --- a/srcpkgs/dvtm/template +++ b/srcpkgs/dvtm/template @@ -1,9 +1,11 @@ # Template file for 'dvtm' pkgname=dvtm version=0.15 -revision=2 +revision=3 +build_style=gnu-makefile +make_use_env=yes +hostmakedepends="ncurses" makedepends="ncurses-devel" -depends="ncurses" # needs tic at post-install short_desc="Tiling window manager for the console" maintainer="Orphaned " license="MIT" @@ -11,13 +13,6 @@ homepage="http://www.brain-dump.org/projects/dvtm/" distfiles="http://www.brain-dump.org/projects/dvtm/$pkgname-$version.tar.gz" checksum=8f2015c05e2ad82f12ae4cf12b363d34f527a4bbc8c369667f239e4542e1e510 -do_build() { - # Do not run tic, useless in build environment. - sed -i 's,tic,/bin/true,g' Makefile - make CC=$CC V=1 -} -do_install() { - make PREFIX=/usr DESTDIR=${DESTDIR} install +post_install() { vlicense LICENSE - vinstall dvtm.info 644 usr/share/terminfo/d } From b439e2d36cc1e48de2bf938d984139c8967b0a9c Mon Sep 17 00:00:00 2001 From: meator Date: Thu, 21 Jul 2022 21:33:12 +0200 Subject: [PATCH 3/7] mtm: generate terminfo when building This commit also removes build_style=gnu-makefile because do_build() and do_install() are defined anyway. --- srcpkgs/mtm/mtm-terminfo.INSTALL | 5 ----- srcpkgs/mtm/mtm-terminfo.REMOVE | 7 ------- srcpkgs/mtm/template | 9 ++++----- 3 files changed, 4 insertions(+), 17 deletions(-) delete mode 100644 srcpkgs/mtm/mtm-terminfo.INSTALL delete mode 100644 srcpkgs/mtm/mtm-terminfo.REMOVE diff --git a/srcpkgs/mtm/mtm-terminfo.INSTALL b/srcpkgs/mtm/mtm-terminfo.INSTALL deleted file mode 100644 index 4c2d03b145ca..000000000000 --- a/srcpkgs/mtm/mtm-terminfo.INSTALL +++ /dev/null @@ -1,5 +0,0 @@ -case "${ACTION}" in -post) - tic -sx usr/share/terminfo/m/mtm.ti - ;; -esac diff --git a/srcpkgs/mtm/mtm-terminfo.REMOVE b/srcpkgs/mtm/mtm-terminfo.REMOVE deleted file mode 100644 index 767b67b2bee4..000000000000 --- a/srcpkgs/mtm/mtm-terminfo.REMOVE +++ /dev/null @@ -1,7 +0,0 @@ -case "${ACTION}" in -pre) - rm usr/share/terminfo/m/mtm - rm usr/share/terminfo/m/mtm-256color - rm usr/share/terminfo/m/mtm-noutf - ;; -esac diff --git a/srcpkgs/mtm/template b/srcpkgs/mtm/template index a6cfd2c104ce..599fa463410d 100644 --- a/srcpkgs/mtm/template +++ b/srcpkgs/mtm/template @@ -1,10 +1,9 @@ # Template file for 'mtm' pkgname=mtm version=1.2.0 -revision=3 -build_style=gnu-makefile +revision=4 +hostmakedepends="ncurses" makedepends="ncurses-devel ncurses-libs" -depends="ncurses" short_desc="Micro Terminal Multiplexer" maintainer="travankor " license="GPL-3.0-or-later" @@ -18,13 +17,13 @@ do_build() { do_install() { vbin mtm - vinstall mtm.ti 644 usr/share/terminfo/m + mkdir -p ${DESTDIR}/usr/share/terminfo + tic -sx -o ${DESTDIR}/usr/share/terminfo mtm.ti vman mtm.1 } mtm-terminfo_package() { short_desc+=" - terminfo data" - depends="ncurses" pkg_install() { vmove usr/share/terminfo } From 5394d54c337c1cf4a38ceba64836f72ea8dc05fa Mon Sep 17 00:00:00 2001 From: meator Date: Thu, 21 Jul 2022 21:38:59 +0200 Subject: [PATCH 4/7] rxvt-unicode: do not include .terminfo file xrvt-unicode already compiles the terminfo descriptions so having the raw version in /usr/share/terminfo is unnecessary. --- srcpkgs/rxvt-unicode/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/rxvt-unicode/template b/srcpkgs/rxvt-unicode/template index 1ad3c47e2448..6593340186ef 100644 --- a/srcpkgs/rxvt-unicode/template +++ b/srcpkgs/rxvt-unicode/template @@ -1,7 +1,7 @@ # Template file for 'rxvt-unicode' pkgname=rxvt-unicode version=9.30 -revision=2 +revision=3 build_style=gnu-configure configure_args=" --with-terminfo=/usr/share/terminfo --enable-256-color @@ -69,7 +69,6 @@ pre_install() { } post_install() { - vinstall doc/etc/rxvt-unicode.terminfo 644 usr/share/terminfo/r vinstall ${FILESDIR}/${pkgname}.desktop 644 usr/share/applications vinstall ${FILESDIR}/${pkgname}.png 644 usr/share/pixmaps } From 2b55dd1a730a5cf2ef3557144fdb501fbc490bf7 Mon Sep 17 00:00:00 2001 From: meator Date: Thu, 21 Jul 2022 21:50:12 +0200 Subject: [PATCH 5/7] st: generate terminfo when building & adopt --- srcpkgs/st/st-terminfo.INSTALL | 5 ----- srcpkgs/st/st-terminfo.REMOVE | 11 ----------- srcpkgs/st/template | 13 +++++++------ 3 files changed, 7 insertions(+), 22 deletions(-) delete mode 100644 srcpkgs/st/st-terminfo.INSTALL delete mode 100644 srcpkgs/st/st-terminfo.REMOVE diff --git a/srcpkgs/st/st-terminfo.INSTALL b/srcpkgs/st/st-terminfo.INSTALL deleted file mode 100644 index 53bfb42d10f8..000000000000 --- a/srcpkgs/st/st-terminfo.INSTALL +++ /dev/null @@ -1,5 +0,0 @@ -case "${ACTION}" in -post) - tic -sx usr/share/terminfo/s/st.terminfo - ;; -esac diff --git a/srcpkgs/st/st-terminfo.REMOVE b/srcpkgs/st/st-terminfo.REMOVE deleted file mode 100644 index ad3893f3269a..000000000000 --- a/srcpkgs/st/st-terminfo.REMOVE +++ /dev/null @@ -1,11 +0,0 @@ -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 - ;; -esac diff --git a/srcpkgs/st/template b/srcpkgs/st/template index 9376a0c0c983..e6d7e3beb977 100644 --- a/srcpkgs/st/template +++ b/srcpkgs/st/template @@ -1,14 +1,14 @@ # Template file for 'st' pkgname=st version=0.8.5 -revision=1 +revision=2 build_style=gnu-makefile make_use_env=compliant hostmakedepends="pkg-config" makedepends="fontconfig-devel libX11-devel libXft-devel" depends="ncurses st-terminfo-${version}_${revision}" short_desc="Simple terminal implementation for X" -maintainer="Orphaned " +maintainer="meator " license="MIT" homepage="https://st.suckless.org" distfiles="https://dl.suckless.org/${pkgname}/${pkgname}-${version}.tar.gz" @@ -17,19 +17,20 @@ checksum=ea6832203ed02ff74182bcb8adaa9ec454c8f989e79232cb859665e2f544ab37 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. - vsed -i Makefile -e '/tic/d' + mkdir -p ${DESTDIR}/usr/share/terminfo +} + +pre_install() { + export TERMINFO=${DESTDIR}/usr/share/terminfo } post_install() { - vinstall st.info 644 usr/share/terminfo/s st.terminfo vdoc README vlicense LICENSE } st-terminfo_package() { short_desc+=" - terminfo data" - depends="ncurses" pkg_install() { vmove usr/share/terminfo } From 6fab02b35ced318dc7c7df0843b4bbc2f65f8f6f Mon Sep 17 00:00:00 2001 From: meator Date: Thu, 21 Jul 2022 21:56:28 +0200 Subject: [PATCH 6/7] xst: generate terminfo when building & simplify --- srcpkgs/xst/INSTALL | 5 ----- srcpkgs/xst/REMOVE | 8 -------- srcpkgs/xst/template | 8 ++------ 3 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 srcpkgs/xst/INSTALL delete mode 100644 srcpkgs/xst/REMOVE diff --git a/srcpkgs/xst/INSTALL b/srcpkgs/xst/INSTALL deleted file mode 100644 index fcad0563b681..000000000000 --- a/srcpkgs/xst/INSTALL +++ /dev/null @@ -1,5 +0,0 @@ -case "${ACTION}" in -post) - tic -sx usr/share/terminfo/x/xst.terminfo - ;; -esac diff --git a/srcpkgs/xst/REMOVE b/srcpkgs/xst/REMOVE deleted file mode 100644 index b46f677d7fdf..000000000000 --- a/srcpkgs/xst/REMOVE +++ /dev/null @@ -1,8 +0,0 @@ -case "${ACTION}" in -pre) - rm usr/share/terminfo/x/xst - rm usr/share/terminfo/x/xst-meta - rm usr/share/terminfo/x/xst-meta-256color - rm usr/share/terminfo/x/xst-256color - ;; -esac diff --git a/srcpkgs/xst/template b/srcpkgs/xst/template index 8600c680ae36..f06dbed9b3d5 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=3 build_style=gnu-makefile make_use_env=compliant hostmakedepends="pkg-config" @@ -14,11 +14,7 @@ homepage="https://github.com/gnotclub/xst" distfiles="https://github.com/gnotclub/xst/archive/v${version}.tar.gz" checksum=cbeb2da6c289415d1168559c6f58b4ce47fd266edefbabc38fd59e8b7c87226d -do_install() { - vbin xst - vman st.1 xst.1 - - vinstall st.info 644 usr/share/terminfo/x xst.terminfo +post_install() { vdoc README vdoc FAQ vdoc .Xresources Xresources From 787006fa1523cd0c04d56b4ae10140395e079d95 Mon Sep 17 00:00:00 2001 From: meator Date: Fri, 22 Jul 2022 19:35:48 +0200 Subject: [PATCH 7/7] ncurses: Resolve conflicts with -terminfo packages ncurses-term provides terminfo entries only for terminals which don't have their own -terminfo subackage now. This also replaces the remove-foot.patch with rm in post_install() to make handling of terminfo conflicts consistent. --- srcpkgs/ncurses/patches/remove-foot.patch | 64 ----------------------- srcpkgs/ncurses/template | 10 +++- 2 files changed, 9 insertions(+), 65 deletions(-) delete mode 100644 srcpkgs/ncurses/patches/remove-foot.patch diff --git a/srcpkgs/ncurses/patches/remove-foot.patch b/srcpkgs/ncurses/patches/remove-foot.patch deleted file mode 100644 index 0328c5c4dad8..000000000000 --- a/srcpkgs/ncurses/patches/remove-foot.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff -ruN ncurses-6.3_orig/misc/terminfo.src ncurses-6.3/misc/terminfo.src ---- ncurses-6.3_orig/misc/terminfo.src 2022-05-17 17:22:53.886017351 +0200 -+++ ncurses-6.3/misc/terminfo.src 2022-05-17 17:23:31.941720306 +0200 -@@ -7627,60 +7627,6 @@ - - ######## WAYLAND CLIENTS - --#### Foot --# https://codeberg.org/dnkl/foot/ --# Version 1.8.2 --# --# This identifies as a VT220 with 4=sixel and 22=color, however: --# tack: --# bell does not work --# status-line does not work because foot does not set the window title --# sends escape when meta key is used, whether or not smm/rmm enabled --# vttest: --# wrap-test fails --# no application-mode for numeric keypad (unless private mode 1035 is set) --# no NRCS --# no VT52 --# no SRM --# protected areas do not work --# SU/SD work, SL/SR do not --# DECRPM responds, but not the corresponding ANSI reports. --# otherwise few reports, except cursor-position and mouse and some dtterm --# VT520 cursor-movement works, except for left/right margins --# supports xterm/DECSCUSR, though default case in vttest does not blink --# Send: <27> [ 0 <32> q --# Text: The cursor should be a blinking rectangle --# partial support for xterm mouse any-event mode and button-event mode: --# + does not report focus-in/focus-out --# + does not report buttons 6/7 --# alternate-screen works --foot|foot terminal emulator, -- oc=\E]104\E\\, use=xterm+256color2, use=foot+base, -- --foot-direct|foot with direct color indexing, -- use=xterm+direct, use=foot+base, -- --foot+base|foot base fragment, -- am, bce, bw, hs, mir, msgr, npc, xenl, AX, XT, -- cols#80, it#8, lines#24, -- acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, -- bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r, -- cub1=^H, cud1=\n, dim=\E[2m, ech=\E[%p1%dX, ed=\E[J, el=\E[K, -- el1=\E[1K, flash=\E]555\E\\, ind=\n, invis=\E[8m, -- is2=\E[!p\E[?3;4l\E[4l\E>, kbs=^?, kcbt=\E[Z, -- oc=\E]104\E\\, op=\E[39;49m, rev=\E[7m, ri=\EM, rmacs=\E(B, -- rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m, -- rs1=\Ec, rs2=\E[!p\E[?3;4l\E[4l\E>, -- sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%; -- %?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m, -- sgr0=\E(B\E[m, smacs=\E(0, smam=\E[?7h, smkx=\E[?1h\E=, -- smso=\E[7m, smul=\E[4m, E3=\E[3J, use=att610+cvis, -- use=ansi+csr, use=ansi+cup, use=ansi+enq, use=ansi+local, -- use=ansi+idc, use=ansi+idl, use=ansi+rca2, use=ansi+rep, -- use=ansi+tabs, use=ecma+index, use=ecma+italics, -- use=ecma+strikeout, use=xterm+alt+title, -- use=xterm+pcfkeys, use=xterm+sm+1006, use=xterm+tmux2, -- - ######## WEB CLIENTS - - #### DomTerm diff --git a/srcpkgs/ncurses/template b/srcpkgs/ncurses/template index 8386760db22f..4dcbc95bcb62 100644 --- a/srcpkgs/ncurses/template +++ b/srcpkgs/ncurses/template @@ -1,7 +1,7 @@ # Template file for 'ncurses' pkgname=ncurses version=6.3 -revision=2 +revision=3 bootstrap=yes configure_args="--enable-big-core" short_desc="System V Release 4.0 curses emulation library" @@ -97,6 +97,14 @@ do_install() { fi } +post_install() { + # resolve conflict with *-terminfo packages + rm ${DESTDIR}/usr/share/terminfo/a/alacritty{,-direct} + rm ${DESTDIR}/usr/share/terminfo/d/dvtm{,-256color} + rm ${DESTDIR}/usr/share/terminfo/s/st{,-256color} + rm ${DESTDIR}/usr/share/terminfo/f/foot{,-direct} +} + ncurses-libs_package() { short_desc+=" -- shared libraries" pkg_install() {