ncurses: Bring in patches for ncurses-6.5

Bring in upstream patches for ncurses-6.5. These include various
upstream fixes including allowing ncurses to be built with GCC15. Taken
from https://invisible-island.net/archives/ncurses/6.5/

20250426
	+ expand note on extensions in curs_addch.3x
	+ add illumos, sun-16color, sun-256color, sun-direct -TD
	+ add wyse+cvis -TD
20250419
	+ add note on scrolling and lower-right corner to waddch and wadd_wch
	  manual pages.
20250412
	+ add pangoterm -TD
	+ add kf1 to kf5 to sclp (report by Werner Fink)
	+ add vt100+pf1-pf4 -TD
20250405
	+ improve formatting/style of manpages (patches by Branden Robinson).
	+ improve infocmp -E/-e fallback feature (report by Ville Rissanen):
	  + prefix names with "ti_" if they begin with a digit, e.g., 9term
	  + escape backslashes and double-quotes in description fields
	+ modify infocmp -E/-e fallback feature to reduce stricter compiler
	  warnings for the extended capability data.
	+ add sclp -TD
	+ add op to vt525 -TD
	+ update contour -TD
20250329
	+ add XM/xm to ms-terminal, to enable mouse with experimental Windows
	  driver -TD
	+ add -x option to infocmp in MKfallback.sh
	+ improve experimental Windows driver by restoring the scroll buffer
	  and console mode, e.g., when reset_prog_mode or endwin is called
	  (patch by Daniel Starke).
	+ add a buffer-limit check in postprocess_termcap (report/testcase by
	  Yifan Zhang).
20250322
	+ add a null pointer check in mouse-initialization, for the
	  experimental Windows driver (patch by Daniel Starke).
	+ improve makefile dependency in Ada95/src
	+ add note in user_caps.5 addressing a quibble about dates.
20250315
	+ improve formatting/style of manpages (patches by Branden Robinson).
20250308
	+ remove test in wgetch which applied notimeout to the initial read
	  of a character (patch by Branden Robinson).
	+ improve formatting/style of manpages (patches by Branden Robinson).
	+ fix a few compiler-warnings in MinGW port.
20250301
	+ add color to vt525 (Branden Robinson)
	+ add vt520-w and vt525-w (Branden Robinson)
	+ improve formatting/style of manpages (patches by Branden Robinson).
	+ improve configurability of alloca() as used in Windows ports.
	+ fix some typos in manpages.
	+ modify configure script checks for stdbool.h to fix build with older
	  gcc version.
