From 45d31f83a697cc46854648a49b45336e67c5573b Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Sun, 21 Jul 2024 00:16:51 +0000 Subject: [PATCH] ncurses 6.5 - patch 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). --- NEWS | 9 +- VERSION | 2 +- aclocal.m4 | 22 +- configure | 55 ++- configure.in | 5 +- dist.mk | 4 +- doc/html/man/curs_add_wch.3x.html | 10 +- doc/html/man/curs_addch.3x.html | 10 +- doc/html/man/curs_addstr.3x.html | 32 +- doc/html/man/curs_addwstr.3x.html | 50 +- doc/html/man/curs_beep.3x.html | 10 +- doc/html/man/curs_get_wch.3x.html | 16 +- doc/html/man/curs_getch.3x.html | 28 +- doc/html/man/curs_move.3x.html | 13 +- doc/html/man/ncurses.3x.html | 752 +++++++++++++++--------------- doc/html/man/terminfo.5.html | 2 +- doc/html/man/wresize.3x.html | 57 ++- man/curs_add_wch.3x | 8 +- man/curs_addch.3x | 8 +- man/curs_addstr.3x | 32 +- man/curs_addwstr.3x | 48 +- man/curs_beep.3x | 6 +- man/curs_get_wch.3x | 25 +- man/curs_getch.3x | 48 +- man/curs_move.3x | 10 +- man/man_db.renames.in | 3 +- man/ncurses.3x | 12 +- man/wresize.3x | 102 +++- misc/Makefile.in | 8 +- ncurses/win32con/win_driver.c | 15 +- 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 +- 37 files changed, 778 insertions(+), 646 deletions(-) diff --git a/NEWS b/NEWS index 4579ce53..e7f92c00 100644 --- a/NEWS +++ b/NEWS @@ -26,7 +26,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: NEWS,v 1.4149 2024/07/13 20:44:30 tom Exp $ +-- $Id: NEWS,v 1.4151 2024/07/20 21:54:20 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -46,6 +46,13 @@ See the AUTHORS file for the corresponding full names. Changes through 1.9.9e did not credit all contributions; it is not possible to add this information. +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. diff --git a/VERSION b/VERSION index 67693a77..b9d96735 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5:0:10 6.5 20240713 +5:0:10 6.5 20240720 diff --git a/aclocal.m4 b/aclocal.m4 index 2239d223..18702c0f 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -29,7 +29,7 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey 1995-on dnl -dnl $Id: aclocal.m4,v 1.1074 2024/07/06 18:27:53 tom Exp $ +dnl $Id: aclocal.m4,v 1.1078 2024/07/20 23:47:05 tom Exp $ dnl Macros used in NCURSES auto-configuration script. dnl dnl These macros are maintained separately from NCURSES. The copyright on @@ -3239,6 +3239,26 @@ if test "$cf_cv_getopt_header" = getopt.h ; then fi ])dnl dnl --------------------------------------------------------------------------- +dnl CF_GLOB_FULLPATH version: 1 updated: 2024/07/20 19:45:17 +dnl ---------------- +dnl Use this in case-statements to check for pathname syntax, i.e., absolute +dnl pathnames. The "x" is assumed since we provide an alternate form for DOS. +AC_DEFUN([CF_GLOB_FULLPATH],[ +AC_REQUIRE([CF_WITH_SYSTYPE])dnl +case "$cf_cv_system_name" in +(cygwin*|msys*|mingw32*|mingw64|os2*) + GLOB_FULLPATH_ONLY='x/*|x[[a-zA-Z]]:[[\\/]]*' + GLOB_FULLPATH_ARGS='x/*\ |x[[a-zA-Z]]:[[\\/]]*\ ' + ;; +(*) + GLOB_FULLPATH_ONLY='x/*' + GLOB_FULLPATH_ARGS='x/*\ ' + ;; +esac +AC_SUBST(GLOB_FULLPATH_ONLY) +AC_SUBST(GLOB_FULLPATH_ARGS) +])dnl +dnl --------------------------------------------------------------------------- dnl CF_GNATPREP_OPT_T version: 1 updated: 2014/08/02 18:37:25 dnl ----------------- AC_DEFUN([CF_GNATPREP_OPT_T],[ diff --git a/configure b/configure index 4408749f..2a5cf1e3 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.782 . +# From configure.in Revision: 1.783 . # Guess values for system-dependent variables and create Makefiles. # Generated by Autoconf 2.52.20240618. # @@ -29428,6 +29428,17 @@ done echo "$as_me:29428: result: $PKG_CFLAGS" >&5 echo "${ECHO_T}$PKG_CFLAGS" >&6 +case "$cf_cv_system_name" in +(cygwin*|msys*|mingw32*|mingw64|os2*) + GLOB_FULLPATH_ONLY='x/*|x[a-zA-Z]:[\\/]*' + GLOB_FULLPATH_ARGS='x/*\ |x[a-zA-Z]:[\\/]*\ ' + ;; +(*) + GLOB_FULLPATH_ONLY='x/*' + GLOB_FULLPATH_ARGS='x/*\ ' + ;; +esac + # AC_CHECK_SIZEOF demands a literal parameter, no variables. So we do this. case "x$NCURSES_OSPEED" in (*short*) @@ -29486,7 +29497,7 @@ then 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}:29489: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5 +echo "${as_me:-configure}:29500: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5 fi @@ -29513,7 +29524,7 @@ fi # This is used for the *-config script and *.pc data files. -echo "$as_me:29516: checking for linker search path" >&5 +echo "$as_me:29527: 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 @@ -29561,7 +29572,7 @@ then cf_pathlist="$cf_pathlist /lib /usr/lib" ;; (*) - { echo "$as_me:29564: WARNING: problem with Solaris architecture" >&5 + { echo "$as_me:29575: WARNING: problem with Solaris architecture" >&5 echo "$as_me: WARNING: problem with Solaris architecture" >&2;} ;; esac @@ -29602,7 +29613,7 @@ done test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib fi -echo "$as_me:29605: result: $cf_cv_ld_searchpath" >&5 +echo "$as_me:29616: 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'` @@ -29688,7 +29699,7 @@ DEFS=-DHAVE_CONFIG_H : "${CONFIG_STATUS=./config.status}" ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:29691: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:29702: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >"$CONFIG_STATUS" <<_ACEOF #! $SHELL @@ -29869,7 +29880,7 @@ cat >>"$CONFIG_STATUS" <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:29872: error: ambiguous option: $1 + { { echo "$as_me:29883: 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;} @@ -29888,7 +29899,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:29891: error: unrecognized option: $1 + -*) { { echo "$as_me:29902: 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;} @@ -30018,7 +30029,7 @@ do "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:30021: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:30032: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -30400,6 +30411,8 @@ s,@MAKE_TESTS@,$MAKE_TESTS,;t t s,@ADAHTML_DIR@,$ADAHTML_DIR,;t t s,@LIBTOOL_OPTS_CXX@,$LIBTOOL_OPTS_CXX,;t t s,@PKG_CFLAGS@,$PKG_CFLAGS,;t t +s,@GLOB_FULLPATH_ONLY@,$GLOB_FULLPATH_ONLY,;t t +s,@GLOB_FULLPATH_ARGS@,$GLOB_FULLPATH_ARGS,;t t s,@MISC_INSTALL_DATA@,$MISC_INSTALL_DATA,;t t s,@MISC_UNINSTALL_DATA@,$MISC_UNINSTALL_DATA,;t t s,@MAKE_DATABASE@,$MAKE_DATABASE,;t t @@ -30540,7 +30553,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:30543: creating $ac_file" >&5 + { echo "$as_me:30556: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -30558,7 +30571,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo "$tmp"/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:30561: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:30574: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo "$f";; @@ -30571,7 +30584,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo "$srcdir/$f" else # /dev/null tree - { { echo "$as_me:30574: error: cannot find input file: $f" >&5 + { { echo "$as_me:30587: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -30587,7 +30600,7 @@ cat >>"$CONFIG_STATUS" <<\EOF if test -n "$ac_seen"; then ac_used=`grep '@datarootdir@' "$ac_item"` if test -z "$ac_used"; then - { echo "$as_me:30590: WARNING: datarootdir was used implicitly but not set: + { echo "$as_me:30603: 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;} @@ -30596,7 +30609,7 @@ $ac_seen" >&2;} fi ac_seen=`grep '${datarootdir}' "$ac_item"` if test -n "$ac_seen"; then - { echo "$as_me:30599: WARNING: datarootdir was used explicitly but not set: + { echo "$as_me:30612: 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;} @@ -30641,7 +30654,7 @@ cat >>"$CONFIG_STATUS" <<\EOF 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:30644: WARNING: Variable $ac_name is used but was not set: + { echo "$as_me:30657: 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;} @@ -30652,7 +30665,7 @@ $ac_seen" >&2;} $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:30655: WARNING: Some variables may not be substituted: + { echo "$as_me:30668: WARNING: Some variables may not be substituted: $ac_seen" >&5 echo "$as_me: WARNING: Some variables may not be substituted: $ac_seen" >&2;} @@ -30701,7 +30714,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue * ) ac_file_in=$ac_file.in ;; esac - test x"$ac_file" != x- && { echo "$as_me:30704: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:30717: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -30712,7 +30725,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo "$tmp"/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:30715: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:30728: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -30725,7 +30738,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo "$srcdir/$f" else # /dev/null tree - { { echo "$as_me:30728: error: cannot find input file: $f" >&5 + { { echo "$as_me:30741: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -30783,7 +30796,7 @@ cat >>"$CONFIG_STATUS" <<\EOF 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:30786: $ac_file is unchanged" >&5 + { echo "$as_me:30799: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ @@ -31170,7 +31183,7 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ (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}:31173: testing overriding CXX_MODEL to SHARED ..." 1>&5 +echo "${as_me:-configure}:31186: testing overriding CXX_MODEL to SHARED ..." 1>&5 with_shared_cxx=yes ;; diff --git a/configure.in b/configure.in index 8a7e6c5e..76bd06d8 100644 --- a/configure.in +++ b/configure.in @@ -29,7 +29,7 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey 1995-on dnl -dnl $Id: configure.in,v 1.782 2024/05/25 23:05:44 tom Exp $ +dnl $Id: configure.in,v 1.783 2024/07/20 23:46:58 tom Exp $ dnl Process this file with autoconf to produce a configure script. dnl dnl For additional information, see @@ -38,7 +38,7 @@ dnl https://invisible-island.net/autoconf/my-autoconf.html dnl dnl --------------------------------------------------------------------------- AC_PREREQ(2.52.20210101) -AC_REVISION($Revision: 1.782 $) +AC_REVISION($Revision: 1.783 $) AC_INIT(ncurses/base/lib_initscr.c) AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin) @@ -2431,6 +2431,7 @@ do done AC_MSG_RESULT($PKG_CFLAGS) AC_SUBST(PKG_CFLAGS) +CF_GLOB_FULLPATH # AC_CHECK_SIZEOF demands a literal parameter, no variables. So we do this. case "x$NCURSES_OSPEED" in diff --git a/dist.mk b/dist.mk index 54e06f0d..ef4624f6 100644 --- a/dist.mk +++ b/dist.mk @@ -26,7 +26,7 @@ # use or other dealings in this Software without prior written # # authorization. # ############################################################################## -# $Id: dist.mk,v 1.1622 2024/07/13 10:06:25 tom Exp $ +# $Id: dist.mk,v 1.1623 2024/07/20 10:19:56 tom Exp $ # Makefile for creating ncurses distributions. # # This only needs to be used directly as a makefile by developers, but @@ -38,7 +38,7 @@ SHELL = /bin/sh # These define the major/minor/patch versions of ncurses. NCURSES_MAJOR = 6 NCURSES_MINOR = 5 -NCURSES_PATCH = 20240713 +NCURSES_PATCH = 20240720 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) diff --git a/doc/html/man/curs_add_wch.3x.html b/doc/html/man/curs_add_wch.3x.html index 5e9c5034..6b84a450 100644 --- a/doc/html/man/curs_add_wch.3x.html +++ b/doc/html/man/curs_add_wch.3x.html @@ -28,19 +28,19 @@ * sale, use or other dealings in this Software without prior written * * authorization. * **************************************************************************** - * @Id: curs_add_wch.3x,v 1.67 2024/06/01 22:29:08 tom Exp @ + * @Id: curs_add_wch.3x,v 1.69 2024/07/20 21:42:38 tom Exp @ --> -curs_add_wch 3x 2024-06-01 ncurses 6.5 Library calls +curs_add_wch 3x 2024-07-20 ncurses 6.5 Library calls -

curs_add_wch 3x 2024-06-01 ncurses 6.5 Library calls

+

curs_add_wch 3x 2024-07-20 ncurses 6.5 Library calls

 curs_add_wch(3x)                 Library calls                curs_add_wch(3x)
 
@@ -103,7 +103,7 @@
        o   Backspace  moves  the cursor one character left; at the left margin
            of a window, it does nothing.
 
-       o   Carriage return moves the cursor to the left margin on the  current
+       o   Carriage return moves the cursor to the left  margin  on  the  same
            line of the window.
 
        o   Line  feed  does a clrtoeol(3x), then advances as if from the right
@@ -364,7 +364,7 @@
 
 
 
-ncurses 6.5                       2024-06-01                  curs_add_wch(3x)
+ncurses 6.5                       2024-07-20                  curs_add_wch(3x)