ttyrec: compilation fix (#12367)

This commit is contained in:
Ivan Max 2022-10-14 21:06:00 +00:00 committed by GitHub
parent 2a9c5c43d0
commit 7321680ed2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 8 deletions

View File

@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Terminal recorder and player"
TERMUX_PKG_LICENSE="BSD"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=1.0.8
TERMUX_PKG_REVISION=6
TERMUX_PKG_REVISION=7
TERMUX_PKG_SRCURL=http://0xcc.net/ttyrec/ttyrec-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=ef5e9bf276b65bb831f9c2554cd8784bd5b4ee65353808f82b7e2aef851587ec
TERMUX_PKG_BUILD_IN_SRC=true

View File

@ -1,7 +1,7 @@
diff -u -r ../ttyrec-1.0.8/ttyrec.c ./ttyrec.c
--- ../ttyrec-1.0.8/ttyrec.c 2006-06-11 17:52:50.000000000 +0200
+++ ./ttyrec.c 2014-06-26 11:01:31.614213029 +0200
@@ -48,7 +48,7 @@
diff -uNr ttyrec-1.0.8/ttyrec.c ttyrec-1.0.8/ttyrec.c.patch
--- ttyrec-1.0.8/ttyrec.c 2022-10-14 23:15:59.670392769 +0300
+++ ttyrec-1.0.8/ttyrec.c.patch 2022-10-14 23:25:00.418452092 +0300
@@ -48,12 +48,13 @@
#include <sys/ioctl.h>
#include <sys/time.h>
#include <sys/file.h>
@ -10,7 +10,13 @@ diff -u -r ../ttyrec-1.0.8/ttyrec.c ./ttyrec.c
#include <stdio.h>
#include <time.h>
#include <unistd.h>
@@ -74,6 +74,35 @@
#include <string.h>
#include <stdlib.h>
+#include <sys/wait.h>
#if defined(SVR4)
#include <fcntl.h>
@@ -74,6 +75,35 @@
#include <libutil.h>
#endif
@ -46,7 +52,7 @@ diff -u -r ../ttyrec-1.0.8/ttyrec.c ./ttyrec.c
#if defined(SVR4) && !defined(CDEL)
#if defined(_POSIX_VDISABLE)
#define CDEL _POSIX_VDISABLE
@@ -156,7 +185,7 @@
@@ -156,7 +186,7 @@
shell = getenv("SHELL");
if (shell == NULL)
@ -55,7 +61,7 @@ diff -u -r ../ttyrec-1.0.8/ttyrec.c ./ttyrec.c
getmaster();
fixtty();
@@ -203,11 +232,7 @@
@@ -203,15 +233,11 @@
void
finish()
{
@ -67,3 +73,8 @@ diff -u -r ../ttyrec-1.0.8/ttyrec.c ./ttyrec.c
register int pid;
register int die = 0;
- while ((pid = wait3((int *)&status, WNOHANG, 0)) > 0)
+ while ((pid = wait4(-1, (int *)&status, WNOHANG, 0)) > 0)
if (pid == child)
die = 1;