From 99c2f2693ec16be12b0a957ceb225acfb08663d0 Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Sun, 31 May 2020 21:05:44 +0000 Subject: [PATCH] snapshot of project "ncurses", label v6_2_20200531 --- Ada95/aclocal.m4 | 6 +++--- Ada95/configure | 2 +- NEWS | 5 +++-- VERSION | 2 +- aclocal.m4 | 6 +++--- configure | 12 ++++++------ configure.in | 12 ++++++------ dist.mk | 4 ++-- ncurses/tty/hashmap.c | 4 ++-- package/debian-mingw/changelog | 4 ++-- package/debian-mingw64/changelog | 4 ++-- package/debian/changelog | 4 ++-- package/mingw-ncurses.nsi | 4 ++-- package/mingw-ncurses.spec | 2 +- package/ncurses.spec | 2 +- package/ncursest.spec | 2 +- progs/tic.c | 14 +++++++++++--- 17 files changed, 49 insertions(+), 40 deletions(-) diff --git a/Ada95/aclocal.m4 b/Ada95/aclocal.m4 index e4ce3771..24f69deb 100644 --- a/Ada95/aclocal.m4 +++ b/Ada95/aclocal.m4 @@ -29,7 +29,7 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey dnl -dnl $Id: aclocal.m4,v 1.156 2020/05/23 23:39:36 tom Exp $ +dnl $Id: aclocal.m4,v 1.157 2020/05/31 20:52:36 tom Exp $ dnl Macros used in NCURSES Ada95 auto-configuration script. dnl dnl These macros are maintained separately from NCURSES. The copyright on @@ -1421,7 +1421,7 @@ test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS" AC_SUBST(GNATPREP_OPTS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GNAT_GENERICS version: 4 updated: 2019/12/31 08:53:54 +dnl CF_GNAT_GENERICS version: 5 updated: 2020/05/31 16:49:35 dnl ---------------- AC_DEFUN([CF_GNAT_GENERICS], [ @@ -1429,7 +1429,7 @@ AC_REQUIRE([CF_GNAT_VERSION]) AC_MSG_CHECKING(if GNAT supports generics) case $cf_cv_gnat_version in -(3.[[1-9]]*|[[4-9]].*) +(3.[[1-9]]*|[[4-9]].*|[[1-9]][[0-9]].*) cf_gnat_generics=yes ;; (*) diff --git a/Ada95/configure b/Ada95/configure index 1b18acd8..61a921f1 100755 --- a/Ada95/configure +++ b/Ada95/configure @@ -16670,7 +16670,7 @@ test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS" echo "$as_me:16670: checking if GNAT supports generics" >&5 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6 case $cf_cv_gnat_version in -(3.[1-9]*|[4-9].*) +(3.[1-9]*|[4-9].*|[1-9][0-9].*) cf_gnat_generics=yes ;; (*) diff --git a/NEWS b/NEWS index 7f1e9936..07434fa2 100644 --- a/NEWS +++ b/NEWS @@ -26,7 +26,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: NEWS,v 1.3500 2020/05/30 21:37:01 tom Exp $ +-- $Id: NEWS,v 1.3502 2020/05/31 19:41:31 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -46,7 +46,8 @@ See the AUTHORS file for the corresponding full names. Changes through 1.9.9e did not credit all contributions; it is not possible to add this information. -20200530 +20200531 + + correct configure version-check/warnng for g++ to allow for 10.x + re-enable "bel" in konsole-base (report by Nia Huang) + add linux-s entry (patch by Alexandre Montaron). + drop long-obsolete convert_configure.pl diff --git a/VERSION b/VERSION index 6aceb3c1..18172f0c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5:0:10 6.2 20200530 +5:0:10 6.2 20200531 diff --git a/aclocal.m4 b/aclocal.m4 index ba09e6e9..09260c46 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -29,7 +29,7 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey 1995-on dnl -dnl $Id: aclocal.m4,v 1.913 2020/05/23 23:46:10 tom Exp $ +dnl $Id: aclocal.m4,v 1.914 2020/05/31 20:50:13 tom Exp $ dnl Macros used in NCURSES auto-configuration script. dnl dnl These macros are maintained separately from NCURSES. The copyright on @@ -2811,7 +2811,7 @@ test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS" AC_SUBST(GNATPREP_OPTS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GNAT_GENERICS version: 4 updated: 2019/12/31 08:53:54 +dnl CF_GNAT_GENERICS version: 5 updated: 2020/05/31 16:49:35 dnl ---------------- AC_DEFUN([CF_GNAT_GENERICS], [ @@ -2819,7 +2819,7 @@ AC_REQUIRE([CF_GNAT_VERSION]) AC_MSG_CHECKING(if GNAT supports generics) case $cf_cv_gnat_version in -(3.[[1-9]]*|[[4-9]].*) +(3.[[1-9]]*|[[4-9]].*|[[1-9]][[0-9]].*) cf_gnat_generics=yes ;; (*) diff --git a/configure b/configure index 6aae31dc..b3b29cef 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.708 . +# From configure.in Revision: 1.709 . # Guess values for system-dependent variables and create Makefiles. # Generated by Autoconf 2.52.20200111. # @@ -3355,9 +3355,9 @@ echo "${ECHO_T}$GXX_VERSION" >&6 fi case $GXX_VERSION in -(1*|2.[0-6]*) - # GXX=""; CXX=""; ac_cv_prog_gxx=no - # cf_cxx_library=no +([1-9][0-9].*) + ;; +(1.*|2.[0-6]*) { echo "$as_me:3361: WARNING: templates do not work" >&5 echo "$as_me: WARNING: templates do not work" >&2;} ;; @@ -23567,7 +23567,7 @@ echo "${ECHO_T}no" >&6 fi case $GXX_VERSION in - (1*|2.0-6*) + (1.*|2.[0-6]*|[1-9][0-9].*) cf_cxx_library=yes ;; (*-2.7*|2.7*) @@ -24971,7 +24971,7 @@ test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS" echo "$as_me:24971: checking if GNAT supports generics" >&5 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6 case $cf_cv_gnat_version in -(3.[1-9]*|[4-9].*) +(3.[1-9]*|[4-9].*|[1-9][0-9].*) cf_gnat_generics=yes ;; (*) diff --git a/configure.in b/configure.in index f06cc79d..7454c9ae 100644 --- a/configure.in +++ b/configure.in @@ -29,7 +29,7 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey 1995-on dnl -dnl $Id: configure.in,v 1.708 2020/05/30 00:11:31 tom Exp $ +dnl $Id: configure.in,v 1.709 2020/05/31 20:04:09 tom Exp $ dnl Process this file with autoconf to produce a configure script. dnl dnl For additional information, see @@ -38,7 +38,7 @@ dnl https://invisible-island.net/autoconf/my-autoconf.html dnl dnl --------------------------------------------------------------------------- AC_PREREQ(2.52.20200111) -AC_REVISION($Revision: 1.708 $) +AC_REVISION($Revision: 1.709 $) AC_INIT(ncurses/base/lib_initscr.c) AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin) @@ -145,9 +145,9 @@ fi CF_GXX_VERSION case $GXX_VERSION in -(1*|2.[[0-6]]*) - # GXX=""; CXX=""; ac_cv_prog_gxx=no - # cf_cxx_library=no +([[1-9]][[0-9]].*) + ;; +(1.*|2.[[0-6]]*) AC_MSG_WARN(templates do not work) ;; esac @@ -1849,7 +1849,7 @@ if test -n "$CXX" ; then CF_PROG_CC_C_O(CXX,[$CXXFLAGS $CPPFLAGS]) case $GXX_VERSION in - (1*|2.[0-6]*) + (1.*|2.[[0-6]]*|[[1-9]][[0-9]].*) cf_cxx_library=yes ;; (*-2.7*|2.7*) diff --git a/dist.mk b/dist.mk index 4362d648..6bfdbd5e 100644 --- a/dist.mk +++ b/dist.mk @@ -26,7 +26,7 @@ # use or other dealings in this Software without prior written # # authorization. # ############################################################################## -# $Id: dist.mk,v 1.1353 2020/05/30 12:52:31 tom Exp $ +# $Id: dist.mk,v 1.1354 2020/05/31 18:56:59 tom Exp $ # Makefile for creating ncurses distributions. # # This only needs to be used directly as a makefile by developers, but @@ -38,7 +38,7 @@ SHELL = /bin/sh # These define the major/minor/patch versions of ncurses. NCURSES_MAJOR = 6 NCURSES_MINOR = 2 -NCURSES_PATCH = 20200530 +NCURSES_PATCH = 20200531 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) diff --git a/ncurses/tty/hashmap.c b/ncurses/tty/hashmap.c index 9d1e482b..3f124c96 100644 --- a/ncurses/tty/hashmap.c +++ b/ncurses/tty/hashmap.c @@ -74,7 +74,7 @@ AUTHOR #define CUR SP_TERMTYPE #endif -MODULE_ID("$Id: hashmap.c,v 1.68 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: hashmap.c,v 1.69 2020/05/31 17:50:48 tom Exp $") #ifdef HASHDEBUG @@ -88,7 +88,7 @@ MODULE_ID("$Id: hashmap.c,v 1.68 2020/02/02 23:34:34 tom Exp $") # undef screen_lines # define screen_lines(sp) MAXLINES # define TEXTWIDTH(sp) 1 -int oldnums[MAXLINES], reallines[MAXLINES]; +static int oldnums[MAXLINES], reallines[MAXLINES]; static NCURSES_CH_T oldtext[MAXLINES][TEXTWIDTH(sp)]; static NCURSES_CH_T newtext[MAXLINES][TEXTWIDTH(sp)]; # define OLDNUM(sp,n) oldnums[n] diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog index 91dec12c..7a9d961d 100644 --- a/package/debian-mingw/changelog +++ b/package/debian-mingw/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.2+20200530) unstable; urgency=low +ncurses6 (6.2+20200531) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Fri, 29 May 2020 18:52:31 -0400 + -- Thomas E. Dickey Sun, 31 May 2020 14:56:59 -0400 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog index 91dec12c..7a9d961d 100644 --- a/package/debian-mingw64/changelog +++ b/package/debian-mingw64/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.2+20200530) unstable; urgency=low +ncurses6 (6.2+20200531) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Fri, 29 May 2020 18:52:31 -0400 + -- Thomas E. Dickey Sun, 31 May 2020 14:56:59 -0400 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian/changelog b/package/debian/changelog index b7f11591..843c49b8 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.2+20200530) unstable; urgency=low +ncurses6 (6.2+20200531) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Fri, 29 May 2020 18:52:31 -0400 + -- Thomas E. Dickey Sun, 31 May 2020 14:56:59 -0400 ncurses6 (5.9-20120608) unstable; urgency=low diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi index a9c01f42..ce1de07c 100644 --- a/package/mingw-ncurses.nsi +++ b/package/mingw-ncurses.nsi @@ -1,4 +1,4 @@ -; $Id: mingw-ncurses.nsi,v 1.397 2020/05/29 22:52:31 tom Exp $ +; $Id: mingw-ncurses.nsi,v 1.398 2020/05/31 18:56:59 tom Exp $ ; TODO add examples ; TODO bump ABI to 6 @@ -10,7 +10,7 @@ !define VERSION_MAJOR "6" !define VERSION_MINOR "2" !define VERSION_YYYY "2020" -!define VERSION_MMDD "0530" +!define VERSION_MMDD "0531" !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} !define MY_ABI "5" diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec index d060c5e6..cefaa9b4 100644 --- a/package/mingw-ncurses.spec +++ b/package/mingw-ncurses.spec @@ -3,7 +3,7 @@ Summary: shared libraries for terminal handling Name: mingw32-ncurses6 Version: 6.2 -Release: 20200530 +Release: 20200531 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncurses.spec b/package/ncurses.spec index dfabc61b..32bc053c 100644 --- a/package/ncurses.spec +++ b/package/ncurses.spec @@ -1,7 +1,7 @@ Summary: shared libraries for terminal handling Name: ncurses6 Version: 6.2 -Release: 20200530 +Release: 20200531 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncursest.spec b/package/ncursest.spec index 93d74a30..b3c4bff1 100644 --- a/package/ncursest.spec +++ b/package/ncursest.spec @@ -1,7 +1,7 @@ Summary: Curses library with POSIX thread support. Name: ncursest6 Version: 6.2 -Release: 20200530 +Release: 20200531 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/progs/tic.c b/progs/tic.c index 052b0304..ae172ece 100644 --- a/progs/tic.c +++ b/progs/tic.c @@ -49,7 +49,7 @@ #include #include -MODULE_ID("$Id: tic.c,v 1.285 2020/05/31 00:12:39 tom Exp $") +MODULE_ID("$Id: tic.c,v 1.286 2020/05/31 21:05:44 tom Exp $") #define STDIN_NAME "" @@ -1179,6 +1179,14 @@ check_acs(TERMTYPE2 *tp) } } +static char * +safe_strdup(const char *value) +{ + if (value == NULL) + value = ""; + return strdup(value); +} + static bool same_color(NCURSES_CONST char *oldcap, NCURSES_CONST char *newcap, int limit) { @@ -1189,8 +1197,8 @@ same_color(NCURSES_CONST char *oldcap, NCURSES_CONST char *newcap, int limit) int n; int same; for (n = same = 0; n < limit; ++n) { - char *oldvalue = strdup(TIPARM_1(oldcap, n)); - char *newvalue = strdup(TIPARM_1(newcap, n)); + char *oldvalue = safe_strdup(TIPARM_1(oldcap, n)); + char *newvalue = safe_strdup(TIPARM_1(newcap, n)); same += !strcmp(oldvalue, newvalue); free(oldvalue); free(newvalue);