From 822e4a6777e5ac97f981ec4f2928ad68784c53e4f9aa0f92f02c78f493b124ec Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Tue, 24 May 2016 07:57:22 +0000
Subject: [PATCH] Add ncurses patch 20160521

OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=246
---
 ncurses-6.0-patches.tar.bz2 |  4 +-
 ncurses-6.0.dif             | 74 ++++++++++++++++++-------------------
 ncurses.changes             | 15 ++++++++
 3 files changed, 54 insertions(+), 39 deletions(-)

diff --git a/ncurses-6.0-patches.tar.bz2 b/ncurses-6.0-patches.tar.bz2
index 6e79595..13fd596 100644
--- a/ncurses-6.0-patches.tar.bz2
+++ b/ncurses-6.0-patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:62ab6d72cfa3639ac748c4e742b84f7599e1dc4d322e04b688cc89b7266628c1
-size 569615
+oid sha256:08e9d92e7a8ed415d8830243160204eca2dd49a81901a094a2ff67ce97f5e9e4
+size 674062
diff --git a/ncurses-6.0.dif b/ncurses-6.0.dif
index 2779be4..ff9a3e1 100644
--- a/ncurses-6.0.dif
+++ b/ncurses-6.0.dif
@@ -21,7 +21,7 @@
  19 files changed, 239 insertions(+), 80 deletions(-)
 
 --- aclocal.m4
-+++ aclocal.m4	2016-05-17 10:35:27.099114266 +0000
++++ aclocal.m4	2016-05-24 07:42:18.632380196 +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)
-@@ -4677,12 +4677,15 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -4684,12 +4684,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
  
-@@ -4692,7 +4695,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -4699,7 +4702,7 @@ cat >>$cf_edit_man <<CF_EOF
  CF_EOF
  else
  cat >>$cf_edit_man <<CF_EOF
@@ -58,7 +58,7 @@
  CF_EOF
  fi
  
-@@ -4732,7 +4735,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -4739,7 +4742,7 @@ cat >>$cf_edit_man <<CF_EOF
  		mv \$TMP.$cf_so_strip \$TMP
  	fi
  	fi
@@ -67,7 +67,7 @@
  CF_EOF
  fi
  
-@@ -4741,23 +4744,23 @@ case "$MANPAGE_FORMAT" in
+@@ -4748,23 +4751,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
-@@ -4766,7 +4769,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -4773,7 +4776,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
-@@ -4776,18 +4779,18 @@ CF_EOF
+@@ -4783,18 +4786,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
-@@ -4807,9 +4810,9 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -4814,9 +4817,9 @@ cat >>$cf_edit_man <<CF_EOF
  			)
  		)
  	elif test \$verb = removing ; then
@@ -141,7 +141,7 @@
  		)
  		test -d \$cf_subdir\${section} &&
  		test -n "\$aliases" && (
-@@ -4829,6 +4832,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -4836,6 +4839,7 @@ cat >>$cf_edit_man <<CF_EOF
  #		echo ".hy 0"
  		cat \$TMP
  	fi
@@ -150,8 +150,8 @@
  esac
  done
 --- configure
-+++ configure	2016-05-17 10:35:27.099114266 +0000
-@@ -5867,7 +5867,7 @@ case $cf_cv_system_name in
++++ configure	2016-05-24 07:42:18.636380119 +0000
+@@ -5878,7 +5878,7 @@ case $cf_cv_system_name in
  	fi
  	;;
  (linux*|gnu*|k*bsd*-gnu|freebsd*)
@@ -160,7 +160,7 @@
  	;;
  (openbsd[2-9].*|mirbsd*)
  	LD_RPATH_OPT="-Wl,-rpath,"
-@@ -11546,12 +11546,15 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -11557,12 +11557,15 @@ cat >>$cf_edit_man <<CF_EOF
  		echo '? missing rename for '\$cf_source
  		cf_target="\$cf_source"
  	fi
@@ -178,7 +178,7 @@
  	sed	-f $cf_man_alias \\
  CF_EOF
  
-@@ -11561,7 +11564,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -11572,7 +11575,7 @@ cat >>$cf_edit_man <<CF_EOF
  CF_EOF
  else
  cat >>$cf_edit_man <<CF_EOF
@@ -187,7 +187,7 @@
  CF_EOF
  fi
  
-@@ -11601,7 +11604,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -11612,7 +11615,7 @@ cat >>$cf_edit_man <<CF_EOF
  		mv \$TMP.$cf_so_strip \$TMP
  	fi
  	fi
@@ -196,7 +196,7 @@
  CF_EOF
  fi
  
-@@ -11610,23 +11613,23 @@ case "$MANPAGE_FORMAT" in
+@@ -11621,23 +11624,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
@@ -226,7 +226,7 @@
  				for cf_alias in \$aliases
  				do
  					if test \$section = 1 ; then
-@@ -11635,7 +11638,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -11646,7 +11649,7 @@ cat >>$cf_edit_man <<CF_EOF
  
  					if test "$MANPAGE_SYMLINKS" = yes ; then
  						if test -f \$cf_alias\${suffix} ; then
@@ -235,7 +235,7 @@
  							then
  								continue
  							fi
-@@ -11645,18 +11648,18 @@ CF_EOF
+@@ -11656,18 +11659,18 @@ CF_EOF
  case "x$LN_S" in
  (*-f)
  cat >>$cf_edit_man <<CF_EOF
@@ -257,7 +257,7 @@
  						echo ".so \$cf_source" >\$TMP
  CF_EOF
  if test -n "$cf_compress" ; then
-@@ -11676,9 +11679,9 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -11687,9 +11690,9 @@ cat >>$cf_edit_man <<CF_EOF
  			)
  		)
  	elif test \$verb = removing ; then
