diff --git a/ncurses-6.0-patches.tar.bz2 b/ncurses-6.0-patches.tar.bz2 index dc48407..3d67cb3 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:ce4843ad31403b3729494a1f459032016b28889af8fb150e00fb9ceccef4848b -size 2588865 +oid sha256:9940715a415c48daef98d79cda759e378c653429405d53eb58cad652826d3ebd +size 2630873 diff --git a/ncurses-6.0.dif b/ncurses-6.0.dif index f2ac473..bb18159 100644 --- a/ncurses-6.0.dif +++ b/ncurses-6.0.dif @@ -21,7 +21,7 @@ 19 files changed, 247 insertions(+), 80 deletions(-) --- aclocal.m4 -+++ aclocal.m4 2017-06-21 10:25:47.213782985 +0000 ++++ aclocal.m4 2017-06-25 07:14:07.696621894 +0000 @@ -580,7 +580,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-06-21 10:25:47.217782909 +0000 ++++ configure 2017-06-25 07:14:07.700621820 +0000 @@ -5925,7 +5925,7 @@ case $cf_cv_system_name in fi ;; @@ -278,7 +278,7 @@ ;; esac done -@@ -22742,6 +22746,7 @@ if test "$with_termlib" != no ; then +@@ -22746,6 +22750,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 2017-06-21 10:25:47.217782909 +0000 ++++ include/curses.h.in 2017-06-25 07:14:07.700621820 +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-06-21 10:25:47.217782909 +0000 ++++ include/termcap.h.in 2017-06-25 07:14:07.700621820 +0000 @@ -46,6 +46,8 @@ extern "C" { #endif /* __cplusplus */ @@ -310,7 +310,7 @@ #undef NCURSES_CONST --- include/tic.h -+++ include/tic.h 2017-06-21 10:25:47.217782909 +0000 ++++ include/tic.h 2017-06-25 07:14:07.700621820 +0000 @@ -205,12 +205,12 @@ struct alias */ @@ -327,7 +327,7 @@ #define CANCELLED_STRING (char *)(-1) --- man/man_db.renames -+++ man/man_db.renames 2017-06-21 10:25:47.217782909 +0000 ++++ man/man_db.renames 2017-06-25 07:14:07.700621820 +0000 @@ -163,6 +163,7 @@ term.7 term.7 term_variables.3x terminfo_variables.3ncurses terminfo.5 terminfo.5 @@ -345,7 +345,7 @@ # getty.1 getty.8 --- man/ncurses.3x -+++ man/ncurses.3x 2017-06-21 10:25:47.217782909 +0000 ++++ man/ncurses.3x 2017-06-25 07:14:07.700621820 +0000 @@ -137,6 +137,10 @@ after the shell environment variable \fB [See \fBterminfo\fR(\*n) for further details.] .SS Datatypes @@ -358,7 +358,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-06-21 10:25:47.221782834 +0000 ++++ misc/gen-pkgconfig.in 2017-06-25 07:14:07.700621820 +0000 @@ -76,7 +76,7 @@ if test "$includedir" != "/usr/include" fi @@ -398,7 +398,7 @@ echo "** creating ${name}${suffix}.pc" --- misc/ncurses-config.in -+++ misc/ncurses-config.in 2017-06-21 10:25:47.221782834 +0000 ++++ misc/ncurses-config.in 2017-06-25 07:14:07.700621820 +0000 @@ -100,7 +100,7 @@ while test $# -gt 0; do # compile/link --cflags) @@ -409,7 +409,7 @@ fi if test "${includedir}" != /usr/include ; then --- misc/terminfo.src -+++ misc/terminfo.src 2017-06-21 10:25:47.273781852 +0000 ++++ misc/terminfo.src 2017-06-25 07:14:07.760620704 +0000 @@ -301,7 +301,9 @@ dumb|80-column dumb tty, am, cols#80, @@ -803,7 +803,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-06-21 10:25:47.221782834 +0000 ++++ ncurses/Makefile.in 2017-06-25 07:14:07.704621745 +0000 @@ -219,7 +219,7 @@ $(DESTDIR)$(libdir) : ../lib : ; mkdir $@ @@ -814,7 +814,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-06-21 10:25:47.225782758 +0000 ++++ ncurses/curses.priv.h 2017-06-25 07:14:07.704621745 +0000 @@ -2099,6 +2099,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); @@ -825,7 +825,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-06-21 10:25:47.225782758 +0000 ++++ ncurses/run_cmd.sh 2017-06-25 07:14:07.704621745 +0000 @@ -0,0 +1,11 @@ +#!/bin/sh + @@ -839,7 +839,7 @@ + +exec ${1+"$@"} --- ncurses/tinfo/MKfallback.sh -+++ ncurses/tinfo/MKfallback.sh 2017-06-21 10:25:47.225782758 +0000 ++++ ncurses/tinfo/MKfallback.sh 2017-06-25 07:14:07.704621745 +0000 @@ -68,6 +68,12 @@ else tmp_info= fi @@ -872,7 +872,7 @@ done --- ncurses/tinfo/access.c -+++ ncurses/tinfo/access.c 2017-06-21 10:25:47.225782758 +0000 ++++ ncurses/tinfo/access.c 2017-06-25 07:14:07.704621745 +0000 @@ -35,6 +35,9 @@ #include @@ -915,7 +915,7 @@ _nc_access(const char *path, int mode) { --- ncurses/tinfo/lib_setup.c -+++ ncurses/tinfo/lib_setup.c 2017-06-21 10:25:47.225782758 +0000 ++++ ncurses/tinfo/lib_setup.c 2017-06-25 07:14:07.704621745 +0000 @@ -599,6 +599,9 @@ _nc_locale_breaks_acs(TERMINAL *termp) } else if ((value = tigetnum("U8")) >= 0) { result = value; /* use extension feature */ @@ -927,7 +927,7 @@ result = 1; /* always broken */ } else if (strstr(env, "screen") != 0 --- ncurses/tinfo/read_entry.c -+++ ncurses/tinfo/read_entry.c 2017-06-21 10:25:47.225782758 +0000 ++++ ncurses/tinfo/read_entry.c 2017-06-25 07:14:07.704621745 +0000 @@ -431,6 +431,7 @@ _nc_read_file_entry(const char *const fi FILE *fp = 0; int code; @@ -945,7 +945,7 @@ return (code); } --- ncurses/tinfo/read_termcap.c -+++ ncurses/tinfo/read_termcap.c 2017-06-21 10:25:47.225782758 +0000 ++++ ncurses/tinfo/read_termcap.c 2017-06-25 07:14:07.708621671 +0000 @@ -322,14 +322,18 @@ _nc_getent( */ if (fd >= 0) { @@ -992,8 +992,8 @@ } if (copied != 0) --- test/test.priv.h -+++ test/test.priv.h 2017-06-21 10:25:47.225782758 +0000 -@@ -801,12 +801,12 @@ extern char *strnames[], *strcodes[], *s ++++ test/test.priv.h 2017-06-25 07:14:07.708621671 +0000 +@@ -805,12 +805,12 @@ extern char *strnames[], *strcodes[], *s #endif /* out-of-band values for representing absent capabilities */ diff --git a/ncurses.changes b/ncurses.changes index 7713fff..e62e861 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Sun Jun 25 07:12:59 UTC 2017 - werner@suse.de + +- Add ncurses patch 20170624 + + modify c++/etip.h.in to accommodate deprecation of throw() and + throws() in c++17 (prompted by patch by Romain Geissler). + + remove some incorrect calls for memory-leaks from 20170617 changes + (report by Allen Hewes). + + add test-programs for termattrs and term_attrs. + + modify _nc_outc_wrapper to use the standard output if the screen was + not initialized, rather than returning an error. + + improve checks for low-level terminfo functions when the terminal + has not been initialized (Redhat #1345963). + + modify make_hash to allow building with address-sanitizer, + assuming that --disable-leaks is configured. + + amend changes for number_format() in 20170506 to avoid undefined + behavior when shifting (patch by Emanuele Giaquinta). + ------------------------------------------------------------------- Wed Jun 21 10:24:20 UTC 2017 - werner@suse.de