mirror/ncursesw-morphos
2
0
Fork 0
mirror of https://github.com/Aigor44/ncursesw-morphos.git synced 2025-02-17 15:59:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

ncurses 6.2 - patch 20211016

Browse Source 
+ build-fix for pmake with libtool.
+ improve make-tar.sh scripts, adding COPYING to tar file, and clean up
  shellcheck warnings.
+ add link for "reset6" manpage in test-package ncurses6-doc
+ revise configure option --with-pkg-config-libdir, using the actual
  search path from pkg-config or pkgconf using the output from --debug
  (report by Pascal Pignard).
+ freeze ABI in ".map" files.
This commit is contained in:
Thomas E. Dickey 2021-10-17 00:15:56 +00:00
parent 3d46d7e9d3
commit 95bcbd4bb8
48 changed files with 3849 additions and 3661 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

131
Ada95/aclocal.m4 vendored
View File

@ -29,7 +29,7 @@ dnl***************************************************************************
dnl
dnl Author: Thomas E. Dickey
dnl
dnl $Id: aclocal.m4,v 1.183 2021/09/05 21:33:34 tom Exp $
dnl $Id: aclocal.m4,v 1.184 2021/10/11 00:18:09 tom Exp $
dnl Macros used in NCURSES Ada95 auto-configuration script.
dnl
dnl These macros are maintained separately from NCURSES. The copyright on
@ -3334,9 +3334,11 @@ case ".[$]$1" in
esac
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_PKG_CONFIG version: 11 updated: 2021/01/01 13:31:04
dnl CF_PKG_CONFIG version: 12 updated: 2021/10/10 20:18:09
dnl -------------
dnl Check for the package-config program, unless disabled by command-line.
dnl
dnl Sets $PKG_CONFIG to the pathname of the pkg-config program.
AC_DEFUN([CF_PKG_CONFIG],
[
AC_MSG_CHECKING(if you want to use pkg-config)
@ -4769,9 +4771,18 @@ eval $3="$withval"
AC_SUBST($3)dnl
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_WITH_PKG_CONFIG_LIBDIR version: 11 updated: 2021/01/01 16:16:30
dnl CF_WITH_PKG_CONFIG_LIBDIR version: 12 updated: 2021/10/10 20:18:09
dnl -------------------------
dnl Allow the choice of the pkg-config library directory to be overridden.
dnl
dnl pkg-config uses a search-list built from these colon-separated lists of
dnl directories:
dnl a) $PKG_CONFIG_PATH (tested first, added if set)
dnl b) $PKG_CONFIG_LIBDIR (tested second, added if set)
dnl c) builtin-list (added if $PKG_CONFIG_LIBDIR is not set)
dnl
dnl pkgconf (used with some systems such as FreeBSD in place of pkg-config)
dnl optionally ignores $PKG_CONFIG_LIBDIR.
AC_DEFUN([CF_WITH_PKG_CONFIG_LIBDIR],[
case "$PKG_CONFIG" in
@ -4783,68 +4794,98 @@ case "$PKG_CONFIG" in
;;
esac
PKG_CONFIG_LIBDIR=no
cf_search_path=`echo "$PKG_CONFIG_LIBDIR" | sed -e 's/:/ /g' -e 's,^[[ ]]*,,'`
AC_ARG_WITH(pkg-config-libdir,
[ --with-pkg-config-libdir=XXX use given directory for installing pc-files],
[PKG_CONFIG_LIBDIR=$withval],
[test "x$PKG_CONFIG" != xnone && PKG_CONFIG_LIBDIR=yes])
[cf_search_path=$withval],
[test "x$PKG_CONFIG" != xnone && cf_search_path=yes])
case x$PKG_CONFIG_LIBDIR in
case x$cf_search_path in
(x/*)
;;
(xyes)
cf_search_path=
CF_VERBOSE(auto...)
# Look for the library directory using the same prefix as the executable
AC_MSG_CHECKING(for search-list)
if test "x$PKG_CONFIG" = xnone
then
cf_path=$prefix
else
cf_path=`echo "$PKG_CONFIG" | sed -e 's,/[[^/]]*/[[^/]]*$,,'`
cf_search_path=`
"$PKG_CONFIG" --debug --exists no-such-package 2>&1 | awk "\
/^Scanning directory #[1-9][0-9]* '.*'$/{ \
sub(\"^[[^']]*'\",\"\"); \
sub(\"'.*\",\"\"); \
printf \" %s\", \\[$]0; } \
/trying path:/{
sub(\"^.* trying path: \",\"\");
sub(\" for no-such-package.*$\",\"\");
printf \" %s\", \\[$]0;
}
{ next; } \
"`
fi
# If you don't like using the default architecture, you have to specify the
# intended library directory and corresponding compiler/linker options.
#
# This case allows for Debian's 2014-flavor of multiarch, along with the
# most common variations before that point. Some other variants spell the
# directory differently, e.g., "pkg-config", and put it in unusual places.
# pkg-config has always been poorly standardized, which is ironic...
case x`(arch) 2>/dev/null` in
(*64)
cf_search_path="\
$cf_path/lib/*64-linux-gnu \
$cf_path/share \
$cf_path/lib64 \
$cf_path/lib32 \
$cf_path/lib"
;;
(*)
cf_search_path="\
$cf_path/lib/*-linux-gnu \
$cf_path/share \
$cf_path/lib32 \
$cf_path/lib \
$cf_path/libdata"
;;
esac
if test -z "$cf_search_path"
then
# If you don't like using the default architecture, you have to specify
# the intended library directory and corresponding compiler/linker
# options.
#
# This case allows for Debian's 2014-flavor of multiarch, along with
# the most common variations before that point. Some other variants
# spell the directory differently, e.g., "pkg-config", and put it in
# unusual places.
#
# pkg-config has always been poorly standardized, which is ironic...
case x`(arch) 2>/dev/null` in
(*64)
cf_test_path="\
$cf_path/lib/*64-linux-gnu \
$cf_path/share \
$cf_path/lib64 \
$cf_path/lib32 \
$cf_path/lib"
;;
(*)
cf_test_path="\
$cf_path/lib/*-linux-gnu \
$cf_path/share \
$cf_path/lib32 \
$cf_path/lib \
$cf_path/libdata"
;;
esac
for cf_config in $cf_test_path
do
test -d "$cf_config/pkgconfig" && cf_search_path="$cf_search_path $cf_config/pkgconfig"
done
fi
AC_MSG_RESULT($cf_search_path)
CF_VERBOSE(list...)
for cf_config in $cf_search_path
do
CF_VERBOSE(checking $cf_config/pkgconfig)
if test -d "$cf_config/pkgconfig"
then
PKG_CONFIG_LIBDIR=$cf_config/pkgconfig
AC_MSG_CHECKING(done)
break
fi
done
;;
(*)
;;
esac
if test "x$PKG_CONFIG_LIBDIR" != xno ; then
AC_MSG_RESULT($PKG_CONFIG_LIBDIR)
AC_MSG_CHECKING(for first directory)
cf_pkg_config_path=none
for cf_config in $cf_search_path
do
if test -d "$cf_config"
then
cf_pkg_config_path=$cf_config
break
fi
done
AC_MSG_RESULT($cf_pkg_config_path)
if test "x$cf_pkg_config_path" != xno ; then
# limit this to the first directory found
PKG_CONFIG_LIBDIR="$cf_pkg_config_path"
fi
AC_SUBST(PKG_CONFIG_LIBDIR)

2479
Ada95/configure vendored
View File

File diff suppressed because it is too large Load Diff

57
Ada95/make-tar.sh
View File

@ -1,5 +1,5 @@
#!/bin/sh
# $Id: make-tar.sh,v 1.19 2021/06/17 21:26:02 tom Exp $
# $Id: make-tar.sh,v 1.20 2021/10/12 21:11:33 tom Exp $
##############################################################################
# Copyright 2019-2020,2021 Thomas E. Dickey #
# Copyright 2010-2015,2017 Free Software Foundation, Inc. #
@ -37,14 +37,14 @@ export CDPATH
TARGET=`pwd`
: ${ROOTNAME:=ncurses-Ada95}
: ${PKG_NAME:=AdaCurses}
: ${DESTDIR:=$TARGET}
: ${TMPDIR:=/tmp}
: "${ROOTNAME:=ncurses-Ada95}"
: "${PKG_NAME:=AdaCurses}"
: "${DESTDIR:=$TARGET}"
: "${TMPDIR:=/tmp}"
grep_assign() {
grep_assign=`egrep "^$2\>" "$1" | sed -e "s/^$2[ ]*=[ ]*//" -e 's/"//g'`
eval $2=\"$grep_assign\"
grep_assign=`grep -E "^$2\>" "$1" | sed -e "s/^$2[ ]*=[ ]*//" -e 's/"//g'`
eval "$2"=\""$grep_assign"\"
}
grep_patchdate() {
@ -59,25 +59,28 @@ edit_specfile() {
sed \
-e "s/\\<MAJOR\\>/$NCURSES_MAJOR/g" \
-e "s/\\<MINOR\\>/$NCURSES_MINOR/g" \
-e "s/\\<YYYYMMDD\\>/$NCURSES_PATCH/g" $1 >$1.new
chmod u+w $1
mv $1.new $1
-e "s/\\<YYYYMMDD\\>/$NCURSES_PATCH/g" "$1" >"$1.new"
chmod u+w "$1"
mv "$1.new" "$1"
}
make_changelog() {
test -f $1 && chmod u+w $1
cat >$1 <<EOF
`echo $PKG_NAME|tr '[A-Z]' '[a-z]'` ($NCURSES_MAJOR.$NCURSES_MINOR+$NCURSES_PATCH) unstable; urgency=low
[ -f "$1" ] && chmod u+w "$1"
cat >"$1" <<EOF
`echo $PKG_NAME|tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` ($NCURSES_MAJOR.$NCURSES_MINOR+$NCURSES_PATCH) unstable; urgency=low
* snapshot of ncurses subpackage for $PKG_NAME.
-- `head -n 1 $HOME/.signature` `date -R`
-- `head -n 1 "$HOME"/.signature` `date -R`
EOF
}
# This can be run from either the subdirectory, or from the top-level
# source directory. We will put the tar file in the original directory.
test -d ./Ada95 && cd ./Ada95
if [ -d ./Ada95 ]
then
cd ./Ada95 || exit
fi
SOURCE=`cd ..;pwd`
BUILD=$TMPDIR/make-tar$$
@ -92,30 +95,30 @@ fi
umask 022
mkdir $BUILD/$ROOTNAME
cp -p -r * $BUILD/$ROOTNAME/ || exit
cp -p -r ./* $BUILD/$ROOTNAME/ || exit
# Add the config.* utility scripts from the top-level directory.
for i in . ..
do
for j in config.guess config.sub install-sh tar-copy.sh
for j in COPYING config.guess config.sub install-sh tar-copy.sh
do
test -f $i/$j && cp -p $i/$j $BUILD/$ROOTNAME/
[ -f $i/$j ] && cp -p $i/$j $BUILD/$ROOTNAME/
done
done
# Make rpm and dpkg scripts for test-builds
grep_patchdate
for spec in $BUILD/$ROOTNAME/package/*.spec
for spec in "$BUILD/$ROOTNAME"/package/*.spec
do
edit_specfile $spec
edit_specfile "$spec"
done
for spec in $BUILD/$ROOTNAME/package/debian*
for spec in "$BUILD/$ROOTNAME"/package/debian*
do
make_changelog $spec/changelog
make_changelog "$spec"/changelog
done
cp -p ../man/MKada_config.in $BUILD/$ROOTNAME/doc/
if test -z "$NO_HTML_DOCS"
if [ -z "$NO_HTML_DOCS" ]
then
# Add the ada documentation.
cd ../doc/html || exit
@ -124,12 +127,12 @@ then
cp -p -r ada $BUILD/$ROOTNAME/doc/
fi
cp -p $SOURCE/NEWS $BUILD/$ROOTNAME
cp -p "$SOURCE/NEWS" $BUILD/$ROOTNAME
# cleanup empty directories (an artifact of ncurses source archives)
touch $BUILD/$ROOTNAME/MANIFEST
( cd $BUILD/$ROOTNAME && find . -type f -print |$SOURCE/misc/csort >MANIFEST )
( cd $BUILD/$ROOTNAME && find . -type f -print | "$SOURCE/misc/csort" >MANIFEST )
cd $BUILD || exit
@ -148,8 +151,8 @@ find . -name "*.gz" -exec rm -rf {} \;
# Make the files writable...
chmod -R u+w .
tar cf - $ROOTNAME | gzip >$DESTDIR/$ROOTNAME.tar.gz
cd $DESTDIR
tar cf - $ROOTNAME | gzip >"$DESTDIR/$ROOTNAME.tar.gz"
cd "$DESTDIR" || exit
pwd
ls -l $ROOTNAME.tar.gz

8
INSTALL
View File

@ -26,7 +26,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
-- $Id: INSTALL,v 1.233 2021/09/01 23:29:12 tom Exp $
-- $Id: INSTALL,v 1.234 2021/10/10 22:36:55 tom Exp $
---------------------------------------------------------------------
How to install Ncurses/Terminfo on your system
---------------------------------------------------------------------
@ -1143,7 +1143,11 @@ CONFIGURE OPTIONS:
--with-pkg-config-libdir=[DIR]
If pkg-config was found, override the automatic check for its library
path.
path. The configure script allows only a single directory, because
that is used as the directory in which to install ".pc" files.
The automatic check for the library path selects the first directory
which currently exists.
--with-profile
Generate profile-libraries These are named by adding "_p" to the root,

12
NEWS
View File

@ -26,7 +26,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
-- $Id: NEWS,v 1.3721 2021/10/09 22:22:17 tom Exp $
-- $Id: NEWS,v 1.3727 2021/10/16 15:17:50 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
@ -46,6 +46,16 @@ 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.
20211016
+ build-fix for pmake with libtool.
+ improve make-tar.sh scripts, adding COPYING to tar file, and clean up
shellcheck warnings.
+ add link for "reset6" manpage in test-package ncurses6-doc
+ revise configure option --with-pkg-config-libdir, using the actual
search path from pkg-config or pkgconf using the output from --debug
(report by Pascal Pignard).
+ freeze ABI in ".map" files.
20211009
+ implement "+m" option in tabs program.
+ fill in some details for infoton -TD

2
VERSION
View File

@ -1 +1 @@
5:0:10 6.2 20211009
5:0:10 6.2 20211016

131
aclocal.m4 vendored
View File

@ -29,7 +29,7 @@ dnl***************************************************************************
dnl
dnl Author: Thomas E. Dickey 1995-on
dnl
dnl $Id: aclocal.m4,v 1.977 2021/09/05 21:32:31 tom Exp $
dnl $Id: aclocal.m4,v 1.979 2021/10/11 00:20:48 tom Exp $
dnl Macros used in NCURSES auto-configuration script.
dnl
dnl These macros are maintained separately from NCURSES. The copyright on
@ -6315,9 +6315,11 @@ case ".[$]$1" in
esac
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_PKG_CONFIG version: 11 updated: 2021/01/01 13:31:04
dnl CF_PKG_CONFIG version: 12 updated: 2021/10/10 20:18:09
dnl -------------
dnl Check for the package-config program, unless disabled by command-line.
dnl
dnl Sets $PKG_CONFIG to the pathname of the pkg-config program.
AC_DEFUN([CF_PKG_CONFIG],
[
AC_MSG_CHECKING(if you want to use pkg-config)
@ -9204,9 +9206,18 @@ if test "x$with_pcre2" != xno ; then
fi
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_WITH_PKG_CONFIG_LIBDIR version: 11 updated: 2021/01/01 16:16:30
dnl CF_WITH_PKG_CONFIG_LIBDIR version: 12 updated: 2021/10/10 20:18:09
dnl -------------------------
dnl Allow the choice of the pkg-config library directory to be overridden.
dnl
dnl pkg-config uses a search-list built from these colon-separated lists of
dnl directories:
dnl a) $PKG_CONFIG_PATH (tested first, added if set)
dnl b) $PKG_CONFIG_LIBDIR (tested second, added if set)
dnl c) builtin-list (added if $PKG_CONFIG_LIBDIR is not set)
dnl
dnl pkgconf (used with some systems such as FreeBSD in place of pkg-config)
dnl optionally ignores $PKG_CONFIG_LIBDIR.
AC_DEFUN([CF_WITH_PKG_CONFIG_LIBDIR],[
case "$PKG_CONFIG" in
@ -9218,68 +9229,98 @@ case "$PKG_CONFIG" in
;;
esac
PKG_CONFIG_LIBDIR=no
cf_search_path=`echo "$PKG_CONFIG_LIBDIR" | sed -e 's/:/ /g' -e 's,^[[ ]]*,,'`
AC_ARG_WITH(pkg-config-libdir,
[ --with-pkg-config-libdir=XXX use given directory for installing pc-files],
[PKG_CONFIG_LIBDIR=$withval],
[test "x$PKG_CONFIG" != xnone && PKG_CONFIG_LIBDIR=yes])
[cf_search_path=$withval],
[test "x$PKG_CONFIG" != xnone && cf_search_path=yes])
case x$PKG_CONFIG_LIBDIR in
case x$cf_search_path in
(x/*)
;;
(xyes)
cf_search_path=
CF_VERBOSE(auto...)
# Look for the library directory using the same prefix as the executable
AC_MSG_CHECKING(for search-list)
if test "x$PKG_CONFIG" = xnone
then
cf_path=$prefix
else
cf_path=`echo "$PKG_CONFIG" | sed -e 's,/[[^/]]*/[[^/]]*$,,'`
cf_search_path=`
"$PKG_CONFIG" --debug --exists no-such-package 2>&1 | awk "\
/^Scanning directory #[1-9][0-9]* '.*'$/{ \
sub(\"^[[^']]*'\",\"\"); \
sub(\"'.*\",\"\"); \
printf \" %s\", \\[$]0; } \
/trying path:/{
sub(\"^.* trying path: \",\"\");
sub(\" for no-such-package.*$\",\"\");
printf \" %s\", \\[$]0;
}
{ next; } \
"`
fi
# If you don't like using the default architecture, you have to specify the
# intended library directory and corresponding compiler/linker options.
#
# This case allows for Debian's 2014-flavor of multiarch, along with the
# most common variations before that point. Some other variants spell the
# directory differently, e.g., "pkg-config", and put it in unusual places.
# pkg-config has always been poorly standardized, which is ironic...
case x`(arch) 2>/dev/null` in
(*64)
cf_search_path="\
$cf_path/lib/*64-linux-gnu \
$cf_path/share \
$cf_path/lib64 \
$cf_path/lib32 \
$cf_path/lib"
;;
(*)
cf_search_path="\
$cf_path/lib/*-linux-gnu \
$cf_path/share \
$cf_path/lib32 \
$cf_path/lib \
$cf_path/libdata"
;;
esac
if test -z "$cf_search_path"
then
# If you don't like using the default architecture, you have to specify
# the intended library directory and corresponding compiler/linker
# options.
#
# This case allows for Debian's 2014-flavor of multiarch, along with
# the most common variations before that point. Some other variants
# spell the directory differently, e.g., "pkg-config", and put it in
# unusual places.
#
# pkg-config has always been poorly standardized, which is ironic...
case x`(arch) 2>/dev/null` in
(*64)
cf_test_path="\
$cf_path/lib/*64-linux-gnu \
$cf_path/share \
$cf_path/lib64 \
$cf_path/lib32 \
$cf_path/lib"
;;
(*)
cf_test_path="\
$cf_path/lib/*-linux-gnu \
$cf_path/share \
$cf_path/lib32 \
$cf_path/lib \
$cf_path/libdata"
;;
esac
for cf_config in $cf_test_path
do
test -d "$cf_config/pkgconfig" && cf_search_path="$cf_search_path $cf_config/pkgconfig"
done
fi
AC_MSG_RESULT($cf_search_path)
CF_VERBOSE(list...)
for cf_config in $cf_search_path
do
CF_VERBOSE(checking $cf_config/pkgconfig)
if test -d "$cf_config/pkgconfig"
then
PKG_CONFIG_LIBDIR=$cf_config/pkgconfig
AC_MSG_CHECKING(done)
break
fi
done
;;
(*)
;;
esac
if test "x$PKG_CONFIG_LIBDIR" != xno ; then
AC_MSG_RESULT($PKG_CONFIG_LIBDIR)
AC_MSG_CHECKING(for first directory)
cf_pkg_config_path=none
for cf_config in $cf_search_path
do
if test -d "$cf_config"
then
cf_pkg_config_path=$cf_config
break
fi
done
AC_MSG_RESULT($cf_pkg_config_path)
if test "x$cf_pkg_config_path" != xno ; then
# limit this to the first directory found
PKG_CONFIG_LIBDIR="$cf_pkg_config_path"
fi
AC_SUBST(PKG_CONFIG_LIBDIR)

4351
configure vendored
View File

File diff suppressed because it is too large Load Diff

4
dist.mk
View File

@ -26,7 +26,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
# $Id: dist.mk,v 1.1439 2021/10/09 10:52:52 tom Exp $
# $Id: dist.mk,v 1.1440 2021/10/16 08:28:32 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 = 2
NCURSES_PATCH = 20211009
NCURSES_PATCH = 20211016
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)

2
doc/html/man/adacurses6-config.1.html
View File

@ -126,7 +126,7 @@
</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
<STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20211009).
This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20211016).