@@ -270,7 +270,7 @@
  		)
  		test -d \$cf_subdir\${section} &&
  		test -n "\$aliases" && (
-@@ -11698,6 +11701,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -11709,6 +11712,7 @@ cat >>$cf_edit_man <<CF_EOF
  #		echo ".hy 0"
  		cat \$TMP
  	fi
@@ -278,7 +278,7 @@
  	;;
  esac
  done
-@@ -21966,6 +21970,7 @@ if test "$with_termlib" != no ; then
+@@ -21976,6 +21980,7 @@ if test "$with_termlib" != no ; then
  		TINFO_LDFLAGS="-L${LIB_DIR}"
  		SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
  	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-05-17 10:35:27.099114266 +0000
++++ include/curses.h.in	2016-05-24 07:42:18.636380119 +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-05-17 10:35:27.103114187 +0000
++++ include/termcap.h.in	2016-05-24 07:42:18.636380119 +0000
 @@ -46,6 +46,8 @@ extern "C"
  {
  #endif /* __cplusplus */
@@ -310,7 +310,7 @@
  
  #undef  NCURSES_CONST 
 --- include/tic.h
-+++ include/tic.h	2016-05-17 10:35:27.103114187 +0000
++++ include/tic.h	2016-05-24 07:42:18.636380119 +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-05-17 10:35:27.103114187 +0000
++++ man/man_db.renames	2016-05-24 07:42:18.636380119 +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-05-17 10:35:27.103114187 +0000
++++ man/ncurses.3x	2016-05-24 07:42:18.636380119 +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-05-17 10:35:27.103114187 +0000
++++ misc/gen-pkgconfig.in	2016-05-24 07:42:18.636380119 +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-05-17 10:35:27.103114187 +0000
++++ misc/ncurses-config.in	2016-05-24 07:42:18.636380119 +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-05-17 10:37:34.480597198 +0000
++++ misc/terminfo.src	2016-05-24 07:42:18.692379030 +0000
 @@ -301,7 +301,9 @@ dumb|80-column dumb tty,
  	am,
  	cols#80,
@@ -773,7 +773,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	2016-05-17 10:35:27.107114107 +0000
++++ ncurses/Makefile.in	2016-05-24 07:42:18.640380041 +0000
 @@ -216,7 +216,7 @@ $(DESTDIR)$(libdir) :
  ../lib : ; mkdir $@
  
@@ -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-05-17 10:35:27.107114107 +0000
++++ ncurses/curses.priv.h	2016-05-24 07:42:18.640380041 +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-05-17 10:35:27.107114107 +0000
++++ ncurses/run_cmd.sh	2016-05-24 07:42:18.640380041 +0000
 @@ -0,0 +1,11 @@
 +#!/bin/sh
 +
@@ -809,7 +809,7 @@
 +
 +exec ${1+"$@"}
 --- ncurses/tinfo/MKfallback.sh
-+++ ncurses/tinfo/MKfallback.sh	2016-05-17 10:35:27.107114107 +0000
++++ ncurses/tinfo/MKfallback.sh	2016-05-24 07:42:18.640380041 +0000
 @@ -68,6 +68,12 @@ else
  	tmp_info=
  fi
@@ -842,7 +842,7 @@
  	done
  
 --- ncurses/tinfo/access.c
-+++ ncurses/tinfo/access.c	2016-05-17 10:35:27.107114107 +0000
++++ ncurses/tinfo/access.c	2016-05-24 07:42:18.640380041 +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-05-17 10:35:27.107114107 +0000
++++ ncurses/tinfo/lib_setup.c	2016-05-24 07:42:18.640380041 +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-05-17 10:35:27.107114107 +0000
++++ ncurses/tinfo/read_entry.c	2016-05-24 07:42:18.640380041 +0000
 @@ -435,6 +435,7 @@ _nc_read_file_entry(const char *const fi
      int limit;
      char buffer[MAX_ENTRY_SIZE + 1];
@@ -915,7 +915,7 @@
      return (code);
  }
 --- ncurses/tinfo/read_termcap.c
-+++ ncurses/tinfo/read_termcap.c	2016-05-17 10:35:27.107114107 +0000
++++ ncurses/tinfo/read_termcap.c	2016-05-24 07:42:18.644379964 +0000
 @@ -322,14 +322,18 @@ _nc_getent(
  	     */
  	    if (fd >= 0) {
@@ -962,7 +962,7 @@
      }
      if (copied != 0)
 --- test/test.priv.h
-+++ test/test.priv.h	2016-05-17 10:35:27.107114107 +0000
++++ test/test.priv.h	2016-05-24 07:42:18.644379964 +0000
 @@ -728,12 +728,12 @@ extern char *strnames[], *strcodes[], *s
  #endif
  
diff --git a/ncurses.changes b/ncurses.changes
index 8ccb6d0..140ca6c 100644
--- a/ncurses.changes
+++ b/ncurses.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Tue May 24 07:41:19 UTC 2016 - werner@suse.de
+
+- Add ncurses patch 20160521
+  + improved manual page description of tset/reset versus window-size.
+  + fixes to work with a slightly broken compiler configuration which
+    cannot compile "Hello World!" without adding compiler options
+    (report by Ola x Nilsson):
+    + pass appropriate compiler options to the CF_PROG_CC_C_O macro.
+    + when separating compiler and options in CF_CC_ENV_FLAGS, ensure
+      that all options are split-off into CFLAGS or CPPFLAGS
+    + restore some -I options removed in 20140726 because they appeared
+      to be redundant.  In fact, they are needed for a compiler that
+      cannot combine -c and -o options.
+
 -------------------------------------------------------------------
 Tue May 17 10:33:40 UTC 2016 - werner@suse.de