From 136d1168be3efd776fc6bfa197aa18e5f641dedc Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 19 Feb 2014 08:44:32 +0100 Subject: fix build with latest uclibc --- package/screen/Makefile | 2 +- package/screen/patches/patch-configure | 6 +++--- package/screen/patches/patch-process_c | 15 +++++++++++++++ package/screen/patches/patch-pty_c | 14 ++++++++++++++ package/screen/patches/patch-screen_c | 13 +++++++++++++ package/screen/patches/patch-tty_sh | 13 +++++++++++++ 6 files changed, 59 insertions(+), 4 deletions(-) create mode 100644 package/screen/patches/patch-process_c create mode 100644 package/screen/patches/patch-pty_c create mode 100644 package/screen/patches/patch-screen_c create mode 100644 package/screen/patches/patch-tty_sh (limited to 'package/screen') diff --git a/package/screen/Makefile b/package/screen/Makefile index e448c3b29..fd8b4e594 100644 --- a/package/screen/Makefile +++ b/package/screen/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= screen PKG_VERSION:= 4.0.3 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 8506fd205028a96c741e4037de6e3c42 PKG_DESCR:= A window manager for the terminal session PKG_SECTION:= misc diff --git a/package/screen/patches/patch-configure b/package/screen/patches/patch-configure index 91f90dc4c..884ebef58 100644 --- a/package/screen/patches/patch-configure +++ b/package/screen/patches/patch-configure @@ -1,5 +1,5 @@ --- screen-4.0.3.orig/configure 2003-12-05 14:46:53.000000000 +0100 -+++ screen-4.0.3/configure 2010-01-23 10:18:22.000000000 +0100 ++++ screen-4.0.3/configure 2014-02-19 08:18:45.000000000 +0100 @@ -124,7 +124,7 @@ done fi if test ! -f "$as_myself"; then @@ -63,7 +63,7 @@ ;; *=*) -@@ -633,7 +633,7 @@ Try \`$0 --help' for more information." +@@ -633,7 +633,7 @@ Try \`$0 --help' for more information." # Reject names that are not valid shell variable names. expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 @@ -490,7 +490,7 @@ --help | --hel | -h ) echo "$ac_cs_usage"; exit 0 ;; --debug | --d* | -d ) -@@ -8516,7 +8480,7 @@ Try \`$0 --help' for more information." +@@ -8516,7 +8480,7 @@ Try \`$0 --help' for more information." Try \`$0 --help' for more information." >&5 echo "$as_me: error: unrecognized option: $1 Try \`$0 --help' for more information." >&2;} diff --git a/package/screen/patches/patch-process_c b/package/screen/patches/patch-process_c new file mode 100644 index 000000000..d41cee752 --- /dev/null +++ b/package/screen/patches/patch-process_c @@ -0,0 +1,15 @@ +--- screen-4.0.3.orig/process.c 2003-09-18 14:53:54.000000000 +0200 ++++ screen-4.0.3/process.c 2014-02-19 08:27:28.000000000 +0100 +@@ -35,12 +35,6 @@ + + + #include "config.h" +- +-/* for solaris 2.1, Unixware (SVR4.2) and possibly others: */ +-#ifdef SVR4 +-# include +-#endif +- + #include "screen.h" + #include "extern.h" + #include "logfile.h" diff --git a/package/screen/patches/patch-pty_c b/package/screen/patches/patch-pty_c new file mode 100644 index 000000000..e62923e01 --- /dev/null +++ b/package/screen/patches/patch-pty_c @@ -0,0 +1,14 @@ +--- screen-4.0.3.orig/pty.c 2003-09-08 16:26:18.000000000 +0200 ++++ screen-4.0.3/pty.c 2014-02-19 08:26:17.000000000 +0100 +@@ -33,11 +33,6 @@ + # include + #endif + +-/* for solaris 2.1, Unixware (SVR4.2) and possibly others */ +-#ifdef HAVE_SVR4_PTYS +-# include +-#endif +- + #if defined(sun) && defined(LOCKPTY) && !defined(TIOCEXCL) + # include + #endif diff --git a/package/screen/patches/patch-screen_c b/package/screen/patches/patch-screen_c new file mode 100644 index 000000000..441dd6255 --- /dev/null +++ b/package/screen/patches/patch-screen_c @@ -0,0 +1,13 @@ +--- screen-4.0.3.orig/screen.c 2003-09-08 16:26:41.000000000 +0200 ++++ screen-4.0.3/screen.c 2014-02-19 08:27:10.000000000 +0100 +@@ -50,10 +50,6 @@ + + #include "config.h" + +-#ifdef SVR4 +-# include +-#endif +- + #if defined(SYSV) && !defined(ISC) + # include + #endif diff --git a/package/screen/patches/patch-tty_sh b/package/screen/patches/patch-tty_sh new file mode 100644 index 000000000..218a3f9e8 --- /dev/null +++ b/package/screen/patches/patch-tty_sh @@ -0,0 +1,13 @@ +--- screen-4.0.3.orig/tty.sh 2003-09-08 16:24:25.000000000 +0200 ++++ screen-4.0.3/tty.sh 2014-02-19 08:40:44.000000000 +0100 +@@ -76,10 +76,6 @@ exit 0 + #endif + + #include "config.h" +-#ifdef SVR4 +-#include /* for I_POP */ +-#endif +- + #include "screen.h" + #include "extern.h" + -- cgit v1.2.3