20250222
	+ modify treatment of "n" parameter for waddnstr, waddnwstr, and
	  wins_nwstr to return OK when "n" is zero, for consistency with other
	  implementations (report by Benjamin Barenblat, cf: 20231118).
	+ formatting improvements for terminfo.5 (Debian #1096164).
20250216
	+ add limit-checks in alloc_entry.c and alloc_ttype.c to avoid indexing
	  errors when using infocmp to compare all capabilities when processing
	  a malformed terminfo binary which has a valid header (testcase by
	  "Ekkosun").
20250215
	+ add gzip option for suppressing filename/timestamp information to an
	  overlooked case (cf: 20240330).
	+ correct spelling errors found with codespell.
	+ fix some typos in manpages (report by Sven Joachim)
	+ amend change to lib_set_term.c to work with thread configuration
	  (report by Rajeev Pillai, cf: 20250208).
20250208
	+ change etip.h.in to include either/both of <new> and <exception>,
	  needed for another old BSD.
	+ update st (report by Alexander Kashpir) -TD
	+ add note for ghostty 1.1.0 -TD
	+ fix a few issues found with coverity.
20250201
	+ add <new> to the possible headers declaring the C++ std::bad_alloc
	  (report by Carl Hansen).
	+ modify check for stdbool.h to be more conservative in case the
	  headers are used with a compiler other than that which was used to
	  configure (Redhat #2342514).
	+ improve MKlib_gen.sh handling of "bool" type, for building link_test
	+ improve formatting/style of manpages (patches by Branden Robinson).
20250125
	+ improve error-handling in c++ binding (report by Mingjie Shen).
	+ strict compiler-warning fixes for upcoming gcc15
20250118
	+ improve pattern used for configure --with-xterm-kbs option (report by
	  Mingyu Wang)
	+ update configure macros, from work on cdk and dialog.
	+ change a parameter name in curs_sp_funcs.3x, for consistency (patch
	  by "WHR").
	> patches by Branden Robinson:
	+ improve formatting/style of manpages
	+ change winwstr() to a generated function, using the macro definition,
	  moving its handling of negative length parameter into winnwstr().
	+ correct actual-function name in a few trace calls.
20250111
	+ add check for infinite loop in tic's use-resolution.
	+ increase limit on use-clauses from 32 to 40, warn but allow entries
	  which exceed the old limit.
	+ add some null-pointer checks after mallocs in test-programs.
20250104
	+ modify tput to warn about capabilities which expect parameters where
	  none are given; also repair the feature where multiple capabilities
	  can be handled on a single line.
	+ cleanup use-clauses -TD
	+ add linux+lockeys, xterm+r5+lockeys, xterm+r5+fkeys -TD
	+ add vt220+ufkeys, vt220+sfkeys
	+ revert man/manlinks.sed change, which loses aliases (cf: 20241228).
	+ modify MKlib_gen.c to allow for Solaris's definition of NULL as 0L
20241228
	+ correct conditional-compile for a case when the C compiler does not
	  have a bool type.
	+ add ghostty -TD
	> patches by Branden Robinson:
	+ add comments to generated term.h to hint the configure options used
	+ use same subdir-convention for term.h, in configure script
	+ improve formatting/style of manpages
20241221
	+ modify ncurses/tinfo/MKfallback.sh to work with MacOS sed, which
	  lacks BSD-style \< and \>
	+ trim padding from sgr expression used in trim_sgr0, to avoid copying
	  the padding into the resulting sgr0 (report by Rajeev Pillai).
	+ strict compiler-warning fixes for upcoming gcc15
20241214
	+ avoid redefining bool in curses.h if the platform already supports
	  that type (cf: 20241123).
	+ move include <curses.h> from etip.h.in to cursesw.h, to work around
	  breakage in Apple's port of ncurses.
	+ strict compiler-warning fixes for upcoming gcc15
20241207
	+ strict compiler-warning fixes for upcoming gcc15
20241130
	+ improve configure check for lint program.
	+ adjust options in test-programs to allow for consistent use of -c/-l
	  for command/logging.
	+ modify win_driver.c for MinGW to handle shift-tab and control-tab as
	  back-tab (report by Axel Reinhold)
20241123
	+ remove dependency on stdbool.h from configure script check for type
	  of bool when C++ binding is omitted (report by Sam James).
	+ compiler-warning fixes
20241109
	+ work around musl header ifdef's (report by Urs Jansen, cf: Gentoo
	  #920266).
	+ improve error-reporting in write_entry.c (report by Changqing Li).
	+ remove unused #include from DJGPP configuration (report by Stas
	  Sergeev).
	+ workaround/fix issues from clang-analyze
20241102
	+ remove djgpp-specific initialization to binary mode (report/patch by
	  Stas Sergeev).
	+ add extended-keys for djgpp 2.05 -TD
20241026
	+ update ms-terminal -TD
	+ add ms-terminal-direct -TD
	+ correct dimensions in test/popup_msg.c, fixing an overrun (patch by
	  Stas Sergeev, cf: 20211219).
20241019
	+ fixes for compiler warnings/cppcheck.
	+ build-fixes for DJGPP configuration (patches by Stas Sergeev)
20241006
	+ fixes for compiler warnings/cppcheck.
	+ use xterm+alt+title in wezterm -TD
20240928
	+ improve error-message from infocmp when a terminal entry cannot be
	  opened (patch by Branden Robinson).
	+ improve filtering of -L options in misc/gen-pkgconfig.in and in
	  misc/ncurses-config.in
	+ add check in wresize() for out-of-range dimensions (report by Peter
	  Bierma).
20240922
	+ add a few null-pointer checks in ncurses
	+ improve test-driver in ncurses/link_test.c
	+ restore background character in manpages as described in X/Open
	  Curses section 3.3.6, and add option "-c" to test programs to
	  illustrate a non-blank character in the window background property.
	+ improve formatting/style of manpages (patches by Branden Robinson).
	+ modify ncurses*-config to add -I option in --cflag where needed for
	  --disable-overwrite to match ".pc" files.
	+ disallow directories and block/character devices in safe-open.
	+ amend scr_restore() and scr_init() to remove the target window only
	  after validating the source window which will replace the target
	  (report by Zixi Liu).
20240914
	+ modify _nc_flush() to also flush stderr to help the flash capability
	  to work in bash (patch by Harm te Hennepe, cf: 20201128)
	+ omit -g and -fXXX flags from CFLAGS in misc/ncurses-config.in
	+ improve formatting/style of manpages (patches by Branden Robinson).
	+ improve examples in NCURSES-Programming-HOWTO.html
	+ update comments in terminfo.src -TD
20240831
	+ build-fix for a case in msys2 where gettimeofday() was available but
	  the fallback was partly configured.
	> patch by Rafael Kitover:
	+ separate the _NC_WINDOWS platform macro into _NC_WINDOWS_NATIVE,
	  for MinGW and other native Win32 support, and _NC_WINDOWS, to make
	  some Win32 features available under the Cygwin runtime, in this case
	  the term-driver.
	+ make some minor adjustments to allow
	      ./configure --enable-term-driver
	  to also work on Cygwin platforms such as Cygwin and MSYS2.
20240824
	+ modify infocmp and tabs to use actual name in usage and header.
	+ modify test/demo_keyok.c to accept ^Q for quit, for consistency.
20240817
	+ review/update foot for 1.18.1 -TD
	+ add a note about DomTerm 3.2.0 -TD
	+ add new glob-expressions variables to list in config.status script
	  (patch by Werner Fink).
	+ add --enable-install-prefix to modify behavior of $DESTDIR to merge
	  or replace the value set by --prefix (adapted from suggestion by
	  Eli Zaretskii).
20240810
	+ modify misc/Makefile.in and misc/run_tic.in so that $DESTDIR is set
	  and used only in the makefile.
	+ modify CF_WITH_PKG_CONFIG_LIBDIR to allow for pkg-config using
	  DOS/Windows pathname syntax (report by Eli Zaretskii).
	+ improve glob-expressions in configure script
	+ remove unused Get_Menu_Screen() macro from menu.priv.h
	+ update config.guess, config.sub
20240727
	+ improve formatting/style of manpages (patches by Branden Robinson).
	+ fixes for compiler warnings/cppcheck.
	+ modify wattron/wattroff calls in form/m_post.c to call wattr_on and
	  wattr_off to omit cast used in the former for X/Open compatibility
	  (patch by Bill Gray).
	+ modify wezterm, omitting its broken left/right margin feature (report
	  by Thayne McCombs) -TD
20240720
	+ improve formatting/style of manpages (patches by Branden Robinson).
	+ modify configure script and misc/Makefile to accept glob expressions
	  that include Windows/DOS drive-letters (report by Eli Zaretskii).
	+ fix misspelled ifdef and correct return-value of _nc_mingw_tcflush in
	  win_driver.c (report/patch by Eli Zaretskii).
20240713
	+ modify misc/ncurses-config.in, improved match with pkg-config output.
20240706
	+ update configure script to use macro changes from dialog.
	+ modify CF_NCURSES_PTHREADS to avoid equating package and library
	  names.
20240629
	+ build-fix for ncurses-examples with newer PDCurses, which no longer
	  has stubs for unimplemented features.
	+ add help-popup for test_instr.c, test_inwstr.c
	+ modify checks in delwin to avoid checking if the window is a pad
	  until first checking if it is still on the active window-list
	  (cf: 20211115).
	+ improve -t option of test/gdc.c, allowing hours only, or hours and
	  minutes only.
20240622
	+ improve test/gdc.c (patch by Branden Robinson).
	+ improve formatting/style of manpages (patches by Branden Robinson).
	+ adjust naming of mingw *-config scripts to match the pkg-config names
	+ widen pattern in pc/*-config scripts to disallow more linker options
	+ add --cflags-only-I and --cflags-only-other options to
	  misc/ncurses-config.in
	+ revert change to CF_BUILD_CC macro (report by Vassili Courzakis,
	  cf: 20240518).
20240615
	+ improve formatting/style of manpages (patches by Branden Robinson).
	+ review/update modules files.
	+ improve install-rules in Ada95 makefiles (report by Branden Robinson).
	+ improve formatting/style of manpages in test-directory.
20240608
	+ change winwstr to return wide character count instead of OK (patch
	  by Branden Robinson).
	+ improve formatting/style of manpages (patches by Branden Robinson).
	+ rename testing dpkg's for ncurses6 to resolve a naming conflict with
	  Debian's ncurses packages.
20240601
	+ improve formatting/style of manpages (patches by Branden Robinson).
	+ change Ada95/configure to use --with-screen option rather than
	  --enable-widec, to provide more choices of underlying curses library
20240525
	+ build-fix for configure option --disable-ext-funcs
	+ improve formatting/style of manpages (patches by Branden Robinson).
	+ review/update iTerm2 for 3.5.0 -TD
20240519
	+ update Ada95/configure to match change for -DTRACE
	+ revert change to include/ncurses_defs, which caused build failure if
	  tracing was not enabled (report by Branden Robinson).
20240518
	+ improve formatting/style of manpages (patches by Branden Robinson).
	+ move makefile's -DTRACE into include/ncurses_cfg.h, to simplify use
	  of CFLAGS/CPPFLAGS.
	+ improve check for clock_gettime(), from xterm.
	+ modify configure script to work around broken gnatgcc script found in
	  gcc-13 builds.
20240511
	+ improve formatting/style of manpages (patches by Branden Robinson).
	+ limit value from ESCDELAY environment variable to 30 seconds, like
	  other delay limits.
	+ limit values from LINES and COLUMNS environment variables to 512
	  (report by Miroslav Lichvar).
20240504
	+ update ncurses/wcwidth.c, for MinGW ports, from xterm.
	+ trim obsolete comment about tack from INSTALL.

Signed-off-by: Chris Packham <judge.packham@gmail.com>

1 files changed, 885 insertions, 0 deletions

diff --git a/packages/ncurses/6.5/ncurses-6.5-20240831.patch b/packages/ncurses/6.5/ncurses-6.5-20240831.patch
new file mode 100644
index 00000000..f817db54
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20240831.patch
@@ -0,0 +1,885 @@
+# ncurses 6.5 - patch 20240831 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20240831.patch.gz
+# patch by Thomas E. Dickey <dickey@invisible-island.net>
+# created  Sat Aug 31 22:36:56 UTC 2024
+# ------------------------------------------------------------------------------
+# NEWS                             |   14 +++++++++++++-
+# VERSION                          |    2 +-
+# configure                        |    4 ++--
+# configure.in                     |    6 +++---
+# dist.mk                          |    4 ++--
+# include/nc_mingw.h               |    8 +++++---
+# include/nc_win32.h               |    8 +++++---
+# include/win32_curses.h           |    7 ++-----
+# ncurses/base/lib_getch.c         |   10 +++++-----
+# ncurses/curses.priv.h            |   32 ++++++++++++++++++++++++++------
+# ncurses/tinfo/lib_napms.c        |    6 +++---
+# ncurses/tinfo/lib_print.c        |    4 ++--
+# ncurses/tinfo/lib_setup.c        |    7 +++----
+# ncurses/tinfo/lib_win32con.c     |    6 +++---
+# ncurses/tinfo/lib_win32util.c    |    8 ++++----
+# ncurses/tinfo/tinfo_driver.c     |    4 ++--
+# ncurses/tinfo/write_entry.c      |    4 ++--
+# ncurses/trace/lib_trace.c        |    4 ++--
+# ncurses/widechar/widechars.c     |    8 ++++----
+# 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 +-
+# test/dots_termcap.c              |    8 ++++----
+# test/dots_xcurses.c              |    6 +++---
+# test/rain.c                      |    6 +++---
+# test/test.priv.h                 |   10 +++++-----
+# test/test_mouse.c                |    4 ++--
+# test/widechars.h                 |    4 ++--
+# 32 files changed, 119 insertions(+), 87 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.4166 
+--- ncurses-6.5-20240824+/NEWS	2024-08-24 20:11:44.000000000 +0000
++++ ncurses-6.5-20240831/NEWS	2024-08-31 21:21:26.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4166 2024/08/24 20:11:44 tom Exp $
++-- $Id: NEWS,v 1.4169 2024/08/31 21:21:26 tom Exp $
+ -------------------------------------------------------------------------------
+ 
+ This is a log of changes that ncurses has gone through since Zeyd started
+@@ -46,6 +46,18 @@
+ Changes through 1.9.9e did not credit all contributions;
+ it is not possible to add this information.
+ 
++20240831
++	+ build-fix for a case in msys2 where gettimeofday() was available but
++	  the fallback was partly configured.
++	> patch by Rafael Kitover:
++	+ separate the _NC_WINDOWS platform macro into _NC_WINDOWS_NATIVE,
++	  for MinGW and other native Win32 support, and _NC_WINDOWS, to make
++	  some Win32 features available under the Cygwin runtime, in this case
++	  the term-driver.
++	+ make some minor adjustments to allow
++	      ./configure --enable-term-driver
++	  to also work on Cygwin platforms such as Cygwin and MSYS2.
++
+ 20240824
+ 	+ modify infocmp and tabs to use actual name in usage and header.
+ 	+ modify test/demo_keyok.c to accept ^Q for quit, for consistency.
+Index: VERSION
+--- ncurses-6.5-20240824+/VERSION	2024-08-24 10:17:07.000000000 +0000
++++ ncurses-6.5-20240831/VERSION	2024-08-31 09:52:35.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20240824
++5:0:10	6.5	20240831
+Index: configure
+--- ncurses-6.5-20240824+/configure	2024-08-17 13:44:13.000000000 +0000
++++ ncurses-6.5-20240831/configure	2024-08-31 21:01:19.000000000 +0000
+@@ -1,5 +1,5 @@
+ #! /bin/sh
+-# From configure.in Revision: 1.785 .
++# From configure.in Revision: 1.786 .
+ # Guess values for system-dependent variables and create Makefiles.
+ # Generated by Autoconf 2.52.20240618.
+ #
+@@ -28526,7 +28526,7 @@
+ if test "$with_term_driver" != no ; then
+ 	LIB_SUBSETS="${LIB_SUBSETS}+port_drivers"
+ 	case "$cf_cv_system_name" in
+-	(*mingw32*|*mingw64*)
++	(*mingw32*|*mingw64*|*msys*|*cygwin*)
+ 		if test "x$with_exp_win32" = xyes ; then
+ 			LIB_SUBSETS="${LIB_SUBSETS}+port_tinfo+port_win32"
+ 		else
+Index: configure.in
+Prereq:  1.785 
+--- ncurses-6.5-20240824+/configure.in	2024-08-17 13:44:13.000000000 +0000
++++ ncurses-6.5-20240831/configure.in	2024-08-31 10:46:01.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: configure.in,v 1.785 2024/08/17 13:44:13 tom Exp $
++dnl $Id: configure.in,v 1.786 2024/08/31 10:46:01 Rafael.Kitover Exp $
+ dnl Process this file with autoconf to produce a configure script.
+ dnl
+ dnl For additional information, see
+@@ -38,7 +38,7 @@
+ dnl
+ dnl ---------------------------------------------------------------------------
+ AC_PREREQ(2.52.20210101)
+-AC_REVISION($Revision: 1.785 $)
++AC_REVISION($Revision: 1.786 $)
+ AC_INIT(ncurses/base/lib_initscr.c)
+ AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
+ 
+@@ -2075,7 +2075,7 @@
+ if test "$with_term_driver" != no ; then
+ 	LIB_SUBSETS="${LIB_SUBSETS}+port_drivers"
+ 	case "$cf_cv_system_name" in
+-	(*mingw32*|*mingw64*)
++	(*mingw32*|*mingw64*|*msys*|*cygwin*)
+ 		if test "x$with_exp_win32" = xyes ; then
+ 			LIB_SUBSETS="${LIB_SUBSETS}+port_tinfo+port_win32"
+ 		else
+Index: dist.mk
+Prereq:  1.1628 
+--- ncurses-6.5-20240824+/dist.mk	2024-08-24 10:17:07.000000000 +0000
++++ ncurses-6.5-20240831/dist.mk	2024-08-31 09:52:35.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1628 2024/08/24 10:17:07 tom Exp $
++# $Id: dist.mk,v 1.1629 2024/08/31 09:52:35 tom Exp $
+ # Makefile for creating ncurses distributions.
+ #
+ # This only needs to be used directly as a makefile by developers, but
+@@ -38,7 +38,7 @@
+ # These define the major/minor/patch versions of ncurses.
+ NCURSES_MAJOR = 6
+ NCURSES_MINOR = 5
+-NCURSES_PATCH = 20240824
++NCURSES_PATCH = 20240831
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: include/nc_mingw.h
+Prereq:  1.12 
+--- ncurses-6.5-20240824+/include/nc_mingw.h	2024-05-04 19:16:38.000000000 +0000
++++ ncurses-6.5-20240831/include/nc_mingw.h	2024-08-31 15:50:24.000000000 +0000
+@@ -31,12 +31,14 @@
+  * Author: Thomas Dickey, 2008-on                                           *
+  ****************************************************************************/
+ 
+-/* $Id: nc_mingw.h,v 1.12 2024/05/04 19:16:38 tom Exp $ */
++/* $Id: nc_mingw.h,v 1.13 2024/08/31 15:50:24 tom Exp $ */
+ 
+ #ifndef NC_MINGW_H
+ #define NC_MINGW_H 1
+ 
+-#ifdef _WIN32
++#include <ncurses_cfg.h>
++
++#if defined(_WIN32) || defined(__MSYS__) || defined(__CYGWIN__)
+ 
+ #ifdef WINVER
+ #  if WINVER < 0x0501
+@@ -85,6 +87,6 @@
+ }
+ #endif
+ 
+-#endif /* _WIN32 */
++#endif /* _WIN32|__MSYS__|__CYGWIN__ */
+ 
+ #endif /* NC_MINGW_H */
+Index: include/nc_win32.h
+Prereq:  1.12 
+--- ncurses-6.5-20240824+/include/nc_win32.h	2024-05-04 19:17:03.000000000 +0000
++++ ncurses-6.5-20240831/include/nc_win32.h	2024-08-31 18:17:21.000000000 +0000
+@@ -31,15 +31,17 @@
+  * Author: Thomas Dickey, 2008-on                                           *
+  ****************************************************************************/
+ 
+-/* $Id: nc_win32.h,v 1.12 2024/05/04 19:17:03 tom Exp $ */
++/* $Id: nc_win32.h,v 1.13 2024/08/31 18:17:21 tom Exp $ */
+ 
+ #ifndef NC_WIN32_H
+ #define NC_WIN32_H 1
+ 
++#include <ncurses_cfg.h>
++
+ #if defined(_WIN32) || defined(_WIN64)
+ 
+-#ifndef _NC_WINDOWS
+-#define _NC_WINDOWS
++#ifndef _NC_WINDOWS_NATIVE
++#define _NC_WINDOWS_NATIVE
+ #endif
+ 
+ #ifdef TERMIOS
+Index: include/win32_curses.h
+Prereq:  1.3 
+--- ncurses-6.5-20240824+/include/win32_curses.h	2021-06-17 21:26:02.000000000 +0000
++++ ncurses-6.5-20240831/include/win32_curses.h	2024-08-31 18:17:44.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2020,2021 Thomas E. Dickey                                *
++ * Copyright 2018-2021,2024 Thomas E. Dickey                                *
+  * Copyright 2008-2014,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -31,7 +31,7 @@
+  * Author: Juergen Pfeifer, 2008-on                                         *
+  ****************************************************************************/
+ 
+-/* $Id: win32_curses.h,v 1.3 2021/06/17 21:26:02 tom Exp $ */
++/* $Id: win32_curses.h,v 1.4 2024/08/31 18:17:44 tom Exp $ */
+ 
+ /*
+  * This is the interface we use on Windows to mimic the control of the settings
+@@ -68,8 +68,5 @@
+ #undef sleep
+ #define sleep(n) Sleep((n) * 1000)
+ 
+-#undef gettimeofday
+-#define gettimeofday(tv,tz) _nc_gettimeofday(tv,tz)
+-
+ #endif /* _NC_WIN32_CURSES_H */
+ #endif /* _WIN32||_WIN64 */
+Index: ncurses/base/lib_getch.c
+Prereq:  1.146 
+--- ncurses-6.5-20240824+/ncurses/base/lib_getch.c	2023-04-29 18:57:12.000000000 +0000
++++ ncurses-6.5-20240831/ncurses/base/lib_getch.c	2024-08-31 15:54:49.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2015,2016 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -44,7 +44,7 @@
+ #define NEED_KEY_EVENT
+ #include <curses.priv.h>
+ 
+-MODULE_ID("$Id: lib_getch.c,v 1.146 2023/04/29 18:57:12 tom Exp $")
++MODULE_ID("$Id: lib_getch.c,v 1.147 2024/08/31 15:54:49 tom Exp $")
+ 
+ #include <fifo_defs.h>
+ 
+@@ -135,7 +135,7 @@
+ }
+ 
+ #ifdef USE_TERM_DRIVER
+-# if defined(_NC_WINDOWS) && !defined(EXP_WIN32_DRIVER)
++# if defined(_NC_WINDOWS_NATIVE) && !defined(EXP_WIN32_DRIVER)
+ static HANDLE
+ _nc_get_handle(int fd)
+ {
+@@ -163,7 +163,7 @@
+ 				   _nc_console_handle(sp->_ifd),
+ 				   delay EVENTLIST_2nd(evl));
+     } else
+-# elif defined(_NC_WINDOWS)
++# elif defined(_NC_WINDOWS_NATIVE)
+     /* if we emulate terminfo on console, we have to use the console routine */
+     if (IsTermInfoOnConsole(sp)) {
+ 	HANDLE fd = _nc_get_handle(sp->_ifd);
+@@ -315,7 +315,7 @@
+ 				 &buf);
+ 	    _nc_set_read_thread(FALSE);
+ 	} else
+-# elif defined(_NC_WINDOWS)
++# elif defined(_NC_WINDOWS_NATIVE)
+ 	if (NC_ISATTY(sp->_ifd) && IsTermInfoOnConsole(sp) && IsCbreak(sp))
+ 	    n = _nc_mingw_console_read(sp,
+ 				       _nc_get_handle(sp->_ifd),
+Index: ncurses/curses.priv.h
+Prereq:  1.689 
+--- ncurses-6.5-20240824+/ncurses/curses.priv.h	2024-05-11 19:05:45.000000000 +0000
++++ ncurses-6.5-20240831/ncurses/curses.priv.h	2024-08-31 10:46:01.000000000 +0000
+@@ -35,7 +35,7 @@
+  ****************************************************************************/
+ 
+ /*
+- * $Id: curses.priv.h,v 1.689 2024/05/11 19:05:45 tom Exp $
++ * $Id: curses.priv.h,v 1.690 2024/08/31 10:46:01 Rafael.Kitover Exp $
+  *
+  *	curses.priv.h
+  *
+@@ -88,13 +88,24 @@
+ #endif
+ 
+ /* Some Windows related defines */
++
+ #undef _NC_WINDOWS
+-#if (defined(_WIN32) || defined(_WIN64))
++#if (defined(_WIN32) || defined(_WIN64__) || defined(__MSYS__) || defined(__CYGWIN__))
+ #define _NC_WINDOWS
+ #else
+ #undef EXP_WIN32_DRIVER
+ #endif
+ 
++#undef _NC_CYGWIN
++#if (defined(__MSYS__) || defined(__CYGWIN__))
++#define _NC_CYGWIN
++#endif
++
++#undef _NC_WINDOWS_NATIVE
++#if (defined(_WIN32) || defined(_WIN64))
++#define _NC_WINDOWS_NATIVE
++#endif
++
+ #undef _NC_MINGW
+ #if (defined(__MINGW32__) || defined(__MINGW64__))
+ #define _NC_MINGW
+@@ -197,7 +208,7 @@
+  * the path separator in configure doesn't work properly. So, if building
+  * for MinGW, we enforce the correct Windows PATH separator
+  */
+-#if defined(_NC_WINDOWS)
++#if defined(_NC_WINDOWS_NATIVE)
+ #  ifdef NCURSES_PATHSEP
+ #    undef NCURSES_PATHSEP
+ #  endif
+@@ -223,6 +234,15 @@
+ #endif
+ 
+ /*
++ * The stricmp() function is in MSVCRT, and cannot be called or linked from
++ * Cygwin runtime-dependent binaries currently. Use the POSIX strcaseccmp()
++ * function instead which is pretty much the same.
++ */
++#if defined(_NC_CYGWIN)
++#define stricmp(s1, s2) strcasecmp(s1, s2)
++#endif
++
++/*
+  * Not all platforms have memmove; some have an equivalent bcopy.  (Some may
+  * have neither).
+  */
+@@ -2238,7 +2258,7 @@
+  */
+ #if USE_WIDEC_SUPPORT
+ 
+-#if defined(_NC_WINDOWS) && !defined(_NC_MSC) && !defined(EXP_WIN32_DRIVER)
++#if defined(_NC_WINDOWS_NATIVE) && !defined(_NC_MSC) && !defined(EXP_WIN32_DRIVER)
+ /*
+  * MinGW has wide-character functions, but they do not work correctly.
+  */
+@@ -2252,9 +2272,9 @@
+ extern int __MINGW_NOTHROW _nc_mblen(const char *, size_t);
+ #define mblen(s,n) _nc_mblen(s, n)
+ 
+-#endif /* _NC_WINDOWS && !_NC_MSC */
++#endif /* _NC_WINDOWS_NATIVE && !_NC_MSC */
+ 
+-#if defined(_NC_WINDOWS) || defined(_NC_MINGW)
++#if defined(_NC_WINDOWS_NATIVE) || defined(_NC_MINGW)
+ /* see wcwidth.c */
+ extern NCURSES_EXPORT(int) mk_wcwidth(uint32_t);
+ #define wcwidth(ucs) _nc_wcwidth(ucs)
+Index: ncurses/tinfo/lib_napms.c
+Prereq:  1.28 
+--- ncurses-6.5-20240824+/ncurses/tinfo/lib_napms.c	2023-09-16 16:09:33.000000000 +0000
++++ ncurses-6.5-20240831/ncurses/tinfo/lib_napms.c	2024-08-31 15:55:00.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2023 Thomas E. Dickey                                     *
++ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2014,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -52,7 +52,7 @@
+ #endif
+ #endif
+ 
+-MODULE_ID("$Id: lib_napms.c,v 1.28 2023/09/16 16:09:33 tom Exp $")
++MODULE_ID("$Id: lib_napms.c,v 1.29 2024/08/31 15:55:00 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ NCURSES_SP_NAME(napms) (NCURSES_SP_DCLx int ms)
+@@ -78,7 +78,7 @@
+ 	    request = remaining;
+ 	}
+     }
+-#elif defined(_NC_WINDOWS)
++#elif defined(_NC_WINDOWS_NATIVE)
+     Sleep((DWORD) ms);
+ #else
+     _nc_timed_wait(0, 0, ms, (int *) 0 EVENTLIST_2nd(0));
+Index: ncurses/tinfo/lib_print.c
+Prereq:  1.32 
+--- ncurses-6.5-20240824+/ncurses/tinfo/lib_print.c	2024-07-27 19:22:23.000000000 +0000
++++ ncurses-6.5-20240831/ncurses/tinfo/lib_print.c	2024-08-31 10:46:01.000000000 +0000
+@@ -40,7 +40,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: lib_print.c,v 1.32 2024/07/27 19:22:23 tom Exp $")
++MODULE_ID("$Id: lib_print.c,v 1.33 2024/08/31 10:46:01 Rafael.Kitover Exp $")
+ 
+ NCURSES_EXPORT(int)
+ NCURSES_SP_NAME(mcprint) (NCURSES_SP_DCLx char *data, int len)
+@@ -98,7 +98,7 @@
+      * kernel will ship the contiguous clist items from the last write
+      * immediately.
+      */
+-#ifndef _NC_WINDOWS
++#ifndef _NC_WINDOWS_NATIVE
+     (void) sleep(0);
+ #endif
+     free(mybuf);
+Index: ncurses/tinfo/lib_setup.c
+Prereq:  1.242 
+--- ncurses-6.5-20240824+/ncurses/tinfo/lib_setup.c	2024-07-27 19:14:45.000000000 +0000
++++ ncurses-6.5-20240831/ncurses/tinfo/lib_setup.c	2024-08-31 21:15:54.000000000 +0000
+@@ -49,7 +49,7 @@
+ #include <locale.h>
+ #endif
+ 
+-MODULE_ID("$Id: lib_setup.c,v 1.242 2024/07/27 19:14:45 tom Exp $")
++MODULE_ID("$Id: lib_setup.c,v 1.244 2024/08/31 21:15:54 tom Exp $")
+ 
+ /****************************************************************************
+  *
+@@ -334,7 +334,6 @@
+ 	char *s;
+ 	char cc;
+ 	const char *skipped;
+-	int scanned;
+ 
+ 	s = memset(buf, '\0', sizeof(buf));
+ 	do {
+@@ -350,7 +349,7 @@
+ 	cc = '\0';
+ 	if (skipped != buf
+ 	    && *skipped != '\0'
+-	    && (scanned = sscanf(skip_csi(buf), "%d;%d%c", &y, &x, &cc)) == 3
++	    && sscanf(skip_csi(buf), "%d;%d%c", &y, &x, &cc) == 3
+ 	    && (cc == 'R')) {
+ 	    *row = y;
+ 	    *col = x;
+@@ -759,7 +758,7 @@
+     static int result = 0;
+ 
+     if (!initialized) {
+-#if defined(_NC_WINDOWS) && USE_WIDEC_SUPPORT
++#if defined(_NC_WINDOWS_NATIVE) && USE_WIDEC_SUPPORT
+ 	result = 1;
+ #elif HAVE_LANGINFO_CODESET
+ 	char *env = nl_langinfo(CODESET);
+Index: ncurses/tinfo/lib_win32con.c
+Prereq:  1.14 
+--- ncurses-6.5-20240824+/ncurses/tinfo/lib_win32con.c	2023-08-05 20:44:38.000000000 +0000
++++ ncurses-6.5-20240831/ncurses/tinfo/lib_win32con.c	2024-08-31 15:55:10.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2021,2023 Thomas E. Dickey                                *
++ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2009,2010 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -38,9 +38,9 @@
+ 
+ #include <curses.priv.h>
+ 
+-MODULE_ID("$Id: lib_win32con.c,v 1.14 2023/08/05 20:44:38 tom Exp $")
++MODULE_ID("$Id: lib_win32con.c,v 1.15 2024/08/31 15:55:10 tom Exp $")
+ 
+-#ifdef _NC_WINDOWS
++#if defined(_NC_WINDOWS)
+ 
+ #ifdef _NC_MINGW
+ #include <wchar.h>
+Index: ncurses/tinfo/lib_win32util.c
+Prereq:  1.4 
+--- ncurses-6.5-20240824+/ncurses/tinfo/lib_win32util.c	2023-06-17 17:19:06.000000000 +0000
++++ ncurses-6.5-20240831/ncurses/tinfo/lib_win32util.c	2024-08-31 15:55:16.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2021,2023 Thomas E. Dickey                                *
++ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2009,2010 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -34,9 +34,9 @@
+ 
+ #include <curses.priv.h>
+ 
+-MODULE_ID("$Id: lib_win32util.c,v 1.4 2023/06/17 17:19:06 tom Exp $")
++MODULE_ID("$Id: lib_win32util.c,v 1.5 2024/08/31 15:55:16 tom Exp $")
+ 
+-#ifdef _NC_WINDOWS
++#ifdef _NC_WINDOWS_NATIVE
+ #include <io.h>
+ 
+ #ifdef _NC_CHECK_MINTTY
+@@ -131,4 +131,4 @@
+ }
+ #endif // HAVE_GETTIMEOFDAY == 2
+ 
+-#endif // _NC_WINDOWS
++#endif // _NC_WINDOWS_NATIVE
+Index: ncurses/tinfo/tinfo_driver.c
+Prereq:  1.75 
+--- ncurses-6.5-20240824+/ncurses/tinfo/tinfo_driver.c	2024-05-11 19:20:44.000000000 +0000
++++ ncurses-6.5-20240831/ncurses/tinfo/tinfo_driver.c	2024-08-31 10:46:01.000000000 +0000
+@@ -52,7 +52,7 @@
+ # endif
+ #endif
+ 
+-MODULE_ID("$Id: tinfo_driver.c,v 1.75 2024/05/11 19:20:44 tom Exp $")
++MODULE_ID("$Id: tinfo_driver.c,v 1.76 2024/08/31 10:46:01 Rafael.Kitover Exp $")
+ 
+ /*
+  * SCO defines TIOCGSIZE and the corresponding struct.  Other systems (SunOS,
+@@ -1504,7 +1504,7 @@
+ 
+ static DRIVER_ENTRY DriverTable[] =
+ {
+-#ifdef _NC_WINDOWS
++#ifdef USE_WIN32CON_DRIVER
+     {"win32console", &_nc_WIN_DRIVER},
+ #endif
+     {"tinfo", &_nc_TINFO_DRIVER}	/* must be last */
+Index: ncurses/tinfo/write_entry.c
+Prereq:  1.133 
+--- ncurses-6.5-20240824+/ncurses/tinfo/write_entry.c	2024-07-27 19:15:16.000000000 +0000
++++ ncurses-6.5-20240831/ncurses/tinfo/write_entry.c	2024-08-31 10:46:01.000000000 +0000
+@@ -42,7 +42,7 @@
+ 
+ #include <tic.h>
+ 
+-MODULE_ID("$Id: write_entry.c,v 1.133 2024/07/27 19:15:16 tom Exp $")
++MODULE_ID("$Id: write_entry.c,v 1.134 2024/08/31 10:46:01 Rafael.Kitover Exp $")
+ 
+ #if 1
+ #define TRACE_OUT(p) DEBUG(2, p)
+@@ -200,7 +200,7 @@
+ 
+ 	if ((rc = stat(path, &statbuf)) == -1) {
+ 	    rc = mkdir(path
+-#ifndef _NC_WINDOWS
++#ifndef _NC_WINDOWS_NATIVE
+ 		       ,0777
+ #endif
+ 		);
+Index: ncurses/trace/lib_trace.c
+Prereq:  1.106 
+--- ncurses-6.5-20240824+/ncurses/trace/lib_trace.c	2024-02-24 18:28:19.000000000 +0000
++++ ncurses-6.5-20240831/ncurses/trace/lib_trace.c	2024-08-31 10:48:22.000000000 +0000
+@@ -48,7 +48,7 @@
+ 
+ #include <ctype.h>
+ 
+-MODULE_ID("$Id: lib_trace.c,v 1.106 2024/02/24 18:28:19 tom Exp $")
++MODULE_ID("$Id: lib_trace.c,v 1.107 2024/08/31 10:48:22 tom Exp $")
+ 
+ NCURSES_EXPORT_VAR(unsigned) _nc_tracing = 0; /* always define this */
+ 
+@@ -261,7 +261,7 @@
+ 	if ((pthread_self))
+ # endif
+ 	    fprintf(fp, "%#" PRIxPTR ":",
+-#ifdef _NC_WINDOWS
++#ifdef _NC_WINDOWS_NATIVE
+ 		    CASTxPTR(pthread_self().p)
+ #else
+ 		    CASTxPTR(pthread_self())
+Index: ncurses/widechar/widechars.c
+Prereq:  1.9 
+--- ncurses-6.5-20240824+/ncurses/widechar/widechars.c	2020-08-29 16:22:03.000000000 +0000
++++ ncurses-6.5-20240831/ncurses/widechar/widechars.c	2024-08-31 15:55:27.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018,2020 Thomas E. Dickey                                     *
++ * Copyright 2018-2020,2024 Thomas E. Dickey                                *
+  * Copyright 2012,2013 Free Software Foundation, Inc.                       *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -31,9 +31,9 @@
+ 
+ #if USE_WIDEC_SUPPORT
+ 
+-MODULE_ID("$Id: widechars.c,v 1.9 2020/08/29 16:22:03 juergen Exp $")
++MODULE_ID("$Id: widechars.c,v 1.10 2024/08/31 15:55:27 tom Exp $")
+ 
+-#if (defined(_NC_WINDOWS)) && !defined(_NC_MSC)
++#if defined(_NC_MINGW)
+ /*
+  * MinGW has wide-character functions, but they do not work correctly.
+  */
+@@ -148,6 +148,6 @@
+     return result;
+ }
+ 
+-#endif /* _NC_WINDOWS */
++#endif /* _NC_MINGW */
+ 
+ #endif /* USE_WIDEC_SUPPORT */
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20240824+/package/debian-mingw/changelog	2024-08-24 10:17:07.000000000 +0000
++++ ncurses-6.5-20240831/package/debian-mingw/changelog	2024-08-31 09:52:35.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240824) unstable; urgency=low
++ncurses6td (6.5+20240831) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 24 Aug 2024 06:17:07 -0400
++ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 31 Aug 2024 05:52:35 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20240824+/package/debian-mingw64/changelog	2024-08-24 10:17:07.000000000 +0000
++++ ncurses-6.5-20240831/package/debian-mingw64/changelog	2024-08-31 09:52:35.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240824) unstable; urgency=low
++ncurses6td (6.5+20240831) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 24 Aug 2024 06:17:07 -0400
++ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 31 Aug 2024 05:52:35 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.5-20240824+/package/debian/changelog	2024-08-24 10:17:07.000000000 +0000
++++ ncurses-6.5-20240831/package/debian/changelog	2024-08-31 09:52:35.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240824) unstable; urgency=low
++ncurses6td (6.5+20240831) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 24 Aug 2024 06:17:07 -0400
++ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 31 Aug 2024 05:52:35 -0400
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.663 
+--- ncurses-6.5-20240824+/package/mingw-ncurses.nsi	2024-08-24 10:17:07.000000000 +0000
++++ ncurses-6.5-20240831/package/mingw-ncurses.nsi	2024-08-31 09:52:35.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.663 2024/08/24 10:17:07 tom Exp $

