+ +0001-Decoupled-installation-of-terminfo-profile-from-make.patch â paste.sr.ht + +

1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68

From 36ae564dbeae08b761541790ae7cf69c75a690bf Mon Sep 17 00:00:00 2001
+From: Ariadna Vigo <arivigodr@gmail.com>
+Date: Sat, 27 Feb 2021 12:15:47 +0100
+Subject: [PATCH] Decoupled installation of terminfo profile from 'make
+ install' target
+
+Installation of terminfo profiles is now left as a manual operation to
+the user's discretion. This fixes path issues: /usr/local/share/terminfo is not
+a standard search path location, according to terminfo(5). The only standard
+locations are /usr/share/terminfo and $HOME/.terminfo. The problem with the
+former is that it risks overwriting the dvtm profile files that some distros
+ship with their curses package (Arch Linux). The problem with the latter is
+that leaving TERMINFO blank on config.mk and running 'make install' as root
+(the usual case) may install the profiles under /root/.terminfo, which is
+incorrect. In other cases, as in Debian(-based) systems, the search paths are
+completely non-standard: Debian requires installing local, system-wide terminfo
+profiles under /etc/terminfo and has tic patched to do so when running as root.
+
+So, as many distros already include the profiles by themselves under curses,
+some use completely non-standard approaches to terminfo, and installation under
+$HOME/.terminfo is affected whether you use su or sudo, etc. The best approach
+to solve all these issues is to leave the decision to the user, so that tic
+does whatever the system wants it to do. Decoupling it from 'make install'
+makes it possible to run it as your regular user without any issues, installing
+the profile under $HOME/.terminfo for sure.
+---
+ Makefile  | 6 ++++--
+ config.mk | 3 ---
+ 2 files changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 818ca0a..0b84b5b 100644
+--- a/Makefile
++++ b/Makefile
+@@ -50,8 +50,10 @@ install: all
+ 		sed -e "s/VERSION/${VERSION}/" < "$$m" >  "${DESTDIR}${MANPREFIX}/man1/$$m" && \
+ 		chmod 644 "${DESTDIR}${MANPREFIX}/man1/$$m"; \
+ 	done
++
++install-terminfo:
+ 	@echo installing terminfo description
+-	@TERMINFO=${TERMINFO} tic -s dvtm.info
++	@tic -s dvtm.info
+
+ uninstall:
+ 	@for b in ${BIN}; do \
+@@ -61,4 +63,4 @@ uninstall:
+ 	@echo removing manual page from ${DESTDIR}${MANPREFIX}/man1
+ 	@rm -f ${DESTDIR}${MANPREFIX}/man1/dvtm.1
+
+-.PHONY: all clean dist install uninstall debug
++.PHONY: all clean dist install install-terminfo uninstall debug
+diff --git a/config.mk b/config.mk
+index db25e8a..cd4d9f7 100644
+--- a/config.mk
++++ b/config.mk
+@@ -2,9 +2,6 @@
+
+ PREFIX ?= /usr/local
+ MANPREFIX = ${PREFIX}/share/man
+-# specify your systems terminfo directory
+-# leave empty to install into your home folder
+-TERMINFO := ${DESTDIR}${PREFIX}/share/terminfo
+
+ INCS = -I.
+ LIBS = -lc -lutil -lncursesw
+--
+2.32.0
+

+~arivigo/0001-Decoupled-installation-of-terminfo-profile-from-make.patch + + + unlisted + +