diff options
Diffstat (limited to 'package/xterm/patches')
| -rw-r--r-- | package/xterm/patches/patch-Makefile_in | 22 | ||||
| -rw-r--r-- | package/xterm/patches/patch-main_c | 41 | ||||
| -rw-r--r-- | package/xterm/patches/patch-ptyx_h | 11 | 
3 files changed, 0 insertions, 74 deletions
| diff --git a/package/xterm/patches/patch-Makefile_in b/package/xterm/patches/patch-Makefile_in deleted file mode 100644 index 1282767e2..000000000 --- a/package/xterm/patches/patch-Makefile_in +++ /dev/null @@ -1,22 +0,0 @@ -	Fix shell compatibility problem. Note: this is rather hacky, as it -	changes the actual semantics of the code - instead of evaluating the -	shell statement when being used as parameter to a command, now the -	$(shell) function is being used and therefore the result computed at -	variable assignment stage. ---- xterm-259.orig/Makefile.in	2010-04-05 00:41:32.000000000 +0200 -+++ xterm-259/Makefile.in	2010-06-06 22:35:13.384934404 +0200 -@@ -175,10 +175,10 @@ resize$x : $(OBJS2) -  - charproc$o : main.h @CHARPROC_DEPS@ - ################################################################################ --actual_xterm  = `echo xterm|        sed '$(transform)'` --actual_resize = `echo resize|       sed '$(transform)'` --actual_uxterm = `echo uxterm|       sed '$(transform)'` --actual_k8term = `echo koi8rxterm|   sed '$(transform)'` -+actual_xterm  = $(shell echo xterm|        sed '$(transform)') -+actual_resize = $(shell echo resize|       sed '$(transform)') -+actual_uxterm = $(shell echo uxterm|       sed '$(transform)') -+actual_k8term = $(shell echo koi8rxterm|   sed '$(transform)') -  - binary_xterm  = $(actual_xterm)$x - binary_resize = $(actual_resize)$x diff --git a/package/xterm/patches/patch-main_c b/package/xterm/patches/patch-main_c deleted file mode 100644 index 96d2398c8..000000000 --- a/package/xterm/patches/patch-main_c +++ /dev/null @@ -1,41 +0,0 @@ ---- xterm-325.orig/main.c	2016-06-01 11:13:46.000000000 +0200 -+++ xterm-325/main.c	2016-09-09 22:25:42.000000000 +0200 -@@ -2637,7 +2637,7 @@ main(int argc, char *argv[]ENVP_ARG) -     } - } -  --#if defined(__osf__) || (defined(__GLIBC__) && !defined(USE_USG_PTYS)) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) -+#if defined(__osf__) || (defined(__linux__) && !defined(USE_USG_PTYS)) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) - #define USE_OPENPTY 1 - static int opened_tty = -1; - #endif -@@ -3204,7 +3204,7 @@ find_utmp(struct UTMP_STR *tofind) -  - #define close_fd(fd) close(fd), fd = -1 -  --#if defined(TIOCNOTTY) && (!defined(__GLIBC__) || (__GLIBC__ < 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ < 1))) -+#if defined(TIOCNOTTY) && defined(__linux__) - #define USE_NO_DEV_TTY 1 - #else - #define USE_NO_DEV_TTY 0 -@@ -3537,7 +3537,8 @@ spawnXTerm(XtermWidget xw) - 	    } - #endif /* __MVS__ */ -  --	    close_fd(ttyfd); -+	    // do not close it here -+	    // close_fd(ttyfd); - 	} -  - 	if (get_pty(&screen->respond, XDisplayString(screen->display))) { -@@ -3966,8 +3967,9 @@ spawnXTerm(XtermWidget xw) - 		   eg. by lineedit in the shell, or emacs, etc. then tio - 		   will have bad values.  Let's just get termio from the - 		   new tty and tailor it.  */ --		if (ttyGetAttr(ttyfd, &tio) == -1) -+		if (ttyGetAttr(ttyfd, &tio) == -1) { - 		    SysError(ERROR_TIOCGETP); -+		} - 		tio.c_lflag |= ECHOE; - #endif /* umips */ - 		/* Now is also the time to change the modes of the diff --git a/package/xterm/patches/patch-ptyx_h b/package/xterm/patches/patch-ptyx_h deleted file mode 100644 index 6fa2d72d2..000000000 --- a/package/xterm/patches/patch-ptyx_h +++ /dev/null @@ -1,11 +0,0 @@ ---- xterm-325.orig/ptyx.h	2016-05-29 22:32:48.000000000 +0200 -+++ xterm-325/ptyx.h	2016-09-09 22:25:42.000000000 +0200 -@@ -176,7 +176,7 @@ - #define USE_PTY_DEVICE 1 - #define USE_PTY_SEARCH 1 -  --#if defined(__osf__) || (defined(linux) && defined(__GLIBC__) && (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1)) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) -+#if defined(__osf__) || defined(linux) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) - #undef USE_PTY_DEVICE - #undef USE_PTY_SEARCH - #define USE_PTS_DEVICE 1 | 