++; $Id: mingw-ncurses.nsi,v 1.664 2024/08/31 09:52:35 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  "2024"

+-!define VERSION_MMDD  "0824"

++!define VERSION_MMDD  "0831"

+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}

+ 

+ !define MY_ABI   "5"

+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20240824+/package/mingw-ncurses.spec	2024-08-24 10:17:07.000000000 +0000
++++ ncurses-6.5-20240831/package/mingw-ncurses.spec	2024-08-31 09:52:35.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20240824
++Release: 20240831
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20240824+/package/ncurses.spec	2024-08-24 10:17:07.000000000 +0000
++++ ncurses-6.5-20240831/package/ncurses.spec	2024-08-31 09:52:35.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20240824
++Release: 20240831
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20240824+/package/ncursest.spec	2024-08-24 10:17:07.000000000 +0000
++++ ncurses-6.5-20240831/package/ncursest.spec	2024-08-31 09:52:35.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20240824
++Release: 20240831
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: test/dots_termcap.c
+Prereq:  1.32 
+--- ncurses-6.5-20240824+/test/dots_termcap.c	2023-02-25 18:11:21.000000000 +0000
++++ ncurses-6.5-20240831/test/dots_termcap.c	2024-08-31 15:55:46.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2013-2014,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -30,14 +30,14 @@
+ /*
+  * Author: Thomas E. Dickey
+  *
+- * $Id: dots_termcap.c,v 1.32 2023/02/25 18:11:21 tom Exp $
++ * $Id: dots_termcap.c,v 1.33 2024/08/31 15:55:46 tom Exp $
+  *
+  * A simple demo of the termcap interface.
+  */
+ #define USE_TINFO
+ #include <test.priv.h>
+ 
+-#if !defined(_NC_WINDOWS)
++#if !defined(_NC_WINDOWS_NATIVE)
+ #include <sys/time.h>
+ #endif
+ 
+@@ -162,7 +162,7 @@
+ my_napms(int ms)
+ {
+     if (ms > 0) {
+-#if defined(_NC_WINDOWS)
++#if defined(_NC_WINDOWS_NATIVE)
+ 	Sleep((unsigned int) ms);
+ #else
+ 	struct timeval data;
+Index: test/dots_xcurses.c
+Prereq:  1.29 
+--- ncurses-6.5-20240824+/test/dots_xcurses.c	2023-01-07 17:21:48.000000000 +0000
++++ ncurses-6.5-20240831/test/dots_xcurses.c	2024-08-31 15:55:52.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2017 Free Software Foundation, Inc.                            *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -30,13 +30,13 @@
+ /*
+  * Author: Thomas E. Dickey
+  *
+- * $Id: dots_xcurses.c,v 1.29 2023/01/07 17:21:48 tom Exp $
++ * $Id: dots_xcurses.c,v 1.30 2024/08/31 15:55:52 tom Exp $
+  *
+  * A simple demo of the wide-curses interface used for comparison with termcap.
+  */
+ #include <test.priv.h>
+ 
+-#if !defined(_NC_WINDOWS)
++#if !defined(_NC_WINDOWS_NATIVE)
+ #include <sys/time.h>
+ #endif
+ 
+Index: test/rain.c
+Prereq:  1.57 
+--- ncurses-6.5-20240824+/test/rain.c	2022-12-04 00:40:11.000000000 +0000
++++ ncurses-6.5-20240831/test/rain.c	2024-08-31 15:56:10.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2020,2022 Thomas E. Dickey                                *
++ * Copyright 2018-2022,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2014,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: rain.c,v 1.57 2022/12/04 00:40:11 tom Exp $
++ * $Id: rain.c,v 1.58 2024/08/31 15:56:10 tom Exp $
+  */
+ #include <test.priv.h>
+ #include <popup_msg.h>
+@@ -229,7 +229,7 @@
+      * Find myself in the list of threads so we can count the number of loops.
+      */
+     for (mystats = 0; mystats < MAX_THREADS; ++mystats) {
+-#if defined(_NC_WINDOWS) && !defined(__WINPTHREADS_VERSION)
++#if defined(_NC_WINDOWS_NATIVE) && !defined(__WINPTHREADS_VERSION)
+ 	if (drop_threads[mystats].myself.p == pthread_self().p)
+ #else
+ 	if (drop_threads[mystats].myself == pthread_self())
+Index: test/test.priv.h
+Prereq:  1.218 
+--- ncurses-6.5-20240824+/test/test.priv.h	2024-02-10 14:40:03.000000000 +0000
++++ ncurses-6.5-20240831/test/test.priv.h	2024-08-31 10:46:01.000000000 +0000
+@@ -30,7 +30,7 @@
+ /****************************************************************************
+  *  Author: Thomas E. Dickey                    1996-on                     *
+  ****************************************************************************/
+-/* $Id: test.priv.h,v 1.218 2024/02/10 14:40:03 tom Exp $ */
++/* $Id: test.priv.h,v 1.219 2024/08/31 10:46:01 Rafael.Kitover Exp $ */
+ 
+ #ifndef __TEST_PRIV_H
+ #define __TEST_PRIV_H 1
+@@ -1047,12 +1047,12 @@
+ #define EXIT_FAILURE 1
+ #endif
+ 
+-#undef _NC_WINDOWS
++#undef _NC_WINDOWS_NATIVE
+ #if (defined(_WIN32) || defined(_WIN64))
+-#define _NC_WINDOWS 1
++#define _NC_WINDOWS_NATIVE 1
+ #endif
+ 
+-#if defined(_NC_WINDOWS) || defined(USE_WIN32CON_DRIVER)
++#if defined(_NC_WINDOWS_NATIVE) || defined(USE_WIN32CON_DRIVER)
+ 
+ #if defined(PDCURSES)
+ #ifdef WINVER
+@@ -1184,7 +1184,7 @@
+ #define InitAndCatch(init,handler) do { init; CATCHALL(handler); } while (0)
+ #endif
+ 
+-#if defined(_NC_WINDOWS) || defined(USE_WIN32CON_DRIVER)
++#if defined(_NC_WINDOWS_NATIVE) || defined(USE_WIN32CON_DRIVER)
+ #define SetupAlarm(opt)	(void)opt
+ #else
+ #define SetupAlarm(opt)	if (opt) alarm((unsigned)opt)
+Index: test/test_mouse.c
+Prereq:  1.31 
+--- ncurses-6.5-20240824+/test/test_mouse.c	2024-03-30 20:45:31.000000000 +0000
++++ ncurses-6.5-20240831/test/test_mouse.c	2024-08-31 10:46:01.000000000 +0000
+@@ -22,7 +22,7 @@
+  * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
+  ****************************************************************************/
+ /*
+- * $Id: test_mouse.c,v 1.31 2024/03/30 20:45:31 tom Exp $
++ * $Id: test_mouse.c,v 1.32 2024/08/31 10:46:01 Rafael.Kitover Exp $
+  *
+  * Author: Leonid S Usov
+  *
+@@ -31,7 +31,7 @@
+ 
+ #include <test.priv.h>
+ 
+-#if defined(NCURSES_MOUSE_VERSION) && !defined(_NC_WINDOWS)
++#if defined(NCURSES_MOUSE_VERSION) && !defined(_NC_WINDOWS_NATIVE)
+ 
+ static int logoffset = 0;
+ 
+Index: test/widechars.h
+--- ncurses-6.5-20240824+/test/widechars.h	2020-09-13 00:20:21.000000000 +0000
++++ ncurses-6.5-20240831/test/widechars.h	2024-08-31 15:56:21.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018,2020 Thomas E. Dickey                                     *
++ * Copyright 2018-2020,2024 Thomas E. Dickey                                *
+  * Copyright 2012 Free Software Foundation, Inc.                            *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -34,7 +34,7 @@
+ 
+ #if USE_WIDEC_SUPPORT
+ 
+-#if defined(_NC_WINDOWS) && !defined(_MSC_VER) && !defined(EXP_WIN32_DRIVER)
++#if defined(_NC_MINGW)
+ /*
+  * MinGW has wide-character functions, but they do not work correctly.
+  */