Accepting request 409012 from Base:System

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/409012
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ncurses?expand=0&rev=118

ncurses-5.9-environment.dif

@@ -1,6 +1,11 @@
+---
+ man/curs_util.3x         |    3 +++
+ ncurses/tinfo/lib_data.c |    2 +-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
 --- man/curs_util.3x
-+++ man/curs_util.3x	2012-07-20 15:36:56.000000000 +0000
++++ man/curs_util.3x	2016-07-07 09:01:21.335637800 +0000
-@@ -167,6 +167,9 @@ ncurses modifies the last step in its co
+@@ -172,6 +172,9 @@ ncurses modifies the last step in its co
  checks if the \fBLINES\fR and \fBCOLUMNS\fR environment variables
  are set to a number greater than zero.
  .bP
@@ -11,7 +16,7 @@
  with the value that it has obtained via operating system call
  or from the terminal database.
 --- ncurses/tinfo/lib_data.c
-+++ ncurses/tinfo/lib_data.c	2012-07-20 15:16:13.000000000 +0000
++++ ncurses/tinfo/lib_data.c	2016-07-07 09:01:21.339637723 +0000
 @@ -257,7 +257,7 @@ NCURSES_EXPORT_VAR(NCURSES_PRESCREEN) _n
      NULL,			/* _tputs_trace */
  #endif

ncurses-5.9-ibm327x.dif

@@ -1,6 +1,10 @@
+---
+ misc/terminfo.src |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
 --- misc/terminfo.src
-+++ misc/terminfo.src	2014-01-28 17:58:38.062235705 +0000
++++ misc/terminfo.src	2016-07-07 09:00:03.889138816 +0000
-@@ -14838,8 +14838,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv
+@@ -15380,8 +15380,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv
  #
  
  ibm327x|line mode IBM 3270 style,

ncurses-6.0-patches.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8274212b194a2d5f4f1283e322277d553188be96e682dfc1ee155de6bfc8c969
+oid sha256:478a080b25d5c9fd9761491c50fcf8d08807d23561a177591051a6a3c6167d28
-size 751760
+size 768432

ncurses-6.0.dif

@@ -21,7 +21,7 @@
  19 files changed, 239 insertions(+), 80 deletions(-)
 
 --- aclocal.m4
-+++ aclocal.m4	2016-06-13 10:16:37.035750939 +0000
++++ aclocal.m4	2016-07-07 09:02:12.558645150 +0000
 @@ -564,7 +564,7 @@ AC_MSG_CHECKING([for size of bool])
  AC_CACHE_VAL(cf_cv_type_of_bool,[
  	rm -f cf_test.out
@@ -31,7 +31,7 @@
  #include <stdio.h>
  
  #if defined(__cplusplus)
-@@ -4684,12 +4684,15 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -4687,12 +4687,15 @@ cat >>$cf_edit_man <<CF_EOF
  		echo '? missing rename for '\$cf_source
  		cf_target="\$cf_source"
  	fi
@@ -49,7 +49,7 @@
  	sed	-f $cf_man_alias \\
  CF_EOF
  
-@@ -4699,7 +4702,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -4702,7 +4705,7 @@ cat >>$cf_edit_man <<CF_EOF
  CF_EOF
  else
  cat >>$cf_edit_man <<CF_EOF
@@ -58,7 +58,7 @@
  CF_EOF
  fi
  
-@@ -4739,7 +4742,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -4742,7 +4745,7 @@ cat >>$cf_edit_man <<CF_EOF
  		mv \$TMP.$cf_so_strip \$TMP
  	fi
  	fi
@@ -67,7 +67,7 @@
  CF_EOF
  fi
  
-@@ -4748,23 +4751,23 @@ case "$MANPAGE_FORMAT" in
+@@ -4751,23 +4754,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
@@ -97,7 +97,7 @@
  				for cf_alias in \$aliases
  				do
  					if test \$section = 1 ; then
-@@ -4773,7 +4776,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -4776,7 +4779,7 @@ cat >>$cf_edit_man <<CF_EOF
  
  					if test "$MANPAGE_SYMLINKS" = yes ; then
  						if test -f \$cf_alias\${suffix} ; then
@@ -106,7 +106,7 @@
  							then
  								continue
  							fi
-@@ -4783,18 +4786,18 @@ CF_EOF
+@@ -4786,18 +4789,18 @@ CF_EOF
  case "x$LN_S" in
  (*-f)
  cat >>$cf_edit_man <<CF_EOF
@@ -128,7 +128,7 @@
  						echo ".so \$cf_source" >\$TMP
  CF_EOF
  if test -n "$cf_compress" ; then
-@@ -4814,9 +4817,9 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -4817,9 +4820,9 @@ cat >>$cf_edit_man <<CF_EOF
  			)
  		)
  	elif test \$verb = removing ; then
