Add ncurses patch 6.1-20180324 as well as 6.1-20180331

OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=369
This commit is contained in:
Dr. Werner Fink 2018-04-03 09:43:30 +00:00 committed by Git OBS Bridge
parent 6723a7148c
commit 26eff98417
3 changed files with 40 additions and 24 deletions

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:539c0f5d4f44cc85c8ff148facc500a3f7553fc07e6d3c266fa8e9e00a9751f5 oid sha256:c8e4c9f4c4b8b1c39513c333f66d10207bb62a0358d619b43b96b2665782e80b
size 92912 size 119567

View File

@ -22,7 +22,7 @@
20 files changed, 248 insertions(+), 81 deletions(-) 20 files changed, 248 insertions(+), 81 deletions(-)
--- aclocal.m4 --- aclocal.m4
+++ aclocal.m4 2018-03-05 07:53:48.984265229 +0000 +++ aclocal.m4 2018-04-03 09:30:51.952306743 +0000
@@ -580,7 +580,7 @@ AC_MSG_CHECKING([for size of bool]) @@ -580,7 +580,7 @@ AC_MSG_CHECKING([for size of bool])
AC_CACHE_VAL(cf_cv_type_of_bool,[ AC_CACHE_VAL(cf_cv_type_of_bool,[
rm -f cf_test.out rm -f cf_test.out
@ -151,7 +151,7 @@
esac esac
done done
--- configure --- configure
+++ configure 2018-03-05 07:53:48.988265152 +0000 +++ configure 2018-04-03 09:30:51.956306670 +0000
@@ -5972,7 +5972,7 @@ case $cf_cv_system_name in @@ -5972,7 +5972,7 @@ case $cf_cv_system_name in
fi fi
;; ;;
@ -288,7 +288,7 @@
# the next lines are needed for linking libtic over libncurses # the next lines are needed for linking libtic over libncurses
TINFO_NAME=${LIB_NAME} TINFO_NAME=${LIB_NAME}
--- include/curses.h.in --- include/curses.h.in
+++ include/curses.h.in 2018-03-05 07:53:48.992265076 +0000 +++ include/curses.h.in 2018-04-03 09:30:51.956306670 +0000
@@ -177,6 +177,9 @@ typedef @cf_cv_typeof_chtype@ chtype; @@ -177,6 +177,9 @@ typedef @cf_cv_typeof_chtype@ chtype;
typedef @cf_cv_typeof_mmask_t@ mmask_t; typedef @cf_cv_typeof_mmask_t@ mmask_t;
#endif #endif
@ -300,7 +300,7 @@
* We need FILE, etc. Include this before checking any feature symbols. * We need FILE, etc. Include this before checking any feature symbols.
*/ */
--- include/termcap.h.in --- include/termcap.h.in
+++ include/termcap.h.in 2018-03-05 07:53:48.992265076 +0000 +++ include/termcap.h.in 2018-04-03 09:30:51.956306670 +0000
@@ -46,6 +46,8 @@ extern "C" @@ -46,6 +46,8 @@ extern "C"
{ {
#endif /* __cplusplus */ #endif /* __cplusplus */
@ -311,7 +311,7 @@
#undef NCURSES_CONST #undef NCURSES_CONST
--- include/tic.h --- include/tic.h
+++ include/tic.h 2018-03-05 07:53:48.992265076 +0000 +++ include/tic.h 2018-04-03 09:30:51.956306670 +0000
@@ -221,12 +221,12 @@ struct alias @@ -221,12 +221,12 @@ struct alias
*/ */
@ -328,7 +328,7 @@
#define CANCELLED_STRING (char *)(-1) #define CANCELLED_STRING (char *)(-1)
--- man/man_db.renames --- man/man_db.renames
+++ man/man_db.renames 2018-03-05 07:53:48.992265076 +0000 +++ man/man_db.renames 2018-04-03 09:30:51.956306670 +0000
@@ -163,6 +163,7 @@ term.7 term.7 @@ -163,6 +163,7 @@ term.7 term.7
term_variables.3x terminfo_variables.3ncurses term_variables.3x terminfo_variables.3ncurses
terminfo.5 terminfo.5 terminfo.5 terminfo.5
@ -346,7 +346,7 @@
# #
getty.1 getty.8 getty.1 getty.8
--- man/ncurses.3x --- man/ncurses.3x
+++ man/ncurses.3x 2018-03-05 07:53:48.992265076 +0000 +++ man/ncurses.3x 2018-04-03 09:30:51.956306670 +0000
@@ -138,6 +138,10 @@ after the shell environment variable \fB @@ -138,6 +138,10 @@ after the shell environment variable \fB
[See \fBterminfo\fR(\*n) for further details.] [See \fBterminfo\fR(\*n) for further details.]
.SS Datatypes .SS Datatypes
@ -359,7 +359,7 @@
called \fIwindows\fR, which can be thought of as two-dimensional called \fIwindows\fR, which can be thought of as two-dimensional
arrays of characters representing all or part of a CRT screen. arrays of characters representing all or part of a CRT screen.
--- misc/gen-pkgconfig.in --- misc/gen-pkgconfig.in
+++ misc/gen-pkgconfig.in 2018-03-05 07:53:48.992265076 +0000 +++ misc/gen-pkgconfig.in 2018-04-03 09:30:51.956306670 +0000
@@ -76,7 +76,7 @@ if test "$includedir" != "/usr/include" @@ -76,7 +76,7 @@ if test "$includedir" != "/usr/include"
fi fi
@ -399,7 +399,7 @@
echo "** creating ${name}${suffix}.pc" echo "** creating ${name}${suffix}.pc"
--- misc/ncurses-config.in --- misc/ncurses-config.in
+++ misc/ncurses-config.in 2018-03-05 07:53:48.992265076 +0000 +++ misc/ncurses-config.in 2018-04-03 09:30:51.956306670 +0000
@@ -100,7 +100,7 @@ while test $# -gt 0; do @@ -100,7 +100,7 @@ while test $# -gt 0; do
# compile/link # compile/link
--cflags) --cflags)
@ -410,7 +410,7 @@
fi fi
if test "${includedir}" != /usr/include ; then if test "${includedir}" != /usr/include ; then
--- misc/terminfo.src --- misc/terminfo.src
+++ misc/terminfo.src 2018-03-05 07:53:48.996265000 +0000 +++ misc/terminfo.src 2018-04-03 09:30:51.964306521 +0000
@@ -301,7 +301,9 @@ dumb|80-column dumb tty, @@ -301,7 +301,9 @@ dumb|80-column dumb tty,
am, am,
cols#80, cols#80,
@ -795,7 +795,7 @@
s1ds=\E(0, sgr0=\E[0m\E(B, use=ibm5154, s1ds=\E(0, sgr0=\E[0m\E(B, use=ibm5154,
ibm5081-c|ibmmpel-c|IBM 5081 1024x1024 256/4096 Megapel enhanced color display, ibm5081-c|ibmmpel-c|IBM 5081 1024x1024 256/4096 Megapel enhanced color display,
--- ncurses/Makefile.in --- ncurses/Makefile.in
+++ ncurses/Makefile.in 2018-03-05 07:53:48.996265000 +0000 +++ ncurses/Makefile.in 2018-04-03 09:30:51.964306521 +0000
@@ -219,7 +219,7 @@ $(DESTDIR)$(libdir) : @@ -219,7 +219,7 @@ $(DESTDIR)$(libdir) :
../lib : ; mkdir $@ ../lib : ; mkdir $@
@ -806,7 +806,7 @@
./lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h ./lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h
$(SHELL) -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@ $(SHELL) -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@
--- ncurses/curses.priv.h --- ncurses/curses.priv.h
+++ ncurses/curses.priv.h 2018-03-05 07:53:48.996265000 +0000 +++ ncurses/curses.priv.h 2018-04-03 09:30:51.964306521 +0000
@@ -2169,6 +2169,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec @@ -2169,6 +2169,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec
extern NCURSES_EXPORT(char *) _nc_tracemouse (SCREEN *, MEVENT const *); extern NCURSES_EXPORT(char *) _nc_tracemouse (SCREEN *, MEVENT const *);
extern NCURSES_EXPORT(char *) _nc_trace_mmask_t (SCREEN *, mmask_t); extern NCURSES_EXPORT(char *) _nc_trace_mmask_t (SCREEN *, mmask_t);
@ -817,7 +817,7 @@
extern NCURSES_EXPORT(int) _nc_freewin (WINDOW *); extern NCURSES_EXPORT(int) _nc_freewin (WINDOW *);
extern NCURSES_EXPORT(int) _nc_getenv_num (const char *); extern NCURSES_EXPORT(int) _nc_getenv_num (const char *);
--- ncurses/run_cmd.sh --- ncurses/run_cmd.sh
+++ ncurses/run_cmd.sh 2018-03-05 07:53:48.996265000 +0000 +++ ncurses/run_cmd.sh 2018-04-03 09:30:51.964306521 +0000
@@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
+#!/bin/sh +#!/bin/sh
+ +
@ -831,7 +831,7 @@
+ +
+exec ${1+"$@"} +exec ${1+"$@"}
--- ncurses/tinfo/MKfallback.sh --- ncurses/tinfo/MKfallback.sh
+++ ncurses/tinfo/MKfallback.sh 2018-03-05 07:53:48.996265000 +0000 +++ ncurses/tinfo/MKfallback.sh 2018-04-03 09:30:51.964306521 +0000
@@ -68,6 +68,12 @@ else @@ -68,6 +68,12 @@ else
tmp_info= tmp_info=
fi fi
@ -864,7 +864,7 @@
done done
--- ncurses/tinfo/access.c --- ncurses/tinfo/access.c
+++ ncurses/tinfo/access.c 2018-03-05 07:53:48.996265000 +0000 +++ ncurses/tinfo/access.c 2018-04-03 09:30:51.964306521 +0000
@@ -35,6 +35,9 @@ @@ -35,6 +35,9 @@
#include <ctype.h> #include <ctype.h>
@ -907,7 +907,7 @@
_nc_access(const char *path, int mode) _nc_access(const char *path, int mode)
{ {
--- ncurses/tinfo/lib_setup.c --- ncurses/tinfo/lib_setup.c
+++ ncurses/tinfo/lib_setup.c 2018-03-05 07:53:48.996265000 +0000 +++ ncurses/tinfo/lib_setup.c 2018-04-03 09:30:51.964306521 +0000
@@ -599,6 +599,9 @@ _nc_locale_breaks_acs(TERMINAL *termp) @@ -599,6 +599,9 @@ _nc_locale_breaks_acs(TERMINAL *termp)
} else if ((value = tigetnum("U8")) >= 0) { } else if ((value = tigetnum("U8")) >= 0) {
result = value; /* use extension feature */ result = value; /* use extension feature */
@ -919,8 +919,8 @@
result = 1; /* always broken */ result = 1; /* always broken */
} else if (strstr(env, "screen") != 0 } else if (strstr(env, "screen") != 0
--- ncurses/tinfo/read_entry.c --- ncurses/tinfo/read_entry.c
+++ ncurses/tinfo/read_entry.c 2018-03-05 07:53:48.996265000 +0000 +++ ncurses/tinfo/read_entry.c 2018-04-03 09:30:51.964306521 +0000
@@ -532,6 +532,7 @@ _nc_read_file_entry(const char *const fi @@ -551,6 +551,7 @@ _nc_read_file_entry(const char *const fi
FILE *fp = 0; FILE *fp = 0;
int code; int code;
@ -928,7 +928,7 @@
if (_nc_access(filename, R_OK) < 0 if (_nc_access(filename, R_OK) < 0
|| (fp = fopen(filename, "rb")) == 0) { || (fp = fopen(filename, "rb")) == 0) {
TR(TRACE_DATABASE, ("cannot open terminfo %s (errno=%d)", filename, errno)); TR(TRACE_DATABASE, ("cannot open terminfo %s (errno=%d)", filename, errno));
@@ -552,6 +553,7 @@ _nc_read_file_entry(const char *const fi @@ -571,6 +572,7 @@ _nc_read_file_entry(const char *const fi
} }
fclose(fp); fclose(fp);
} }
@ -937,7 +937,7 @@
return (code); return (code);
} }
--- ncurses/tinfo/read_termcap.c --- ncurses/tinfo/read_termcap.c
+++ ncurses/tinfo/read_termcap.c 2018-03-05 07:53:48.996265000 +0000 +++ ncurses/tinfo/read_termcap.c 2018-04-03 09:30:51.964306521 +0000
@@ -322,14 +322,18 @@ _nc_getent( @@ -322,14 +322,18 @@ _nc_getent(
*/ */
if (fd >= 0) { if (fd >= 0) {
@ -984,7 +984,7 @@
} }
if (copied != 0) if (copied != 0)
--- progs/Makefile.in --- progs/Makefile.in
+++ progs/Makefile.in 2018-03-05 07:53:48.996265000 +0000 +++ progs/Makefile.in 2018-04-03 09:30:51.964306521 +0000
@@ -100,7 +100,7 @@ CFLAGS_LIBTOOL = $(CCFLAGS) @@ -100,7 +100,7 @@ CFLAGS_LIBTOOL = $(CCFLAGS)
CFLAGS_NORMAL = $(CCFLAGS) CFLAGS_NORMAL = $(CCFLAGS)
CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE
@ -1004,7 +1004,7 @@
LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@) LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@)
--- test/test.priv.h --- test/test.priv.h
+++ test/test.priv.h 2018-03-05 07:53:48.996265000 +0000 +++ test/test.priv.h 2018-04-03 09:30:51.964306521 +0000
@@ -910,12 +910,12 @@ extern char *strnames[], *strcodes[], *s @@ -910,12 +910,12 @@ extern char *strnames[], *strcodes[], *s
#endif #endif

View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Tue Apr 3 09:30:14 UTC 2018 - werner@suse.de
- Add ncurses patch 6.1-20180331
+ improve terminfo write/read by modifying the fourth item of the
extended header to denote the number of valid strings in the extended
string table (prompted by a comment in unibilium's sources).
-------------------------------------------------------------------
Thu Mar 29 11:30:00 UTC 2018 - werner@suse.de
- Add ncurses patch 6.1-20180324
+ amend Scaled256() macro in test/picsmap.c to cover the full range
0..1000 (report by Roger Pau Monne).
+ add some checks in tracemunch for undefined variables.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Mar 21 07:46:36 UTC 2018 - werner@suse.de Wed Mar 21 07:46:36 UTC 2018 - werner@suse.de