From a28e782d7794ddeec23e7cb212dc455f0d93dc22 Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Mon, 28 Dec 2020 01:11:44 +0000 Subject: [PATCH] ncurses 6.2 - patch 20201227 + update terminology entry to 1.8.1 -TD + fix some compiler-warnings which gcc8 reports incorrectly. --- NEWS | 6 +++++- VERSION | 2 +- dist.mk | 4 ++-- misc/terminfo.src | 33 +++++++++++++++++++++++++++++--- 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 +- panel/p_delete.c | 6 +++--- panel/p_new.c | 16 ++++++++-------- progs/dump_entry.c | 6 +++--- test/demo_defkey.c | 6 +++--- test/picsmap.c | 4 ++-- test/tclock.c | 4 ++-- test/tracemunch | 4 +++- 18 files changed, 73 insertions(+), 40 deletions(-) diff --git a/NEWS b/NEWS index d58c2c1c..8eb99de7 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.3608 2020/12/19 23:57:59 tom Exp $ +-- $Id: NEWS,v 1.3610 2020/12/27 23:49:02 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -46,6 +46,10 @@ 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. +20201227 + + update terminology entry to 1.8.1 -TD + + fix some compiler-warnings which gcc8 reports incorrectly. + 20201219 + suppress hyphenation in generated html for manpages, to address regression in upgrade of groff 1.22.2 to 1.22.3. diff --git a/VERSION b/VERSION index 0eb92632..b1ea8743 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5:0:10 6.2 20201219 +5:0:10 6.2 20201227 diff --git a/dist.mk b/dist.mk index 9503a8b6..f7525de2 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.1391 2020/12/19 23:48:33 tom Exp $ +# $Id: dist.mk,v 1.1393 2020/12/27 23:48:19 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 = 20201219 +NCURSES_PATCH = 20201227 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) diff --git a/misc/terminfo.src b/misc/terminfo.src index 3afb57e8..3b683c65 100644 --- a/misc/terminfo.src +++ b/misc/terminfo.src @@ -6,8 +6,8 @@ # Report bugs and new terminal descriptions to # bug-ncurses@gnu.org # -# $Revision: 1.835 $ -# $Date: 2020/12/05 16:54:21 $ +# $Revision: 1.840 $ +# $Date: 2020/12/28 00:40:10 $ # # The original header is preserved below for reference. It is noted that there # is a "newer" version which differs in some cosmetic details (but actually @@ -6957,6 +6957,7 @@ terminator|Terminator no line wrap, #### TERMINOLOGY # https://www.enlightenment.org/about-terminology # +# 2014/10/14: # Tested terminology-0.3.0, 0.6.1, using tack and vttest. This is not a vt100 # emulator, nor is it compatible with xterm, but it uses a few features from # both -TD @@ -7020,6 +7021,7 @@ terminology-0.6.1|EFL-based terminal emulator, kRIT7=\E[1;7C, kUP=\E[1;2A, use=xterm+pcf0, use=vt100, use=xterm+256setaf, +# 2017-11-11 # Tested terminology 1.0.0 # # tack - @@ -7043,8 +7045,30 @@ terminology-1.0.0|EFL-based terminal emulator, use=xterm+x11mouse, use=xterm+pce2, use=xterm+pcf2, use=xterm+pcc2, use=terminology-0.6.1, +# 2020/12/26: +# Tested terminology 1.8.1 using tack and vttest. +# tack - +# flash does not work +# italics and crossed-out text work +# no meta mode +# vttest - +# DA1 says this is a VT420 with with 132 columns, NRCS, horizontal scrolling +# DA2 says this is a VT510, version 33.7 +# NRCS does not work, program hangs in the locking shift test. +# some of the VT420 rectangle operations work +# left/right margins do not work +# most of DECSCUSR works +# most problems with bce are fixed. +terminology-1.8.1|EFL-based terminal emulator, + km@, + cvvis@, flash@, initc@, kcbt=\E[Z, rmm@, smm@, Ms@, + use=ecma+index, use=xterm+256setaf, use=ansi+rep, + use=ecma+strikeout, use=xterm+sm+1006, + use=xterm+pcfkeys, use=xterm+tmux, use=xterm-basic, + use=ecma+italics, use=xterm-basic, + terminology|EFL-based terminal emulator, - use=terminology-1.0.0, + use=terminology-1.8.1, ######## OPENGL CLIENTS @@ -26751,4 +26775,7 @@ v3220|LANPAR Vision II model 3220/3221/3222, # + correct mlterm3 kf1-kf4 (Debian #975322) -TD # + add flash to mlterm3 -TD # +# 2020-12-27 +# + update terminology to 1.8.1 -TD +# ######## SHANTIH! SHANTIH! SHANTIH! diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog index c51335f3..ee47719d 100644 --- a/package/debian-mingw/changelog +++ b/package/debian-mingw/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.2+20201219) unstable; urgency=low +ncurses6 (6.2+20201227) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 19 Dec 2020 05:58:49 -0500 + -- Thomas E. Dickey Sun, 27 Dec 2020 18:48:19 -0500 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog index c51335f3..ee47719d 100644 --- a/package/debian-mingw64/changelog +++ b/package/debian-mingw64/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.2+20201219) unstable; urgency=low +ncurses6 (6.2+20201227) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 19 Dec 2020 05:58:49 -0500 + -- Thomas E. Dickey Sun, 27 Dec 2020 18:48:19 -0500 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian/changelog b/package/debian/changelog index 41e7ebef..2e8cfdf9 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.2+20201219) unstable; urgency=low +ncurses6 (6.2+20201227) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 19 Dec 2020 05:58:49 -0500 + -- Thomas E. Dickey Sun, 27 Dec 2020 18:48:19 -0500 ncurses6 (5.9-20120608) unstable; urgency=low diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi index af6d9d1e..d8eb402d 100644 --- a/package/mingw-ncurses.nsi +++ b/package/mingw-ncurses.nsi @@ -1,4 +1,4 @@ -; $Id: mingw-ncurses.nsi,v 1.434 2020/12/19 10:58:49 tom Exp $ +; $Id: mingw-ncurses.nsi,v 1.436 2020/12/27 23:48:19 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 "1219" +!define VERSION_MMDD "1227" !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} !define MY_ABI "5" diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec index 1daa90bf..36cc6df4 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: 20201219 +Release: 20201227 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncurses.spec b/package/ncurses.spec index 7f858b0a..c0e1642c 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: 20201219 +Release: 20201227 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncursest.spec b/package/ncursest.spec index b2d1334e..f3d7d66c 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: 20201219 +Release: 20201227 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/panel/p_delete.c b/panel/p_delete.c index d6a4f5d7..da3dcdf9 100644 --- a/panel/p_delete.c +++ b/panel/p_delete.c @@ -38,10 +38,10 @@ */ #include "panel.priv.h" -MODULE_ID("$Id: p_delete.c,v 1.16 2020/09/26 23:58:55 tom Exp $") +MODULE_ID("$Id: p_delete.c,v 1.17 2020/12/26 18:25:34 tom Exp $") PANEL_EXPORT(int) -del_panel(PANEL * pan) +del_panel(PANEL *pan) { int err = OK; @@ -51,7 +51,7 @@ del_panel(PANEL * pan) GetHook(pan); HIDE_PANEL(pan, err, OK); dBug(("...discard ptr=%s", USER_PTR(pan->user, 1))); - dBug(("...deleted pan=%p", pan)); + dBug(("...deleted pan=%p", (void *)pan)); free((void *)pan); } else diff --git a/panel/p_new.c b/panel/p_new.c index 76f190a0..a7c5a4e2 100644 --- a/panel/p_new.c +++ b/panel/p_new.c @@ -39,7 +39,7 @@ */ #include "panel.priv.h" -MODULE_ID("$Id: p_new.c,v 1.21 2020/09/26 19:35:49 tom Exp $") +MODULE_ID("$Id: p_new.c,v 1.22 2020/12/26 18:25:48 tom Exp $") #ifdef TRACE static char *stdscr_id; @@ -50,7 +50,7 @@ AllocPanel(const char *name) { PANEL *result = typeMalloc(PANEL, 1); - _tracef("create :%s %p", name, result); + _tracef("create :%s %p", name, (void *)result); return result; } #define InitUser(name) \ @@ -78,7 +78,7 @@ root_panel(NCURSES_SP_DCL0) struct panelhook *ph = _nc_panelhook(); #endif - if (_nc_stdscr_pseudo_panel == (PANEL *) 0) + if (_nc_stdscr_pseudo_panel == (PANEL *)0) { assert(SP_PARM && SP_PARM->_stdscr && !_nc_bottom_panel && !_nc_top_panel); @@ -92,8 +92,8 @@ root_panel(NCURSES_SP_DCL0) WINDOW *win = SP_PARM->_stdscr; pan->win = win; - pan->below = (PANEL *) 0; - pan->above = (PANEL *) 0; + pan->below = (PANEL *)0; + pan->above = (PANEL *)0; InitUser(stdscr); _nc_bottom_panel = _nc_top_panel = pan; } @@ -104,7 +104,7 @@ root_panel(NCURSES_SP_DCL0) PANEL_EXPORT(PANEL *) new_panel(WINDOW *win) { - PANEL *pan = (PANEL *) 0; + PANEL *pan = (PANEL *)0; GetWindowHook(win); @@ -120,8 +120,8 @@ new_panel(WINDOW *win) if (!(win->_flags & _ISPAD) && (pan = AllocPanel("new_panel"))) { pan->win = win; - pan->above = (PANEL *) 0; - pan->below = (PANEL *) 0; + pan->above = (PANEL *)0; + pan->below = (PANEL *)0; InitUser(new); (void)show_panel(pan); } diff --git a/progs/dump_entry.c b/progs/dump_entry.c index 4d3bb142..75bbe059 100644 --- a/progs/dump_entry.c +++ b/progs/dump_entry.c @@ -40,7 +40,7 @@ #include "termsort.c" /* this C file is generated */ #include /* so is this */ -MODULE_ID("$Id: dump_entry.c,v 1.180 2020/11/14 18:18:13 tom Exp $") +MODULE_ID("$Id: dump_entry.c,v 1.181 2020/12/26 18:25:18 tom Exp $") #define DISCARD(string) string = ABSENT_STRING #define PRINTF (void) printf @@ -1347,7 +1347,7 @@ kill_labels(TERMTYPE2 *tterm, int target) int n; int result = 0; char *cap; - char name[10]; + char name[20]; for (n = 0; n <= 10; ++n) { _nc_SPRINTF(name, _nc_SLIMIT(sizeof(name)) "lf%d", n); @@ -1373,7 +1373,7 @@ kill_fkeys(TERMTYPE2 *tterm, int target) int n; int result = 0; char *cap; - char name[10]; + char name[20]; for (n = 60; n >= 0; --n) { _nc_SPRINTF(name, _nc_SLIMIT(sizeof(name)) "kf%d", n); diff --git a/test/demo_defkey.c b/test/demo_defkey.c index ea6c5222..afe10293 100644 --- a/test/demo_defkey.c +++ b/test/demo_defkey.c @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: demo_defkey.c,v 1.30 2020/02/02 23:34:34 tom Exp $ + * $Id: demo_defkey.c,v 1.31 2020/12/26 17:55:13 tom Exp $ * * Demonstrate the define_key() function. * Thomas Dickey - 2002/11/23 @@ -74,7 +74,7 @@ log_last_line(WINDOW *win) static char * visichar(int ch) { - static char temp[10]; + static char temp[20]; ch = UChar(ch); assert(ch >= 0 && ch < 256); @@ -242,7 +242,7 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) * keypad() initializes the corresponding data. */ for (n = 0; n < 12; ++n) { - char name[10]; + char name[20]; _nc_SPRINTF(name, _nc_SLIMIT(sizeof(name)) "kf%d", n + 1); fkeys[n] = tigetstr(name); } diff --git a/test/picsmap.c b/test/picsmap.c index 3c4eb697..a2e4c430 100644 --- a/test/picsmap.c +++ b/test/picsmap.c @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: picsmap.c,v 1.134 2020/07/11 23:01:49 tom Exp $ + * $Id: picsmap.c,v 1.135 2020/12/26 18:04:03 tom Exp $ * * Author: Thomas E. Dickey * @@ -1612,7 +1612,7 @@ report_colors(PICS_HEAD * pics) for (k = 0; k < wide; ++k) { int n = j + (k * high); size_t want = (sizeof(buffer) - (size_t) (s - buffer)); - if (want < 100) + if (want < 100 || want >= sizeof(buffer)) break; if (n >= pics->colors) break; diff --git a/test/tclock.c b/test/tclock.c index 6460c314..71da53af 100644 --- a/test/tclock.c +++ b/test/tclock.c @@ -1,4 +1,4 @@ -/* $Id: tclock.c,v 1.41 2020/01/18 16:46:35 tom Exp $ */ +/* $Id: tclock.c,v 1.42 2020/12/26 17:56:36 tom Exp $ */ #define NEED_TIME_H #include @@ -140,7 +140,7 @@ main(int argc, char *argv[]) bool odd = FALSE; time_t tim; struct tm *t; - char szChar[10]; + char szChar[20]; char *text; short my_bg = COLOR_BLACK; #if HAVE_GETTIMEOFDAY diff --git a/test/tracemunch b/test/tracemunch index a8ba223e..13a3b647 100755 --- a/test/tracemunch +++ b/test/tracemunch @@ -1,5 +1,5 @@ #!/usr/bin/env perl -# $Id: tracemunch,v 1.32 2020/09/26 19:40:55 tom Exp $ +# $Id: tracemunch,v 1.33 2020/12/26 23:56:50 tom Exp $ ############################################################################## # Copyright 2018-2019,2020 Thomas E. Dickey # # Copyright 1998-2005,2017 Free Software Foundation, Inc. # @@ -511,6 +511,8 @@ sub muncher($) { CLASSIFY: { + next unless $_; + # just in case someone tries a file with cr/lf line-endings: $_ =~ s/\r\n/\n/g; $_ =~ s/\r/\n/g; -- 2.44.0