snapshot of project "ncurses", label v6_5_20251129

This commit is contained in:
Thomas E. Dickey 2025-11-29 23:45:48 +00:00
parent 61c6a3aadb
commit 7c06cbacd7
No known key found for this signature in database
GPG Key ID: CC2AF4472167BE03
17 changed files with 47 additions and 38 deletions

5
NEWS
View File

@ -26,7 +26,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
-- $Id: NEWS,v 1.4374 2025/11/23 19:13:18 tom Exp $
-- $Id: NEWS,v 1.4376 2025/11/29 19:07:52 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
@ -46,6 +46,9 @@ 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.
20251129
+ in-progress work to merge MinGW/Windows port.
20251123
+ revert change using NCURSES_SBOOL in tic.h which interfered with
sign-extension in tigetflag (Debian #1121191, cf: 20251101).

View File

@ -1 +1 @@
5:0:10 6.5 20251123
5:0:10 6.5 20251129

View File

@ -26,7 +26,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
# $Id: dist.mk,v 1.1701 2025/11/23 18:59:57 tom Exp $
# $Id: dist.mk,v 1.1702 2025/11/29 10:26:45 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 = 5
NCURSES_PATCH = 20251123
NCURSES_PATCH = 20251129
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)

View File

@ -35,7 +35,7 @@
****************************************************************************/
/*
* $Id: curses.priv.h,v 1.732 2025/11/16 16:08:54 tom Exp $
* $Id: curses.priv.h,v 1.733 2025/11/29 16:17:08 tom Exp $
*
* curses.priv.h
*
@ -90,7 +90,7 @@ extern int errno;
/* Some Windows related defines */
#undef _NC_WINDOWS
#if (defined(_WIN32) || defined(_WIN64__) || defined(__MSYS__) || defined(__CYGWIN__))
#if (defined(_WIN32) || defined(_WIN64__) || defined(__MSYS__))
#define _NC_WINDOWS
#else
#undef EXP_WIN32_DRIVER

View File