2
doc/html/man/captoinfo.1m.html
View File

@ -199,7 +199,7 @@
</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
<STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20211009).
This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20211016).
</PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>

2
doc/html/man/clear.1.html
View File

@ -150,7 +150,7 @@
</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
<STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20211009).
This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20211016).

2
doc/html/man/form.3x.html
View File

@ -248,7 +248,7 @@
<STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names begin "form_" for detailed
descriptions of the entry points.
This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20211009).
This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20211016).

2
doc/html/man/infocmp.1m.html
View File

@ -514,7 +514,7 @@
https://invisible-island.net/ncurses/tctest.html
This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20211009).
This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20211016).
</PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>

2
doc/html/man/infotocap.1m.html
View File

@ -91,7 +91,7 @@
</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
<STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20211009).
This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20211016).
</PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>

2
doc/html/man/menu.3x.html
View File

@ -223,7 +223,7 @@
<STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names begin "menu_" for detailed
descriptions of the entry points.
This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20211009).
This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20211016).

2
doc/html/man/ncurses.3x.html
View File

@ -60,7 +60,7 @@
method of updating character screens with reasonable optimization.
This implementation is "new curses" (ncurses) and is the approved
replacement for 4.4BSD classic curses, which has been discontinued.
This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20211009).
This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20211016).
The <STRONG>ncurses</STRONG> library emulates the curses library of System V Release 4
UNIX, and XPG4 (X/Open Portability Guide) curses (also known as XSI

2
doc/html/man/ncurses6-config.1.html
View File

@ -113,7 +113,7 @@
</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
<STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20211009).
This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20211016).

