Update to patch ncurses-6.0-20170107

OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=279
2017-01-09 11:23:17 +00:00
parent 8f7461bf1b
commit f22221feea
4 changed files with 82 additions and 37 deletions
--- 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:42dc865bc17177a245ff496b9e648927432fe4b076bd9c6b5e5eee2a621912b0
-size 1393149
+oid sha256:91011cc35b511b114a8d044aad83fb547d32903ba72dcf7195d841c8cfbf62ea
+size 1541192
--- a/ncurses-6.0.dif
+++ b/ncurses-6.0.dif
@@ -21,7 +21,7 @@
 19 files changed, 240 insertions(+), 80 deletions(-)

 --- aclocal.m4
-+++ aclocal.m4	2016-12-12 12:26:15.352276409 +0000
+++ aclocal.m4	2017-01-09 11:19:52.643668657 +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
@@ -150,7 +150,7 @@
 esac
 done
 --- configure
-+++ configure	2016-12-12 12:26:15.360276271 +0000
+++ configure	2017-01-09 11:19:52.651668503 +0000
@@ -5896,7 +5896,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-12-12 12:26:15.360276271 +0000
+++ include/curses.h.in	2017-01-09 11:19:52.651668503 +0000
@@ -174,6 +174,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-12-12 12:26:15.360276271 +0000
+++ include/termcap.h.in	2017-01-09 11:19:52.651668503 +0000
@@ -46,6 +46,8 @@ extern "C"
 {
 #endif /* __cplusplus */
@@ -310,7 +310,7 @@
 
 #undef  NCURSES_CONST 
 --- include/tic.h
-+++ include/tic.h	2016-12-12 12:26:15.360276271 +0000
+++ include/tic.h	2017-01-09 11:19:52.651668503 +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-12-12 12:26:15.360276271 +0000
+++ man/man_db.renames	2017-01-09 11:19:52.651668503 +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-12-12 12:26:15.360276271 +0000
+++ man/ncurses.3x	2017-01-09 11:19:52.651668503 +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-12-12 12:26:15.360276271 +0000
+++ misc/gen-pkgconfig.in	2017-01-09 11:19:52.651668503 +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-12-12 12:26:15.360276271 +0000
+++ misc/ncurses-config.in	2017-01-09 11:19:52.651668503 +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-12-12 12:26:15.420275232 +0000
+++ misc/terminfo.src	2017-01-09 11:19:52.659668347 +0000
@@ -301,7 +301,9 @@ dumb|80-column dumb tty,
 	am,
 	cols#80,
@@ -696,7 +696,7 @@
 	kc1=\E[8~, kc3=\E[6~, kent=\EOM, khlp=\E[28~, kmous=\E[M,
 	mc4=\E[4i, mc5=\E[5i, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O,
 	rmam=\E[?7l, rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=,
-@@ -6093,7 +6162,7 @@ pty|4bsd pseudo teletype,
+@@ -6104,7 +6173,7 @@ pty|4bsd pseudo teletype,
 #### Emacs
 
 # The codes supported by the term.el terminal emulation in GNU Emacs 19.30
@@ -705,7 +705,7 @@
 	am, mir, xenl,
 	cols#80, lines#24,
 	bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=^M,
-@@ -6106,6 +6175,13 @@ eterm|gnu emacs term.el terminal emulati
+@@ -6117,6 +6186,13 @@ eterm|gnu emacs term.el terminal emulati
 	rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmso=\E[m, rmul=\E[m,
 	sgr0=\E[m, smcup=\E7\E[?47h, smir=\E[4h, smso=\E[7m,
 	smul=\E[4m,
@@ -719,7 +719,7 @@
 
 # The codes supported by the term.el terminal emulation in GNU Emacs 22.2
 eterm-color|Emacs term.el terminal emulator term-protocol-version 0.96,
-@@ -6208,7 +6284,7 @@ screen|VT 100/ANSI X3.64 virtual termina
+@@ -6219,7 +6295,7 @@ screen|VT 100/ANSI X3.64 virtual termina
 	dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K,
 	enacs=\E(B\E)0, flash=\Eg, home=\E[H, ht=^I, hts=\EH,
 	ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=^J, is2=\E)0,
@@ -728,7 +728,7 @@
 	kcuu1=\EOA, kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~,
 	kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
 	kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
-@@ -6408,7 +6484,7 @@ screen2|old VT 100/ANSI X3.64 virtual te
+@@ -6419,7 +6495,7 @@ screen2|old VT 100/ANSI X3.64 virtual te
 	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
 	dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J,
 	el=\E[K, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=, il=\E[%p1%dL,
@@ -737,7 +737,7 @@
 	kcuu1=\EA, kf0=\E~, kf1=\ES, kf2=\ET, kf3=\EU, kf4=\EV,
 	kf5=\EW, kf6=\EP, kf7=\EQ, kf8=\ER, kf9=\E0I, khome=\EH,
 	nel=^M^J, rc=\E8, ri=\EM, rmir=\E[4l, rmso=\E[23m,
-@@ -8195,7 +8271,7 @@ hp700-wy|HP700/41 emulating wyse30,
+@@ -8206,7 +8282,7 @@ hp700-wy|HP700/41 emulating wyse30,
 	ri=\Ej, rmir=\Er, rmso=\EG0$<10/>, rmul=\EG0$<10/>,
 	sgr0=\EG0$<10/>, smir=\Eq, smso=\EG4$<10/>,
 	smul=\EG8$<10/>, tbc=\E0, vpa=\E[%p1%{32}%+%c,
@@ -746,7 +746,7 @@
 	am, da, db, xhp,
 	cols#80, lh#2, lines#24, lm#0, lw#8, nlab#8,
 	acsc=0cjgktlrmfn/q\,t5u6v8w7x., bel=^G, blink=\E&dA,
-@@ -11416,6 +11492,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit
+@@ -11427,6 +11503,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit
 # at support for the VT320 itself.
 # Please send changes with explanations to bug-gnu-emacs@prep.ai.mit.edu.
 # (vt320-k3: I added <rmam>/<smam> based on the init string -- esr)
@@ -754,7 +754,7 @@
 vt320-k3|MS-Kermit 3.00's vt320 emulation,
 	am, eslok, hs, km, mir, msgr, xenl,
 	cols#80, it#8, lines#49, pb#9600, vt#3,
-@@ -11425,7 +11502,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio
+@@ -11436,7 +11513,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio
 	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
 	cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C,
 	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
@@ -763,7 +763,7 @@
 	dsl=\E[0$~, ech=\E[%p1%dX, ed=\E[J, el=\E[K,
 	flash=\E[?5h$<100/>\E[?5l\E[?5h$<100/>\E[?5l\E[?5h$<100/>\E[
 	      ?5l,
-@@ -15842,7 +15919,7 @@ ibm3101|i3101|IBM 3101-10,
+@@ -15853,7 +15930,7 @@ ibm3101|i3101|IBM 3101-10,
 	cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, ed=\EJ,
 	el=\EI, home=\EH, hts=\E0, ind=^J, kcub1=\ED, kcud1=\EB,
 	kcuf1=\EC, kcuu1=\EA, nel=^M^J, tbc=\EH,
@@ -772,7 +772,7 @@
 	is2=\E S, rmacs=\E>B, rmcup=\E>B, rs2=\E S, s0ds=\E>B,
 	sgr=\E4%{64}%?%p1%t%{65}%|%;%?%p2%t%{66}%|%;%?%p3%t%{65}%|%;
 	    %?%p4%t%{68}%|%;%?%p5%t%{64}%|%;%?%p6%t%{72}%|%;%?%p7%t
-@@ -16100,7 +16177,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De
+@@ -16111,7 +16188,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De
 	tbc=\E[3g,
 # "Megapel" refers to the display adapter, which was used with the IBM RT
 # aka IBM 6150.
@@ -782,7 +782,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-12-12 12:26:15.364276201 +0000
+++ ncurses/Makefile.in	2017-01-09 11:19:52.659668347 +0000
@@ -218,7 +218,7 @@ $(DESTDIR)$(libdir) :
 ../lib : ; mkdir $@
 
@@ -793,8 +793,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	2016-12-12 12:26:15.364276201 +0000
-@@ -2024,6 +2024,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec
+++ ncurses/curses.priv.h	2017-01-09 11:19:52.659668347 +0000
+@@ -2029,6 +2029,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);
@@ -804,7 +804,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-12-12 12:26:15.364276201 +0000
+++ ncurses/run_cmd.sh	2017-01-09 11:19:52.659668347 +0000
@@ -0,0 +1,11 @@
 +#!/bin/sh
 +
@@ -818,7 +818,7 @@
 +
 +exec ${1+"$@"}
 --- ncurses/tinfo/MKfallback.sh
-+++ ncurses/tinfo/MKfallback.sh	2016-12-12 12:26:15.364276201 +0000
+++ ncurses/tinfo/MKfallback.sh	2017-01-09 11:21:19.097993942 +0000
@@ -68,6 +68,12 @@ else
 	tmp_info=
 fi
@@ -830,9 +830,9 @@
 +fi
 +
 cat <<EOF
- /*
-  * DO NOT EDIT THIS FILE BY HAND!  It is generated by MKfallback.sh.
-@@ -87,7 +93,7 @@ EOF
+ /* This file was generated by $0 */
+ 
+@@ -89,7 +95,7 @@ EOF
 	for x in $*
 	do
 		echo "/* $x */"
@@ -841,7 +841,7 @@
 	done
 
 	cat <<EOF
-@@ -98,7 +104,7 @@ EOF
+@@ -100,7 +106,7 @@ EOF
 	for x in $*
 	do
 		echo "$comma /* $x */"
@@ -851,7 +851,7 @@
 	done
 
 --- ncurses/tinfo/access.c
-+++ ncurses/tinfo/access.c	2016-12-12 12:26:15.364276201 +0000
+++ ncurses/tinfo/access.c	2017-01-09 11:19:52.659668347 +0000
@@ -35,6 +35,9 @@
 #include <ctype.h>
 
@@ -894,8 +894,8 @@
 _nc_access(const char *path, int mode)
 {
 --- ncurses/tinfo/lib_setup.c
-+++ ncurses/tinfo/lib_setup.c	2016-12-12 12:26:15.364276201 +0000
-@@ -584,6 +584,9 @@ _nc_locale_breaks_acs(TERMINAL * termp)
+++ ncurses/tinfo/lib_setup.c	2017-01-09 11:19:52.659668347 +0000
+@@ -593,6 +593,9 @@ _nc_locale_breaks_acs(TERMINAL * termp)
     } else if ((value = tigetnum("U8")) >= 0) {
 	result = value;		/* use extension feature */
     } else if ((env = getenv("TERM")) != 0) {
@@ -906,7 +906,7 @@
 	    result = 1;		/* always broken */
 	} else if (strstr(env, "screen") != 0
 --- ncurses/tinfo/read_entry.c
-+++ ncurses/tinfo/read_entry.c	2016-12-12 12:26:15.368276132 +0000
+++ ncurses/tinfo/read_entry.c	2017-01-09 11:19:52.659668347 +0000
@@ -433,6 +433,7 @@ _nc_read_file_entry(const char *const fi
     FILE *fp = 0;
     int code;
@@ -924,7 +924,7 @@
     return (code);
 }
 --- ncurses/tinfo/read_termcap.c
-+++ ncurses/tinfo/read_termcap.c	2016-12-12 12:26:15.368276132 +0000
+++ ncurses/tinfo/read_termcap.c	2017-01-09 11:19:52.659668347 +0000
@@ -322,14 +322,18 @@ _nc_getent(
 	     */
 	    if (fd >= 0) {
@@ -971,7 +971,7 @@
     }
     if (copied != 0)
 --- test/test.priv.h
-+++ test/test.priv.h	2016-12-12 12:26:15.368276132 +0000
+++ test/test.priv.h	2017-01-09 11:19:52.659668347 +0000
@@ -790,12 +790,12 @@ extern char *strnames[], *strcodes[], *s
 #endif
 
--- a/ncurses.changes
+++ b/ncurses.changes
@@ -1,3 +1,48 @@
+-------------------------------------------------------------------
+Mon Jan  9 11:17:00 UTC 2017 - werner@suse.de
+
+- Add ncurses patch 20170107
+  + amend changes for tput to reset tty modes to "sane" if the program
+    is run as "reset", like tset.  Likewise, ensure that tset sends
+    either reset- or init-strings.
+  + improve manual page descriptions of tput init/reset and tset/reset,
+    to make it easier to see how they are similar and different.
+  + move a static result from key_name() to _nc_globals
+  + modify _nc_get_screensize to allow for use_env() and use_tioctl()
+    state to be per-screen when sp-funcs are configured, better matching
+    the behavior when using the term-driver configuration.
+  + improve cross-references in manual pages for often used functions
+  + move SCREEN field for use_tioctl() data before the ncursesw fields,
+    and limit that to the sp-funcs configuration to improve termlib
+    compatibility (cf:  20120714).
+  + correct order of initialization for traces in use_env() and
+    use_tioctl() versus first trace calls.
+ - Add ncurses patch 20161231
+  + fix errata for ncurses-howto (report by Damien Ruscoe).
+  + fix a few places in configure/build scripts where DESTDIR and rpath
+    were combined (report by Thomas Klausner).
+  + merge current st description (report by Harry Gindi) -TD
+  + modify flash capability for linux and wyse entries to put the delay
+    between the reverse/normal escapes rather than after -TD
+  + modify program tabs to pass the actual tty file descriptor to
+    setupterm rather than the standard output, making padding work
+    consistently.
+  + explain in clear's manual page that it writes to stdout.
+  + add special case for verbose debugging traces of command-line
+    utilities which write to stderr (cf: 20161126).
+  + remove a trace with literal escapes from skip_DECSCNM(), added in
+    20161203.
+  + update config.guess, config.sub from
+          http://git.savannah.gnu.org/cgit/config.git
+- Add ncurses patch 20161224
+  + correct parmeters for copywin call in _nc_Synchronize_Attributes()
+    (patch by Leon Winter).
+  + improve color-handling section in terminfo manual page (prompted by
+    patch by Mihail Konev).
+  + modify programs clear, tput and tset to pass the actual tty file
+    descriptor to setupterm rather than the standard output, making
+    padding work.
+
 -------------------------------------------------------------------
 Mon Dec 19 12:57:51 UTC 2016 - werner@suse.de

--- a/ncurses.spec
+++ b/ncurses.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package ncurses
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed