From 5b9f286ed4e8ad656507180622935138cf96737d Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Mon, 5 May 2025 21:31:34 -0600 Subject: [PATCH] xterm: fix open pty --- recipes/wip/x11/xterm/redox.patch | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/recipes/wip/x11/xterm/redox.patch b/recipes/wip/x11/xterm/redox.patch index 6326c626d..69e3a0abd 100644 --- a/recipes/wip/x11/xterm/redox.patch +++ b/recipes/wip/x11/xterm/redox.patch @@ -1,6 +1,6 @@ diff -ruwN xterm-398/main.c source/main.c --- xterm-398/main.c 2025-03-08 06:03:19.000000000 -0700 -+++ source/main.c 2025-05-05 20:51:10.249419667 -0600 ++++ source/main.c 2025-05-05 21:25:41.492475745 -0600 @@ -162,6 +162,10 @@ #define USE_POSIX_SIGNALS #endif @@ -23,9 +23,27 @@ diff -ruwN xterm-398/main.c source/main.c #ifdef __SCO__ #ifndef _SVID3 #define _SVID3 +@@ -3114,7 +3122,7 @@ + } + } + +-#if defined(__osf__) || (defined(__linux__) && !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__) || defined(__redox__) + #define USE_OPENPTY 1 + static int opened_tty = -1; + #endif +@@ -4494,7 +4502,7 @@ + /* make /dev/tty work */ + ioctl(ttyfd, TIOCSCTTY, 0); + #endif +-#ifdef USE_SYSV_PGRP ++#if defined(USE_SYSV_PGRP) && !defined(__redox__) + /* We need to make sure that we are actually + * the process group leader for the pty. If + * we are, then we should now be able to open diff -ruwN xterm-398/xterm.h source/xterm.h --- xterm-398/xterm.h 2025-04-08 01:36:09.000000000 -0600 -+++ source/xterm.h 2025-05-05 20:10:18.830478495 -0600 ++++ source/xterm.h 2025-05-05 21:11:05.413561791 -0600 @@ -80,7 +80,7 @@ #define HAVE_PUTENV 1 #endif @@ -46,7 +64,7 @@ diff -ruwN xterm-398/xterm.h source/xterm.h #define HAVE_SETITIMER 0 diff -ruwN xterm-398/xterm_io.h source/xterm_io.h --- xterm-398/xterm_io.h 2024-09-30 02:03:20.000000000 -0600 -+++ source/xterm_io.h 2025-05-05 20:14:21.528656084 -0600 ++++ source/xterm_io.h 2025-05-05 21:11:05.413561791 -0600 @@ -57,7 +57,7 @@ #define USE_SYSV_TERMIO #endif