changeset 448:32de384fc96f

terminals/xterm: add patch from Alpine
author David Demelier <markand@malikania.fr>
date Fri, 05 Apr 2019 13:46:20 +0200
parents db2fc46d4501
children 215f817b7af4
files terminals/xterm/posix-ptys.patch terminals/xterm/xterm.sh
diffstat 2 files changed, 23 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/terminals/xterm/posix-ptys.patch	Fri Apr 05 13:46:20 2019 +0200
@@ -0,0 +1,21 @@
+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();
--- a/terminals/xterm/xterm.sh	Fri Apr 05 13:18:11 2019 +0200
+++ b/terminals/xterm/xterm.sh	Fri Apr 05 13:46:20 2019 +0200
@@ -45,6 +45,8 @@
 	tar xvaf $PKGNAME-$PKGVERSION.tgz
 	pushd $PKGNAME-$PKGVERSION
 
+	# https://git.alpinelinux.org/aports/tree/community/xterm/posix-ptys.patch
+	patch -p1 < ../posix-ptys.patch
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
 	LDFLAGS="$LDFLAGS" \