Add ncurses patch 20161126

OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=274
2016-11-28 08:50:37 +00:00 · 2016-11-28 08:50:37 +00:00 · 782c59ad7c
commit 782c59ad7c
parent 2f43be6a95
3 changed files with 47 additions and 29 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:bcb134b70aeb51a01742f2b4bfeaec25bc38659f3e889f939ce4b2f952feee68
-size 1313444
+oid sha256:9a5c5e4b291c1fe4647517eb5bb1651f96245a081bb1bf8833806516a0df6f0e
+size 1325151
--- 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-11-21 08:55:04.418932316 +0000
+++ aclocal.m4	2016-11-28 08:39:58.684185854 +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-11-21 08:55:04.422932233 +0000
+++ configure	2016-11-28 08:39:58.688185773 +0000
@@ -5895,7 +5895,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-11-21 08:55:04.422932233 +0000
+++ include/curses.h.in	2016-11-28 08:39:58.688185773 +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-11-21 08:55:04.422932233 +0000
+++ include/termcap.h.in	2016-11-28 08:39:58.688185773 +0000
@@ -46,6 +46,8 @@ extern "C"
 {
 #endif /* __cplusplus */
@ -310,7 +310,7 @@
 
 #undef  NCURSES_CONST 
 --- include/tic.h
-+++ include/tic.h	2016-11-21 08:55:04.422932233 +0000
+++ include/tic.h	2016-11-28 08:39:58.688185773 +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-11-21 08:55:04.422932233 +0000
+++ man/man_db.renames	2016-11-28 08:39:58.688185773 +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-11-21 08:55:04.422932233 +0000
+++ man/ncurses.3x	2016-11-28 08:39:58.688185773 +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-11-21 08:55:04.422932233 +0000
+++ misc/gen-pkgconfig.in	2016-11-28 08:39:58.688185773 +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-11-21 08:55:04.422932233 +0000
+++ misc/ncurses-config.in	2016-11-28 08:39:58.688185773 +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-11-21 09:00:40.276070162 +0000
+++ misc/terminfo.src	2016-11-28 08:44:03.115136374 +0000
@@ -301,7 +301,9 @@ dumb|80-column dumb tty,
 	am,
 	cols#80,
@ -443,7 +443,7 @@
@@ -1754,6 +1762,7 @@ linux2.6|linux 2.6.x console,
 	acsc=++\,\,--..00__``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwx
 	     xyyzz{{||}c~~,
- 	enacs=\E(B\E)0, rmacs=^O,
+ 	enacs=\E)0, rmacs=^O,
 +	cvvis=\E[?25h\E[?8c,
 	sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5
 	    %t;2%;%?%p6%t;1%;m%?%p9%t\016%e\017%;,
@ -601,9 +601,9 @@
 -	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
 +	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, cvvis=\E[?25h,
 	dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K,
- 	enacs=\E(B\E)0, flash=\E[?5h\E[?5l, home=\E[H, ht=^I,
- 	hts=\EH, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[L,
- 	ind=^J, is1=\E[?47l\E=\E[?1l,
+ 	enacs=\E(B\E)0, flash=\E[?5h$<100/>\E[?5l, home=\E[H,
+ 	ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL,
+ 	il1=\E[L, ind=^J, is1=\E[?47l\E=\E[?1l,
 -	is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, kbs=^H,
 -	kcbt=\E[Z, kmous=\E[M, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O,
 +	is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, kbs=\177, kcbt=\E[Z,
@ -761,9 +761,9 @@
 -	dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M,
 +	cvvis=\E[?25h, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M,
 	dsl=\E[0$~, ech=\E[%p1%dX, ed=\E[J, el=\E[K,
- 	flash=\E[?5h\E[?5l\E[?5h\E[?5l\E[?5h\E[?5l,
- 	fsl=\E[0$}, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH,
-@@ -15840,7 +15917,7 @@ ibm3101|i3101|IBM 3101-10,
+ 	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,
 	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
-@@ -16098,7 +16175,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De
+@@ -16100,7 +16177,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-11-21 08:55:04.426932153 +0000
+++ ncurses/Makefile.in	2016-11-28 08:39:58.692185690 +0000
@@ -218,7 +218,7 @@ $(DESTDIR)$(libdir) :
 ../lib : ; mkdir $@
 
@ -793,7 +793,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-11-21 08:55:04.426932153 +0000
+++ ncurses/curses.priv.h	2016-11-28 08:39:58.692185690 +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);
@ -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-11-21 08:55:04.430932070 +0000
+++ ncurses/run_cmd.sh	2016-11-28 08:39:58.692185690 +0000
@@ -0,0 +1,11 @@
 +#!/bin/sh
 +
@ -818,7 +818,7 @@
 +
 +exec ${1+"$@"}
 --- ncurses/tinfo/MKfallback.sh
-+++ ncurses/tinfo/MKfallback.sh	2016-11-21 08:55:04.430932070 +0000
+++ ncurses/tinfo/MKfallback.sh	2016-11-28 08:39:58.692185690 +0000
@@ -68,6 +68,12 @@ else
 	tmp_info=
 fi
@ -851,7 +851,7 @@
 	done
 
 --- ncurses/tinfo/access.c
-+++ ncurses/tinfo/access.c	2016-11-21 08:55:04.430932070 +0000
+++ ncurses/tinfo/access.c	2016-11-28 08:39:58.692185690 +0000
@@ -35,6 +35,9 @@
 #include <ctype.h>
 
@ -894,7 +894,7 @@
 _nc_access(const char *path, int mode)
 {
 --- ncurses/tinfo/lib_setup.c
-+++ ncurses/tinfo/lib_setup.c	2016-11-21 08:55:04.430932070 +0000
+++ ncurses/tinfo/lib_setup.c	2016-11-28 08:39:58.692185690 +0000
@@ -584,6 +584,9 @@ _nc_locale_breaks_acs(TERMINAL * termp)
     } else if ((value = tigetnum("U8")) >= 0) {
 	result = value;		/* use extension feature */
@ -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-11-21 08:55:04.430932070 +0000
+++ ncurses/tinfo/read_entry.c	2016-11-28 08:39:58.692185690 +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-11-21 08:55:04.430932070 +0000
+++ ncurses/tinfo/read_termcap.c	2016-11-28 08:39:58.692185690 +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-11-21 08:55:04.430932070 +0000
+++ test/test.priv.h	2016-11-28 08:39:58.692185690 +0000
@@ -790,12 +790,12 @@ extern char *strnames[], *strcodes[], *s
 #endif
 
--- a/ncurses.changes
+++ b/ncurses.changes
@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Mon Nov 28 08:37:34 UTC 2016 - werner@suse.de
+
+- Add ncurses patch 20161126
+  + modify linux-16color to not mask dim, standout or reverse with the
+    ncv capability -TD
+  + add 0.1sec mandatory delay to flash capabilities using the VT100
+    reverse-video control -TD
+  + omit selection of ISO-8859-1 for G0 in enacs capability from linux2.6
+    entry, to avoid conflict with the user-defined mapping.  The reset
+    feature will use ISO-8859-1 in any case (Mikulas Patocka).
+  + improve check in tic for delays by also warning about beep/flash
+    when a delay is not embedded, or if those use the VT100 reverse
+    video escape without using a delay.
+  + minor fix for syntax-check of delays from 20161119 changes.
+  + modify trace() to avoid overwriting existing file (report by Maor
+    Shwartz).
+
 -------------------------------------------------------------------
 Mon Nov 21 08:52:05 UTC 2016 - werner@suse.de