2
doc/html/man/panel.3x.html
View File

@ -281,7 +281,7 @@
</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
<STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20211009).
This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20211016).
</PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>

37
doc/html/man/tabs.1.html
View File

@ -27,7 +27,7 @@
* sale, use or other dealings in this Software without prior written *
* authorization. *
****************************************************************************
* @Id: tabs.1,v 1.30 2021/10/09 23:48:50 tom Exp @
* @Id: tabs.1,v 1.32 2021/10/16 13:37:43 tom Exp @
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
<HTML>
@ -212,38 +212,47 @@
The PWB/Unix <STRONG>tabs</STRONG> utility, which was included in System III (1980),
used built-in tables rather than the terminal database, to support a
half-dozen terminal types. It also had built-in logic to support the
left-margin, as well as a feature for copying the tab settings from a
file.
half-dozen hardcopy terminal (printer) types. It also had built-in
logic to support the left-margin, as well as a feature for copying the
tab settings from a file.
Later versions of Unix, e.g., SVr4, added support for the terminal
database, but kept the tables, as a fallback. In an earlier
database, but kept the tables to support the printers. In an earlier
development effort, the tab-stop initialization provided by <STRONG>tset</STRONG> (1982)
and incorporated into <STRONG>tput</STRONG> uses the terminal database,
POSIX documents no limits on the number of tab stops. Documentation
The <STRONG>+m</STRONG> option was documented in the Base Specifications Issue 5
(Unix98, 1997), and omitted in Issue 6 (Unix03, 2004) without
documenting the rationale, though an introductory comment <EM>"and</EM>
<EM>optionally</EM> <EM>adjusts</EM> <EM>the</EM> <EM>margin"</EM> remains, overlooked in the removal. The
documented <STRONG>tabs</STRONG> utility in Issues 6 and later has no mechanism for
setting margins. The <STRONG>+m</STRONG> option in this implementation differs from the
feature in SVr4 by using terminal capabilities rather than built-in
tables.
POSIX documents no limits on the number of tab stops. Documentation
for other implementations states that there is a limit on the number of
tab stops (e.g., 20 in PWB/Unix's <STRONG>tabs</STRONG> utility). While some terminals
may not accept an arbitrary number of tab stops, this implementation
will attempt to set tab stops up to the right margin of the screen, if
tab stops (e.g., 20 in PWB/Unix's <STRONG>tabs</STRONG> utility). While some terminals
may not accept an arbitrary number of tab stops, this implementation
will attempt to set tab stops up to the right margin of the screen, if
the given list happens to be that long.
The <EM>Rationale</EM> section of the POSIX documentation goes into some detail
about the ways the committee considered redesigning the <STRONG>tabs</STRONG> and <STRONG>tput</STRONG>
The <EM>Rationale</EM> section of the POSIX documentation goes into some detail
about the ways the committee considered redesigning the <STRONG>tabs</STRONG> and <STRONG>tput</STRONG>
utilities, without proposing an improved solution. It comments that
no known historical version of tabs supports the capability of
no known historical version of tabs supports the capability of
setting arbitrary tab stops.
However, the <EM>Explicit</EM> <EM>Lists</EM> described in this manual page were
implemented in PWB/Unix. Those provide the capability of setting
implemented in PWB/Unix. Those provide the capability of setting
abitrary tab stops.
</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
<STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20211009).
This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20211016).

