diff options
Diffstat (limited to 'packages/ncurses/6.5/ncurses-6.5-20241123.patch')
| -rw-r--r-- | packages/ncurses/6.5/ncurses-6.5-20241123.patch | 2742 |
1 files changed, 2742 insertions, 0 deletions
diff --git a/packages/ncurses/6.5/ncurses-6.5-20241123.patch b/packages/ncurses/6.5/ncurses-6.5-20241123.patch new file mode 100644 index 00000000..d0b2fa7c --- /dev/null +++ b/packages/ncurses/6.5/ncurses-6.5-20241123.patch @@ -0,0 +1,2742 @@ +# ncurses 6.5 - patch 20241123 - 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-20241123.patch.gz +# patch by Thomas E. Dickey <dickey@invisible-island.net> +# created Sun Nov 24 01:16:21 UTC 2024 +# ------------------------------------------------------------------------------ +# NEWS | 7 +# VERSION | 2 +# configure | 339 +++++++++++++++++-------------------- +# configure.in | 15 - +# dist.mk | 4 +# menu/m_item_new.c | 6 +# ncurses/base/lib_color.c | 10 - +# ncurses/base/lib_mouse.c | 16 - +# ncurses/base/lib_newterm.c | 4 +# ncurses/base/lib_set_term.c | 6 +# ncurses/base/lib_touch.c | 12 - +# ncurses/base/resizeterm.c | 4 +# ncurses/curses.priv.h | 12 - +# ncurses/llib-lncurses | 20 +- +# ncurses/llib-lncursest | 20 +- +# ncurses/llib-lncursestw | 22 +- +# ncurses/llib-lncursesw | 22 +- +# ncurses/llib-ltinfo | 14 - +# ncurses/llib-ltinfot | 14 - +# ncurses/llib-ltinfotw | 14 - +# ncurses/llib-ltinfow | 14 - +# ncurses/tinfo/comp_scan.c | 4 +# ncurses/tinfo/lib_has_cap.c | 8 +# ncurses/tinfo/lib_options.c | 6 +# ncurses/tinfo/lib_setup.c | 12 - +# ncurses/tinfo/parse_entry.c | 4 +# ncurses/trace/lib_trace.c | 6 +# ncurses/trace/lib_tracechr.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/infocmp.c | 4 +# progs/toe.c | 4 +# progs/tput.c | 6 +# progs/tset.c | 6 +# test/demo_panels.c | 4 +# test/test_opaque.c | 20 +- +# 41 files changed, 336 insertions(+), 351 deletions(-) +# ------------------------------------------------------------------------------ +Index: NEWS +Prereq: 1.4199 +--- ncurses-6.5-20241109+/NEWS 2024-11-09 23:12:36.000000000 +0000 ++++ ncurses-6.5-20241123/NEWS 2024-11-23 22:57:05.000000000 +0000 +@@ -26,7 +26,7 @@ + -- sale, use or other dealings in this Software without prior written -- + -- authorization. -- + ------------------------------------------------------------------------------- +--- $Id: NEWS,v 1.4199 2024/11/09 23:12:36 tom Exp $ ++-- $Id: NEWS,v 1.4203 2024/11/23 22:57:05 tom Exp $ + ------------------------------------------------------------------------------- + + This is a log of changes that ncurses has gone through since Zeyd started +@@ -46,6 +46,11 @@ + Changes through 1.9.9e did not credit all contributions; + it is not possible to add this information. + ++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). +Index: VERSION +--- ncurses-6.5-20241109+/VERSION 2024-11-09 11:12:30.000000000 +0000 ++++ ncurses-6.5-20241123/VERSION 2024-11-23 10:51:23.000000000 +0000 +@@ -1 +1 @@ +-5:0:10 6.5 20241109 ++5:0:10 6.5 20241123 +Index: configure +--- ncurses-6.5-20241109+/configure 2024-11-09 23:13:16.000000000 +0000 ++++ ncurses-6.5-20241123/configure 2024-11-23 22:59:00.000000000 +0000 +@@ -1,5 +1,5 @@ + #! /bin/sh +-# From configure.in Revision: 1.786 . ++# From configure.in Revision: 1.787 . + # Guess values for system-dependent variables and create Makefiles. + # Generated by Autoconf 2.52.20240618. + # +@@ -27337,15 +27337,14 @@ + cf_cv_type_of_bool=$NCURSES_BOOL + cf_cv_header_stdbool_h=0 + else +- if test "$cf_cv_header_stdbool_h" = 1 ; then + +-echo "$as_me:27342: checking for bool" >&5 ++echo "$as_me:27341: checking for bool" >&5 + echo $ECHO_N "checking for bool... $ECHO_C" >&6 + if test "${ac_cv_type_bool+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 27348 "configure" ++#line 27347 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -27380,16 +27379,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:27383: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:27382: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:27386: \$? = $ac_status" >&5 ++ echo "$as_me:27385: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:27389: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27388: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27392: \$? = $ac_status" >&5 ++ echo "$as_me:27391: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_type_bool=yes + else +@@ -27399,10 +27398,10 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:27402: result: $ac_cv_type_bool" >&5 ++echo "$as_me:27401: result: $ac_cv_type_bool" >&5 + echo "${ECHO_T}$ac_cv_type_bool" >&6 + +-echo "$as_me:27405: checking size of bool" >&5 ++echo "$as_me:27404: checking size of bool" >&5 + echo $ECHO_N "checking size of bool... $ECHO_C" >&6 + if test "${ac_cv_sizeof_bool+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -27411,7 +27410,7 @@ + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 27414 "configure" ++#line 27413 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -27443,21 +27442,21 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:27446: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:27445: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:27449: \$? = $ac_status" >&5 ++ echo "$as_me:27448: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:27452: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27451: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27455: \$? = $ac_status" >&5 ++ echo "$as_me:27454: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 27460 "configure" ++#line 27459 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -27489,16 +27488,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:27492: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:27491: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:27495: \$? = $ac_status" >&5 ++ echo "$as_me:27494: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:27498: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27497: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27501: \$? = $ac_status" >&5 ++ echo "$as_me:27500: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid; break + else +@@ -27514,7 +27513,7 @@ + ac_hi=-1 ac_mid=-1 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 27517 "configure" ++#line 27516 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -27546,16 +27545,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:27549: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:27548: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:27552: \$? = $ac_status" >&5 ++ echo "$as_me:27551: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:27555: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27554: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27558: \$? = $ac_status" >&5 ++ echo "$as_me:27557: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=$ac_mid; break + else +@@ -27571,7 +27570,7 @@ + while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"` + cat >"conftest.$ac_ext" <<_ACEOF +-#line 27574 "configure" ++#line 27573 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -27603,16 +27602,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:27606: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:27605: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:27609: \$? = $ac_status" >&5 ++ echo "$as_me:27608: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:27612: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27611: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27615: \$? = $ac_status" >&5 ++ echo "$as_me:27614: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid + else +@@ -27625,12 +27624,12 @@ + ac_cv_sizeof_bool=$ac_lo + else + if test "$cross_compiling" = yes; then +- { { echo "$as_me:27628: error: cannot run test program while cross compiling" >&5 ++ { { echo "$as_me:27627: error: cannot run test program while cross compiling" >&5 + echo "$as_me: error: cannot run test program while cross compiling" >&2;} + { (exit 1); exit 1; }; } + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 27633 "configure" ++#line 27632 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -27666,15 +27665,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:27669: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:27668: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:27672: \$? = $ac_status" >&5 ++ echo "$as_me:27671: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:27674: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27673: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27677: \$? = $ac_status" >&5 ++ echo "$as_me:27676: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sizeof_bool=`cat conftest.val` + else +@@ -27690,13 +27689,13 @@ + ac_cv_sizeof_bool=0 + fi + fi +-echo "$as_me:27693: result: $ac_cv_sizeof_bool" >&5 ++echo "$as_me:27692: result: $ac_cv_sizeof_bool" >&5 + echo "${ECHO_T}$ac_cv_sizeof_bool" >&6 + cat >>confdefs.h <<EOF + #define SIZEOF_BOOL $ac_cv_sizeof_bool + EOF + +-echo "$as_me:27699: checking for type of bool" >&5 ++echo "$as_me:27698: checking for type of bool" >&5 + echo $ECHO_N "checking for type of bool... $ECHO_C" >&6 + if test "${cf_cv_type_of_bool+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -27715,7 +27714,7 @@ + + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 27718 "configure" ++#line 27717 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -27756,15 +27755,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:27759: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:27758: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:27762: \$? = $ac_status" >&5 ++ echo "$as_me:27761: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:27764: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27763: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27767: \$? = $ac_status" >&5 ++ echo "$as_me:27766: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_type_of_bool=`cat cf_test.out` + if test -z "$cf_cv_type_of_bool"; then +@@ -27781,28 +27780,18 @@ + rm -f cf_test.out + + fi +-echo "$as_me:27784: result: $cf_cv_type_of_bool" >&5 ++echo "$as_me:27783: result: $cf_cv_type_of_bool" >&5 + echo "${ECHO_T}$cf_cv_type_of_bool" >&6 + + if test "$cf_cv_type_of_bool" = unknown ; then + case .$NCURSES_BOOL in + (.auto|.) NCURSES_BOOL=unsigned;; + esac +- { echo "$as_me:27791: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 ++ { echo "$as_me:27790: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 + echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;} + cf_cv_type_of_bool=$NCURSES_BOOL + fi + +- else +- echo "$as_me:27797: checking for fallback type of bool" >&5 +-echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6 +- case "$host_cpu" in +- (i?86) cf_cv_type_of_bool=char ;; +- (*) cf_cv_type_of_bool=int ;; +- esac +- echo "$as_me:27803: result: $cf_cv_type_of_bool" >&5 +-echo "${ECHO_T}$cf_cv_type_of_bool" >&6 +- fi + fi + fi + +@@ -27829,7 +27818,7 @@ + + if test "$cf_with_ada" != "no" ; then + if test "$with_libtool" != "no"; then +- { echo "$as_me:27832: WARNING: libtool does not support Ada - disabling feature" >&5 ++ { echo "$as_me:27821: WARNING: libtool does not support Ada - disabling feature" >&5 + echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;} + cf_with_ada=no + fi +@@ -27840,7 +27829,7 @@ + + ADAFLAGS="$ADAFLAGS -gnatpn" + +- echo "$as_me:27843: checking optimization options for ADAFLAGS" >&5 ++ echo "$as_me:27832: checking optimization options for ADAFLAGS" >&5 + echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 + case "$CFLAGS" in + (*-g*) +@@ -27857,10 +27846,10 @@ + + ;; + esac +- echo "$as_me:27860: result: $ADAFLAGS" >&5 ++ echo "$as_me:27849: result: $ADAFLAGS" >&5 + echo "${ECHO_T}$ADAFLAGS" >&6 + +-echo "$as_me:27863: checking if GNATPREP supports -T option" >&5 ++echo "$as_me:27852: checking if GNATPREP supports -T option" >&5 + echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6 + if test "${cf_cv_gnatprep_opt_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -27870,11 +27859,11 @@ + gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes + + fi +-echo "$as_me:27873: result: $cf_cv_gnatprep_opt_t" >&5 ++echo "$as_me:27862: result: $cf_cv_gnatprep_opt_t" >&5 + echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6 + test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS" + +-echo "$as_me:27877: checking if GNAT supports generics" >&5 ++echo "$as_me:27866: 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[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9]) +@@ -27884,7 +27873,7 @@ + cf_gnat_generics=no + ;; + esac +-echo "$as_me:27887: result: $cf_gnat_generics" >&5 ++echo "$as_me:27876: result: $cf_gnat_generics" >&5 + echo "${ECHO_T}$cf_gnat_generics" >&6 + + if test "$cf_gnat_generics" = yes +@@ -27896,7 +27885,7 @@ + cf_generic_objects= + fi + +-echo "$as_me:27899: checking if GNAT supports SIGINT" >&5 ++echo "$as_me:27888: checking if GNAT supports SIGINT" >&5 + echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6 + if test "${cf_cv_gnat_sigint+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -27944,7 +27933,7 @@ + rm -rf ./conftest* ./*~conftest* + + fi +-echo "$as_me:27947: result: $cf_cv_gnat_sigint" >&5 ++echo "$as_me:27936: result: $cf_cv_gnat_sigint" >&5 + echo "${ECHO_T}$cf_cv_gnat_sigint" >&6 + + if test "$cf_cv_gnat_sigint" = yes ; then +@@ -27957,7 +27946,7 @@ + cf_gnat_projects=no + + if test "$enable_gnat_projects" != no ; then +-echo "$as_me:27960: checking if GNAT supports project files" >&5 ++echo "$as_me:27949: checking if GNAT supports project files" >&5 + echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6 + case "$cf_cv_gnat_version" in + (3.[0-9]*) +@@ -28020,15 +28009,15 @@ + esac + ;; + esac +-echo "$as_me:28023: result: $cf_gnat_projects" >&5 ++echo "$as_me:28012: result: $cf_gnat_projects" >&5 + echo "${ECHO_T}$cf_gnat_projects" >&6 + fi # enable_gnat_projects + + if test "$cf_gnat_projects" = yes + then +- echo "$as_me:28029: checking if GNAT supports libraries" >&5 ++ echo "$as_me:28018: checking if GNAT supports libraries" >&5 + echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6 +- echo "$as_me:28031: result: $cf_gnat_libraries" >&5 ++ echo "$as_me:28020: result: $cf_gnat_libraries" >&5 + echo "${ECHO_T}$cf_gnat_libraries" >&6 + fi + +@@ -28048,7 +28037,7 @@ + then + USE_GNAT_MAKE_GPR="" + else +- { echo "$as_me:28051: WARNING: use old makefile rules since tools are missing" >&5 ++ { echo "$as_me:28040: WARNING: use old makefile rules since tools are missing" >&5 + echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;} + fi + fi +@@ -28060,7 +28049,7 @@ + USE_GNAT_LIBRARIES="#" + fi + +-echo "$as_me:28063: checking for Ada95 compiler" >&5 ++echo "$as_me:28052: checking for Ada95 compiler" >&5 + echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6 + + # Check whether --with-ada-compiler or --without-ada-compiler was given. +@@ -28071,12 +28060,12 @@ + cf_ada_compiler=gnatmake + fi; + +-echo "$as_me:28074: result: $cf_ada_compiler" >&5 ++echo "$as_me:28063: result: $cf_ada_compiler" >&5 + echo "${ECHO_T}$cf_ada_compiler" >&6 + + cf_ada_package=terminal_interface + +-echo "$as_me:28079: checking for Ada95 include directory" >&5 ++echo "$as_me:28068: checking for Ada95 include directory" >&5 + echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6 + + # Check whether --with-ada-include or --without-ada-include was given. +@@ -28110,7 +28099,7 @@ + withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:28113: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:28102: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -28119,10 +28108,10 @@ + fi + eval ADA_INCLUDE="$withval" + +-echo "$as_me:28122: result: $ADA_INCLUDE" >&5 ++echo "$as_me:28111: result: $ADA_INCLUDE" >&5 + echo "${ECHO_T}$ADA_INCLUDE" >&6 + +-echo "$as_me:28125: checking for Ada95 object directory" >&5 ++echo "$as_me:28114: checking for Ada95 object directory" >&5 + echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6 + + # Check whether --with-ada-objects or --without-ada-objects was given. +@@ -28156,7 +28145,7 @@ + withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:28159: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:28148: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -28165,10 +28154,10 @@ + fi + eval ADA_OBJECTS="$withval" + +-echo "$as_me:28168: result: $ADA_OBJECTS" >&5 ++echo "$as_me:28157: result: $ADA_OBJECTS" >&5 + echo "${ECHO_T}$ADA_OBJECTS" >&6 + +-echo "$as_me:28171: checking whether to build an Ada95 shared library" >&5 ++echo "$as_me:28160: checking whether to build an Ada95 shared library" >&5 + echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6 + + # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given. +@@ -28189,11 +28178,11 @@ + fi + fi + +-echo "$as_me:28192: result: $with_ada_sharedlib" >&5 ++echo "$as_me:28181: result: $with_ada_sharedlib" >&5 + echo "${ECHO_T}$with_ada_sharedlib" >&6 + if test "x$cf_ada_sharedlib_warn" != xno + then +- { echo "$as_me:28196: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5 ++ { echo "$as_me:28185: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5 + echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;} + fi + +@@ -28211,7 +28200,7 @@ + + # allow the Ada binding to be renamed + +-echo "$as_me:28214: checking for Ada95 curses library name" >&5 ++echo "$as_me:28203: checking for Ada95 curses library name" >&5 + echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6 + + # Check whether --with-ada-libname or --without-ada-libname was given. +@@ -28227,7 +28216,7 @@ + ;; + esac + +-echo "$as_me:28230: result: $ADA_LIBNAME" >&5 ++echo "$as_me:28219: result: $ADA_LIBNAME" >&5 + echo "${ECHO_T}$ADA_LIBNAME" >&6 + + fi +@@ -28238,13 +28227,13 @@ + + # do this "late" to avoid conflict with header-checks + if test "x$with_widec" = xyes ; then +- echo "$as_me:28241: checking for wchar_t" >&5 ++ echo "$as_me:28230: checking for wchar_t" >&5 + echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6 + if test "${ac_cv_type_wchar_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 28247 "configure" ++#line 28236 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -28259,16 +28248,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:28262: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:28251: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:28265: \$? = $ac_status" >&5 ++ echo "$as_me:28254: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:28268: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:28257: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:28271: \$? = $ac_status" >&5 ++ echo "$as_me:28260: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_type_wchar_t=yes + else +@@ -28278,10 +28267,10 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:28281: result: $ac_cv_type_wchar_t" >&5 ++echo "$as_me:28270: result: $ac_cv_type_wchar_t" >&5 + echo "${ECHO_T}$ac_cv_type_wchar_t" >&6 + +-echo "$as_me:28284: checking size of wchar_t" >&5 ++echo "$as_me:28273: checking size of wchar_t" >&5 + echo $ECHO_N "checking size of wchar_t... $ECHO_C" >&6 + if test "${ac_cv_sizeof_wchar_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -28290,7 +28279,7 @@ + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 28293 "configure" ++#line 28282 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -28302,21 +28291,21 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:28305: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:28294: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:28308: \$? = $ac_status" >&5 ++ echo "$as_me:28297: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:28311: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:28300: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:28314: \$? = $ac_status" >&5 ++ echo "$as_me:28303: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 28319 "configure" ++#line 28308 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -28328,16 +28317,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:28331: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:28320: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:28334: \$? = $ac_status" >&5 ++ echo "$as_me:28323: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:28337: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:28326: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:28340: \$? = $ac_status" >&5 ++ echo "$as_me:28329: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid; break + else +@@ -28353,7 +28342,7 @@ + ac_hi=-1 ac_mid=-1 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 28356 "configure" ++#line 28345 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -28365,16 +28354,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:28368: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:28357: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:28371: \$? = $ac_status" >&5 ++ echo "$as_me:28360: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:28374: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:28363: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:28377: \$? = $ac_status" >&5 ++ echo "$as_me:28366: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=$ac_mid; break + else +@@ -28390,7 +28379,7 @@ + while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"` + cat >"conftest.$ac_ext" <<_ACEOF +-#line 28393 "configure" ++#line 28382 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -28402,16 +28391,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:28405: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:28394: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:28408: \$? = $ac_status" >&5 ++ echo "$as_me:28397: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:28411: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:28400: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:28414: \$? = $ac_status" >&5 ++ echo "$as_me:28403: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid + else +@@ -28424,12 +28413,12 @@ + ac_cv_sizeof_wchar_t=$ac_lo + else + if test "$cross_compiling" = yes; then +- { { echo "$as_me:28427: error: cannot run test program while cross compiling" >&5 ++ { { echo "$as_me:28416: error: cannot run test program while cross compiling" >&5 + echo "$as_me: error: cannot run test program while cross compiling" >&2;} + { (exit 1); exit 1; }; } + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 28432 "configure" ++#line 28421 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -28445,15 +28434,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:28448: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:28437: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:28451: \$? = $ac_status" >&5 ++ echo "$as_me:28440: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:28453: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:28442: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:28456: \$? = $ac_status" >&5 ++ echo "$as_me:28445: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sizeof_wchar_t=`cat conftest.val` + else +@@ -28469,7 +28458,7 @@ + ac_cv_sizeof_wchar_t=0 + fi + fi +-echo "$as_me:28472: result: $ac_cv_sizeof_wchar_t" >&5 ++echo "$as_me:28461: result: $ac_cv_sizeof_wchar_t" >&5 + echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6 + cat >>confdefs.h <<EOF + #define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t +@@ -28482,7 +28471,7 @@ + then + test -n "$verbose" && echo " test failed (assume 2)" 1>&6 + +-echo "${as_me:-configure}:28485: testing test failed (assume 2) ..." 1>&5 ++echo "${as_me:-configure}:28474: testing test failed (assume 2) ..." 1>&5 + + sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp + mv confdefs.tmp confdefs.h +@@ -28500,7 +28489,7 @@ + ### chooses to split module lists into libraries. + ### + ### (see CF_LIB_RULES). +-echo "$as_me:28503: checking for library subsets" >&5 ++echo "$as_me:28492: checking for library subsets" >&5 + echo $ECHO_N "checking for library subsets... $ECHO_C" >&6 + LIB_SUBSETS= + +@@ -28554,7 +28543,7 @@ + test "x$with_widec" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+widechar" + test "x$with_ext_funcs" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs" + +-echo "$as_me:28557: result: $LIB_SUBSETS" >&5 ++echo "$as_me:28546: result: $LIB_SUBSETS" >&5 + echo "${ECHO_T}$LIB_SUBSETS" >&6 + + ### Construct the list of include-directories to be generated +@@ -28585,7 +28574,7 @@ + fi + + ### Build up pieces for makefile rules +-echo "$as_me:28588: checking default library suffix" >&5 ++echo "$as_me:28577: checking default library suffix" >&5 + echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 + + case $DFT_LWR_MODEL in +@@ -28596,10 +28585,10 @@ + (shared) DFT_ARG_SUFFIX='' ;; + esac + test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}" +-echo "$as_me:28599: result: $DFT_ARG_SUFFIX" >&5 ++echo "$as_me:28588: result: $DFT_ARG_SUFFIX" >&5 + echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 + +-echo "$as_me:28602: checking default library-dependency suffix" >&5 ++echo "$as_me:28591: checking default library-dependency suffix" >&5 + echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 + + case X$DFT_LWR_MODEL in +@@ -28682,10 +28671,10 @@ + DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}" + DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}" + fi +-echo "$as_me:28685: result: $DFT_DEP_SUFFIX" >&5 ++echo "$as_me:28674: result: $DFT_DEP_SUFFIX" >&5 + echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 + +-echo "$as_me:28688: checking default object directory" >&5 ++echo "$as_me:28677: checking default object directory" >&5 + echo $ECHO_N "checking default object directory... $ECHO_C" >&6 + + case $DFT_LWR_MODEL in +@@ -28701,11 +28690,11 @@ + DFT_OBJ_SUBDIR='obj_s' ;; + esac + esac +-echo "$as_me:28704: result: $DFT_OBJ_SUBDIR" >&5 ++echo "$as_me:28693: result: $DFT_OBJ_SUBDIR" >&5 + echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 + + if test "x$cf_with_cxx" = xyes ; then +-echo "$as_me:28708: checking c++ library-dependency suffix" >&5 ++echo "$as_me:28697: checking c++ library-dependency suffix" >&5 + echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6 + if test "$with_libtool" != "no"; then + # libtool thinks it can make c++ shared libraries (perhaps only g++) +@@ -28798,7 +28787,7 @@ + fi + + fi +-echo "$as_me:28801: result: $CXX_LIB_SUFFIX" >&5 ++echo "$as_me:28790: result: $CXX_LIB_SUFFIX" >&5 + echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6 + + fi +@@ -28974,19 +28963,19 @@ + + if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED" + then +- echo "$as_me:28977: checking if linker supports switching between static/dynamic" >&5 ++ echo "$as_me:28966: checking if linker supports switching between static/dynamic" >&5 + echo $ECHO_N "checking if linker supports switching between static/dynamic... $ECHO_C" >&6 + + rm -f libconftest.a + cat >conftest.$ac_ext <<EOF +-#line 28982 "configure" ++#line 28971 "configure" + #include <stdio.h> + int cf_ldflags_static(FILE *fp) { return fflush(fp); } + EOF +- if { (eval echo "$as_me:28986: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:28975: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:28989: \$? = $ac_status" >&5 ++ echo "$as_me:28978: \$? = $ac_status" >&5 + (exit "$ac_status"); } ; then + ( $AR $ARFLAGS libconftest.a conftest.o ) 2>&5 1>/dev/null + ( eval $RANLIB libconftest.a ) 2>&5 >/dev/null +@@ -28997,10 +28986,10 @@ + + LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 29000 "configure" ++#line 28989 "configure" + #include "confdefs.h" + +-#line 29003 "configure" ++#line 28992 "configure" + #include <stdio.h> + int cf_ldflags_static(FILE *fp); + +@@ -29015,16 +29004,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:29018: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:29007: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:29021: \$? = $ac_status" >&5 ++ echo "$as_me:29010: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:29024: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:29013: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:29027: \$? = $ac_status" >&5 ++ echo "$as_me:29016: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + # some linkers simply ignore the -dynamic +@@ -29047,7 +29036,7 @@ + rm -f libconftest.* + LIBS="$cf_save_LIBS" + +- echo "$as_me:29050: result: $cf_ldflags_static" >&5 ++ echo "$as_me:29039: result: $cf_ldflags_static" >&5 + echo "${ECHO_T}$cf_ldflags_static" >&6 + + if test "$cf_ldflags_static" != yes +@@ -29063,7 +29052,7 @@ + ;; + esac + +-echo "$as_me:29066: checking where we will install curses.h" >&5 ++echo "$as_me:29055: checking where we will install curses.h" >&5 + echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6 + + includesubdir= +@@ -29073,7 +29062,7 @@ + then + includesubdir="/ncurses${USE_LIB_SUFFIX}" + fi +-echo "$as_me:29076: result: ${includedir}${includesubdir}" >&5 ++echo "$as_me:29065: result: ${includedir}${includesubdir}" >&5 + echo "${ECHO_T}${includedir}${includesubdir}" >&6 + + ### Resolve a conflict between normal and wide-curses by forcing applications +@@ -29081,7 +29070,7 @@ + if test "$with_overwrite" != no ; then + if test "$NCURSES_LIBUTF8" = 1 ; then + NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)' +- { echo "$as_me:29084: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 ++ { echo "$as_me:29073: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 + echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;} + fi + fi +@@ -29106,7 +29095,7 @@ + + # pkgsrc uses these + +-echo "$as_me:29109: checking for desired basename for form library" >&5 ++echo "$as_me:29098: checking for desired basename for form library" >&5 + echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6 + + # Check whether --with-form-libname or --without-form-libname was given. +@@ -29126,10 +29115,10 @@ + ;; + esac + +-echo "$as_me:29129: result: $FORM_NAME" >&5 ++echo "$as_me:29118: result: $FORM_NAME" >&5 + echo "${ECHO_T}$FORM_NAME" >&6 + +-echo "$as_me:29132: checking for desired basename for menu library" >&5 ++echo "$as_me:29121: checking for desired basename for menu library" >&5 + echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6 + + # Check whether --with-menu-libname or --without-menu-libname was given. +@@ -29149,10 +29138,10 @@ + ;; + esac + +-echo "$as_me:29152: result: $MENU_NAME" >&5 ++echo "$as_me:29141: result: $MENU_NAME" >&5 + echo "${ECHO_T}$MENU_NAME" >&6 + +-echo "$as_me:29155: checking for desired basename for panel library" >&5 ++echo "$as_me:29144: checking for desired basename for panel library" >&5 + echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6 + + # Check whether --with-panel-libname or --without-panel-libname was given. +@@ -29172,10 +29161,10 @@ + ;; + esac + +-echo "$as_me:29175: result: $PANEL_NAME" >&5 ++echo "$as_me:29164: result: $PANEL_NAME" >&5 + echo "${ECHO_T}$PANEL_NAME" >&6 + +-echo "$as_me:29178: checking for desired basename for cxx library" >&5 ++echo "$as_me:29167: checking for desired basename for cxx library" >&5 + echo $ECHO_N "checking for desired basename for cxx library... $ECHO_C" >&6 + + # Check whether --with-cxx-libname or --without-cxx-libname was given. +@@ -29195,13 +29184,13 @@ + ;; + esac + +-echo "$as_me:29198: result: $CXX_NAME" >&5 ++echo "$as_me:29187: result: $CXX_NAME" >&5 + echo "${ECHO_T}$CXX_NAME" >&6 + + ### Construct the list of subdirectories for which we'll customize makefiles + ### with the appropriate compile-rules. + +-echo "$as_me:29204: checking for src modules" >&5 ++echo "$as_me:29193: checking for src modules" >&5 + echo $ECHO_N "checking for src modules... $ECHO_C" >&6 + + # dependencies and linker-arguments for test-programs +@@ -29260,7 +29249,7 @@ + fi + fi + done +-echo "$as_me:29263: result: $cf_cv_src_modules" >&5 ++echo "$as_me:29252: result: $cf_cv_src_modules" >&5 + echo "${ECHO_T}$cf_cv_src_modules" >&6 + + TEST_ARGS="-L${LIB_DIR} $TEST_ARGS" +@@ -29421,7 +29410,7 @@ + (*-D_XOPEN_SOURCE_EXTENDED*) + test -n "$verbose" && echo " moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6 + +-echo "${as_me:-configure}:29424: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5 ++echo "${as_me:-configure}:29413: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5 + + CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED" + CPPFLAGS=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/-D_XOPEN_SOURCE_EXTENDED//'` +@@ -29432,7 +29421,7 @@ + + # Help to automatically enable the extended curses features when using either + # the *-config or the ".pc" files by adding defines. +-echo "$as_me:29435: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5 ++echo "$as_me:29424: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5 + echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script... $ECHO_C" >&6 + PKG_CFLAGS= + for cf_loop1 in $CPPFLAGS_after_XOPEN +@@ -29448,7 +29437,7 @@ + done + test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1" + done +-echo "$as_me:29451: result: $PKG_CFLAGS" >&5 ++echo "$as_me:29440: result: $PKG_CFLAGS" >&5 + echo "${ECHO_T}$PKG_CFLAGS" >&6 + + case "$cf_cv_system_name" in +@@ -29520,7 +29509,7 @@ + cf_filter_syms=$cf_dft_filter_syms + test -n "$verbose" && echo " will map symbols to ABI=$cf_cv_abi_default" 1>&6 + +-echo "${as_me:-configure}:29523: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5 ++echo "${as_me:-configure}:29512: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5 + + fi + +@@ -29547,7 +29536,7 @@ + + # This is used for the *-config script and *.pc data files. + +-echo "$as_me:29550: checking for linker search path" >&5 ++echo "$as_me:29539: checking for linker search path" >&5 + echo $ECHO_N "checking for linker search path... $ECHO_C" >&6 + if test "${cf_cv_ld_searchpath+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -29595,7 +29584,7 @@ + cf_pathlist="$cf_pathlist /lib /usr/lib" + ;; + (*) +- { echo "$as_me:29598: WARNING: problem with Solaris architecture" >&5 ++ { echo "$as_me:29587: WARNING: problem with Solaris architecture" >&5 + echo "$as_me: WARNING: problem with Solaris architecture" >&2;} + ;; + esac +@@ -29636,7 +29625,7 @@ + test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib + + fi +-echo "$as_me:29639: result: $cf_cv_ld_searchpath" >&5 ++echo "$as_me:29628: result: $cf_cv_ld_searchpath" >&5 + echo "${ECHO_T}$cf_cv_ld_searchpath" >&6 + + LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'` +@@ -29722,7 +29711,7 @@ + : "${CONFIG_STATUS=./config.status}" + ac_clean_files_save=$ac_clean_files + ac_clean_files="$ac_clean_files $CONFIG_STATUS" +-{ echo "$as_me:29725: creating $CONFIG_STATUS" >&5 ++{ echo "$as_me:29714: creating $CONFIG_STATUS" >&5 + echo "$as_me: creating $CONFIG_STATUS" >&6;} + cat >"$CONFIG_STATUS" <<_ACEOF + #! $SHELL +@@ -29903,7 +29892,7 @@ + echo "$ac_cs_version"; exit 0 ;; + --he | --h) + # Conflict between --help and --header +- { { echo "$as_me:29906: error: ambiguous option: $1 ++ { { echo "$as_me:29895: error: ambiguous option: $1 + Try \`$0 --help' for more information." >&5 + echo "$as_me: error: ambiguous option: $1 + Try \`$0 --help' for more information." >&2;} +@@ -29922,7 +29911,7 @@ + ac_need_defaults=false;; + + # This is an error. +- -*) { { echo "$as_me:29925: error: unrecognized option: $1 ++ -*) { { echo "$as_me:29914: error: unrecognized option: $1 + Try \`$0 --help' for more information." >&5 + echo "$as_me: error: unrecognized option: $1 + Try \`$0 --help' for more information." >&2;} +@@ -30054,7 +30043,7 @@ + "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; + "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;; +- *) { { echo "$as_me:30057: error: invalid argument: $ac_config_target" >&5 ++ *) { { echo "$as_me:30046: error: invalid argument: $ac_config_target" >&5 + echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + { (exit 1); exit 1; }; };; + esac +@@ -30579,7 +30568,7 @@ + esac + + if test x"$ac_file" != x-; then +- { echo "$as_me:30582: creating $ac_file" >&5 ++ { echo "$as_me:30571: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi +@@ -30597,7 +30586,7 @@ + -) echo "$tmp"/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:30600: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:30589: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo "$f";; +@@ -30610,7 +30599,7 @@ + echo "$srcdir/$f" + else + # /dev/null tree +- { { echo "$as_me:30613: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:30602: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -30626,7 +30615,7 @@ + if test -n "$ac_seen"; then + ac_used=`grep '@datarootdir@' "$ac_item"` + if test -z "$ac_used"; then +- { echo "$as_me:30629: WARNING: datarootdir was used implicitly but not set: ++ { echo "$as_me:30618: WARNING: datarootdir was used implicitly but not set: + $ac_seen" >&5 + echo "$as_me: WARNING: datarootdir was used implicitly but not set: + $ac_seen" >&2;} +@@ -30635,7 +30624,7 @@ + fi + ac_seen=`grep '${datarootdir}' "$ac_item"` + if test -n "$ac_seen"; then +- { echo "$as_me:30638: WARNING: datarootdir was used explicitly but not set: ++ { echo "$as_me:30627: WARNING: datarootdir was used explicitly but not set: + $ac_seen" >&5 + echo "$as_me: WARNING: datarootdir was used explicitly but not set: + $ac_seen" >&2;} +@@ -30680,7 +30669,7 @@ + ac_init=`$EGREP '[ ]*'$ac_name'[ ]*=' "$ac_file"` + if test -z "$ac_init"; then + ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'` +- { echo "$as_me:30683: WARNING: Variable $ac_name is used but was not set: ++ { echo "$as_me:30672: WARNING: Variable $ac_name is used but was not set: + $ac_seen" >&5 + echo "$as_me: WARNING: Variable $ac_name is used but was not set: + $ac_seen" >&2;} +@@ -30691,7 +30680,7 @@ + $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out + if test -s "$tmp"/out; then + ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out` +- { echo "$as_me:30694: WARNING: Some variables may not be substituted: ++ { echo "$as_me:30683: WARNING: Some variables may not be substituted: + $ac_seen" >&5 + echo "$as_me: WARNING: Some variables may not be substituted: + $ac_seen" >&2;} +@@ -30740,7 +30729,7 @@ + * ) ac_file_in=$ac_file.in ;; + esac + +- test x"$ac_file" != x- && { echo "$as_me:30743: creating $ac_file" >&5 ++ test x"$ac_file" != x- && { echo "$as_me:30732: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + + # First look for the input files in the build tree, otherwise in the +@@ -30751,7 +30740,7 @@ + -) echo "$tmp"/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:30754: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:30743: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; +@@ -30764,7 +30753,7 @@ + echo "$srcdir/$f" + else + # /dev/null tree +- { { echo "$as_me:30767: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:30756: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -30822,7 +30811,7 @@ + rm -f "$tmp"/in + if test x"$ac_file" != x-; then + if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then +- { echo "$as_me:30825: $ac_file is unchanged" >&5 ++ { echo "$as_me:30814: $ac_file is unchanged" >&5 + echo "$as_me: $ac_file is unchanged" >&6;} + else + ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +@@ -31209,7 +31198,7 @@ + (cygdll|msysdll|mingw|msvcdll) + test "x$with_shared_cxx" = xno && test -n "$verbose" && echo " overriding CXX_MODEL to SHARED" 1>&6 + +-echo "${as_me:-configure}:31212: testing overriding CXX_MODEL to SHARED ..." 1>&5 ++echo "${as_me:-configure}:31201: testing overriding CXX_MODEL to SHARED ..." 1>&5 + + with_shared_cxx=yes + ;; +Index: configure.in +Prereq: 1.786 +--- ncurses-6.5-20241109+/configure.in 2024-08-31 10:46:01.000000000 +0000 ++++ ncurses-6.5-20241123/configure.in 2024-11-23 22:52:31.000000000 +0000 +@@ -29,7 +29,7 @@ + dnl + dnl Author: Thomas E. Dickey 1995-on + dnl +-dnl $Id: configure.in,v 1.786 2024/08/31 10:46:01 Rafael.Kitover Exp $ ++dnl $Id: configure.in,v 1.787 2024/11/23 22:52:31 tom 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.786 $) ++AC_REVISION($Revision: 1.787 $) + AC_INIT(ncurses/base/lib_initscr.c) + AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin) + +@@ -1942,16 +1942,7 @@ + cf_cv_type_of_bool=$NCURSES_BOOL + cf_cv_header_stdbool_h=0 + else +- if test "$cf_cv_header_stdbool_h" = 1 ; then +- CF_BOOL_SIZE +- else +- AC_MSG_CHECKING(for fallback type of bool) +- case "$host_cpu" in +- (i?86) cf_cv_type_of_bool=char ;; +- (*) cf_cv_type_of_bool=int ;; +- esac +- AC_MSG_RESULT($cf_cv_type_of_bool) +- fi ++ CF_BOOL_SIZE + fi + fi + AC_SUBST(CXXLIBS) +Index: dist.mk +Prereq: 1.1640 +--- ncurses-6.5-20241109+/dist.mk 2024-11-09 11:12:30.000000000 +0000 ++++ ncurses-6.5-20241123/dist.mk 2024-11-23 10:51:23.000000000 +0000 +@@ -26,7 +26,7 @@ + # use or other dealings in this Software without prior written # + # authorization. # + ############################################################################## +-# $Id: dist.mk,v 1.1640 2024/11/09 11:12:30 tom Exp $ ++# $Id: dist.mk,v 1.1642 2024/11/23 10:51:23 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 = 20241109 ++NCURSES_PATCH = 20241123 + + # We don't append the patch to the version, since this only applies to releases + VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) +Index: menu/m_item_new.c +Prereq: 1.38 +--- ncurses-6.5-20241109+/menu/m_item_new.c 2021-06-17 21:26:02.000000000 +0000 ++++ ncurses-6.5-20241123/menu/m_item_new.c 2024-11-23 19:16:50.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright 2020-2021 Thomas E. Dickey * ++ * Copyright 2020-2021,2024 Thomas E. Dickey * + * Copyright 1998-2010,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * +@@ -45,7 +45,7 @@ + #endif + #endif + +-MODULE_ID("$Id: m_item_new.c,v 1.38 2021/06/17 21:26:02 tom Exp $") ++MODULE_ID("$Id: m_item_new.c,v 1.39 2024/11/23 19:16:50 tom Exp $") + + /*--------------------------------------------------------------------------- + | Facility : libnmenu +@@ -60,7 +60,7 @@ + static bool + Is_Printable_String(const char *s) + { +- int result = TRUE; ++ bool result = TRUE; + + #if USE_WIDEC_SUPPORT + int count = (int)mbstowcs(0, s, 0); +Index: ncurses/base/lib_color.c +Prereq: 1.151 +--- ncurses-6.5-20241109+/ncurses/base/lib_color.c 2024-05-25 23:10:42.000000000 +0000 ++++ ncurses-6.5-20241123/ncurses/base/lib_color.c 2024-11-23 18:27:25.000000000 +0000 +@@ -49,7 +49,7 @@ + #define CUR SP_TERMTYPE + #endif + +-MODULE_ID("$Id: lib_color.c,v 1.151 2024/05/25 23:10:42 tom Exp $") ++MODULE_ID("$Id: lib_color.c,v 1.152 2024/11/23 18:27:25 tom Exp $") + + #ifdef USE_TERM_DRIVER + #define CanChange InfoOf(SP_PARM).canchange +@@ -776,7 +776,7 @@ + NCURSES_EXPORT(bool) + NCURSES_SP_NAME(can_change_color) (NCURSES_SP_DCL) + { +- int result = FALSE; ++ bool result = FALSE; + + T((T_CALLED("can_change_color(%p)"), (void *) SP_PARM)); + +@@ -784,7 +784,7 @@ + result = TRUE; + } + +- returnCode(result); ++ returnBool(result); + } + + #if NCURSES_SP_FUNCS +@@ -798,7 +798,7 @@ + NCURSES_EXPORT(bool) + NCURSES_SP_NAME(has_colors) (NCURSES_SP_DCL0) + { +- int code = FALSE; ++ bool code = FALSE; + + (void) SP_PARM; + T((T_CALLED("has_colors(%p)"), (void *) SP_PARM)); +@@ -814,7 +814,7 @@ + || set_color_pair)) ? TRUE : FALSE); + #endif + } +- returnCode(code); ++ returnBool(code); + } + + #if NCURSES_SP_FUNCS +Index: ncurses/base/lib_mouse.c +Prereq: 1.201 +--- ncurses-6.5-20241109+/ncurses/base/lib_mouse.c 2024-10-19 21:03:19.000000000 +0000 ++++ ncurses-6.5-20241123/ncurses/base/lib_mouse.c 2024-11-23 19:06:20.000000000 +0000 +@@ -85,7 +85,7 @@ + #define CUR SP_TERMTYPE + #endif + +-MODULE_ID("$Id: lib_mouse.c,v 1.201 2024/10/19 21:03:19 tom Exp $") ++MODULE_ID("$Id: lib_mouse.c,v 1.202 2024/11/23 19:06:20 tom Exp $") + + #include <tic.h> + +@@ -440,7 +440,7 @@ + #endif + + static void +-enable_xterm_mouse(SCREEN *sp, int enable) ++enable_xterm_mouse(SCREEN *sp, bool enable) + { + TPUTS_TRACE(enable + ? "xterm mouse initialization" +@@ -455,7 +455,7 @@ + + #if defined(USE_TERM_DRIVER) + static void +-enable_win32_mouse(SCREEN *sp, int enable) ++enable_win32_mouse(SCREEN *sp, bool enable) + { + #if defined(EXP_WIN32_DRIVER) + enable_xterm_mouse(sp, enable); +@@ -485,7 +485,7 @@ + const char *env = getenv("TERM"); + if (list != 0) { + if (env != 0) { +- result = _nc_name_match(list, env, "|:"); ++ result = _nc_name_match(list, env, "|:") ? TRUE : FALSE; + } + } else { + /* GPM checks the beginning of the $TERM variable to decide if it +@@ -796,7 +796,7 @@ + } + result = sp->_mouse_initialized; + } +- returnCode(result); ++ returnBool(result); + } + + /* +@@ -1404,7 +1404,7 @@ + } + + static void +-mouse_activate(SCREEN *sp, int on) ++mouse_activate(SCREEN *sp, bool on) + { + T((T_CALLED("mouse_activate(%p,%s)"), + (void *) SP_PARM, on ? "on" : "off")); +@@ -1422,7 +1422,7 @@ + #if NCURSES_EXT_FUNCS + NCURSES_SP_NAME(keyok) (NCURSES_SP_ARGx KEY_MOUSE, on); + #endif +- enable_xterm_mouse(sp, 1); ++ enable_xterm_mouse(sp, TRUE); + break; + #if USE_GPM_SUPPORT + case M_GPM: +@@ -1462,7 +1462,7 @@ + + switch (sp->_mouse_type) { + case M_XTERM: +- enable_xterm_mouse(sp, 0); ++ enable_xterm_mouse(sp, FALSE); + break; + #if USE_GPM_SUPPORT + case M_GPM: +Index: ncurses/base/lib_newterm.c +Prereq: 1.105 +--- ncurses-6.5-20241109+/ncurses/base/lib_newterm.c 2024-05-11 19:06:59.000000000 +0000 ++++ ncurses-6.5-20241123/ncurses/base/lib_newterm.c 2024-11-23 18:33:35.000000000 +0000 +@@ -49,7 +49,7 @@ + + #include <tic.h> + +-MODULE_ID("$Id: lib_newterm.c,v 1.105 2024/05/11 19:06:59 tom Exp $") ++MODULE_ID("$Id: lib_newterm.c,v 1.106 2024/11/23 18:33:35 tom Exp $") + + #ifdef USE_TERM_DRIVER + #define NumLabels InfoOf(SP_PARM).numlabels +@@ -212,7 +212,7 @@ + TINFO_SETUP_TERM(&new_term, name, + fileno(_ofp), &errret, FALSE) != ERR) { + int slk_format; +- int filter_mode; ++ bool filter_mode; + + _nc_set_screen(0); + #ifdef USE_TERM_DRIVER +Index: ncurses/base/lib_set_term.c +Prereq: 1.188 +--- ncurses-6.5-20241109+/ncurses/base/lib_set_term.c 2024-11-09 16:36:29.000000000 +0000 ++++ ncurses-6.5-20241123/ncurses/base/lib_set_term.c 2024-11-23 18:33:50.000000000 +0000 +@@ -57,7 +57,7 @@ + #undef CUR + #define CUR SP_TERMTYPE + +-MODULE_ID("$Id: lib_set_term.c,v 1.188 2024/11/09 16:36:29 tom Exp $") ++MODULE_ID("$Id: lib_set_term.c,v 1.189 2024/11/23 18:33:50 tom Exp $") + + #ifdef USE_TERM_DRIVER + #define MaxColors InfoOf(sp).maxcolors +@@ -315,7 +315,7 @@ + int slines, + int scolumns, + FILE *output, +- int filtered, ++ bool filtered, + int slk_format) + { + #ifndef USE_TERM_DRIVER +@@ -766,7 +766,7 @@ + _nc_setupscreen(int slines GCC_UNUSED, + int scolumns GCC_UNUSED, + FILE *output, +- int filtered, ++ bool filtered, + int slk_format) + { + SCREEN *sp = 0; +Index: ncurses/base/lib_touch.c +Prereq: 1.16 +--- ncurses-6.5-20241109+/ncurses/base/lib_touch.c 2020-02-02 23:34:34.000000000 +0000 ++++ ncurses-6.5-20241123/ncurses/base/lib_touch.c 2024-11-23 19:17:05.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright 2020 Thomas E. Dickey * ++ * Copyright 2020,2024 Thomas E. Dickey * + * Copyright 1998-2016,2017 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * +@@ -44,7 +44,7 @@ + + #include <curses.priv.h> + +-MODULE_ID("$Id: lib_touch.c,v 1.16 2020/02/02 23:34:34 tom Exp $") ++MODULE_ID("$Id: lib_touch.c,v 1.17 2024/11/23 19:17:05 tom Exp $") + + #undef is_linetouched + +@@ -55,10 +55,10 @@ + + /* XSI doesn't define any error, and gcc ultimately made it impossible */ + if (!win || (line > win->_maxy) || (line < 0)) { +- returnCode(FALSE); ++ returnBool(FALSE); + } + +- returnCode(win->_line[line].firstchar != _NOCHANGE ? TRUE : FALSE); ++ returnBool(win->_line[line].firstchar != _NOCHANGE ? TRUE : FALSE); + } + + NCURSES_EXPORT(bool) +@@ -71,9 +71,9 @@ + + for (i = 0; i <= win->_maxy; i++) + if (win->_line[i].firstchar != _NOCHANGE) +- returnCode(TRUE); ++ returnBool(TRUE); + } +- returnCode(FALSE); ++ returnBool(FALSE); + } + + NCURSES_EXPORT(int) +Index: ncurses/base/resizeterm.c +Prereq: 1.56 +--- ncurses-6.5-20241109+/ncurses/base/resizeterm.c 2024-09-22 20:25:15.000000000 +0000 ++++ ncurses-6.5-20241123/ncurses/base/resizeterm.c 2024-11-23 18:35:34.000000000 +0000 +@@ -46,7 +46,7 @@ + #define CUR SP_TERMTYPE + #endif + +-MODULE_ID("$Id: resizeterm.c,v 1.56 2024/09/22 20:25:15 tom Exp $") ++MODULE_ID("$Id: resizeterm.c,v 1.57 2024/11/23 18:35:34 tom Exp $") + + /* + * If we're trying to be reentrant, do not want any local statics. +@@ -103,7 +103,7 @@ + NCURSES_SP_NAME(is_term_resized) (NCURSES_SP_DCLx int ToLines, int ToCols) + { + T((T_CALLED("is_term_resized(%p, %d, %d)"), (void *) SP_PARM, ToLines, ToCols)); +- returnCode(ToLines > 0 ++ returnBool(ToLines > 0 + && ToCols > 0 + && SP_PARM != NULL + && (ToLines != screen_lines(SP_PARM) +Index: ncurses/curses.priv.h +Prereq: 1.694 +--- ncurses-6.5-20241109+/ncurses/curses.priv.h 2024-10-19 21:23:40.000000000 +0000 ++++ ncurses-6.5-20241123/ncurses/curses.priv.h 2024-11-23 18:40:45.000000000 +0000 +@@ -35,7 +35,7 @@ + ****************************************************************************/ + + /* +- * $Id: curses.priv.h,v 1.694 2024/10/19 21:23:40 tom Exp $ ++ * $Id: curses.priv.h,v 1.695 2024/11/23 18:40:45 tom Exp $ + * + * curses.priv.h + * +@@ -1733,7 +1733,7 @@ + #define returnPtrDB(rc) do { TR(TRACE_DATABASE,(T_RETURN("%p"), (rc))); return (rc); } while (0) + #define returnVoidDB do { TR(TRACE_DATABASE,(T_RETURN(""))); return; } while (0) + +-extern NCURSES_EXPORT(NCURSES_BOOL) _nc_retrace_bool (int); ++extern NCURSES_EXPORT(bool) _nc_retrace_bool (bool); + extern NCURSES_EXPORT(NCURSES_CONST void *) _nc_retrace_cvoid_ptr (NCURSES_CONST void *); + extern NCURSES_EXPORT(SCREEN *) _nc_retrace_sp (SCREEN *); + extern NCURSES_EXPORT(WINDOW *) _nc_retrace_win (WINDOW *); +@@ -2067,7 +2067,7 @@ + + /* lib_setup.c */ + extern NCURSES_EXPORT(char *) _nc_get_locale(void); +-extern NCURSES_EXPORT(int) _nc_unicode_locale(void); ++extern NCURSES_EXPORT(bool) _nc_unicode_locale(void); + extern NCURSES_EXPORT(int) _nc_locale_breaks_acs(TERMINAL *); + extern NCURSES_EXPORT(int) _nc_setupterm(const char *, int, int *, int); + extern NCURSES_EXPORT(void) _nc_tinfo_cmdch(TERMINAL *, int); +@@ -2161,7 +2161,7 @@ + extern NCURSES_EXPORT(int) _nc_baudrate (int); + extern NCURSES_EXPORT(int) _nc_freewin (WINDOW *); + extern NCURSES_EXPORT(int) _nc_getenv_num (const char *); +-extern NCURSES_EXPORT(int) _nc_keypad (SCREEN *, int); ++extern NCURSES_EXPORT(int) _nc_keypad (SCREEN *, bool); + extern NCURSES_EXPORT(int) _nc_ospeed (int); + extern NCURSES_EXPORT(int) _nc_outch (int); + extern NCURSES_EXPORT(int) _nc_putchar (int); +@@ -2169,7 +2169,7 @@ + extern NCURSES_EXPORT(int) _nc_putp_flush(const char *, const char *); + extern NCURSES_EXPORT(int) _nc_read_termcap_entry (const char *const, TERMTYPE2 *const); + extern NCURSES_EXPORT(int) _nc_setup_tinfo(const char *, TERMTYPE2 *); +-extern NCURSES_EXPORT(int) _nc_setupscreen (int, int, FILE *, int, int); ++extern NCURSES_EXPORT(int) _nc_setupscreen (int, int, FILE *, bool, int); + extern NCURSES_EXPORT(int) _nc_timed_wait (const SCREEN *, int, int, int * EVENTLIST_2nd(_nc_eventlist *)); + extern NCURSES_EXPORT(int) _nc_trans_string (char *, const char *); + extern NCURSES_EXPORT(void) _nc_init_termtype (TERMTYPE2 *const); +@@ -2627,7 +2627,7 @@ + extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_ripoffline)(SCREEN*, int, int (*)(WINDOW *,int)); + extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_scrolln)(SCREEN*, int, int, int, int); + extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_set_tty_mode)(SCREEN*, TTY*); +-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_setupscreen)(SCREEN**, int, int, FILE *, int, int); ++extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_setupscreen)(SCREEN**, int, int, FILE *, bool, int); + extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_tgetent)(SCREEN*,char*,const char *); + extern NCURSES_EXPORT(void) NCURSES_SP_NAME(_nc_do_color)(SCREEN*, int, int, int, NCURSES_SP_OUTC); + extern NCURSES_EXPORT(void) NCURSES_SP_NAME(_nc_do_xmc_glitch)(SCREEN*, attr_t); +Index: ncurses/llib-lncurses +--- ncurses-6.5-20241109+/ncurses/llib-lncurses 2023-08-12 18:53:52.000000000 +0000 ++++ ncurses-6.5-20241123/ncurses/llib-lncurses 2024-11-23 21:33:59.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright 2019-2022,2023 Thomas E. Dickey * ++ * Copyright 2019-2023,2024 Thomas E. Dickey * + * Copyright 1998-2016,2017 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * +@@ -1475,7 +1475,7 @@ + + #undef _nc_has_mouse + NCURSES_BOOL _nc_has_mouse( +- SCREEN *sp) ++ const SCREEN *sp) + { return(*(NCURSES_BOOL *)0); } + + #undef has_mouse_sp +@@ -2032,7 +2032,7 @@ + int slines, + int scolumns, + FILE *output, +- int filtered, ++ NCURSES_BOOL filtered, + int slk_format) + { return(*(int *)0); } + +@@ -2041,7 +2041,7 @@ + int slines, + int scolumns, + FILE *output, +- int filtered, ++ NCURSES_BOOL filtered, + int slk_format) + { return(*(int *)0); } + +@@ -2994,7 +2994,7 @@ + #undef _nc_free_entry + void _nc_free_entry( + ENTRY *headp, +- TERMTYPE *tterm) ++ const TERMTYPE *tterm) + { /* void */ } + + #undef _nc_free_entries +@@ -3339,7 +3339,7 @@ + #undef _nc_keypad + int _nc_keypad( + SCREEN *sp, +- int flag) ++ NCURSES_BOOL flag) + { return(*(int *)0); } + + /* ./tinfo/lib_raw.c */ +@@ -3525,8 +3525,8 @@ + { return(*(char **)0); } + + #undef _nc_unicode_locale +-int _nc_unicode_locale(void) +- { return(*(int *)0); } ++NCURSES_BOOL _nc_unicode_locale(void) ++ { return(*(NCURSES_BOOL *)0); } + + #undef _nc_locale_breaks_acs + int _nc_locale_breaks_acs( +@@ -3848,7 +3848,7 @@ + + #undef _nc_retrace_bool + NCURSES_BOOL _nc_retrace_bool( +- int code) ++ NCURSES_BOOL code) + { return(*(NCURSES_BOOL *)0); } + + #undef _nc_retrace_char +@@ -4054,7 +4054,7 @@ + + #undef _nc_timed_wait + int _nc_timed_wait( +- SCREEN *sp, ++ const SCREEN *sp, + int mode, + int milliseconds, + int *timeleft) +Index: ncurses/llib-lncursest +--- ncurses-6.5-20241109+/ncurses/llib-lncursest 2023-08-12 18:55:32.000000000 +0000 ++++ ncurses-6.5-20241123/ncurses/llib-lncursest 2024-11-23 21:33:59.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright 2019-2022,2023 Thomas E. Dickey * ++ * Copyright 2019-2023,2024 Thomas E. Dickey * + * Copyright 2008-2016,2017 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * +@@ -1484,7 +1484,7 @@ + + #undef _nc_has_mouse + NCURSES_BOOL _nc_has_mouse( +- SCREEN *sp) ++ const SCREEN *sp) + { return(*(NCURSES_BOOL *)0); } + + #undef has_mouse_sp +@@ -2041,7 +2041,7 @@ + int slines, + int scolumns, + FILE *output, +- int filtered, ++ NCURSES_BOOL filtered, + int slk_format) + { return(*(int *)0); } + +@@ -2050,7 +2050,7 @@ + int slines, + int scolumns, + FILE *output, +- int filtered, ++ NCURSES_BOOL filtered, + int slk_format) + { return(*(int *)0); } + +@@ -3008,7 +3008,7 @@ + #undef _nc_free_entry + void _nc_free_entry( + ENTRY *headp, +- TERMTYPE *tterm) ++ const TERMTYPE *tterm) + { /* void */ } + + #undef _nc_free_entries +@@ -3394,7 +3394,7 @@ + #undef _nc_keypad + int _nc_keypad( + SCREEN *sp, +- int flag) ++ NCURSES_BOOL flag) + { return(*(int *)0); } + + /* ./tinfo/lib_raw.c */ +@@ -3602,8 +3602,8 @@ + { return(*(char **)0); } + + #undef _nc_unicode_locale +-int _nc_unicode_locale(void) +- { return(*(int *)0); } ++NCURSES_BOOL _nc_unicode_locale(void) ++ { return(*(NCURSES_BOOL *)0); } + + #undef _nc_locale_breaks_acs + int _nc_locale_breaks_acs( +@@ -3947,7 +3947,7 @@ + + #undef _nc_retrace_bool + NCURSES_BOOL _nc_retrace_bool( +- int code) ++ NCURSES_BOOL code) + { return(*(NCURSES_BOOL *)0); } + + #undef _nc_retrace_char +@@ -4164,7 +4164,7 @@ + + #undef _nc_timed_wait + int _nc_timed_wait( +- SCREEN *sp, ++ const SCREEN *sp, + int mode, + int milliseconds, + int *timeleft) +Index: ncurses/llib-lncursestw +--- ncurses-6.5-20241109+/ncurses/llib-lncursestw 2023-08-12 18:54:59.000000000 +0000 ++++ ncurses-6.5-20241123/ncurses/llib-lncursestw 2024-11-23 21:33:59.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright 2018-2022,2023 Thomas E. Dickey * ++ * Copyright 2018-2023,2024 Thomas E. Dickey * + * Copyright 2009-2016,2017 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * +@@ -2065,7 +2065,7 @@ + + #undef _nc_has_mouse + NCURSES_BOOL _nc_has_mouse( +- SCREEN *sp) ++ const SCREEN *sp) + { return(*(NCURSES_BOOL *)0); } + + #undef has_mouse_sp +@@ -2622,7 +2622,7 @@ + int slines, + int scolumns, + FILE *output, +- int filtered, ++ NCURSES_BOOL filtered, + int slk_format) + { return(*(int *)0); } + +@@ -2631,7 +2631,7 @@ + int slines, + int scolumns, + FILE *output, +- int filtered, ++ NCURSES_BOOL filtered, + int slk_format) + { return(*(int *)0); } + +@@ -3581,7 +3581,7 @@ + void _nc_reset_color_pair( + SCREEN *sp, + int pair, +- colorpair_t *next) ++ const colorpair_t *next) + { /* void */ } + + #undef _nc_set_color_pair +@@ -3959,7 +3959,7 @@ + #undef _nc_free_entry + void _nc_free_entry( + ENTRY *headp, +- TERMTYPE2 *tterm) ++ const TERMTYPE2 *tterm) + { /* void */ } + + #undef _nc_free_entries +@@ -4355,7 +4355,7 @@ + #undef _nc_keypad + int _nc_keypad( + SCREEN *sp, +- int flag) ++ NCURSES_BOOL flag) + { return(*(int *)0); } + + /* ./tinfo/lib_raw.c */ +@@ -4563,8 +4563,8 @@ + { return(*(char **)0); } + + #undef _nc_unicode_locale +-int _nc_unicode_locale(void) +- { return(*(int *)0); } ++NCURSES_BOOL _nc_unicode_locale(void) ++ { return(*(NCURSES_BOOL *)0); } + + #undef _nc_locale_breaks_acs + int _nc_locale_breaks_acs( +@@ -4908,7 +4908,7 @@ + + #undef _nc_retrace_bool + NCURSES_BOOL _nc_retrace_bool( +- int code) ++ NCURSES_BOOL code) + { return(*(NCURSES_BOOL *)0); } + + #undef _nc_retrace_char +@@ -5136,7 +5136,7 @@ + + #undef _nc_timed_wait + int _nc_timed_wait( +- SCREEN *sp, ++ const SCREEN *sp, + int mode, + int milliseconds, + int *timeleft) +Index: ncurses/llib-lncursesw +--- ncurses-6.5-20241109+/ncurses/llib-lncursesw 2023-08-12 18:54:25.000000000 +0000 ++++ ncurses-6.5-20241123/ncurses/llib-lncursesw 2024-11-23 21:33:59.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright 2018-2022,2023 Thomas E. Dickey * ++ * Copyright 2018-2023,2024 Thomas E. Dickey * + * Copyright 2001-2016,2017 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * +@@ -2056,7 +2056,7 @@ + + #undef _nc_has_mouse + NCURSES_BOOL _nc_has_mouse( +- SCREEN *sp) ++ const SCREEN *sp) + { return(*(NCURSES_BOOL *)0); } + + #undef has_mouse_sp +@@ -2613,7 +2613,7 @@ + int slines, + int scolumns, + FILE *output, +- int filtered, ++ NCURSES_BOOL filtered, + int slk_format) + { return(*(int *)0); } + +@@ -2622,7 +2622,7 @@ + int slines, + int scolumns, + FILE *output, +- int filtered, ++ NCURSES_BOOL filtered, + int slk_format) + { return(*(int *)0); } + +@@ -3572,7 +3572,7 @@ + void _nc_reset_color_pair( + SCREEN *sp, + int pair, +- colorpair_t *next) ++ const colorpair_t *next) + { /* void */ } + + #undef _nc_set_color_pair +@@ -3945,7 +3945,7 @@ + #undef _nc_free_entry + void _nc_free_entry( + ENTRY *headp, +- TERMTYPE2 *tterm) ++ const TERMTYPE2 *tterm) + { /* void */ } + + #undef _nc_free_entries +@@ -4300,7 +4300,7 @@ + #undef _nc_keypad + int _nc_keypad( + SCREEN *sp, +- int flag) ++ NCURSES_BOOL flag) + { return(*(int *)0); } + + /* ./tinfo/lib_raw.c */ +@@ -4486,8 +4486,8 @@ + { return(*(char **)0); } + + #undef _nc_unicode_locale +-int _nc_unicode_locale(void) +- { return(*(int *)0); } ++NCURSES_BOOL _nc_unicode_locale(void) ++ { return(*(NCURSES_BOOL *)0); } + + #undef _nc_locale_breaks_acs + int _nc_locale_breaks_acs( +@@ -4809,7 +4809,7 @@ + + #undef _nc_retrace_bool + NCURSES_BOOL _nc_retrace_bool( +- int code) ++ NCURSES_BOOL code) + { return(*(NCURSES_BOOL *)0); } + + #undef _nc_retrace_char +@@ -5026,7 +5026,7 @@ + + #undef _nc_timed_wait + int _nc_timed_wait( +- SCREEN *sp, ++ const SCREEN *sp, + int mode, + int milliseconds, + int *timeleft) +Index: ncurses/llib-ltinfo +--- ncurses-6.5-20241109+/ncurses/llib-ltinfo 2023-08-12 18:54:05.000000000 +0000 ++++ ncurses-6.5-20241123/ncurses/llib-ltinfo 2024-11-23 21:33:59.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright 2019-2022,2023 Thomas E. Dickey * ++ * Copyright 2019-2023,2024 Thomas E. Dickey * + * Copyright 2012-2016,2017 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * +@@ -265,7 +265,7 @@ + #undef _nc_free_entry + void _nc_free_entry( + ENTRY *headp, +- TERMTYPE *tterm) ++ const TERMTYPE *tterm) + { /* void */ } + + #undef _nc_free_entries +@@ -610,7 +610,7 @@ + #undef _nc_keypad + int _nc_keypad( + SCREEN *sp, +- int flag) ++ NCURSES_BOOL flag) + { return(*(int *)0); } + + /* ./tinfo/lib_raw.c */ +@@ -796,8 +796,8 @@ + { return(*(char **)0); } + + #undef _nc_unicode_locale +-int _nc_unicode_locale(void) +- { return(*(int *)0); } ++NCURSES_BOOL _nc_unicode_locale(void) ++ { return(*(NCURSES_BOOL *)0); } + + #undef _nc_locale_breaks_acs + int _nc_locale_breaks_acs( +@@ -1119,7 +1119,7 @@ + + #undef _nc_retrace_bool + NCURSES_BOOL _nc_retrace_bool( +- int code) ++ NCURSES_BOOL code) + { return(*(NCURSES_BOOL *)0); } + + #undef _nc_retrace_char +@@ -1325,7 +1325,7 @@ + + #undef _nc_timed_wait + int _nc_timed_wait( +- SCREEN *sp, ++ const SCREEN *sp, + int mode, + int milliseconds, + int *timeleft) +Index: ncurses/llib-ltinfot +--- ncurses-6.5-20241109+/ncurses/llib-ltinfot 2023-08-12 18:55:45.000000000 +0000 ++++ ncurses-6.5-20241123/ncurses/llib-ltinfot 2024-11-23 21:33:59.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright 2019-2022,2023 Thomas E. Dickey * ++ * Copyright 2019-2023,2024 Thomas E. Dickey * + * Copyright 2013-2016,2017 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * +@@ -270,7 +270,7 @@ + #undef _nc_free_entry + void _nc_free_entry( + ENTRY *headp, +- TERMTYPE *tterm) ++ const TERMTYPE *tterm) + { /* void */ } + + #undef _nc_free_entries +@@ -656,7 +656,7 @@ + #undef _nc_keypad + int _nc_keypad( + SCREEN *sp, +- int flag) ++ NCURSES_BOOL flag) + { return(*(int *)0); } + + /* ./tinfo/lib_raw.c */ +@@ -864,8 +864,8 @@ + { return(*(char **)0); } + + #undef _nc_unicode_locale +-int _nc_unicode_locale(void) +- { return(*(int *)0); } ++NCURSES_BOOL _nc_unicode_locale(void) ++ { return(*(NCURSES_BOOL *)0); } + + #undef _nc_locale_breaks_acs + int _nc_locale_breaks_acs( +@@ -1209,7 +1209,7 @@ + + #undef _nc_retrace_bool + NCURSES_BOOL _nc_retrace_bool( +- int code) ++ NCURSES_BOOL code) + { return(*(NCURSES_BOOL *)0); } + + #undef _nc_retrace_char +@@ -1426,7 +1426,7 @@ + + #undef _nc_timed_wait + int _nc_timed_wait( +- SCREEN *sp, ++ const SCREEN *sp, + int mode, + int milliseconds, + int *timeleft) +Index: ncurses/llib-ltinfotw +--- ncurses-6.5-20241109+/ncurses/llib-ltinfotw 2023-08-12 18:55:14.000000000 +0000 ++++ ncurses-6.5-20241123/ncurses/llib-ltinfotw 2024-11-23 21:33:59.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright 2018-2022,2023 Thomas E. Dickey * ++ * Copyright 2018-2023,2024 Thomas E. Dickey * + * Copyright 2012-2016,2017 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * +@@ -282,7 +282,7 @@ + #undef _nc_free_entry + void _nc_free_entry( + ENTRY *headp, +- TERMTYPE2 *tterm) ++ const TERMTYPE2 *tterm) + { /* void */ } + + #undef _nc_free_entries +@@ -678,7 +678,7 @@ + #undef _nc_keypad + int _nc_keypad( + SCREEN *sp, +- int flag) ++ NCURSES_BOOL flag) + { return(*(int *)0); } + + /* ./tinfo/lib_raw.c */ +@@ -886,8 +886,8 @@ + { return(*(char **)0); } + + #undef _nc_unicode_locale +-int _nc_unicode_locale(void) +- { return(*(int *)0); } ++NCURSES_BOOL _nc_unicode_locale(void) ++ { return(*(NCURSES_BOOL *)0); } + + #undef _nc_locale_breaks_acs + int _nc_locale_breaks_acs( +@@ -1231,7 +1231,7 @@ + + #undef _nc_retrace_bool + NCURSES_BOOL _nc_retrace_bool( +- int code) ++ NCURSES_BOOL code) + { return(*(NCURSES_BOOL *)0); } + + #undef _nc_retrace_char +@@ -1459,7 +1459,7 @@ + + #undef _nc_timed_wait + int _nc_timed_wait( +- SCREEN *sp, ++ const SCREEN *sp, + int mode, + int milliseconds, + int *timeleft) +Index: ncurses/llib-ltinfow +--- ncurses-6.5-20241109+/ncurses/llib-ltinfow 2023-08-12 18:54:39.000000000 +0000 ++++ ncurses-6.5-20241123/ncurses/llib-ltinfow 2024-11-23 21:33:59.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright 2018-2022,2023 Thomas E. Dickey * ++ * Copyright 2018-2023,2024 Thomas E. Dickey * + * Copyright 2012-2016,2017 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * +@@ -277,7 +277,7 @@ + #undef _nc_free_entry + void _nc_free_entry( + ENTRY *headp, +- TERMTYPE2 *tterm) ++ const TERMTYPE2 *tterm) + { /* void */ } + + #undef _nc_free_entries +@@ -632,7 +632,7 @@ + #undef _nc_keypad + int _nc_keypad( + SCREEN *sp, +- int flag) ++ NCURSES_BOOL flag) + { return(*(int *)0); } + + /* ./tinfo/lib_raw.c */ +@@ -818,8 +818,8 @@ + { return(*(char **)0); } + + #undef _nc_unicode_locale +-int _nc_unicode_locale(void) +- { return(*(int *)0); } ++NCURSES_BOOL _nc_unicode_locale(void) ++ { return(*(NCURSES_BOOL *)0); } + + #undef _nc_locale_breaks_acs + int _nc_locale_breaks_acs( +@@ -1141,7 +1141,7 @@ + + #undef _nc_retrace_bool + NCURSES_BOOL _nc_retrace_bool( +- int code) ++ NCURSES_BOOL code) + { return(*(NCURSES_BOOL *)0); } + + #undef _nc_retrace_char +@@ -1358,7 +1358,7 @@ + + #undef _nc_timed_wait + int _nc_timed_wait( +- SCREEN *sp, ++ const SCREEN *sp, + int mode, + int milliseconds, + int *timeleft) +Index: ncurses/tinfo/comp_scan.c +Prereq: 1.123 +--- ncurses-6.5-20241109+/ncurses/tinfo/comp_scan.c 2024-07-27 19:22:23.000000000 +0000 ++++ ncurses-6.5-20241123/ncurses/tinfo/comp_scan.c 2024-11-23 18:45:01.000000000 +0000 +@@ -51,7 +51,7 @@ + #include <ctype.h> + #include <tic.h> + +-MODULE_ID("$Id: comp_scan.c,v 1.123 2024/07/27 19:22:23 tom Exp $") ++MODULE_ID("$Id: comp_scan.c,v 1.124 2024/11/23 18:45:01 tom Exp $") + + /* + * Maximum length of string capability we'll accept before raising an error. +@@ -61,7 +61,7 @@ + + #define iswhite(ch) (ch == ' ' || ch == '\t') + +-NCURSES_EXPORT_VAR (int) _nc_syntax = 0; /* termcap or terminfo? */ ++NCURSES_EXPORT_VAR (int) _nc_syntax = SYN_TERMINFO; /* termcap or terminfo? */ + NCURSES_EXPORT_VAR (int) _nc_strict_bsd = 1; /* ncurses extended termcap? */ + NCURSES_EXPORT_VAR (long) _nc_curr_file_pos = 0; /* file offset of current line */ + NCURSES_EXPORT_VAR (long) _nc_comment_start = 0; /* start of comment range before name */ +Index: ncurses/tinfo/lib_has_cap.c +Prereq: 1.11 +--- ncurses-6.5-20241109+/ncurses/tinfo/lib_has_cap.c 2020-02-02 23:34:34.000000000 +0000 ++++ ncurses-6.5-20241123/ncurses/tinfo/lib_has_cap.c 2024-11-23 19:17:15.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright 2020 Thomas E. Dickey * ++ * Copyright 2020,2024 Thomas E. Dickey * + * Copyright 1998-2009,2013 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * +@@ -47,7 +47,7 @@ + #define CUR SP_TERMTYPE + #endif + +-MODULE_ID("$Id: lib_has_cap.c,v 1.11 2020/02/02 23:34:34 tom Exp $") ++MODULE_ID("$Id: lib_has_cap.c,v 1.12 2024/11/23 19:17:15 tom Exp $") + + NCURSES_EXPORT(bool) + NCURSES_SP_NAME(has_ic) (NCURSES_SP_DCL0) +@@ -62,7 +62,7 @@ + && (delete_character || parm_dch)) ? TRUE : FALSE; + } + +- returnCode(code); ++ returnBool(code); + } + + #if NCURSES_SP_FUNCS +@@ -83,7 +83,7 @@ + && (delete_line || parm_delete_line)) ? TRUE : FALSE; + } + +- returnCode(code); ++ returnBool(code); + } + + #if NCURSES_SP_FUNCS +Index: ncurses/tinfo/lib_options.c +Prereq: 1.83 +--- ncurses-6.5-20241109+/ncurses/tinfo/lib_options.c 2023-04-29 18:56:12.000000000 +0000 ++++ ncurses-6.5-20241123/ncurses/tinfo/lib_options.c 2024-11-23 19:17:25.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright 2020-2021,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 * +@@ -47,7 +47,7 @@ + #define CUR SP_TERMTYPE + #endif + +-MODULE_ID("$Id: lib_options.c,v 1.83 2023/04/29 18:56:12 tom Exp $") ++MODULE_ID("$Id: lib_options.c,v 1.84 2024/11/23 19:17:25 tom Exp $") + + NCURSES_EXPORT(int) + idlok(WINDOW *win, bool flag) +@@ -330,7 +330,7 @@ + * the terminal state _before_ switching modes. + */ + NCURSES_EXPORT(int) +-_nc_keypad(SCREEN *sp, int flag) ++_nc_keypad(SCREEN *sp, bool flag) + { + int rc = ERR; + +Index: ncurses/tinfo/lib_setup.c +Prereq: 1.245 +--- ncurses-6.5-20241109+/ncurses/tinfo/lib_setup.c 2024-10-19 21:17:36.000000000 +0000 ++++ ncurses-6.5-20241123/ncurses/tinfo/lib_setup.c 2024-11-23 18:32:54.000000000 +0000 +@@ -49,7 +49,7 @@ + #include <locale.h> + #endif + +-MODULE_ID("$Id: lib_setup.c,v 1.245 2024/10/19 21:17:36 tom Exp $") ++MODULE_ID("$Id: lib_setup.c,v 1.246 2024/11/23 18:32:54 tom Exp $") + + /**************************************************************************** + * +@@ -751,24 +751,24 @@ + /* + * Check if we are running in a UTF-8 locale. + */ +-NCURSES_EXPORT(int) ++NCURSES_EXPORT(bool) + _nc_unicode_locale(void) + { + static bool initialized = FALSE; +- static int result = 0; ++ static bool result = FALSE; + + if (!initialized) { + #if defined(_NC_WINDOWS_NATIVE) && USE_WIDEC_SUPPORT +- result = 1; ++ result = TRUE; + #elif HAVE_LANGINFO_CODESET + char *env = nl_langinfo(CODESET); +- result = !strcmp(env, "UTF-8"); ++ result = !strcmp(env, "UTF-8") ? TRUE : FALSE; + T(("_nc_unicode_locale(%s) ->%d", env, result)); + #else + char *env = _nc_get_locale(); + if (env != 0) { + if (strstr(env, ".UTF-8") != 0) { +- result = 1; ++ result = TRUE; + T(("_nc_unicode_locale(%s) ->%d", env, result)); + } + } +Index: ncurses/tinfo/parse_entry.c +Prereq: 1.110 +--- ncurses-6.5-20241109+/ncurses/tinfo/parse_entry.c 2024-10-19 21:22:04.000000000 +0000 ++++ ncurses-6.5-20241123/ncurses/tinfo/parse_entry.c 2024-11-23 18:49:08.000000000 +0000 +@@ -48,7 +48,7 @@ + #include <ctype.h> + #include <tic.h> + +-MODULE_ID("$Id: parse_entry.c,v 1.110 2024/10/19 21:22:04 tom Exp $") ++MODULE_ID("$Id: parse_entry.c,v 1.111 2024/11/23 18:49:08 tom Exp $") + + #ifdef LINT + static short const parametrized[] = +@@ -395,7 +395,7 @@ + } else { + /* normal token lookup */ + entry_ptr = _nc_find_entry(_nc_curr_token.tk_name, +- _nc_get_hash_table(_nc_syntax)); ++ _nc_get_hash_table(_nc_syntax == SYN_TERMCAP)); + + /* + * Our kluge to handle aliasing. The reason it is done +Index: ncurses/trace/lib_trace.c +Prereq: 1.107 +--- ncurses-6.5-20241109+/ncurses/trace/lib_trace.c 2024-08-31 10:48:22.000000000 +0000 ++++ ncurses-6.5-20241123/ncurses/trace/lib_trace.c 2024-11-23 18:40:23.000000000 +0000 +@@ -48,7 +48,7 @@ + + #include <ctype.h> + +-MODULE_ID("$Id: lib_trace.c,v 1.107 2024/08/31 10:48:22 tom Exp $") ++MODULE_ID("$Id: lib_trace.c,v 1.108 2024/11/23 18:40:23 tom Exp $") + + NCURSES_EXPORT_VAR(unsigned) _nc_tracing = 0; /* always define this */ + +@@ -295,8 +295,8 @@ + } + + /* Trace 'bool' return-values */ +-NCURSES_EXPORT(NCURSES_BOOL) +-_nc_retrace_bool(int code) ++NCURSES_EXPORT(bool) ++_nc_retrace_bool(bool code) + { + T((T_RETURN("%s"), code ? "TRUE" : "FALSE")); + return code; +Index: ncurses/trace/lib_tracechr.c +Prereq: 1.24 +--- ncurses-6.5-20241109+/ncurses/trace/lib_tracechr.c 2024-02-04 00:11:35.000000000 +0000 ++++ ncurses-6.5-20241123/ncurses/trace/lib_tracechr.c 2024-11-23 19:50:34.000000000 +0000 +@@ -40,7 +40,7 @@ + + #include <ctype.h> + +-MODULE_ID("$Id: lib_tracechr.c,v 1.24 2024/02/04 00:11:35 tom Exp $") ++MODULE_ID("$Id: lib_tracechr.c,v 1.25 2024/11/23 19:50:34 tom Exp $") + + #ifdef TRACE + +@@ -59,7 +59,7 @@ + if (name == 0 || *name == '\0') + name = "NULL"; + _nc_SPRINTF(MyBuffer, _nc_SLIMIT(MyBufSize) +- "'%.30s' = \\x%02x", name, ch); ++ "'%.30s' = \\x%02x", name, UChar(ch)); + } else if (!is8bits(ch) + || (_nc_unicode_locale() && !is7bits(ch)) + || !isprint(UChar(ch))) { +Index: package/debian-mingw/changelog +--- ncurses-6.5-20241109+/package/debian-mingw/changelog 2024-11-09 11:12:30.000000000 +0000 ++++ ncurses-6.5-20241123/package/debian-mingw/changelog 2024-11-23 10:51:23.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6td (6.5+20241109) unstable; urgency=low ++ncurses6td (6.5+20241123) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 09 Nov 2024 06:12:30 -0500 ++ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 23 Nov 2024 05:51:23 -0500 + + ncurses6 (5.9+20131005) unstable; urgency=low + +Index: package/debian-mingw64/changelog +--- ncurses-6.5-20241109+/package/debian-mingw64/changelog 2024-11-09 11:12:30.000000000 +0000 ++++ ncurses-6.5-20241123/package/debian-mingw64/changelog 2024-11-23 10:51:23.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6td (6.5+20241109) unstable; urgency=low ++ncurses6td (6.5+20241123) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 09 Nov 2024 06:12:30 -0500 ++ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 23 Nov 2024 05:51:23 -0500 + + ncurses6 (5.9+20131005) unstable; urgency=low + +Index: package/debian/changelog +--- ncurses-6.5-20241109+/package/debian/changelog 2024-11-09 11:12:30.000000000 +0000 ++++ ncurses-6.5-20241123/package/debian/changelog 2024-11-23 10:51:23.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6td (6.5+20241109) unstable; urgency=low ++ncurses6td (6.5+20241123) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 09 Nov 2024 06:12:30 -0500 ++ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 23 Nov 2024 05:51:23 -0500 + + ncurses6 (5.9+20120608) unstable; urgency=low + +Index: package/mingw-ncurses.nsi +Prereq: 1.675 +--- ncurses-6.5-20241109+/package/mingw-ncurses.nsi 2024-11-09 11:12:30.000000000 +0000 ++++ ncurses-6.5-20241123/package/mingw-ncurses.nsi 2024-11-23 10:51:23.000000000 +0000 +@@ -1,4 +1,4 @@ +-; $Id: mingw-ncurses.nsi,v 1.675 2024/11/09 11:12:30 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.677 2024/11/23 10:51:23 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 "1109"
++!define VERSION_MMDD "1123"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+
+ !define MY_ABI "5"
+Index: package/mingw-ncurses.spec +--- ncurses-6.5-20241109+/package/mingw-ncurses.spec 2024-11-09 11:12:30.000000000 +0000 ++++ ncurses-6.5-20241123/package/mingw-ncurses.spec 2024-11-23 10:51:23.000000000 +0000 +@@ -3,7 +3,7 @@ + Summary: shared libraries for terminal handling + Name: mingw32-ncurses6 + Version: 6.5 +-Release: 20241109 ++Release: 20241123 + License: X11 + Group: Development/Libraries + URL: https://invisible-island.net/ncurses/ +Index: package/ncurses.spec +--- ncurses-6.5-20241109+/package/ncurses.spec 2024-11-09 11:12:30.000000000 +0000 ++++ ncurses-6.5-20241123/package/ncurses.spec 2024-11-23 10:51:23.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: shared libraries for terminal handling + Name: ncurses6 + Version: 6.5 +-Release: 20241109 ++Release: 20241123 + License: X11 + Group: Development/Libraries + URL: https://invisible-island.net/ncurses/ +Index: package/ncursest.spec +--- ncurses-6.5-20241109+/package/ncursest.spec 2024-11-09 11:12:30.000000000 +0000 ++++ ncurses-6.5-20241123/package/ncursest.spec 2024-11-23 10:51:23.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: Curses library with POSIX thread support. + Name: ncursest6 + Version: 6.5 +-Release: 20241109 ++Release: 20241123 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: progs/infocmp.c +Prereq: 1.167 +--- ncurses-6.5-20241109+/progs/infocmp.c 2024-11-09 19:33:50.000000000 +0000 ++++ ncurses-6.5-20241123/progs/infocmp.c 2024-11-23 19:54:44.000000000 +0000 +@@ -43,7 +43,7 @@ + + #include <dump_entry.h> + +-MODULE_ID("$Id: infocmp.c,v 1.167 2024/11/09 19:33:50 tom Exp $") ++MODULE_ID("$Id: infocmp.c,v 1.168 2024/11/23 19:54:44 tom Exp $") + + #ifndef ACTUAL_TIC + #define ACTUAL_TIC "tic" +@@ -1344,7 +1344,7 @@ + char buf[MAX_STRING], *sp, *tp; + + tp = buf; +-#define TP_LIMIT ((MAX_STRING - 5) - (size_t)(tp - buf)) ++#define TP_LIMIT ((MAX_STRING - 6) - (size_t)(tp - buf)) + *tp++ = '"'; + for (sp = term->Strings[n]; + *sp != 0 && TP_LIMIT > 2; +Index: progs/toe.c +Prereq: 1.90 +--- ncurses-6.5-20241109+/progs/toe.c 2024-10-19 22:00:53.000000000 +0000 ++++ ncurses-6.5-20241123/progs/toe.c 2024-11-23 20:09:23.000000000 +0000 +@@ -45,7 +45,7 @@ + #include <hashed_db.h> + #endif + +-MODULE_ID("$Id: toe.c,v 1.90 2024/10/19 22:00:53 tom Exp $") ++MODULE_ID("$Id: toe.c,v 1.91 2024/11/23 20:09:23 tom Exp $") + + #define isDotname(name) (!strcmp(name, ".") || !strcmp(name, "..")) + +@@ -436,7 +436,7 @@ + continue; + } + +- cwd_len = NAMLEN(subdir) + strlen(eargv[i]) + 3; ++ cwd_len = strlen(name_1) + strlen(eargv[i]) + 3; + cwd_buf = typeRealloc(char, cwd_len, cwd_buf); + if (cwd_buf == 0) + failed("realloc cwd_buf"); +Index: progs/tput.c +Prereq: 1.104 +--- ncurses-6.5-20241109+/progs/tput.c 2024-04-20 22:20:51.000000000 +0000 ++++ ncurses-6.5-20241123/progs/tput.c 2024-11-23 19:38:51.000000000 +0000 +@@ -47,7 +47,7 @@ + #include <transform.h> + #include <tty_settings.h> + +-MODULE_ID("$Id: tput.c,v 1.104 2024/04/20 22:20:51 tom Exp $") ++MODULE_ID("$Id: tput.c,v 1.105 2024/11/23 19:38:51 tom Exp $") + + #define PUTS(s) fputs(s, stdout) + +@@ -182,8 +182,8 @@ + NCURSES_INT2 my_rows = lines; + NCURSES_INT2 my_cols = columns; + set_window_size(fd, &my_rows, &my_cols); +- lines = my_rows; +- columns = my_cols; ++ lines = (short) my_rows; ++ columns = (short) my_cols; + } + #else + (void) fd; +Index: progs/tset.c +Prereq: 1.136 +--- ncurses-6.5-20241109+/progs/tset.c 2024-10-19 21:40:28.000000000 +0000 ++++ ncurses-6.5-20241123/progs/tset.c 2024-11-23 19:39:01.000000000 +0000 +@@ -98,7 +98,7 @@ + char *ttyname(int fd); + #endif + +-MODULE_ID("$Id: tset.c,v 1.136 2024/10/19 21:40:28 tom Exp $") ++MODULE_ID("$Id: tset.c,v 1.137 2024/11/23 19:39:01 tom Exp $") + + #ifndef environ + extern char **environ; +@@ -872,8 +872,8 @@ + NCURSES_INT2 my_rows = lines; + NCURSES_INT2 my_cols = columns; + set_window_size(my_fd, &my_rows, &my_cols); +- lines = my_rows; +- columns = my_cols; ++ lines = (short) my_rows; ++ columns = (short) my_cols; + } + #endif + if (opt_c) { +Index: test/demo_panels.c +Prereq: 1.51 +--- ncurses-6.5-20241109+/test/demo_panels.c 2024-11-09 22:54:38.000000000 +0000 ++++ ncurses-6.5-20241123/test/demo_panels.c 2024-11-23 19:07:23.000000000 +0000 +@@ -27,7 +27,7 @@ + * authorization. * + ****************************************************************************/ + /* +- * $Id: demo_panels.c,v 1.51 2024/11/09 22:54:38 tom Exp $ ++ * $Id: demo_panels.c,v 1.52 2024/11/23 19:07:23 tom Exp $ + * + * Demonstrate a variety of functions from the panel library. + */ +@@ -509,7 +509,7 @@ + for (j = 1; j <= MAX_PANELS; ++j) { + table[j].valid = (px[j] != 0); + if (table[j].valid) { +- table[j].hidden = panel_hidden(px[j]); ++ table[j].hidden = panel_hidden(px[j]) ? TRUE : FALSE; + table[j].above = panel_above(px[j]); + table[j].below = panel_below(px[j]); + } +Index: test/test_opaque.c +Prereq: 1.16 +--- ncurses-6.5-20241109+/test/test_opaque.c 2024-10-05 19:27:33.000000000 +0000 ++++ ncurses-6.5-20241123/test/test_opaque.c 2024-11-23 19:10:23.000000000 +0000 +@@ -27,7 +27,7 @@ + * authorization. * + ****************************************************************************/ + /* +- * $Id: test_opaque.c,v 1.16 2024/10/05 19:27:33 tom Exp $ ++ * $Id: test_opaque.c,v 1.17 2024/11/23 19:10:23 tom Exp $ + * + * Author: Thomas E Dickey + * +@@ -79,7 +79,7 @@ + test_opaque_idcok(WINDOW *win, int mode) + { + if (mode >= 0) { +- idcok(win, mode); ++ idcok(win, (bool) mode); + } + return is_idcok(win); + } +@@ -88,7 +88,7 @@ + test_opaque_idlok(WINDOW *win, int mode) + { + if (mode >= 0) { +- idlok(win, mode); ++ idlok(win, (bool) mode); + } + return is_idlok(win); + } +@@ -97,7 +97,7 @@ + test_opaque_immedok(WINDOW *win, int mode) + { + if (mode >= 0) { +- immedok(win, mode); ++ immedok(win, (bool) mode); + } + return is_immedok(win); + } +@@ -106,7 +106,7 @@ + test_opaque_keypad(WINDOW *win, int mode) + { + if (mode >= 0) { +- keypad(win, mode); ++ keypad(win, (bool) mode); + } + return is_keypad(win); + } +@@ -115,7 +115,7 @@ + test_opaque_leaveok(WINDOW *win, int mode) + { + if (mode >= 0) { +- leaveok(win, mode); ++ leaveok(win, (bool) mode); + } + return is_leaveok(win); + } +@@ -124,7 +124,7 @@ + test_opaque_nodelay(WINDOW *win, int mode) + { + if (mode >= 0) { +- nodelay(win, mode); ++ nodelay(win, (bool) mode); + } + return is_nodelay(win); + } +@@ -133,7 +133,7 @@ + test_opaque_notimeout(WINDOW *win, int mode) + { + if (mode >= 0) { +- notimeout(win, mode); ++ notimeout(win, (bool) mode); + } + return is_notimeout(win); + } +@@ -142,7 +142,7 @@ + test_opaque_scrollok(WINDOW *win, int mode) + { + if (mode >= 0) { +- scrollok(win, mode); ++ scrollok(win, (bool) mode); + } + return is_scrollok(win); + } +@@ -151,7 +151,7 @@ + test_opaque_syncok(WINDOW *win, int mode) + { + if (mode >= 0) { +- syncok(win, mode); ++ syncok(win, (bool) mode); + } + return is_syncok(win); + } |