From 7d422b5d68a96b60c02d7c23e1fecb2ce37aef5c869d477fb526699c2a64f31f Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Mon, 7 Jan 2019 07:51:03 +0000
Subject: [PATCH] Update to ncurses 6.1-20190105
OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=404
---
ncurses-6.1-patches.tar.bz2 | 4 +--
ncurses-6.1.dif | 58 ++++++++++++++++++-------------------
ncurses.changes | 11 +++++++
3 files changed, 42 insertions(+), 31 deletions(-)
diff --git a/ncurses-6.1-patches.tar.bz2 b/ncurses-6.1-patches.tar.bz2
index 5ca6dcd..078ca2c 100644
--- a/ncurses-6.1-patches.tar.bz2
+++ b/ncurses-6.1-patches.tar.bz2
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:725e5aeafbdc4b46c4263bac7e3c283bea9860553d9d12b917a085f12fae6fc5
-size 1146732
+oid sha256:7b8fd9627da4af92f5e8de6ffcced47341be658bd5c489028a6be7a4f2b004ff
+size 1216570
diff --git a/ncurses-6.1.dif b/ncurses-6.1.dif
index 74d625d..adfab59 100644
--- a/ncurses-6.1.dif
+++ b/ncurses-6.1.dif
@@ -22,7 +22,7 @@
20 files changed, 248 insertions(+), 81 deletions(-)
--- aclocal.m4
-+++ aclocal.m4 2018-12-17 07:11:25.212263133 +0000
++++ aclocal.m4 2019-01-07 07:47:20.064859035 +0000
@@ -580,7 +580,7 @@ AC_MSG_CHECKING([for size of bool])
AC_CACHE_VAL(cf_cv_type_of_bool,[
rm -f cf_test.out
@@ -151,7 +151,7 @@
esac
done
--- configure
-+++ configure 2018-12-17 07:11:25.216263058 +0000
++++ configure 2019-01-07 07:47:20.068858960 +0000
@@ -5485,7 +5485,7 @@ echo $ECHO_N "checking for an rpath opti
fi
;;
@@ -161,7 +161,7 @@
;;
(openbsd[2-9].*|mirbsd*)
LD_RPATH_OPT="-Wl,-rpath,"
-@@ -13582,12 +13582,15 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -13642,12 +13642,15 @@ cat >>$cf_edit_man <<CF_EOF
echo '? missing rename for '\$cf_source
cf_target="\$cf_source"
fi
@@ -179,7 +179,7 @@
sed -f $cf_man_alias \\
CF_EOF
-@@ -13597,7 +13600,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -13657,7 +13660,7 @@ cat >>$cf_edit_man <<CF_EOF
CF_EOF
else
cat >>$cf_edit_man <<CF_EOF
@@ -188,7 +188,7 @@
CF_EOF
fi
-@@ -13637,7 +13640,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -13697,7 +13700,7 @@ cat >>$cf_edit_man <<CF_EOF
mv \$TMP.$cf_so_strip \$TMP
fi
fi
@@ -197,7 +197,7 @@
CF_EOF
fi
-@@ -13646,23 +13649,23 @@ case "$MANPAGE_FORMAT" in
+@@ -13706,23 +13709,23 @@ case "$MANPAGE_FORMAT" in
cat >>$cf_edit_man <<CF_EOF
if test \$form = format ; then
# BSDI installs only .0 suffixes in the cat directories
@@ -227,7 +227,7 @@
for cf_alias in \$aliases
do
if test \$section = 1 ; then
-@@ -13671,7 +13674,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -13731,7 +13734,7 @@ cat >>$cf_edit_man <<CF_EOF
if test "$MANPAGE_SYMLINKS" = yes ; then
if test -f \$cf_alias\${suffix} ; then
@@ -236,7 +236,7 @@
then
continue
fi
-@@ -13681,18 +13684,18 @@ CF_EOF
+@@ -13741,18 +13744,18 @@ CF_EOF
case "x$LN_S" in
(*-f)
cat >>$cf_edit_man <<CF_EOF
@@ -258,7 +258,7 @@
echo ".so \$cf_source" >\$TMP
CF_EOF
if test -n "$cf_compress" ; then
-@@ -13712,9 +13715,9 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -13772,9 +13775,9 @@ cat >>$cf_edit_man <<CF_EOF
)
)
elif test \$verb = removing ; then
@@ -271,7 +271,7 @@
)
test -d \$cf_subdir\${section} &&
test -n "\$aliases" && (
-@@ -13734,6 +13737,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -13794,6 +13797,7 @@ cat >>$cf_edit_man <<CF_EOF
# echo ".hy 0"
cat \$TMP
fi
@@ -279,7 +279,7 @@
;;
esac
done
-@@ -24380,6 +24384,7 @@ if test "$with_termlib" != no ; then
+@@ -24440,6 +24444,7 @@ if test "$with_termlib" != no ; then
TINFO_LDFLAGS="-L${LIB_DIR}"
SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
fi
@@ -288,7 +288,7 @@
# the next lines are needed for linking libtic over libncurses
TINFO_NAME=${LIB_NAME}
--- include/curses.h.in
-+++ include/curses.h.in 2018-12-17 07:11:25.216263058 +0000
++++ include/curses.h.in 2019-01-07 07:47:20.068858960 +0000
@@ -177,6 +177,9 @@ typedef @cf_cv_typeof_chtype@ chtype;
typedef @cf_cv_typeof_mmask_t@ mmask_t;
#endif
@@ -300,7 +300,7 @@
* We need FILE, etc. Include this before checking any feature symbols.
*/
--- include/termcap.h.in
-+++ include/termcap.h.in 2018-12-17 07:11:25.216263058 +0000
++++ include/termcap.h.in 2019-01-07 07:47:20.068858960 +0000
@@ -46,6 +46,8 @@ extern "C"
{
#endif /* __cplusplus */
@@ -311,7 +311,7 @@
#undef NCURSES_OSPEED
--- include/tic.h
-+++ include/tic.h 2018-12-17 07:11:25.216263058 +0000
++++ include/tic.h 2019-01-07 07:47:20.068858960 +0000
@@ -221,12 +221,12 @@ struct alias
*/
@@ -328,7 +328,7 @@
#define CANCELLED_STRING (char *)(-1)
--- man/man_db.renames
-+++ man/man_db.renames 2018-12-17 07:11:25.216263058 +0000
++++ man/man_db.renames 2019-01-07 07:47:20.068858960 +0000
@@ -163,6 +163,7 @@ term.7 term.7
term_variables.3x terminfo_variables.3ncurses
terminfo.5 terminfo.5
@@ -346,7 +346,7 @@
#
getty.1 getty.8
--- man/ncurses.3x
-+++ man/ncurses.3x 2018-12-17 07:11:25.216263058 +0000
++++ man/ncurses.3x 2019-01-07 07:47:20.072858886 +0000
@@ -139,6 +139,10 @@ after the shell environment variable \fB
[See \fBterminfo\fR(\*n) for further details.]
.SS Datatypes
@@ -359,7 +359,7 @@
called \fIwindows\fR, which can be thought of as two-dimensional
arrays of characters representing all or part of a CRT screen.
--- misc/gen-pkgconfig.in
-+++ misc/gen-pkgconfig.in 2018-12-17 07:11:25.216263058 +0000
++++ misc/gen-pkgconfig.in 2019-01-07 07:47:20.072858886 +0000
@@ -77,7 +77,7 @@ if test "$includedir" != "/usr/include"
fi
@@ -399,7 +399,7 @@
if test $name = $MAIN_LIBRARY
--- misc/ncurses-config.in
-+++ misc/ncurses-config.in 2018-12-17 07:11:25.216263058 +0000
++++ misc/ncurses-config.in 2019-01-07 07:47:20.072858886 +0000
@@ -100,7 +100,7 @@ while test $# -gt 0; do
# compile/link
--cflags)
@@ -410,7 +410,7 @@
fi
if test "${includedir}" != /usr/include ; then
--- misc/terminfo.src
-+++ misc/terminfo.src 2018-12-17 07:11:25.236262684 +0000
++++ misc/terminfo.src 2019-01-07 07:47:20.080858734 +0000
@@ -301,7 +301,9 @@ dumb|80-column dumb tty,
am,
cols#80,
@@ -795,7 +795,7 @@
s1ds=\E(0, sgr0=\E[0m\E(B, use=ibm5154,
ibm5081-c|ibmmpel-c|IBM 5081 1024x1024 256/4096 Megapel enhanced color display,
--- ncurses/Makefile.in
-+++ ncurses/Makefile.in 2018-12-17 07:11:25.240262609 +0000
++++ ncurses/Makefile.in 2019-01-07 07:47:20.080858734 +0000
@@ -219,7 +219,7 @@ $(DESTDIR)$(libdir) :
../lib : ; mkdir $@
@@ -806,7 +806,7 @@
./lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h
$(SHELL) -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@
--- ncurses/curses.priv.h
-+++ ncurses/curses.priv.h 2018-12-17 07:11:25.240262609 +0000
++++ ncurses/curses.priv.h 2019-01-07 07:47:20.080858734 +0000
@@ -2196,6 +2196,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec
extern NCURSES_EXPORT(char *) _nc_tracemouse (SCREEN *, MEVENT const *);
extern NCURSES_EXPORT(char *) _nc_trace_mmask_t (SCREEN *, mmask_t);
@@ -817,7 +817,7 @@
extern NCURSES_EXPORT(int) _nc_freewin (WINDOW *);
extern NCURSES_EXPORT(int) _nc_getenv_num (const char *);
--- ncurses/run_cmd.sh
-+++ ncurses/run_cmd.sh 2018-12-17 07:11:25.240262609 +0000
++++ ncurses/run_cmd.sh 2019-01-07 07:47:20.080858734 +0000
@@ -0,0 +1,11 @@
+#!/bin/sh
+
@@ -831,7 +831,7 @@
+
+exec ${1+"$@"}
--- ncurses/tinfo/MKfallback.sh
-+++ ncurses/tinfo/MKfallback.sh 2018-12-17 07:11:25.240262609 +0000
++++ ncurses/tinfo/MKfallback.sh 2019-01-07 07:47:20.080858734 +0000
@@ -68,6 +68,12 @@ else
tmp_info=
fi
@@ -864,7 +864,7 @@
done
--- ncurses/tinfo/access.c
-+++ ncurses/tinfo/access.c 2018-12-17 07:11:25.240262609 +0000
++++ ncurses/tinfo/access.c 2019-01-07 07:47:20.080858734 +0000
@@ -35,6 +35,9 @@
#include <ctype.h>
@@ -907,7 +907,7 @@
_nc_access(const char *path, int mode)
{
--- ncurses/tinfo/lib_setup.c
-+++ ncurses/tinfo/lib_setup.c 2018-12-17 07:11:25.240262609 +0000
++++ ncurses/tinfo/lib_setup.c 2019-01-07 07:47:20.084858660 +0000
@@ -599,6 +599,9 @@ _nc_locale_breaks_acs(TERMINAL *termp)
} else if ((value = tigetnum("U8")) >= 0) {
result = value; /* use extension feature */
@@ -919,7 +919,7 @@
result = 1; /* always broken */
} else if (strstr(env, "screen") != 0
--- ncurses/tinfo/read_entry.c
-+++ ncurses/tinfo/read_entry.c 2018-12-17 07:11:25.240262609 +0000
++++ ncurses/tinfo/read_entry.c 2019-01-07 07:47:20.084858660 +0000
@@ -551,6 +551,7 @@ _nc_read_file_entry(const char *const fi
FILE *fp = 0;
int code;
@@ -937,7 +937,7 @@
return (code);
}
--- ncurses/tinfo/read_termcap.c
-+++ ncurses/tinfo/read_termcap.c 2018-12-17 07:11:25.240262609 +0000
++++ ncurses/tinfo/read_termcap.c 2019-01-07 07:47:20.084858660 +0000
@@ -322,14 +322,18 @@ _nc_getent(
*/
if (fd >= 0) {
@@ -984,7 +984,7 @@
}
if (copied != 0)
--- progs/Makefile.in
-+++ progs/Makefile.in 2018-12-17 07:11:25.240262609 +0000
++++ progs/Makefile.in 2019-01-07 07:47:20.084858660 +0000
@@ -100,7 +100,7 @@ CFLAGS_LIBTOOL = $(CCFLAGS)
CFLAGS_NORMAL = $(CCFLAGS)
CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE
@@ -1004,7 +1004,7 @@
LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@)
--- test/test.priv.h
-+++ test/test.priv.h 2018-12-17 07:11:25.240262609 +0000
++++ test/test.priv.h 2019-01-07 07:47:20.084858660 +0000
@@ -929,12 +929,12 @@ extern char *strnames[], *strcodes[], *s
#endif
diff --git a/ncurses.changes b/ncurses.changes
index a02c5c9..b22b363 100644
--- a/ncurses.changes
+++ b/ncurses.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Jan 7 07:46:46 UTC 2019 - Dr. Werner Fink <werner@suse.de>
+
+- Add ncurses patch 20190105
+ + add dummy "check" rule in top-level and test-Makefile to simply
+ building test-packages for Arch.
+ + modify configure script to avoid conflict with a non-POSIX feature
+ that enables all parts of the system headers by default. Some
+ packagers have come to rely upon this behavior (FreeBSD #234049).
+ + update config.guess, config.sub
+
-------------------------------------------------------------------
Wed Jan 2 09:43:41 UTC 2019 - Dr. Werner Fink <werner@suse.de>