From 00b47b8d3b54d35e4429bec6dd5ebe11bfc9ec9ca7c32f5364be8d02e0fb2cee Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 20 Feb 2017 11:17:38 +0000 Subject: [PATCH] Update to patch 20170218 OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=290 --- ncurses-6.0-patches.tar.bz2 | 4 ++-- ncurses-6.0.dif | 42 ++++++++++++++++++------------------- ncurses.changes | 12 +++++++++++ 3 files changed, 35 insertions(+), 23 deletions(-) diff --git a/ncurses-6.0-patches.tar.bz2 b/ncurses-6.0-patches.tar.bz2 index 1077255..61d9e48 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:e10c437bfb8cd9ff93d305bdf558f52f58f48ad15fa9c401c3ecaa454c1d8925 -size 1725564 +oid sha256:c9e207531c4357cf2d4e44adf8ce6cb93e7af5799174497c7733cfe3bc9d3814 +size 1739944 diff --git a/ncurses-6.0.dif b/ncurses-6.0.dif index 8b6cc8e..c8f4f73 100644 --- 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 2017-02-13 09:16:39.555034132 +0000 ++++ aclocal.m4 2017-02-20 11:16:21.482330611 +0000 @@ -593,7 +593,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 2017-02-13 09:16:39.559034059 +0000 ++++ configure 2017-02-20 11:16:21.486330535 +0000 @@ -5904,7 +5904,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 2017-02-13 09:16:39.559034059 +0000 ++++ include/curses.h.in 2017-02-20 11:16:21.486330535 +0000 @@ -177,6 +177,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 2017-02-13 09:16:39.559034059 +0000 ++++ include/termcap.h.in 2017-02-20 11:16:21.486330535 +0000 @@ -46,6 +46,8 @@ extern "C" { #endif /* __cplusplus */ @@ -310,7 +310,7 @@ #undef NCURSES_CONST --- include/tic.h -+++ include/tic.h 2017-02-13 09:16:39.559034059 +0000 ++++ include/tic.h 2017-02-20 11:16:21.486330535 +0000 @@ -233,12 +233,12 @@ extern NCURSES_EXPORT(const struct alias */ @@ -327,7 +327,7 @@ #define CANCELLED_STRING (char *)(-1) --- man/man_db.renames -+++ man/man_db.renames 2017-02-13 09:16:39.559034059 +0000 ++++ man/man_db.renames 2017-02-20 11:16:21.486330535 +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 2017-02-13 09:16:39.559034059 +0000 ++++ man/ncurses.3x 2017-02-20 11:16:21.486330535 +0000 @@ -134,6 +134,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 2017-02-13 09:16:39.559034059 +0000 ++++ misc/gen-pkgconfig.in 2017-02-20 11:16:21.486330535 +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 2017-02-13 09:16:39.559034059 +0000 ++++ misc/ncurses-config.in 2017-02-20 11:16:21.490330456 +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 2017-02-13 09:16:39.611033100 +0000 ++++ misc/terminfo.src 2017-02-20 11:16:21.542329451 +0000 @@ -301,7 +301,9 @@ dumb|80-column dumb tty, am, cols#80, @@ -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 2017-02-13 09:16:39.563033985 +0000 ++++ ncurses/Makefile.in 2017-02-20 11:16:21.494330379 +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 2017-02-13 09:16:39.563033985 +0000 ++++ ncurses/curses.priv.h 2017-02-20 11:16:21.494330379 +0000 @@ -2034,6 +2034,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 2017-02-13 09:16:39.563033985 +0000 ++++ ncurses/run_cmd.sh 2017-02-20 11:16:21.494330379 +0000 @@ -0,0 +1,11 @@ +#!/bin/sh + @@ -818,7 +818,7 @@ + +exec ${1+"$@"} --- ncurses/tinfo/MKfallback.sh -+++ ncurses/tinfo/MKfallback.sh 2017-02-13 09:16:39.563033985 +0000 ++++ ncurses/tinfo/MKfallback.sh 2017-02-20 11:16:21.494330379 +0000 @@ -68,6 +68,12 @@ else tmp_info= fi @@ -851,7 +851,7 @@ done --- ncurses/tinfo/access.c -+++ ncurses/tinfo/access.c 2017-02-13 09:16:39.563033985 +0000 ++++ ncurses/tinfo/access.c 2017-02-20 11:16:21.494330379 +0000 @@ -35,6 +35,9 @@ #include @@ -894,7 +894,7 @@ _nc_access(const char *path, int mode) { --- ncurses/tinfo/lib_setup.c -+++ ncurses/tinfo/lib_setup.c 2017-02-13 09:16:39.563033985 +0000 ++++ ncurses/tinfo/lib_setup.c 2017-02-20 11:16:21.494330379 +0000 @@ -593,6 +593,9 @@ _nc_locale_breaks_acs(TERMINAL * termp) } else if ((value = tigetnum("U8")) >= 0) { result = value; /* use extension feature */ @@ -906,8 +906,8 @@ result = 1; /* always broken */ } else if (strstr(env, "screen") != 0 --- ncurses/tinfo/read_entry.c -+++ ncurses/tinfo/read_entry.c 2017-02-13 09:16:39.563033985 +0000 -@@ -438,6 +438,7 @@ _nc_read_file_entry(const char *const fi ++++ ncurses/tinfo/read_entry.c 2017-02-20 11:16:21.494330379 +0000 +@@ -431,6 +431,7 @@ _nc_read_file_entry(const char *const fi FILE *fp = 0; int code; @@ -915,7 +915,7 @@ if (_nc_access(filename, R_OK) < 0 || (fp = fopen(filename, "rb")) == 0) { TR(TRACE_DATABASE, ("cannot open terminfo %s (errno=%d)", filename, errno)); -@@ -458,6 +459,7 @@ _nc_read_file_entry(const char *const fi +@@ -451,6 +452,7 @@ _nc_read_file_entry(const char *const fi } fclose(fp); } @@ -924,7 +924,7 @@ return (code); } --- ncurses/tinfo/read_termcap.c -+++ ncurses/tinfo/read_termcap.c 2017-02-13 09:16:39.563033985 +0000 ++++ ncurses/tinfo/read_termcap.c 2017-02-20 11:16:21.494330379 +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 2017-02-13 09:16:39.563033985 +0000 ++++ test/test.priv.h 2017-02-20 11:16:21.494330379 +0000 @@ -786,12 +786,12 @@ extern char *strnames[], *strcodes[], *s #endif diff --git a/ncurses.changes b/ncurses.changes index 1d7fab2..927dd2d 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon Feb 20 11:15:23 UTC 2017 - werner@suse.de + +- Add ncurses patch 20170218 + + fix several formatting issues with manual pages. + + correct read of terminfo entry in which all strings are absent or + explicitly cancelled. Before this fix, the result was that all were + treated as only absent. + + modify infocmp to suppress mixture of absent/cancelled capabilities + that would only show as "NULL, NULL", unless the -q option is used, + e.g., to show "-, @" or "@, -". + ------------------------------------------------------------------- Mon Feb 13 09:16:11 UTC 2017 - werner@suse.de