@ -39,7 +39,7 @@
#define TTY int /* FIXME: TTY originalMode */
#include <curses.priv.h>
MODULE_ID("$Id: lib_win32con.c,v 1.43 2025/10/18 19:18:29 tom Exp $")
MODULE_ID("$Id: lib_win32con.c,v 1.44 2025/11/29 21:45:49 tom Exp $")
#if defined(_NC_WINDOWS)
@ -225,9 +225,6 @@ _nc_console_fd2handle(int fd)
T(("lib_win32con:validateHandle %d maps to unknown HANDLE", fd));
hdl = INVALID_HANDLE_VALUE;
}
#if 1
assert(hdl != INVALID_HANDLE_VALUE);
#endif
if (hdl != INVALID_HANDLE_VALUE) {
if (hdl != WINCONSOLE.inp && (!WINCONSOLE.isTermInfoConsole && WINCONSOLE.progMode)) {
if (hdl == WINCONSOLE.out && hdl != WINCONSOLE.hdl) {

View File

@ -52,7 +52,7 @@
# endif
#endif
MODULE_ID("$Id: tinfo_driver.c,v 1.83 2025/10/18 18:11:02 tom Exp $")
MODULE_ID("$Id: tinfo_driver.c,v 1.84 2025/11/29 23:45:48 tom Exp $")
/*
* SCO defines TIOCGSIZE and the corresponding struct. Other systems (SunOS,
@ -161,7 +161,8 @@ drv_CanHandle(TERMINAL_CONTROL_BLOCK * TCB, const char *tname, int *errret)
SCREEN *sp;
START_TRACE();
T((T_CALLED("tinfo::drv_CanHandle(%p)"), (void *) TCB));
T((T_CALLED("tinfo::drv_CanHandle(%p,%s,%p)"),
(void *) TCB, NonNull(tname), (void *) errret));
assert(TCB != NULL && tname != NULL);
termp = (TERMINAL *) TCB;

View File

@ -85,7 +85,13 @@
#include <ctype.h>
MODULE_ID("$Id: tty_update.c,v 1.321 2025/11/15 15:59:13 tom Exp $")
#if USE_WIDEC_SUPPORT
#if HAVE_WCTYPE_H
#include <wctype.h>
#endif
#endif
MODULE_ID("$Id: tty_update.c,v 1.322 2025/11/29 19:03:46 tom Exp $")
/*
* This define controls the line-breakout optimization. Every once in a

View File

@ -43,7 +43,7 @@
#define CUR TerminalType(my_term).
MODULE_ID("$Id: win32_driver.c,v 1.14 2025/09/27 20:58:55 tom Exp $")
MODULE_ID("$Id: win32_driver.c,v 1.15 2025/11/29 23:45:48 tom Exp $")
#define WINMAGIC NCDRV_MAGIC(NCDRV_WINCONSOLE)
#define EXP_OPTIMIZE 0
@ -518,9 +518,10 @@ wcon_CanHandle(TERMINAL_CONTROL_BLOCK * TCB,
{
bool code = FALSE;
T((T_CALLED("win32con::wcon_CanHandle(%p)"), TCB));
T((T_CALLED("win32con::wcon_CanHandle(%p,%s,%p)"),
(void *) TCB, NonNull(tname), (void *) errret));
assert((TCB != NULL) && (tname != NULL));
assert(TCB != NULL);
TCB->magic = WINMAGIC;

View File

@ -42,7 +42,7 @@
#define CUR TerminalType(my_term).
MODULE_ID("$Id: win_driver.c,v 1.114 2025/10/18 19:18:39 tom Exp $")
MODULE_ID("$Id: win_driver.c,v 1.115 2025/11/29 23:45:48 tom Exp $")
#define WINMAGIC NCDRV_MAGIC(NCDRV_WINCONSOLE)
#define EXP_OPTIMIZE 0
@ -518,9 +518,10 @@ wcon_CanHandle(TERMINAL_CONTROL_BLOCK * TCB,
{
bool code = FALSE;
T((T_CALLED("win32con::wcon_CanHandle(%p)"), TCB));
T((T_CALLED("win32con::wcon_CanHandle(%p,%s,%p)"),
(void *) TCB, NonNull(tname), (void *) errret));
assert((TCB != NULL) && (tname != NULL));
assert(TCB != NULL);
TCB->magic = WINMAGIC;

View File

@ -1,8 +1,8 @@
ncurses6td (6.5+20251123) unstable; urgency=low
ncurses6td (6.5+20251129) unstable; urgency=low
* latest weekly patch
-- Thomas E. Dickey <dickey@invisible-island.net> Sun, 23 Nov 2025 13:59:57 -0500
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 29 Nov 2025 05:26:45 -0500
ncurses6 (5.9+20131005) unstable; urgency=low

View File

@ -1,8 +1,8 @@
ncurses6td (6.5+20251123) unstable; urgency=low
ncurses6td (6.5+20251129) unstable; urgency=low
* latest weekly patch
-- Thomas E. Dickey <dickey@invisible-island.net> Sun, 23 Nov 2025 13:59:57 -0500
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 29 Nov 2025 05:26:45 -0500
ncurses6 (5.9+20131005) unstable; urgency=low

View File

@ -1,8 +1,8 @@
ncurses6td (6.5+20251123) unstable; urgency=low
ncurses6td (6.5+20251129) unstable; urgency=low
* latest weekly patch
-- Thomas E. Dickey <dickey@invisible-island.net> Sun, 23 Nov 2025 13:59:57 -0500
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 29 Nov 2025 05:26:45 -0500
ncurses6 (5.9+20120608) unstable; urgency=low

View File

@ -1,4 +1,4 @@
; $Id: mingw-ncurses.nsi,v 1.732 2025/11/23 18:59:57 tom Exp $
; $Id: mingw-ncurses.nsi,v 1.733 2025/11/29 10:26:45 tom Exp $
; TODO add examples
; TODO bump ABI to 6
@ -10,7 +10,7 @@
!define VERSION_MAJOR "6"
!define VERSION_MINOR "5"
!define VERSION_YYYY "2025"
!define VERSION_MMDD "1123"
!define VERSION_MMDD "1129"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"

View File

@ -3,7 +3,7 @@
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 6.5
Release: 20251123
Release: 20251129
License: X11 License Distribution Modification Variant
Group: Development/Libraries
URL: https://invisible-island.net/ncurses/
@ -144,8 +144,8 @@ popd
%changelog
* Sun Nov 23 2025 Thomas E. Dickey
- testing ncurses 6.5-20251123
* Sat Nov 29 2025 Thomas E. Dickey
- testing ncurses 6.5-20251129
* Sat Feb 25 2023 Thomas Dickey
- amend URLs per rpmlint

View File

@ -1,7 +1,7 @@
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 6.5
Release: 20251123
Release: 20251129
License: X11 License Distribution Modification Variant
Group: Development/Libraries
URL: https://invisible-island.net/ncurses/
@ -134,8 +134,8 @@ rm -f test/ncurses
%changelog
* Sun Nov 23 2025 Thomas E. Dickey
- testing ncurses 6.5-20251123
* Sat Nov 29 2025 Thomas E. Dickey
- testing ncurses 6.5-20251129
* Sat Feb 25 2023 Thomas Dickey
- amend URLs per rpmlint

View File

@ -1,7 +1,7 @@
Summary: Curses library with POSIX thread support.
Name: ncursest6
Version: 6.5
Release: 20251123
Release: 20251129
License: X11 License Distribution Modification Variant
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
@ -142,8 +142,8 @@ exit 0
%changelog
* Sun Nov 23 2025 Thomas E. Dickey
- testing ncurses 6.5-20251123
* Sat Nov 29 2025 Thomas E. Dickey
- testing ncurses 6.5-20251129
* Tue Dec 24 2019 Thomas Dickey
- drop custom CC_NORMAL warning flags because setting CFLAGS interferes with

View File

@ -38,7 +38,7 @@
#define USE_LIBTINFO
#include <clear_cmd.h>
MODULE_ID("$Id: clear_cmd.c,v 1.6 2025/01/18 14:51:58 tom Exp $")
MODULE_ID("$Id: clear_cmd.c,v 1.7 2025/11/29 19:34:33 tom Exp $")
static int
putch(int c)
@ -53,7 +53,7 @@ clear_cmd(bool legacy)
if (!legacy) {
/* Clear the scrollback buffer if possible. */
char *E3 = tigetstr(UserCap(E3));
if (E3)
if (VALID_STRING(E3))
(void) tputs(E3, lines > 0 ? lines : 1, putch);
}
return retval;