From af3d7473f8e3b9023bfec15ec03b080e8a81feea28d4b86872043166aa34d7e4 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 18 Aug 2020 07:05:39 +0000 Subject: [PATCH] ncurses-6.2-20200817 OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=501 --- ncurses-6.2-patches.tar.bz2 | 4 +- ncurses-6.2.dif | 90 ++++++++++++++++++++++--------------- ncurses.changes | 38 ++++++++++++++++ 3 files changed, 94 insertions(+), 38 deletions(-) diff --git a/ncurses-6.2-patches.tar.bz2 b/ncurses-6.2-patches.tar.bz2 index 92fa0c8..95d21a8 100644 --- a/ncurses-6.2-patches.tar.bz2 +++ b/ncurses-6.2-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:12f41b197259a24d17e0f64d77a74c17c47a84dcba669f89acc6370120330a53 -size 654391 +oid sha256:2adb671bd9d12831cbee6b3532d5e2690bda68a057e7776b200cace56f08e600 +size 732276 diff --git a/ncurses-6.2.dif b/ncurses-6.2.dif index 4945f3c..355c827 100644 --- a/ncurses-6.2.dif +++ b/ncurses-6.2.dif @@ -11,17 +11,17 @@ ncurses/Makefile.in | 2 ncurses/curses.priv.h | 2 ncurses/run_cmd.sh | 11 +++ - ncurses/tinfo/MKfallback.sh | 6 + + ncurses/tinfo/MKfallback.sh | 10 ++- ncurses/tinfo/access.c | 28 ++++++++ ncurses/tinfo/lib_setup.c | 3 ncurses/tinfo/read_entry.c | 2 ncurses/tinfo/read_termcap.c | 21 ++++-- progs/Makefile.in | 4 - test/test.priv.h | 4 - - 19 files changed, 248 insertions(+), 77 deletions(-) + 19 files changed, 250 insertions(+), 79 deletions(-) --- 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]) AC_CACHE_VAL(cf_cv_type_of_bool,[ rm -f cf_test.out @@ -150,7 +150,7 @@ esac done --- 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 fi ;; @@ -160,7 +160,7 @@ ;; (openbsd[2-9].*|mirbsd*) LD_RPATH_OPT="-Wl,-rpath," -@@ -14232,12 +14232,15 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <\$TMP CF_EOF if test -n "$cf_compress" ; then -@@ -14362,9 +14365,9 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <$@ -+ $(SHELL) -e $(srcdir)/run_cmd.sh $(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) >$@ ./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 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 extern NCURSES_EXPORT(char *) _nc_tracemouse (SCREEN *, MEVENT const *); 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_getenv_num (const char *); --- 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 @@ +#!/bin/sh + @@ -819,22 +819,40 @@ + +exec ${1+"$@"} --- ncurses/tinfo/MKfallback.sh -+++ ncurses/tinfo/MKfallback.sh 2020-03-09 09:17:28.753300070 +0000 -@@ -72,6 +72,12 @@ else ++++ ncurses/tinfo/MKfallback.sh 2020-08-17 08:33:39.543183822 +0000 +@@ -74,6 +74,12 @@ else tmp_info= fi +if test -n "$TERMINFO" -a -d "$TERMINFO" ; then -+ infocmp_path="$infocmp_path -v1 -A $TERMINFO" ++ infocmp_args="-v1 -A $TERMINFO" +else -+ infocmp_path="$infocmp_path -v1" ++ infocmp_args="-v1" +fi + cat </NCURSES_INT2/g' ++ "$infocmp_path" $infocmp_args -E "$x" | sed -e 's/\/NCURSES_INT2/g' + done + + cat <= 0) { result = value; /* use extension feature */ @@ -890,7 +908,7 @@ result = 1; /* always broken */ } else if (strstr(env, "screen") != 0 --- 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 FILE *fp = 0; int code; @@ -908,7 +926,7 @@ return (code); } --- 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( */ if (fd >= 0) { @@ -955,7 +973,7 @@ } if (copied != 0) --- 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) CFLAGS_NORMAL = $(CCFLAGS) -DNCURSES_STATIC CFLAGS_DEBUG = $(CCFLAGS) -DNCURSES_STATIC @CC_G_OPT@ -DTRACE @@ -975,7 +993,7 @@ LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@) --- 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 #endif diff --git a/ncurses.changes b/ncurses.changes index b427aae..072e44c 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,41 @@ +------------------------------------------------------------------- +Tue Aug 18 06:44:15 UTC 2020 - Dr. Werner Fink + +- 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 + +- 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 + +- 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