2
doc/html/man/terminfo.5.html
View File

@ -106,7 +106,7 @@
have, by specifying how to perform screen operations, and by specifying
padding requirements and initialization sequences.
This manual describes <STRONG>ncurses</STRONG> version 6.2 (patch 20211009).
This manual describes <STRONG>ncurses</STRONG> version 6.2 (patch 20211016).
</PRE><H3><a name="h3-Terminfo-Entry-Syntax">Terminfo Entry Syntax</a></H3><PRE>

2
doc/html/man/tic.1m.html
View File

@ -461,7 +461,7 @@
<STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>, <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,
<STRONG><A HREF="term.5.html">term(5)</A></STRONG>. <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>. <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>.
This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20211009).
This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20211016).
</PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>

2
doc/html/man/toe.1m.html
View File

@ -171,7 +171,7 @@
<STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>, <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,
<STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20211009).
This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20211016).

2
doc/html/man/tput.1.html
View File

@ -545,7 +545,7 @@
</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
<STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>, <STRONG>stty(1)</STRONG>, <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>, <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20211009).
This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20211016).

2
doc/html/man/tset.1.html
View File

@ -389,7 +389,7 @@
<STRONG>csh(1)</STRONG>, <STRONG>sh(1)</STRONG>, <STRONG>stty(1)</STRONG>, <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>, <STRONG>tty(4)</STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>,
<STRONG>ttys(5)</STRONG>, <STRONG>environ(7)</STRONG>
This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20211009).
This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20211016).

17
man/tabs.1
View File