@@ -141,7 +141,7 @@
  		)
  		test -d \$cf_subdir\${section} &&
  		test -n "\$aliases" && (
-@@ -4836,6 +4839,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -4839,6 +4842,7 @@ cat >>$cf_edit_man <<CF_EOF
  #		echo ".hy 0"
  		cat \$TMP
  	fi
@@ -150,7 +150,7 @@
  esac
  done
 --- configure
-+++ configure	2016-06-13 10:16:37.039750860 +0000
++++ configure	2016-07-07 09:02:12.562645073 +0000
 @@ -5885,7 +5885,7 @@ case $cf_cv_system_name in
  	fi
  	;;
@@ -287,7 +287,7 @@
  	# the next lines are needed for linking libtic over libncurses
  	TINFO_NAME=${LIB_NAME}
 --- include/curses.h.in
-+++ include/curses.h.in	2016-06-13 10:16:37.039750860 +0000
++++ include/curses.h.in	2016-07-07 09:02:12.562645073 +0000
 @@ -165,6 +165,9 @@ typedef @cf_cv_typeof_chtype@ chtype;
  typedef @cf_cv_typeof_mmask_t@ mmask_t;
  #endif
@@ -299,7 +299,7 @@
   * We need FILE, etc.  Include this before checking any feature symbols.
   */
 --- include/termcap.h.in
-+++ include/termcap.h.in	2016-06-13 10:16:37.039750860 +0000
++++ include/termcap.h.in	2016-07-07 09:02:12.562645073 +0000
 @@ -46,6 +46,8 @@ extern "C"
  {
  #endif /* __cplusplus */
@@ -310,7 +310,7 @@
  
  #undef  NCURSES_CONST 
 --- include/tic.h
-+++ include/tic.h	2016-06-13 10:16:37.039750860 +0000
++++ include/tic.h	2016-07-07 09:02:12.562645073 +0000
 @@ -231,12 +231,12 @@ extern NCURSES_EXPORT(const struct alias
   */
  
@@ -327,7 +327,7 @@
  #define CANCELLED_STRING	(char *)(-1)
  
 --- man/man_db.renames
-+++ man/man_db.renames	2016-06-13 10:16:37.039750860 +0000
++++ man/man_db.renames	2016-07-07 09:02:12.562645073 +0000
 @@ -167,6 +167,8 @@ tput.1				tput.1
  tset.1				tset.1
  vprintf.3s			vprintf.3
@@ -338,7 +338,7 @@
  # Other:
  tack.1m				tack.1
 --- man/ncurses.3x
-+++ man/ncurses.3x	2016-06-13 10:16:37.039750860 +0000
++++ man/ncurses.3x	2016-07-07 09:02:12.562645073 +0000
 @@ -121,6 +121,10 @@ after the shell environment variable \fB
  [See \fBterminfo\fR(\*n) for further details.]
  .SS Datatypes
@@ -351,7 +351,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	2016-06-13 10:16:37.039750860 +0000
++++ misc/gen-pkgconfig.in	2016-07-07 09:02:12.562645073 +0000
 @@ -76,7 +76,7 @@ if test "$includedir" != "/usr/include"
  fi
  
@@ -391,7 +391,7 @@
  
  	echo "** creating ${name}${suffix}.pc"
 --- misc/ncurses-config.in
-+++ misc/ncurses-config.in	2016-06-13 10:16:37.039750860 +0000
++++ misc/ncurses-config.in	2016-07-07 09:02:12.562645073 +0000
 @@ -100,7 +100,7 @@ while test $# -gt 0; do
  	# compile/link
  	--cflags)
@@ -402,7 +402,7 @@
  		fi
  		if test "${includedir}" != /usr/include ; then
 --- misc/terminfo.src
-+++ misc/terminfo.src	2016-06-13 10:16:37.091749844 +0000
++++ misc/terminfo.src	2016-07-07 09:02:12.626643834 +0000
 @@ -301,7 +301,9 @@ dumb|80-column dumb tty,
  	am,
  	cols#80,
@@ -773,8 +773,8 @@
  	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	2016-06-13 10:16:37.043750782 +0000
++++ ncurses/Makefile.in	2016-07-07 09:02:12.566644995 +0000
-@@ -216,7 +216,7 @@ $(DESTDIR)$(libdir) :
+@@ -218,7 +218,7 @@ $(DESTDIR)$(libdir) :
  ../lib : ; mkdir $@
  
  ./fallback.c : $(tinfo)/MKfallback.sh
@@ -784,7 +784,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	2016-06-13 10:16:37.043750782 +0000
++++ ncurses/curses.priv.h	2016-07-07 09:02:12.566644995 +0000
 @@ -2024,6 +2024,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);
@@ -795,7 +795,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	2016-06-13 10:16:37.043750782 +0000
++++ ncurses/run_cmd.sh	2016-07-07 09:02:12.566644995 +0000
 @@ -0,0 +1,11 @@
 +#!/bin/sh
 +
@@ -809,7 +809,7 @@
 +
 +exec ${1+"$@"}
 --- ncurses/tinfo/MKfallback.sh
-+++ ncurses/tinfo/MKfallback.sh	2016-06-13 10:16:37.043750782 +0000
++++ ncurses/tinfo/MKfallback.sh	2016-07-07 09:02:12.566644995 +0000
 @@ -68,6 +68,12 @@ else
  	tmp_info=
  fi
@@ -842,7 +842,7 @@
  	done
  
 --- ncurses/tinfo/access.c
-+++ ncurses/tinfo/access.c	2016-06-13 10:16:37.043750782 +0000
++++ ncurses/tinfo/access.c	2016-07-07 09:02:12.566644995 +0000
 @@ -35,6 +35,9 @@
  #include <ctype.h>
  
@@ -885,7 +885,7 @@
  _nc_access(const char *path, int mode)
  {
 --- ncurses/tinfo/lib_setup.c
-+++ ncurses/tinfo/lib_setup.c	2016-06-13 10:16:37.043750782 +0000
++++ ncurses/tinfo/lib_setup.c	2016-07-07 09:02:12.566644995 +0000
 @@ -584,6 +584,9 @@ _nc_locale_breaks_acs(TERMINAL * termp)
      } else if ((value = tigetnum("U8")) >= 0) {
  	result = value;		/* use extension feature */
@@ -897,7 +897,7 @@
  	    result = 1;		/* always broken */
  	} else if (strstr(env, "screen") != 0
 --- ncurses/tinfo/read_entry.c
-+++ ncurses/tinfo/read_entry.c	2016-06-13 10:16:37.043750782 +0000
++++ ncurses/tinfo/read_entry.c	2016-07-07 09:02:12.566644995 +0000
 @@ -433,6 +433,7 @@ _nc_read_file_entry(const char *const fi
      FILE *fp = 0;
      int code;
@@ -915,7 +915,7 @@
      return (code);
  }
 --- ncurses/tinfo/read_termcap.c
-+++ ncurses/tinfo/read_termcap.c	2016-06-13 10:16:37.047750704 +0000
++++ ncurses/tinfo/read_termcap.c	2016-07-07 09:02:12.570644918 +0000
 @@ -322,14 +322,18 @@ _nc_getent(
  	     */
  	    if (fd >= 0) {
@@ -962,8 +962,8 @@
      }
      if (copied != 0)
 --- test/test.priv.h
-+++ test/test.priv.h	2016-06-13 10:16:37.047750704 +0000
++++ test/test.priv.h	2016-07-07 09:02:12.570644918 +0000
-@@ -728,12 +728,12 @@ extern char *strnames[], *strcodes[], *s
+@@ -736,12 +736,12 @@ extern char *strnames[], *strcodes[], *s
  #endif
  
  /* out-of-band values for representing absent capabilities */

ncurses.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Thu Jul  7 08:57:03 UTC 2016 - werner@suse.de
+
+- Add ncurses patch 20160702
+  + improve test/list_keys.c, using $TERM if no parameters areg given.
+- Add ncurses patch 20160625
+  + build-fixes for ncurses "test_progs" rule. 
+  + amend change to CF_CC_ENV_FLAGS in 20160521 to make multilib build 
+    work (report by Sven Joachim).
+- Add ncurses patch 20160618
+  + build-fixes for ncurses-examples with NetBSD curses.
+  + improve test/list_keys.c, fixing column-widths and sorting the list
+    to make it more readable.
+
 -------------------------------------------------------------------
 Mon Jun 13 10:09:58 UTC 2016 - werner@suse.de
 

ncurses.spec

@@ -277,10 +277,10 @@ find -name '*.orig' | xargs -r rm -f
 rm -fr tack
 tar  xfz %{S:5}
 mv tack-* tack
-%patch -P 1 -p0 -b .327x
+%patch1 -p0 -b .327x
-%patch -P 4 -p0 -b .hs
+%patch4 -p0 -b .hs
-%patch -P 5 -p0 -b .lc
+%patch5 -p0 -b .lc
-%patch -P 0 -p0 -b .p0
+%patch0 -p0 -b .p0
 rm -vf include/ncurses_dll.h
 rm -vf mkdirs.sh
 rm -vf tar-copy.sh