Update to 6.0-20170923

OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=330

ncurses-6.0-patches.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f68a10599401b16daa2863dbea754de997b52728c63b7fa6882f00ea9bb6a406
+oid sha256:bbec4f5647bec9bec437e8df979d08b02a07cccea18ebc097f6efcfb896eb804
-size 2934285
+size 2940871

ncurses-6.0.dif

@@ -8,7 +8,7 @@
  man/ncurses.3x               |    4 +
  misc/gen-pkgconfig.in        |    7 +-
  misc/ncurses-config.in       |    2 
- misc/terminfo.src            |  140 ++++++++++++++++++++++++++++++++++---------
+ misc/terminfo.src            |  138 ++++++++++++++++++++++++++++++++++---------
  ncurses/Makefile.in          |    2 
  ncurses/curses.priv.h        |    2 
  ncurses/run_cmd.sh           |   11 +++
@@ -19,10 +19,10 @@
  ncurses/tinfo/read_termcap.c |   21 ++++--
  progs/Makefile.in            |    4 -
  test/test.priv.h             |    4 -
- 20 files changed, 249 insertions(+), 82 deletions(-)
+ 20 files changed, 248 insertions(+), 81 deletions(-)
 
 --- aclocal.m4
-+++ aclocal.m4	2017-09-11 09:50:30.547698975 +0000
++++ aclocal.m4	2017-09-25 07:49:16.358294203 +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	2017-09-11 09:50:30.551698903 +0000
++++ configure	2017-09-25 07:49:16.362294129 +0000
 @@ -5950,7 +5950,7 @@ case $cf_cv_system_name in
  	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	2017-09-11 09:50:30.551698903 +0000
++++ include/curses.h.in	2017-09-25 07:49:16.362294129 +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	2017-09-11 09:50:30.551698903 +0000
++++ include/termcap.h.in	2017-09-25 07:49:16.362294129 +0000
 @@ -46,6 +46,8 @@ extern "C"
  {
  #endif /* __cplusplus */
@@ -311,7 +311,7 @@
  
  #undef  NCURSES_CONST 
 --- include/tic.h
-+++ include/tic.h	2017-09-11 09:50:30.551698903 +0000
++++ include/tic.h	2017-09-25 07:49:16.362294129 +0000
 @@ -207,12 +207,12 @@ struct alias
   */
  
@@ -328,7 +328,7 @@
  #define CANCELLED_STRING	(char *)(-1)
  
 --- man/man_db.renames
-+++ man/man_db.renames	2017-09-11 09:50:30.551698903 +0000
++++ man/man_db.renames	2017-09-25 07:49:16.362294129 +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	2017-09-11 09:50:30.551698903 +0000
++++ man/ncurses.3x	2017-09-25 07:49:16.362294129 +0000
 @@ -137,6 +137,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	2017-09-11 09:50:30.551698903 +0000
++++ misc/gen-pkgconfig.in	2017-09-25 07:49:16.362294129 +0000
 @@ -76,7 +76,7 @@ if test "$includedir" != "/usr/include"
  fi
  
@@ -399,7 +399,7 @@
  
  	echo "** creating ${name}${suffix}.pc"
 --- misc/ncurses-config.in
-+++ misc/ncurses-config.in	2017-09-11 09:50:30.551698903 +0000
++++ misc/ncurses-config.in	2017-09-25 07:49:16.362294129 +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	2017-09-11 09:50:30.631697446 +0000
++++ misc/terminfo.src	2017-09-25 07:49:16.366294055 +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	2017-09-11 09:50:30.559698757 +0000
++++ ncurses/Makefile.in	2017-09-25 07:49:16.366294055 +0000
 @@ -219,7 +219,7 @@ $(DESTDIR)$(libdir) :
  ../lib : ; mkdir $@
  
@@ -806,8 +806,8 @@
  ./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	2017-09-11 09:50:30.559698757 +0000
++++ ncurses/curses.priv.h	2017-09-25 07:49:16.366294055 +0000
-@@ -2145,6 +2145,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec
+@@ -2146,6 +2146,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);
  extern NCURSES_EXPORT(int) _nc_access (const char *, int);
@@ -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	2017-09-11 09:50:30.559698757 +0000
++++ ncurses/run_cmd.sh	2017-09-25 07:49:16.366294055 +0000
 @@ -0,0 +1,11 @@
 +#!/bin/sh
 +
@@ -831,7 +831,7 @@
 +
 +exec ${1+"$@"}
 --- ncurses/tinfo/MKfallback.sh
-+++ ncurses/tinfo/MKfallback.sh	2017-09-11 09:50:30.559698757 +0000
++++ ncurses/tinfo/MKfallback.sh	2017-09-25 07:49:16.366294055 +0000
 @@ -68,6 +68,12 @@ else
  	tmp_info=
  fi
@@ -864,7 +864,7 @@
  	done
  
 --- ncurses/tinfo/access.c
-+++ ncurses/tinfo/access.c	2017-09-11 09:50:30.559698757 +0000
++++ ncurses/tinfo/access.c	2017-09-25 07:49:16.366294055 +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	2017-09-11 09:50:30.559698757 +0000
++++ ncurses/tinfo/lib_setup.c	2017-09-25 07:49:16.370293980 +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	2017-09-11 09:50:30.559698757 +0000
++++ ncurses/tinfo/read_entry.c	2017-09-25 07:49:16.370293980 +0000
 @@ -431,6 +431,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	2017-09-11 09:50:30.559698757 +0000
++++ ncurses/tinfo/read_termcap.c	2017-09-25 07:49:16.370293980 +0000
 @@ -322,14 +322,18 @@ _nc_getent(
  	     */
  	    if (fd >= 0) {
@@ -984,7 +984,7 @@
      }
      if (copied != 0)
 --- progs/Makefile.in
-+++ progs/Makefile.in	2017-09-11 09:50:30.559698757 +0000
++++ progs/Makefile.in	2017-09-25 07:49:16.370293980 +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	2017-09-11 09:50:30.559698757 +0000
++++ test/test.priv.h	2017-09-25 07:49:16.370293980 +0000
 @@ -875,12 +875,12 @@ extern char *strnames[], *strcodes[], *s
  #endif
  

ncurses.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Sep 25 07:48:39 UTC 2017 - werner@suse.de
+
+- Add ncurses patch 20170923
+  + modify menu for test/ncurses.c to fit on 24-line screen.
+  + build-fix for configure --with-caps=uwin
+  + add options to test_arrays.c, for selecting termcap vs terminfo, etc.
+
 -------------------------------------------------------------------
 Mon Sep 18 15:03:22 UTC 2017 - werner@suse.de