screen: update to 4.8.0

This commit is contained in:
CvH 2020-06-21 22:50:17 +02:00
parent 38b2e1cb3b
commit ecddcc97da
3 changed files with 3 additions and 97 deletions

View File

@ -2,14 +2,14 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="screen"
PKG_VERSION="4.6.2"
PKG_SHA256="1b6922520e6a0ce5e28768d620b0f640a6631397f95ccb043b70b91bb503fa3a"
PKG_VERSION="4.8.0"
PKG_SHA256="6e11b13d8489925fde25dfb0935bf6ed71f9eb47eff233a181e078fde5655aa1"
PKG_LICENSE="GPL"
PKG_SITE="http://www.gnu.org/software/screen/"
PKG_URL="http://ftpmirror.gnu.org/screen/$PKG_NAME-${PKG_VERSION}.tar.gz"
PKG_DEPENDS_TARGET="toolchain ncurses"
PKG_LONGDESC="Screen is a window manager that multiplexes a physical terminal between several processes"
PKG_BUILD_FLAGS="-parallel -sysroot"
PKG_BUILD_FLAGS="-sysroot"
PKG_CONFIGURE_OPTS_TARGET="ac_cv_header_utempter_h=no \
--enable-colors256 \
@ -18,11 +18,3 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_header_utempter_h=no \
--disable-telnet \
--disable-socket-dir"
pre_configure_target() {
CFLAGS="$CFLAGS -DTERMINFO"
export LDFLAGS=`echo $LDFLAGS | sed -e "s|-Wl,--as-needed||"`
# screen fails to build in subdirs
cd $PKG_BUILD
rm -rf .$TARGET_NAME
}

View File

@ -1,64 +0,0 @@
--- a/configure
+++ b/configure
@@ -414,7 +414,7 @@ as_fn_error ()
$as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
fi
$as_echo "$as_me: error: $2" >&2
- as_fn_exit $as_status
+ # as_fn_exit $as_status
} # as_fn_error
if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -5941,8 +5941,6 @@ else
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
-test -f /lib/libsec.a || test -f /usr/lib/libsec.a && LIBS="$LIBS -lsec"
-test -f /lib/libshadow.a || test -f /usr/lib/libshadow.a && LIBS="$LIBS -lshadow"
oldlibs="$LIBS"
LIBS="$LIBS -lsun"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking IRIX sun library..." >&5
@@ -7023,7 +7021,7 @@ as_fn_error ()
$as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
fi
$as_echo "$as_me: error: $2" >&2
- as_fn_exit $as_status
+ # as_fn_exit $as_status
} # as_fn_error
--- a/pty.c
+++ b/pty.c
@@ -39,9 +39,9 @@
#endif
/* for solaris 2.1, Unixware (SVR4.2) and possibly others */
-#ifdef HAVE_STROPTS_H
-# include <sys/stropts.h>
-#endif
+//#ifdef HAVE_STROPTS_H
+//# include <sys/stropts.h>
+//#endif
#if defined(sun) && defined(LOCKPTY) && !defined(TIOCEXCL)
# include <sys/ttold.h>
--- a/sched.h
+++ b/sched.h
@@ -27,6 +27,11 @@
* $Id$ GNU
*/
+#ifndef __SCHED_H
+#define __SCHED_H
+
+#include <sys/time.h>
+
struct event
{
struct event *next;
@@ -46,3 +51,5 @@ struct event
#define EV_READ 1
#define EV_WRITE 2
#define EV_ALWAYS 3
+
+#endif

View File

@ -1,22 +0,0 @@
diff -Naur screen-4.3.1/configure screen-4.3.1.patch/configure
--- screen-4.3.1/configure 2015-06-28 23:42:40.000000000 +0200
+++ screen-4.3.1.patch/configure 2016-03-26 17:52:12.807054501 +0100
@@ -4156,7 +4156,6 @@
oldlibs="$LIBS"
-LIBS="$LIBS -lelf"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking SVR4..." >&5
$as_echo "$as_me: checking SVR4..." >&6;}
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
diff -Naur screen-4.3.1/configure.ac screen-4.3.1.patch/configure.ac
--- screen-4.3.1/configure.ac 2015-06-28 23:22:55.000000000 +0200
+++ screen-4.3.1.patch/configure.ac 2016-03-26 17:52:03.538036990 +0100
@@ -203,7 +203,6 @@
], LIBS="$LIBS -lsocket -linet";seqptx=1)
oldlibs="$LIBS"
-LIBS="$LIBS -lelf"
AC_CHECKING(SVR4)
AC_TRY_LINK([#include <utmpx.h>
],,