From d8d029ed8d2793e679c2b247620ea5e2e9d6144b Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Sun, 10 Mar 2024 00:28:08 +0000 Subject: [PATCH] ncurses 6.4 - patch 20240309 + modify xgterm to work around line-drawing bug -TD + use CSI 3J in vte-2017 (report by Sven Joachim) --- NEWS | 6 +++++- VERSION | 2 +- dist.mk | 4 ++-- misc/terminfo.src | 18 +++++++++++++----- 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 +- 11 files changed, 32 insertions(+), 20 deletions(-) diff --git a/NEWS b/NEWS index 75b4bf1f..710de1b8 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.4089 2024/03/02 20:47:38 tom Exp $ +-- $Id: NEWS,v 1.4091 2024/03/09 22:33:41 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. +20240309 + + modify xgterm to work around line-drawing bug -TD + + use CSI 3J in vte-2017 (report by Sven Joachim) + 20240302 + add configure check for MB_LEN_MAX, to provide warning as needed. + improve formatting/style of manpages (patches by Branden Robinson). diff --git a/VERSION b/VERSION index 6269f3b7..89ea57d3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5:0:10 6.4 20240302 +5:0:10 6.4 20240309 diff --git a/dist.mk b/dist.mk index 8cd1e5e8..510fc519 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.1600 2024/03/02 11:13:41 tom Exp $ +# $Id: dist.mk,v 1.1601 2024/03/09 13:05:08 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 = 4 -NCURSES_PATCH = 20240302 +NCURSES_PATCH = 20240309 # 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 182b8936..5d575b8e 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.1140 $ -# $Date: 2024/02/11 20:09:01 $ +# $Revision: 1.1143 $ +# $Date: 2024/03/09 20:01:40 $ # # 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 @@ -6037,7 +6037,11 @@ color_xterm|cx|cx100|color_xterm color terminal emulator for X, # does nothing with those, even after installing the app-defaults file which # was overlooked by the Debian packager. xgterm|graphic terminal for IRAF, - use=xterm+acs, use=xterm-r5, use=xterm+keypad, + enacs=\E(B\E)0, rmacs=^O, + sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m%?%p9%t + \016%e\017%;, + sgr0=\E[m\017, smacs=^N, use=xterm+acs, use=xterm-r5, + use=xterm+keypad, # The 'nxterm' distributed with Redhat Linux 5.2 is a slight rehack of # xterm-sb_right-ansi-3d, which implements ANSI colors, but does not support @@ -6248,7 +6252,7 @@ vte-2014|VTE 0.35.1, # As of January 2018, this was the most recent release, # e.g., with gnome-terminal 3.26.2 vte-2017|VTE 0.50.2, - use=ecma+strikeout, use=vte-2014, + E3=\E[3J, use=ecma+strikeout, use=vte-2014, # VTE 0.51.2 and gnome-terminal 3.28.2 copied a feature from KovId's TTY # late in 2017 for changing the appearance of underlines, which was @@ -27498,8 +27502,12 @@ v3220|LANPAR Vision II model 3220/3221/3222, # to trim -TD # + NetBSD-related fixes for x68k and wsvt52 (patch by Thomas Klausner) # -# 2024-02011 +# 2024-02-11 # + add vt100+noapp, vt100+noapp+pc, xterm+app+pc, xterm+decedit from # xterm #389 -TD # +# 2024-03-09 +# + modify xgterm to work around line-drawing bug -TD +# + use CSI 3J in vte-2017 (report by Sven Joachim) +# ######## SHANTIH! SHANTIH! SHANTIH! diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog index 6b728409..9bdf9389 100644 --- a/package/debian-mingw/changelog +++ b/package/debian-mingw/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.4+20240302) unstable; urgency=low +ncurses6 (6.4+20240309) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 02 Mar 2024 06:13:41 -0500 + -- Thomas E. Dickey Sat, 09 Mar 2024 08:05:08 -0500 ncurses6 (5.9+20131005) unstable; urgency=low diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog index 6b728409..9bdf9389 100644 --- a/package/debian-mingw64/changelog +++ b/package/debian-mingw64/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.4+20240302) unstable; urgency=low +ncurses6 (6.4+20240309) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 02 Mar 2024 06:13:41 -0500 + -- Thomas E. Dickey Sat, 09 Mar 2024 08:05:08 -0500 ncurses6 (5.9+20131005) unstable; urgency=low diff --git a/package/debian/changelog b/package/debian/changelog index 0ba1f2db..7343f67d 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.4+20240302) unstable; urgency=low +ncurses6 (6.4+20240309) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 02 Mar 2024 06:13:41 -0500 + -- Thomas E. Dickey Sat, 09 Mar 2024 08:05:08 -0500 ncurses6 (5.9+20120608) unstable; urgency=low diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi index 710d81a5..31776381 100644 --- a/package/mingw-ncurses.nsi +++ b/package/mingw-ncurses.nsi @@ -1,4 +1,4 @@ -; $Id: mingw-ncurses.nsi,v 1.635 2024/03/02 11:13:41 tom Exp $ +; $Id: mingw-ncurses.nsi,v 1.636 2024/03/09 13:05:08 tom Exp $ ; TODO add examples ; TODO bump ABI to 6 @@ -10,7 +10,7 @@ !define VERSION_MAJOR "6" !define VERSION_MINOR "4" !define VERSION_YYYY "2024" -!define VERSION_MMDD "0302" +!define VERSION_MMDD "0309" !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} !define MY_ABI "5" diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec index 0c5a4a16..22d7abf6 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.4 -Release: 20240302 +Release: 20240309 License: X11 Group: Development/Libraries URL: https://invisible-island.net/ncurses/ diff --git a/package/ncurses.spec b/package/ncurses.spec index 29163b35..2203a077 100644 --- a/package/ncurses.spec +++ b/package/ncurses.spec @@ -1,7 +1,7 @@ Summary: shared libraries for terminal handling Name: ncurses6 Version: 6.4 -Release: 20240302 +Release: 20240309 License: X11 Group: Development/Libraries URL: https://invisible-island.net/ncurses/ diff --git a/package/ncursest.spec b/package/ncursest.spec index 5fb77d73..5b35f300 100644 --- a/package/ncursest.spec +++ b/package/ncursest.spec @@ -1,7 +1,7 @@ Summary: Curses library with POSIX thread support. Name: ncursest6 Version: 6.4 -Release: 20240302 +Release: 20240309 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz -- 2.45.0