@ -27,7 +27,7 @@
.\" authorization. *
.\"***************************************************************************
.\"
.\" $Id: tabs.1,v 1.30 2021/10/09 23:48:50 tom Exp $
.\" $Id: tabs.1,v 1.32 2021/10/16 13:37:43 tom Exp $
.TH @TABS@ 1 ""
.ds n 5
.ie \n(.g .ds `` \(lq
@ -239,17 +239,28 @@ That option is not documented by POSIX.
.PP
The PWB/Unix \fBtabs\fP utility, which was included in System III (1980),
used built-in tables rather than the terminal database,
to support a half-dozen terminal types.
to support a half-dozen hardcopy terminal (printer) types.
It also had built-in logic to support the left-margin,
as well as a feature for copying the tab settings from a file.
.PP
Later versions of Unix, e.g., SVr4,
added support for the terminal database,
but kept the tables, as a fallback.
but kept the tables to support the printers.
In an earlier development effort,
the tab-stop initialization provided by \fBtset\fP (1982)
and incorporated into \fBtput\fP uses the terminal database,
.PP
The \fB\+m\fP option was documented
in the Base Specifications Issue 5 (Unix98, 1997),
and omitted in Issue 6 (Unix03, 2004) without documenting the rationale,
though an introductory comment
\fI\*(``and optionally adjusts the margin\*(''\fP remains,
overlooked in the removal.
The documented \fBtabs\fP utility in Issues 6 and later has no mechanism
for setting margins.
The \fB\+m\fP option in this implementation differs from the feature
in SVr4 by using terminal capabilities rather than built-in tables.
.PP
POSIX documents no limits on the number of tab stops.
Documentation for other implementations states that there is a limit on the
number of tab stops

15
misc/terminfo.src
View File

@ -6,8 +6,8 @@
# Report bugs and new terminal descriptions to
# bug-ncurses@gnu.org
#
# $Revision: 1.942 $
# $Date: 2021/10/09 22:06:46 $
# $Revision: 1.943 $
# $Date: 2021/10/14 00:40:38 $
#
# The original header is preserved below for reference. It is noted that there
# is a "newer" version which differs in some cosmetic details (but actually
@ -23340,16 +23340,16 @@ ti700|ti733|ti735|ti745|ti800|Texas Instruments Silent 700/733/735/745 or OMNI 8
# http://www.bitsavers.org/pdf/ti/terminal/silent_700/
# Refer to:
# Model 707 Data Terminal User's Manual
# http://www.bitsavers.org/pdf/ti/terminal/silent_700/2310451-0001_Silent_700_Model_707_Users_Manual_Nov1983.pdf
#
# pages 2-7 and 2-8 say that the model 707 prints 10.2 characters per inch
# (cpi) (80 characters per line) by default, and can be switched to/from 17.0
# cpi using an escape sequence. There is no 80/132-column capability in
# terminfo (only the more general cpi which allows any value).
ti703|ti707|Texas Instruments Silent 703/707,
am, hc, os, xenl,
cols#80, it#8,
bel=^G, cr=\r$<162>, cub1=^H, cud1=\n, cuf1=\s, ind=\n,
is2=\EPC\\, nel=\r\n,
am, xenl,
it#8,
cuf1=\s, is2=\EPC\\, nel=\r\n, use=ti700,
ti703-w|ti707-w|Texas Instruments Silent 703/707,
cols#132,
is2=\EPD\\, use=ti703,
@ -27270,4 +27270,7 @@ v3220|LANPAR Vision II model 3220/3221/3222,
# + fix spelling/consistency in several descriptions -TD
# + use vt420+lrmm in vt420 -TD
#
# 2021-10-13
# + trim some redundant definitions -TD
#
######## SHANTIH! SHANTIH! SHANTIH!

12
mk-1st.awk
View File

@ -1,4 +1,4 @@
# $Id: mk-1st.awk,v 1.123 2021/08/15 20:01:44 tom Exp $
# $Id: mk-1st.awk,v 1.124 2021/10/15 00:50:05 tom Exp $
##############################################################################
# Copyright 2018-2020,2021 Thomas E. Dickey #
# Copyright 1998-2016,2017 Free Software Foundation, Inc. #
@ -477,10 +477,6 @@ END {
{
end_name = lib_name;
use_name = trim_suffix(TermlibRoot) USE_LIB_SUFFIX
printf "# FIXME\n";
printf "# name '%s'\n", name;
printf "# end_name '%s'\n", end_name;
printf "# use_name '%s'\n", use_name;
printf "../lib/%s : \\\n", lib_name
if ( (name != use_name ) && ( index(name, "++") == 0 ) && ( index(name, "tic") == 1 || index(name, "ncurses") == 1 ) ) {
printf "\t\t../lib/lib%s.la \\\n", use_name;
@ -511,8 +507,10 @@ END {
printf "\t\t$(DESTDIR)$(libdir) \\\n";
use_name = TermlibRoot USE_LIB_SUFFIX
if ( (name != use_name ) && ( index(name, "++") == 0 ) && ( index(name, "tic") == 1 || index(name, "ncurses") == 1 ) ) {
printf "\t\tinstall.%s \\\n", trim_suffix(TermlibRoot);
if ( index(name, "tic") == 1 && index(TermlibRoot, "ncurses") != 1 ) {
if ( trim_suffix(TermlibRoot) != trim_suffix(name) ) {
printf "\t\tinstall.%s \\\n", trim_suffix(TermlibRoot);
}
if ( index(name, "tic") == 1 && index(TermlibRoot, "ncurses") != 1 && trim_suffix(name) != "ncurses" ) {
printf "\t\tinstall.%s \\\n", "ncurses";
}
}

30
ncurses/llib-lncurses
View File

@ -2831,8 +2831,8 @@ int _nc_add_to_try(
#undef _nc_align_termtype
void _nc_align_termtype(
TERMTYPE2 *to,
TERMTYPE2 *from)
TERMTYPE *to,
TERMTYPE *from)
{ /* void */ }
#undef _nc_copy_termtype
@ -2994,7 +2994,7 @@ ENTRY *_nc_tail;
#undef _nc_free_entry
void _nc_free_entry(
ENTRY *headp,
TERMTYPE2 *tterm)
TERMTYPE *tterm)
{ /* void */ }
#undef _nc_free_entries
@ -3014,9 +3014,9 @@ void exit_terminfo(
/* ./fallback.c */
#undef _nc_fallback
const TERMTYPE2 *_nc_fallback(
const TERMTYPE *_nc_fallback(
const char *name)
{ return(*(const TERMTYPE2 **)0); }
{ return(*(const TERMTYPE **)0); }
/* ./tinfo/free_ttype.c */
@ -3470,7 +3470,7 @@ void _nc_update_screensize(
#undef _nc_setup_tinfo
int _nc_setup_tinfo(
const char *const tn,
TERMTYPE2 *const tp)
TERMTYPE *const tp)
{ return(*(int *)0); }
#undef _nc_tinfo_cmdch
@ -4047,12 +4047,12 @@ void _nc_set_buffer(
#undef _nc_init_termtype
void _nc_init_termtype(
TERMTYPE2 *const tp)
TERMTYPE *const tp)
{ /* void */ }
#undef _nc_read_termtype
int _nc_read_termtype(
TERMTYPE2 *ptr,
TERMTYPE *ptr,
char *buffer,
int limit)
{ return(*(int *)0); }
@ -4060,14 +4060,14 @@ int _nc_read_termtype(
#undef _nc_read_file_entry
int _nc_read_file_entry(
const char *const filename,
TERMTYPE2 *ptr)
TERMTYPE *ptr)
{ return(*(int *)0); }
#undef _nc_read_entry
int _nc_read_entry(
const char *const name,
char *const filename,
TERMTYPE2 *const tp)
TERMTYPE *const tp)
{ return(*(int *)0); }
/* ./tinfo/read_termcap.c */
@ -4075,7 +4075,7 @@ int _nc_read_entry(
#undef _nc_read_termcap_entry
int _nc_read_termcap_entry(
const char *const tn,
TERMTYPE2 *const tp)
TERMTYPE *const tp)
{ return(*(int *)0); }
/* ./tinfo/strings.c */
@ -4158,7 +4158,7 @@ int _nc_remove_string(
#undef _nc_trim_sgr0
char *_nc_trim_sgr0(
TERMTYPE2 *tp)
TERMTYPE *tp)
{ return(*(char **)0); }
/* ./unctrl.c */
@ -4264,7 +4264,7 @@ char *_nc_tic_expand(
#undef _nc_check_termtype2
void (*_nc_check_termtype2)(
TERMTYPE2 *p1,
TERMTYPE *p1,
NCURSES_BOOL p2);
#undef _nc_entry_match
@ -4359,12 +4359,12 @@ void _nc_set_writedir(
#undef _nc_write_entry
void _nc_write_entry(
TERMTYPE2 *const tp)
TERMTYPE *const tp)
{ /* void */ }
#undef _nc_write_object
int _nc_write_object(
TERMTYPE2 *tp,
TERMTYPE *tp,
char *buffer,
unsigned *offset,
unsigned limit)

30
ncurses/llib-lncursest
View File

@ -2840,8 +2840,8 @@ int _nc_add_to_try(
#undef _nc_align_termtype
void _nc_align_termtype(
TERMTYPE2 *to,
TERMTYPE2 *from)
TERMTYPE *to,
TERMTYPE *from)
{ /* void */ }
#undef _nc_copy_termtype
@ -3008,7 +3008,7 @@ ENTRY *_nc_tail;
#undef _nc_free_entry
void _nc_free_entry(
ENTRY *headp,
TERMTYPE2 *tterm)
TERMTYPE *tterm)
{ /* void */ }
#undef _nc_free_entries
@ -3028,9 +3028,9 @@ void exit_terminfo(
/* ./fallback.c */
#undef _nc_fallback
const TERMTYPE2 *_nc_fallback(
const TERMTYPE *_nc_fallback(
const char *name)
{ return(*(const TERMTYPE2 **)0); }
{ return(*(const TERMTYPE **)0); }
/* ./tinfo/free_ttype.c */
@ -3547,7 +3547,7 @@ void _nc_update_screensize(
#undef _nc_setup_tinfo
int _nc_setup_tinfo(
const char *const tn,
TERMTYPE2 *const tp)
TERMTYPE *const tp)
{ return(*(int *)0); }
#undef _nc_tinfo_cmdch
@ -4168,12 +4168,12 @@ void _nc_set_buffer(
#undef _nc_init_termtype
void _nc_init_termtype(
TERMTYPE2 *const tp)
TERMTYPE *const tp)
{ /* void */ }
#undef _nc_read_termtype
int _nc_read_termtype(
TERMTYPE2 *ptr,
TERMTYPE *ptr,
char *buffer,
int limit)
{ return(*(int *)0); }
@ -4181,14 +4181,14 @@ int _nc_read_termtype(
#undef _nc_read_file_entry
int _nc_read_file_entry(
const char *const filename,
TERMTYPE2 *ptr)
TERMTYPE *ptr)
{ return(*(int *)0); }
#undef _nc_read_entry
int _nc_read_entry(
const char *const name,
char *const filename,
TERMTYPE2 *const tp)
TERMTYPE *const tp)
{ return(*(int *)0); }
/* ./tinfo/read_termcap.c */
@ -4196,7 +4196,7 @@ int _nc_read_entry(
#undef _nc_read_termcap_entry
int _nc_read_termcap_entry(
const char *const tn,
TERMTYPE2 *const tp)
TERMTYPE *const tp)
{ return(*(int *)0); }
/* ./tinfo/strings.c */
@ -4279,7 +4279,7 @@ int _nc_remove_string(
#undef _nc_trim_sgr0
char *_nc_trim_sgr0(
TERMTYPE2 *tp)
TERMTYPE *tp)
{ return(*(char **)0); }
/* ./unctrl.c */
@ -4385,7 +4385,7 @@ char *_nc_tic_expand(
#undef _nc_check_termtype2
void (*_nc_check_termtype2)(
TERMTYPE2 *p1,
TERMTYPE *p1,
NCURSES_BOOL p2);
#undef _nc_entry_match
@ -4480,12 +4480,12 @@ void _nc_set_writedir(
#undef _nc_write_entry
void _nc_write_entry(
TERMTYPE2 *const tp)
TERMTYPE *const tp)
{ /* void */ }
#undef _nc_write_object
int _nc_write_object(
TERMTYPE2 *tp,
TERMTYPE *tp,
char *buffer,
unsigned *offset,
unsigned limit)

6
ncurses/llib-ltic
View File

@ -92,7 +92,7 @@ char *_nc_tic_expand(
#undef _nc_check_termtype2
void (*_nc_check_termtype2)(
TERMTYPE2 *p1,
TERMTYPE *p1,
NCURSES_BOOL p2);
#undef _nc_entry_match
@ -187,12 +187,12 @@ void _nc_set_writedir(
#undef _nc_write_entry
void _nc_write_entry(
TERMTYPE2 *const tp)
TERMTYPE *const tp)
{ /* void */ }
#undef _nc_write_object
int _nc_write_object(
TERMTYPE2 *tp,
TERMTYPE *tp,
char *buffer,
unsigned *offset,
unsigned limit)

6
ncurses/llib-ltict
View File

@ -92,7 +92,7 @@ char *_nc_tic_expand(
#undef _nc_check_termtype2
void (*_nc_check_termtype2)(
TERMTYPE2 *p1,
TERMTYPE *p1,
NCURSES_BOOL p2);
#undef _nc_entry_match
@ -187,12 +187,12 @@ void _nc_set_writedir(
#undef _nc_write_entry
void _nc_write_entry(
TERMTYPE2 *const tp)
TERMTYPE *const tp)
{ /* void */ }
#undef _nc_write_object
int _nc_write_object(
TERMTYPE2 *tp,
TERMTYPE *tp,
char *buffer,
unsigned *offset,
unsigned limit)

22
ncurses/llib-ltinfo
View File

@ -102,8 +102,8 @@ int _nc_add_to_try(
#undef _nc_align_termtype
void _nc_align_termtype(
TERMTYPE2 *to,
TERMTYPE2 *from)
TERMTYPE *to,
TERMTYPE *from)
{ /* void */ }
#undef _nc_copy_termtype
@ -265,7 +265,7 @@ ENTRY *_nc_tail;
#undef _nc_free_entry
void _nc_free_entry(
ENTRY *headp,
TERMTYPE2 *tterm)
TERMTYPE *tterm)
{ /* void */ }
#undef _nc_free_entries
@ -285,9 +285,9 @@ void exit_terminfo(
/* ./fallback.c */
#undef _nc_fallback
const TERMTYPE2 *_nc_fallback(
const TERMTYPE *_nc_fallback(
const char *name)
{ return(*(const TERMTYPE2 **)0); }
{ return(*(const TERMTYPE **)0); }
/* ./tinfo/free_ttype.c */
@ -741,7 +741,7 @@ void _nc_update_screensize(
#undef _nc_setup_tinfo
int _nc_setup_tinfo(
const char *const tn,
TERMTYPE2 *const tp)
TERMTYPE *const tp)
{ return(*(int *)0); }
#undef _nc_tinfo_cmdch
@ -1318,12 +1318,12 @@ void _nc_set_buffer(
#undef _nc_init_termtype
void _nc_init_termtype(
TERMTYPE2 *const tp)
TERMTYPE *const tp)
{ /* void */ }
#undef _nc_read_termtype
int _nc_read_termtype(
TERMTYPE2 *ptr,
TERMTYPE *ptr,
char *buffer,
int limit)
{ return(*(int *)0); }
@ -1331,14 +1331,14 @@ int _nc_read_termtype(
#undef _nc_read_file_entry
int _nc_read_file_entry(
const char *const filename,
TERMTYPE2 *ptr)
TERMTYPE *ptr)
{ return(*(int *)0); }
#undef _nc_read_entry
int _nc_read_entry(
const char *const name,
char *const filename,
TERMTYPE2 *const tp)
TERMTYPE *const tp)
{ return(*(int *)0); }
/* ./tinfo/read_termcap.c */
@ -1427,7 +1427,7 @@ int _nc_remove_string(
#undef _nc_trim_sgr0
char *_nc_trim_sgr0(
TERMTYPE2 *tp)
TERMTYPE *tp)
{ return(*(char **)0); }
/* ./unctrl.c */

22
ncurses/llib-ltinfot
View File

@ -102,8 +102,8 @@ int _nc_add_to_try(
#undef _nc_align_termtype
void _nc_align_termtype(
TERMTYPE2 *to,
TERMTYPE2 *from)
TERMTYPE *to,
TERMTYPE *from)
{ /* void */ }
#undef _nc_copy_termtype
@ -270,7 +270,7 @@ ENTRY *_nc_tail;
#undef _nc_free_entry
void _nc_free_entry(
ENTRY *headp,
TERMTYPE2 *tterm)
TERMTYPE *tterm)
{ /* void */ }
#undef _nc_free_entries
@ -290,9 +290,9 @@ void exit_terminfo(
/* ./fallback.c */
#undef _nc_fallback
const TERMTYPE2 *_nc_fallback(
const TERMTYPE *_nc_fallback(
const char *name)
{ return(*(const TERMTYPE2 **)0); }
{ return(*(const TERMTYPE **)0); }
/* ./tinfo/free_ttype.c */
@ -809,7 +809,7 @@ void _nc_update_screensize(
#undef _nc_setup_tinfo
int _nc_setup_tinfo(
const char *const tn,
TERMTYPE2 *const tp)
TERMTYPE *const tp)
{ return(*(int *)0); }
#undef _nc_tinfo_cmdch
@ -1430,12 +1430,12 @@ void _nc_set_buffer(
#undef _nc_init_termtype
void _nc_init_termtype(
TERMTYPE2 *const tp)
TERMTYPE *const tp)
{ /* void */ }
#undef _nc_read_termtype
int _nc_read_termtype(
TERMTYPE2 *ptr,
TERMTYPE *ptr,
char *buffer,
int limit)
{ return(*(int *)0); }
@ -1443,14 +1443,14 @@ int _nc_read_termtype(
#undef _nc_read_file_entry
int _nc_read_file_entry(
const char *const filename,
TERMTYPE2 *ptr)
TERMTYPE *ptr)
{ return(*(int *)0); }
#undef _nc_read_entry
int _nc_read_entry(
const char *const name,
char *const filename,
TERMTYPE2 *const tp)
TERMTYPE *const tp)
{ return(*(int *)0); }
/* ./tinfo/read_termcap.c */
@ -1539,7 +1539,7 @@ int _nc_remove_string(
#undef _nc_trim_sgr0
char *_nc_trim_sgr0(
TERMTYPE2 *tp)
TERMTYPE *tp)
{ return(*(char **)0); }
/* ./unctrl.c */

4
package/debian-mingw/changelog
View File

@ -1,8 +1,8 @@
ncurses6 (6.2+20211009) unstable; urgency=low
ncurses6 (6.2+20211016) unstable; urgency=low
* latest weekly patch
-- Thomas E. Dickey <dickey@invisible-island.net> Sun, 03 Oct 2021 11:37:51 -0400
-- Thomas E. Dickey <dickey@invisible-island.net> Sun, 10 Oct 2021 11:29:02 -0400
ncurses6 (5.9-20131005) unstable; urgency=low

4
package/debian-mingw64/changelog
View File

@ -1,8 +1,8 @@
ncurses6 (6.2+20211009) unstable; urgency=low
ncurses6 (6.2+20211016) unstable; urgency=low
* latest weekly patch
-- Thomas E. Dickey <dickey@invisible-island.net> Sun, 03 Oct 2021 11:37:51 -0400
-- Thomas E. Dickey <dickey@invisible-island.net> Sun, 10 Oct 2021 11:29:02 -0400
ncurses6 (5.9-20131005) unstable; urgency=low

4
package/debian/changelog
View File

@ -1,8 +1,8 @@
ncurses6 (6.2+20211009) unstable; urgency=low
ncurses6 (6.2+20211016) unstable; urgency=low
* latest weekly patch
-- Thomas E. Dickey <dickey@invisible-island.net> Sun, 03 Oct 2021 11:37:51 -0400
-- Thomas E. Dickey <dickey@invisible-island.net> Sun, 10 Oct 2021 11:29:02 -0400
ncurses6 (5.9-20120608) unstable; urgency=low

4
package/debian/rules
View File

@ -1,5 +1,5 @@
#!/usr/bin/make -f
# $Id: rules,v 1.40 2021/03/23 00:17:05 tom Exp $
# $Id: rules,v 1.41 2021/10/11 18:18:08 tom Exp $
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
@ -209,6 +209,8 @@ install-ncurses6-doc-stamp: build-ncurses6-stamp
$(MAKE) -C t/ncurses6 install.man DESTDIR=$(NCURSES6_DIR)-doc
cd $(NCURSES6_DIR)-doc/usr/share/man/man1 && ln -sf tset6.1.gz reset6.1.gz
touch $@
HTML_DESTDIR=$(NCURSES6_DIR)-doc-html/usr/share/ncurses6-doc-html

4
package/mingw-ncurses.nsi
View File

@ -1,4 +1,4 @@
; $Id: mingw-ncurses.nsi,v 1.481 2021/10/09 10:52:52 tom Exp $
; $Id: mingw-ncurses.nsi,v 1.482 2021/10/10 15:29:02 tom Exp $
; TODO add examples
; TODO bump ABI to 6
@ -10,7 +10,7 @@
!define VERSION_MAJOR "6"
!define VERSION_MINOR "2"
!define VERSION_YYYY "2021"
!define VERSION_MMDD "1009"
!define VERSION_MMDD "1016"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"

2
package/mingw-ncurses.spec
View File

@ -3,7 +3,7 @@
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 6.2
Release: 20211009
Release: 20211016
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz

4
package/ncurses.map
View File

@ -1,4 +1,4 @@
# $Id: ncurses.map,v 1.54 2021/08/19 23:49:21 tom Exp $
# $Id: ncurses.map,v 1.55 2021/10/10 15:22:33 tom Exp $
# script for shared library symbol-versioning using ld
#
# This file was generated by ncu-mapsyms
@ -1208,7 +1208,7 @@ NCURSES_TINFO_6.2.20200212 {
exit_terminfo;
} NCURSES_TINFO_6.1.20171230;
NCURSES_TINFO_6.2.current {
NCURSES_TINFO_6.2.20211010 {
global:
_nc_reset_tparm;
_nc_safe_fopen;

7
package/ncurses.spec
View File

@ -1,7 +1,7 @@
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 6.2
Release: 20211009
Release: 20211016
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
@ -77,7 +77,7 @@ This package is used for testing ABI %{MY_ABI}.
--enable-opaque-menu \\\
--enable-opaque-panel \\\
--enable-pc-files \\\
--enable-rpath \\\
--disable-rpath \\\
--enable-stdnoreturn \\\
--enable-warnings \\\
--enable-wgetch-events \\\
@ -140,6 +140,9 @@ exit 0
%changelog
* Sat Oct 16 2021 Thomas Dickey
- disable rpath to address QA_RPATHS=1 warning.
* Tue Dec 24 2019 Thomas Dickey
- drop custom CC_NORMAL warning flags because setting CFLAGS interferes with
matching Fedora's PIE/PIC configuration. Also, generate debug/debug-source

4
package/ncursest.map
View File

@ -1,4 +1,4 @@
# $Id: ncursest.map,v 1.52 2021/08/19 23:49:21 tom Exp $
# $Id: ncursest.map,v 1.53 2021/10/10 15:22:33 tom Exp $
# script for shared library symbol-versioning using ld
#
# This file was generated by ncu-mapsyms
@ -487,7 +487,7 @@ NCURSES_TINFO_6.2.20200212 {
exit_terminfo;
} NCURSES_TINFO_6.1.20171230;
NCURSES_TINFO_6.2.current {
NCURSES_TINFO_6.2.20211010 {
global:
_nc_reset_tparm;
_nc_safe_fopen;

2
package/ncursest.spec
View File

@ -1,7 +1,7 @@
Summary: Curses library with POSIX thread support.
Name: ncursest6
Version: 6.2
Release: 20211009
Release: 20211016
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz

4
package/ncursestw.map
View File

@ -1,4 +1,4 @@
# $Id: ncursestw.map,v 1.55 2021/08/19 23:49:21 tom Exp $
# $Id: ncursestw.map,v 1.56 2021/10/10 15:22:33 tom Exp $
# script for shared library symbol-versioning using ld
#
# This file was generated by ncu-mapsyms
@ -493,7 +493,7 @@ NCURSES_TINFO_6.2.20200212 {
exit_terminfo;
} NCURSES_TINFO_6.1.20171230;
NCURSES_TINFO_6.2.current {
NCURSES_TINFO_6.2.20211010 {
global:
_nc_reset_tparm;
_nc_tiparm;

4
package/ncursesw.map
View File

@ -1,4 +1,4 @@
# $Id: ncursesw.map,v 1.58 2021/08/19 23:49:21 tom Exp $
# $Id: ncursesw.map,v 1.59 2021/10/10 15:22:33 tom Exp $
# script for shared library symbol-versioning using ld
#
# This file was generated by ncu-mapsyms
@ -487,7 +487,7 @@ NCURSES_TINFO_6.2.20200212 {
exit_terminfo;
} NCURSES_TINFO_6.1.20171230;
NCURSES_TINFO_6.2.current {
NCURSES_TINFO_6.2.20211010 {
global:
_nc_reset_tparm;
_nc_tiparm;

6
test/aclocal.m4 vendored
View File

@ -27,7 +27,7 @@ dnl sale, use or other dealings in this Software without prior written *
dnl authorization. *
dnl***************************************************************************
dnl
dnl $Id: aclocal.m4,v 1.201 2021/09/05 21:29:34 tom Exp $
dnl $Id: aclocal.m4,v 1.202 2021/10/11 00:18:09 tom Exp $
dnl
dnl Author: Thomas E. Dickey
dnl
@ -3181,9 +3181,11 @@ else
fi
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_PKG_CONFIG version: 11 updated: 2021/01/01 13:31:04
dnl CF_PKG_CONFIG version: 12 updated: 2021/10/10 20:18:09
dnl -------------
dnl Check for the package-config program, unless disabled by command-line.
dnl
dnl Sets $PKG_CONFIG to the pathname of the pkg-config program.
AC_DEFUN([CF_PKG_CONFIG],
[
AC_MSG_CHECKING(if you want to use pkg-config)

55
test/make-tar.sh
View File

@ -1,5 +1,5 @@
#!/bin/sh
# $Id: make-tar.sh,v 1.17 2021/06/17 21:26:02 tom Exp $
# $Id: make-tar.sh,v 1.18 2021/10/12 21:12:16 tom Exp $
##############################################################################
# Copyright 2019-2020,2021 Thomas E. Dickey #
# Copyright 2010-2015,2017 Free Software Foundation, Inc. #
@ -37,14 +37,14 @@ export CDPATH
TARGET=`pwd`
: ${PKG_NAME:=ncurses-examples}
: ${ROOTNAME:=ncurses-test}
: ${DESTDIR:=$TARGET}
: ${TMPDIR:=/tmp}
: "${PKG_NAME:=ncurses-examples}"
: "${ROOTNAME:=ncurses-test}"
: "${DESTDIR:=$TARGET}"
: "${TMPDIR:=/tmp}"
grep_assign() {
grep_assign=`egrep "^$2\>" "$1" | sed -e "s/^$2[ ]*=[ ]*//" -e 's/"//g'`
eval $2=\"$grep_assign\"
grep_assign=`grep -E "^$2\>" "$1" | sed -e "s/^$2[ ]*=[ ]*//" -e 's/"//g'`
eval "$2"=\""$grep_assign"\"
}
grep_patchdate() {
@ -59,25 +59,28 @@ edit_specfile() {
sed \
-e "s/\\<MAJOR\\>/$NCURSES_MAJOR/g" \
-e "s/\\<MINOR\\>/$NCURSES_MINOR/g" \
-e "s/\\<YYYYMMDD\\>/$NCURSES_PATCH/g" $1 >$1.new
chmod u+w $1
mv $1.new $1
-e "s/\\<YYYYMMDD\\>/$NCURSES_PATCH/g" "$1" >"$1.new"
chmod u+w "$1"
mv "$1.new" "$1"
}
make_changelog() {
test -f $1 && chmod u+w $1
cat >$1 <<EOF
`echo $PKG_NAME|tr '[A-Z]' '[a-z]'` ($NCURSES_MAJOR.$NCURSES_MINOR+$NCURSES_PATCH) unstable; urgency=low
[ -f "$1" ] && chmod u+w "$1"
cat >"$1" <<EOF
`echo $PKG_NAME|tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` ($NCURSES_MAJOR.$NCURSES_MINOR+$NCURSES_PATCH) unstable; urgency=low
* snapshot of ncurses subpackage for $PKG_NAME.
-- `head -n 1 $HOME/.signature` `date -R`
-- `head -n 1 "$HOME"/.signature` `date -R`
EOF
}
# This can be run from either the subdirectory, or from the top-level
# source directory. We will put the tar file in the original directory.
test -d ./test && cd ./test
if [ -d ./test ]
then
cd ./test || exit
fi
SOURCE=`cd ..;pwd`
BUILD=$TMPDIR/make-tar$$
@ -92,34 +95,34 @@ fi
umask 022
mkdir $BUILD/$ROOTNAME
cp -p -r * $BUILD/$ROOTNAME/ || exit
cp -p -r ./* $BUILD/$ROOTNAME/ || exit
# Add the config.* utility scripts from the top-level directory.
for i in . ..
do
for j in config.guess config.sub install-sh tar-copy.sh
for j in COPYING config.guess config.sub install-sh tar-copy.sh
do
test -f $i/$j && cp -p $i/$j $BUILD/$ROOTNAME/
[ -f $i/$j ] && cp -p $i/$j $BUILD/$ROOTNAME/
done
done
# Make rpm and dpkg scripts for test-builds
grep_patchdate
for spec in $BUILD/$ROOTNAME/package/*.spec
for spec in "$BUILD/$ROOTNAME"/package/*.spec
do
edit_specfile $spec
edit_specfile "$spec"
done
for spec in $BUILD/$ROOTNAME/package/debian*
for spec in "$BUILD/$ROOTNAME"/package/debian*
do
make_changelog $spec/changelog
make_changelog "$spec"/changelog
done
cp -p $SOURCE/NEWS $BUILD/$ROOTNAME
cp -p "$SOURCE/NEWS" "$BUILD/$ROOTNAME"
# cleanup empty directories (an artifact of ncurses source archives)
touch $BUILD/$ROOTNAME/MANIFEST
( cd $BUILD/$ROOTNAME && find . -type f -print |$SOURCE/misc/csort >MANIFEST )
( cd $BUILD/$ROOTNAME && find . -type f -print | "$SOURCE/misc/csort" >MANIFEST )
cd $BUILD || exit
@ -138,8 +141,8 @@ find . -name "*.gz" -exec rm -rf {} \;
# Make the files writable...
chmod -R u+w .
tar cf - $ROOTNAME | gzip >$DESTDIR/$ROOTNAME.tar.gz
cd $DESTDIR
tar cf - $ROOTNAME | gzip >"$DESTDIR/$ROOTNAME.tar.gz"
cd "$DESTDIR" || exit
pwd
ls -l $ROOTNAME.tar.gz