testing/ncurses
SHA256
3
0
Fork 0
forked from pool/ncurses
Code Pull Requests Activity

ncurses-6.2-20200817

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=501
This commit is contained in:
Dr. Werner Fink 2020-08-18 07:05:39 +00:00 committed by Git OBS Bridge
parent f1a93d3ce8
commit af3d7473f8
3 changed files with 94 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ncurses-6.2-patches.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:12f41b197259a24d17e0f64d77a74c17c47a84dcba669f89acc6370120330a53 oid sha256:2adb671bd9d12831cbee6b3532d5e2690bda68a057e7776b200cace56f08e600
size 654391 size 732276

90
ncurses-6.2.dif
View File

@ -11,17 +11,17 @@
ncurses/Makefile.in | 2 ncurses/Makefile.in | 2
ncurses/curses.priv.h | 2 ncurses/curses.priv.h | 2
ncurses/run_cmd.sh | 11 +++ ncurses/run_cmd.sh | 11 +++
ncurses/tinfo/MKfallback.sh | 6 + ncurses/tinfo/MKfallback.sh | 10 ++-
ncurses/tinfo/access.c | 28 ++++++++ ncurses/tinfo/access.c | 28 ++++++++
ncurses/tinfo/lib_setup.c | 3 ncurses/tinfo/lib_setup.c | 3
ncurses/tinfo/read_entry.c | 2 ncurses/tinfo/read_entry.c | 2
ncurses/tinfo/read_termcap.c | 21 ++++-- ncurses/tinfo/read_termcap.c | 21 ++++--
progs/Makefile.in | 4 - progs/Makefile.in | 4 -
test/test.priv.h | 4 - test/test.priv.h | 4 -
19 files changed, 248 insertions(+), 77 deletions(-) 19 files changed, 250 insertions(+), 79 deletions(-)
--- aclocal.m4 --- aclocal.m4
+++ aclocal.m4 2020-03-09 09:17:28.745300221 +0000 +++ aclocal.m4 2020-08-17 08:13:47.804152211 +0000
@@ -617,7 +617,7 @@ AC_MSG_CHECKING([for size of bool]) @@ -617,7 +617,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
@ -150,7 +150,7 @@
esac esac
done done
--- configure --- configure
+++ configure 2020-03-09 09:17:28.749300145 +0000 +++ configure 2020-08-17 08:13:47.808152141 +0000
@@ -5628,7 +5628,7 @@ echo $ECHO_N "checking for an rpath opti @@ -5628,7 +5628,7 @@ echo $ECHO_N "checking for an rpath opti
fi fi
;; ;;
@ -160,7 +160,7 @@
;; ;;
(openbsd[2-9].*|mirbsd*) (openbsd[2-9].*|mirbsd*)
LD_RPATH_OPT="-Wl,-rpath," LD_RPATH_OPT="-Wl,-rpath,"
@@ -14232,12 +14232,15 @@ cat >>$cf_edit_man <<CF_EOF @@ -14385,12 +14385,15 @@ cat >>$cf_edit_man <<CF_EOF
echo '? missing rename for '\$cf_source echo '? missing rename for '\$cf_source
cf_target="\$cf_source" cf_target="\$cf_source"
fi fi
@ -178,7 +178,7 @@
sed -f $cf_man_alias \\ sed -f $cf_man_alias \\
CF_EOF CF_EOF
@@ -14247,7 +14250,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -14400,7 +14403,7 @@ cat >>$cf_edit_man <<CF_EOF
CF_EOF CF_EOF
else else
cat >>$cf_edit_man <<CF_EOF cat >>$cf_edit_man <<CF_EOF
@ -187,7 +187,7 @@
CF_EOF CF_EOF
fi fi
@@ -14287,7 +14290,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -14440,7 +14443,7 @@ cat >>$cf_edit_man <<CF_EOF
mv \$TMP.$cf_so_strip \$TMP mv \$TMP.$cf_so_strip \$TMP
fi fi
fi fi
@ -196,7 +196,7 @@
CF_EOF CF_EOF
fi fi
@@ -14296,23 +14299,23 @@ case "$MANPAGE_FORMAT" in @@ -14449,23 +14452,23 @@ case "$MANPAGE_FORMAT" in
cat >>$cf_edit_man <<CF_EOF cat >>$cf_edit_man <<CF_EOF
if test \$form = format ; then if test \$form = format ; then
# BSDI installs only .0 suffixes in the cat directories # BSDI installs only .0 suffixes in the cat directories
@ -226,7 +226,7 @@
for cf_alias in \$aliases for cf_alias in \$aliases
do do
if test \$section = 1 ; then if test \$section = 1 ; then
@@ -14321,7 +14324,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -14474,7 +14477,7 @@ cat >>$cf_edit_man <<CF_EOF
if test "$MANPAGE_SYMLINKS" = yes ; then if test "$MANPAGE_SYMLINKS" = yes ; then
if test -f \$cf_alias\${suffix} ; then if test -f \$cf_alias\${suffix} ; then
@ -235,7 +235,7 @@
then then
continue continue
fi fi
@@ -14331,18 +14334,18 @@ CF_EOF @@ -14484,18 +14487,18 @@ CF_EOF
case "x$LN_S" in case "x$LN_S" in
(*-f) (*-f)
cat >>$cf_edit_man <<CF_EOF cat >>$cf_edit_man <<CF_EOF
@ -257,7 +257,7 @@
echo ".so \$cf_source" >\$TMP echo ".so \$cf_source" >\$TMP
CF_EOF CF_EOF
if test -n "$cf_compress" ; then if test -n "$cf_compress" ; then
@@ -14362,9 +14365,9 @@ cat >>$cf_edit_man <<CF_EOF @@ -14515,9 +14518,9 @@ cat >>$cf_edit_man <<CF_EOF
) )
) )
elif test \$verb = removing ; then elif test \$verb = removing ; then
@ -270,7 +270,7 @@
) )
test -d \$cf_subdir\${section} && test -d \$cf_subdir\${section} &&
test -n "\$aliases" && ( test -n "\$aliases" && (
@@ -14384,6 +14387,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -14537,6 +14540,7 @@ cat >>$cf_edit_man <<CF_EOF
# echo ".hy 0" # echo ".hy 0"
cat \$TMP cat \$TMP
fi fi
@ -278,7 +278,7 @@
;; ;;
esac esac
done done
@@ -25843,6 +25847,7 @@ if test "$with_termlib" != no ; then @@ -25996,6 +26000,7 @@ if test "$with_termlib" != no ; then
TINFO_LDFLAGS="-L${LIB_DIR}" TINFO_LDFLAGS="-L${LIB_DIR}"
SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}" SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
fi fi
@ -287,7 +287,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 2020-03-09 09:17:28.749300145 +0000 +++ include/curses.h.in 2020-08-17 08:13:47.808152141 +0000
@@ -186,6 +186,9 @@ typedef @cf_cv_typeof_chtype@ chtype; @@ -186,6 +186,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
@ -299,7 +299,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 2020-03-09 09:17:28.749300145 +0000 +++ include/termcap.h.in 2020-08-17 08:13:47.808152141 +0000
@@ -47,6 +47,8 @@ extern "C" @@ -47,6 +47,8 @@ extern "C"
{ {
#endif /* __cplusplus */ #endif /* __cplusplus */
@ -310,7 +310,7 @@
#undef NCURSES_OSPEED #undef NCURSES_OSPEED
--- include/tic.h --- include/tic.h
+++ include/tic.h 2020-03-09 09:17:28.749300145 +0000 +++ include/tic.h 2020-08-17 08:13:47.808152141 +0000
@@ -237,12 +237,12 @@ struct user_table_entry @@ -237,12 +237,12 @@ struct user_table_entry
*/ */
@ -327,7 +327,7 @@
#define CANCELLED_STRING (char *)(-1) #define CANCELLED_STRING (char *)(-1)
--- man/man_db.renames --- man/man_db.renames
+++ man/man_db.renames 2020-03-09 09:17:28.749300145 +0000 +++ man/man_db.renames 2020-08-17 08:13:47.808152141 +0000
@@ -164,6 +164,7 @@ term.7 term.7 @@ -164,6 +164,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
@ -345,7 +345,7 @@
# #
getty.1 getty.8 getty.1 getty.8
--- man/ncurses.3x --- man/ncurses.3x
+++ man/ncurses.3x 2020-03-09 09:17:28.749300145 +0000 +++ man/ncurses.3x 2020-08-17 08:13:47.808152141 +0000
@@ -140,6 +140,10 @@ after the shell environment variable \fB @@ -140,6 +140,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
@ -358,7 +358,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 2020-03-09 09:17:28.749300145 +0000 +++ misc/gen-pkgconfig.in 2020-08-17 08:13:47.808152141 +0000
@@ -92,6 +92,9 @@ do @@ -92,6 +92,9 @@ do
-specs*) # ignore linker specs-files which were used to build library -specs*) # ignore linker specs-files which were used to build library
continue continue
@ -399,7 +399,7 @@
if [ $name = $MAIN_LIBRARY ] if [ $name = $MAIN_LIBRARY ]
--- misc/terminfo.src --- misc/terminfo.src
+++ misc/terminfo.src 2020-03-09 09:17:28.753300070 +0000 +++ misc/terminfo.src 2020-08-17 08:13:47.812152071 +0000
@@ -305,7 +305,9 @@ dumb|80-column dumb tty, @@ -305,7 +305,9 @@ dumb|80-column dumb tty,
am, am,
cols#80, cols#80,
@ -783,18 +783,18 @@
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 2020-03-09 09:17:28.753300070 +0000 +++ ncurses/Makefile.in 2020-08-17 08:13:47.812152071 +0000
@@ -229,7 +229,7 @@ $(DESTDIR)$(libdir) : @@ -230,7 +230,7 @@ $(DESTDIR)$(libdir) :
../lib : ; mkdir $@ ../lib : ; mkdir $@
./fallback.c : $(tinfo)/MKfallback.sh ./fallback.c : $(tinfo)/MKfallback.sh
- $(SHELL) -e $(tinfo)/MKfallback.sh $(TERMINFO) $(TERMINFO_SRC) $(TIC_PATH) $(INFOCMP_PATH) $(FALLBACK_LIST) >$@ - $(SHELL) -e $(tinfo)/MKfallback.sh $(TERMINFO) $(TERMINFO_SRC) "$(TIC_PATH)" "$(INFOCMP_PATH)" $(FALLBACK_LIST) >$@
+ $(SHELL) -e $(srcdir)/run_cmd.sh $(tinfo)/MKfallback.sh $(TERMINFO) $(TERMINFO_SRC) $(TIC_PATH) $(INFOCMP_PATH) $(FALLBACK_LIST) >$@ + $(SHELL) -e $(srcdir)/run_cmd.sh $(tinfo)/MKfallback.sh $(TERMINFO) $(TERMINFO_SRC) "$(TIC_PATH)" "$(INFOCMP_PATH)" $(FALLBACK_LIST) >$@
./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 2020-03-09 09:17:28.753300070 +0000 +++ ncurses/curses.priv.h 2020-08-17 08:13:47.812152071 +0000
@@ -2250,6 +2250,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec @@ -2250,6 +2250,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);
@ -805,7 +805,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 2020-03-09 09:17:28.753300070 +0000 +++ ncurses/run_cmd.sh 2020-08-17 08:13:47.812152071 +0000
@@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
+#!/bin/sh +#!/bin/sh
+ +
@ -819,22 +819,40 @@
+ +
+exec ${1+"$@"} +exec ${1+"$@"}
--- ncurses/tinfo/MKfallback.sh --- ncurses/tinfo/MKfallback.sh
+++ ncurses/tinfo/MKfallback.sh 2020-03-09 09:17:28.753300070 +0000 +++ ncurses/tinfo/MKfallback.sh 2020-08-17 08:33:39.543183822 +0000
@@ -72,6 +72,12 @@ else @@ -74,6 +74,12 @@ else
tmp_info= tmp_info=
fi fi
+if test -n "$TERMINFO" -a -d "$TERMINFO" ; then +if test -n "$TERMINFO" -a -d "$TERMINFO" ; then
+ infocmp_path="$infocmp_path -v1 -A $TERMINFO" + infocmp_args="-v1 -A $TERMINFO"
+else +else
+ infocmp_path="$infocmp_path -v1" + infocmp_args="-v1"
+fi +fi
+ +
cat <<EOF cat <<EOF
/* This file was generated by $0 */ /* This file was generated by $0 */
@@ -95,7 +101,7 @@ EOF
for x in "$@"
do
echo "/* $x */"
- "$infocmp_path" -E "$x" | sed -e 's/\<short\>/NCURSES_INT2/g'
+ "$infocmp_path" $infocmp_args -E "$x" | sed -e 's/\<short\>/NCURSES_INT2/g'
done
cat <<EOF
@@ -106,7 +112,7 @@ EOF
for x in "$@"
do
echo "$comma /* $x */"
- "$infocmp_path" -e "$x"
+ "$infocmp_path" $infocmp_args -e "$x"
comma=","
done
--- ncurses/tinfo/access.c --- ncurses/tinfo/access.c
+++ ncurses/tinfo/access.c 2020-03-09 09:17:28.753300070 +0000 +++ ncurses/tinfo/access.c 2020-08-17 08:13:47.812152071 +0000
@@ -31,6 +31,10 @@ @@ -31,6 +31,10 @@
* Author: Thomas E. Dickey * * Author: Thomas E. Dickey *
****************************************************************************/ ****************************************************************************/
@ -878,7 +896,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 2020-03-09 09:17:28.753300070 +0000 +++ ncurses/tinfo/lib_setup.c 2020-08-17 08:13:47.812152071 +0000
@@ -605,6 +605,9 @@ _nc_locale_breaks_acs(TERMINAL *termp) @@ -605,6 +605,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 */
@ -890,7 +908,7 @@
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 2020-03-09 09:17:28.753300070 +0000 +++ ncurses/tinfo/read_entry.c 2020-08-17 08:13:47.812152071 +0000
@@ -552,6 +552,7 @@ _nc_read_file_entry(const char *const fi @@ -552,6 +552,7 @@ _nc_read_file_entry(const char *const fi
FILE *fp = 0; FILE *fp = 0;
int code; int code;
@ -908,7 +926,7 @@
return (code); return (code);
} }
--- ncurses/tinfo/read_termcap.c --- ncurses/tinfo/read_termcap.c
+++ ncurses/tinfo/read_termcap.c 2020-03-09 09:17:28.753300070 +0000 +++ ncurses/tinfo/read_termcap.c 2020-08-17 08:13:47.812152071 +0000
@@ -323,14 +323,18 @@ _nc_getent( @@ -323,14 +323,18 @@ _nc_getent(
*/ */
if (fd >= 0) { if (fd >= 0) {
@ -955,7 +973,7 @@
} }
if (copied != 0) if (copied != 0)
--- progs/Makefile.in --- progs/Makefile.in
+++ progs/Makefile.in 2020-07-07 09:13:53.548391492 +0000 +++ progs/Makefile.in 2020-08-17 08:13:47.812152071 +0000
@@ -101,7 +101,7 @@ CFLAGS_LIBTOOL = $(CCFLAGS) @@ -101,7 +101,7 @@ CFLAGS_LIBTOOL = $(CCFLAGS)
CFLAGS_NORMAL = $(CCFLAGS) -DNCURSES_STATIC CFLAGS_NORMAL = $(CCFLAGS) -DNCURSES_STATIC
CFLAGS_DEBUG = $(CCFLAGS) -DNCURSES_STATIC @CC_G_OPT@ -DTRACE CFLAGS_DEBUG = $(CCFLAGS) -DNCURSES_STATIC @CC_G_OPT@ -DTRACE
@ -975,7 +993,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 2020-03-09 09:17:28.753300070 +0000 +++ test/test.priv.h 2020-08-17 08:13:47.812152071 +0000
@@ -1005,12 +1005,12 @@ extern char *_nc_strstr(const char *, co @@ -1005,12 +1005,12 @@ extern char *_nc_strstr(const char *, co
#endif #endif

38
ncurses.changes
View File

@ -1,3 +1,41 @@
-------------------------------------------------------------------
Tue Aug 18 06:44:15 UTC 2020 - Dr. Werner Fink <werner@suse.de>
- Add ncurses patch 20200817
+ reduce build-warnings by excluding ncurses-internals from deprecation
warnings.
+ mark wgetch-events feature as deprecated.
+ add definition for $(LIBS) to ncurses/Makefile.in, to simplify builds
using the string-hacks option.
+ prevent KEY_EVENT from appearing in curses.h unless the configure
option --enable-wgetch-events is used (report by Werner Fink).
-------------------------------------------------------------------
Mon Aug 17 08:08:37 UTC 2020 - Dr. Werner Fink <werner@suse.de>
- Add ncurses patch 20200816
+ amend tic/infocmp check to allow for the respective tool's absence
(report by Steve Wills, cf: 20200808).
+ improved some of the build-scripts with shellcheck
+ filter out -MT/-MD/-MTd/-MDd options in script for Visual Studio C++
(discussion with "Maarten Anonymous").
-------------------------------------------------------------------
Tue Aug 11 09:09:09 UTC 2020 - Dr. Werner Fink <werner@suse.de>
- Add ncurses patch 20200808
+ improve discussion of the system's tic utility when used as part
of cross-compiling (discussion with Keith Marshall).
+ modify configuration checks for build-time tic/infocmp to use
AC_CHECK_TOOL. That can still be overridden by --with-tic-path and
--with-infocmp-path when fallbacks are used, but even if not using
fallbacks, the improved check may help with cross-compiling
(discussion with Keith Marshall).
+ other build-fixes for Ada95 with MinGW.
+ modify Ada95 source-generation utility to write to a file given as
parameter rather than to the standard output, allowing builds with
MinGW.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Aug 3 08:36:51 UTC 2020 - Dr. Werner Fink <werner@suse.de> Mon Aug 3 08:36:51 UTC 2020 - Dr. Werner Fink <werner@suse.de>