Upgraded xterm from 372 to 379

This commit is contained in:
dslm4515
2023-12-21 23:46:24 -06:00
parent 2042a7d139
commit 6afc0736e6
2 changed files with 5 additions and 28 deletions

View File

@ -1,7 +1,7 @@
#! /bin/bash
# XTerm
# Source: https://invisible-mirror.net/archives/xterm/xterm-372.tgz
# Source: https://invisible-mirror.net/archives/xterm/xterm-379.tgz
#
# $BUILD = Directory to temporarily install
# $PKGS = Directory to store built packages
@ -11,8 +11,6 @@
# Recommended: NONE
# Optional: pcre or pcre2, vlagrind, man2html, utempter
patch -Np1 -i ../patches/xterm-alpine/posix-ptys.patch
# If using netBSD curses instead of Ncurses, use "-lterminfo" instead of "-ltinfo"
CFLAGS="-ltinfo " \
./configure \
@ -43,8 +41,8 @@ CFLAGS="-ltinfo " \
--enable-narrowproto \
--enable-exec-xterm \
--enable-sixel-graphics \
--with-tty-group=tty \
--with-utempter $BUILDTRUPLE &&
--with-tty-group=tty #\
# --with-utempter $BUILDTRUPLE &&
read -p "Compile?" && make -j2 &&
sudo -S make DESTDIR=$BUILD install &&
@ -74,7 +72,7 @@ xterm:
xterm:
EOF
sudo -S mv -v /tmp/slack-desc install/ &&
sudo -S makepkg -l y -c n $PKGS/xterm-372-$(uname -m)-mlfs.txz && \
sudo -S makepkg -l y -c n $PKGS/xterm-379-$PSUFFIX && \
cd /BMAN && \
cat > /tmp/slack-desc << "EOF"
xterm-doc: Manuals for xterm (terminal emulator for X)
@ -85,5 +83,5 @@ xterm-doc: https://invisible-mirror.net
xterm-doc:
EOF
sudo -S mv -v /tmp/slack-desc install/ && \
sudo -S makepkg -l y -c n $PKGS/xterm-doc-372-noarch-mlfs.txz && \
sudo -S makepkg -l y -c n $PKGS/xterm-doc-379-$NOPSUFFIX && \
sudo -S rm -rf ${BUILD}/* /BMAN/*

View File

@ -1,21 +0,0 @@
diff -upr xterm-323.orig/main.c xterm-323/main.c
--- xterm-323.orig/main.c 2016-03-09 15:30:51.191053881 +0100
+++ xterm-323/main.c 2016-03-09 15:31:17.961635229 +0100
@@ -2654,7 +2654,7 @@ get_pty(int *pty, char *from GCC_UNUSED)
close(opened_tty);
opened_tty = -1;
}
-#elif defined(HAVE_POSIX_OPENPT) && defined(HAVE_PTSNAME) && defined(HAVE_GRANTPT_PTY_ISATTY)
+#elif defined(HAVE_POSIX_OPENPT) && defined(HAVE_PTSNAME)
if ((*pty = posix_openpt(O_RDWR)) >= 0) {
char *name = ptsname(*pty);
if (name != 0) {
@@ -3735,7 +3735,7 @@ spawnXTerm(XtermWidget xw)
/*
* now in child process
*/
-#if defined(_POSIX_SOURCE) || defined(SVR4) || defined(__convex__) || defined(__SCO__) || defined(__QNX__)
+#if defined(_POSIX_VERSION) || defined(SVR4) || defined(__convex__) || defined(__SCO__) || defined(__QNX__)
int pgrp = setsid(); /* variable may not be used... */
#else
int pgrp = getpid();