mirror of
https://github.com/Aigor44/ncursesw-morphos.git
synced 2024-11-21 03:12:03 +08:00
ncurses 6.3 - patch 20221023
+ change man_db.renames to template, to handle ncurses*-config script with the extra-suffix configure option.
This commit is contained in:
Thomas E. Dickey
parent
aaa5142e4b
commit
859f2280a3
2
MANIFEST
2
MANIFEST
@ -671,7 +671,7 @@
|
||||
./man/keyok.3x
|
||||
./man/legacy_coding.3x
|
||||
./man/make_sed.sh
|
||||
./man/man_db.renames
|
||||
./man/man_db.renames.in
|
||||
./man/manhtml.aliases
|
||||
./man/manhtml.externs
|
||||
./man/manlinks.sed
|
||||
|
||||
6
NEWS
6
NEWS
@ -26,7 +26,7 @@
|
||||
-- sale, use or other dealings in this Software without prior written --
|
||||
-- authorization. --
|
||||
-------------------------------------------------------------------------------
|
||||
-- $Id: NEWS,v 1.3868 2022/10/15 19:45:12 tom Exp $
|
||||
-- $Id: NEWS,v 1.3871 2022/10/23 11:32:30 tom Exp $
|
||||
-------------------------------------------------------------------------------
|
||||
|
||||
This is a log of changes that ncurses has gone through since Zeyd started
|
||||
@ -46,6 +46,10 @@ 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.
|
||||
|
||||
20221023
|
||||
+ change man_db.renames to template, to handle ncurses*-config script
|
||||
with the extra-suffix configure option.
|
||||
|
||||
20221015
|
||||
+ fix another memory-leak in tic.
|
||||
+ update install-sh script from autoconf, to fix install problem for
|
||||
|
||||
45
aclocal.m4
vendored
45
aclocal.m4
vendored
@ -29,7 +29,7 @@ dnl***************************************************************************
|
||||
dnl
|
||||
dnl Author: Thomas E. Dickey 1995-on
|
||||
dnl
|
||||
dnl $Id: aclocal.m4,v 1.1015 2022/10/02 23:55:56 tom Exp $
|
||||
dnl $Id: aclocal.m4,v 1.1021 2022/10/23 11:46:29 tom Exp $
|
||||
dnl Macros used in NCURSES auto-configuration script.
|
||||
dnl
|
||||
dnl These macros are maintained separately from NCURSES. The copyright on
|
||||
@ -5690,7 +5690,7 @@ if test -n "$cf_unknown" ; then
|
||||
fi
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_MANPAGE_RENAMES version: 13 updated: 2022/10/01 09:13:09
|
||||
dnl CF_MANPAGE_RENAMES version: 16 updated: 2022/10/22 19:12:31
|
||||
dnl ------------------
|
||||
dnl The Debian people have their own naming convention for manpages. This
|
||||
dnl option lets us override the name of the file containing renaming, or
|
||||
@ -5710,27 +5710,19 @@ case ".$MANPAGE_RENAMES" in
|
||||
(.|.yes)
|
||||
# Debian 'man' program?
|
||||
if test -f /etc/debian_version ; then
|
||||
MANPAGE_RENAMES=`cd "$srcdir" && pwd`/man/man_db.renames
|
||||
MANPAGE_RENAMES=man/man_db.renames
|
||||
else
|
||||
MANPAGE_RENAMES=no
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
if test "$MANPAGE_RENAMES" != no ; then
|
||||
if test -f "$srcdir/man/$MANPAGE_RENAMES" ; then
|
||||
MANPAGE_RENAMES=`cd "$srcdir/man" && pwd`/$MANPAGE_RENAMES
|
||||
elif test ! -f "$MANPAGE_RENAMES" ; then
|
||||
AC_MSG_ERROR(not a filename: $MANPAGE_RENAMES)
|
||||
fi
|
||||
|
||||
test ! -d man && mkdir man
|
||||
|
||||
# Construct a sed-script to perform renaming within man-pages
|
||||
if test -n "$MANPAGE_RENAMES" ; then
|
||||
test ! -d man && mkdir man
|
||||
FGREP="${FGREP-grep -F}" $SHELL "$srcdir/man/make_sed.sh" "$MANPAGE_RENAMES" >./edit_man.sed
|
||||
fi
|
||||
if test "$MANPAGE_RENAMES" = man/man_db.renames ; then
|
||||
MANPAGE_RENAMES=`pwd`/$MANPAGE_RENAMES
|
||||
elif test "$MANPAGE_RENAMES" = no ; then
|
||||
:
|
||||
elif test ! -f "$MANPAGE_RENAMES" ; then
|
||||
AC_MSG_ERROR(not a filename: $MANPAGE_RENAMES)
|
||||
fi
|
||||
|
||||
AC_MSG_RESULT($MANPAGE_RENAMES)
|
||||
@ -5799,7 +5791,7 @@ AC_ARG_WITH(manpage-tbl,
|
||||
AC_MSG_RESULT($MANPAGE_TBL)
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_MAN_PAGES version: 52 updated: 2022/02/05 12:31:08
|
||||
dnl CF_MAN_PAGES version: 53 updated: 2022/10/23 07:30:26
|
||||
dnl ------------
|
||||
dnl Try to determine if the man-pages on the system are compressed, and if
|
||||
dnl so, what format is used. Use this information to construct a script that
|
||||
@ -5983,7 +5975,7 @@ cat >>$cf_edit_man <<CF_EOF
|
||||
sed -f "$cf_man_alias" \\
|
||||
CF_EOF
|
||||
|
||||
if test -f "$MANPAGE_RENAMES" ; then
|
||||
if test "$MANPAGE_RENAMES" != no ; then
|
||||
cat >>$cf_edit_man <<CF_EOF
|
||||
< "\$i" | sed -f `pwd`/edit_man.sed >\$TMP
|
||||
CF_EOF
|
||||
@ -6412,6 +6404,21 @@ AC_DEFUN([CF_OBJ_SUBDIR],
|
||||
esac
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_OUTPUT_MANPAGE_RENAMES version: 2 updated: 2022/10/22 19:12:31
|
||||
dnl -------------------------
|
||||
dnl This runs in the output step to config.status, after man_db.renames has
|
||||
dnl been generated.
|
||||
AC_DEFUN([CF_OUTPUT_MANPAGE_RENAMES],
|
||||
[
|
||||
AC_REQUIRE([CF_MANPAGE_RENAMES])
|
||||
if test "$MANPAGE_RENAMES" != no ; then
|
||||
# Construct a sed-script to perform renaming within man-pages
|
||||
test -n "$verbose" && echo "creating edit_man.sed"
|
||||
test ! -d man && mkdir man
|
||||
FGREP="${FGREP-grep -F}" $SHELL "$srcdir/man/make_sed.sh" "$MANPAGE_RENAMES" >./edit_man.sed
|
||||
fi
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_PATHSEP version: 8 updated: 2021/01/01 13:31:04
|
||||
dnl ----------
|
||||
dnl Provide a value for the $PATH and similar separator (or amend the value
|
||||
|
||||
@ -29,7 +29,7 @@ dnl***************************************************************************
|
||||
dnl
|
||||
dnl Author: Thomas E. Dickey 1995-on
|
||||
dnl
|
||||
dnl $Id: configure.in,v 1.750 2022/10/08 15:54:35 tom Exp $
|
||||
dnl $Id: configure.in,v 1.752 2022/10/22 19:19:52 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.750 $)
|
||||
AC_REVISION($Revision: 1.752 $)
|
||||
AC_INIT(ncurses/base/lib_initscr.c)
|
||||
AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
|
||||
|
||||
@ -2547,12 +2547,14 @@ AC_OUTPUT( \
|
||||
include/ncurses_dll.h \
|
||||
include/termcap.h \
|
||||
include/unctrl.h \
|
||||
man/man_db.renames \
|
||||
$SUB_MAKEFILES \
|
||||
Makefile,[
|
||||
if test "x$cf_with_tests" != xno ; then
|
||||
CF_PRG_RULES(["$srcdir/test/mk-test.awk" INSTALL=no ECHO_LINK="$ECHO_LD"], test)
|
||||
fi
|
||||
CF_LIB_RULES($SRC_SUBDIRS)
|
||||
CF_OUTPUT_MANPAGE_RENAMES
|
||||
|
||||
if test "x$cf_with_ada" = "xyes" && test "x$cf_cv_prog_gnat_correct" = "xyes"; then
|
||||
if test -z "$USE_OLD_MAKERULES" ; then
|
||||
@ -2582,6 +2584,7 @@ LIB_SUFFIX="$LIB_SUFFIX"
|
||||
LIB_TRACING="$LIB_TRACING"
|
||||
LN_S="$LN_S"
|
||||
MAKE_TERMINFO="$MAKE_TERMINFO"
|
||||
MANPAGE_RENAMES="$MANPAGE_RENAMES"
|
||||
MENU_NAME="$MENU_NAME"
|
||||
NCURSES_MAJOR="$NCURSES_MAJOR"
|
||||
NCURSES_MINOR="$NCURSES_MINOR"
|
||||
@ -2635,6 +2638,7 @@ cf_with_manpages="$cf_with_manpages"
|
||||
cf_with_tests="$cf_with_tests"
|
||||
host="$host"
|
||||
target="$target"
|
||||
verbose="$verbose"
|
||||
with_shared_cxx="$with_shared_cxx"
|
||||
|
||||
],cat)dnl
|
||||
|
||||
4
dist.mk
4
dist.mk
@ -26,7 +26,7 @@
|
||||
# use or other dealings in this Software without prior written #
|
||||
# authorization. #
|
||||
##############################################################################
|
||||
# $Id: dist.mk,v 1.1507 2022/10/15 11:57:10 tom Exp $
|
||||
# $Id: dist.mk,v 1.1509 2022/10/23 11:32:30 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 = 3
|
||||
NCURSES_PATCH = 20221015
|
||||
NCURSES_PATCH = 20221023
|
||||
|
||||
# We don't append the patch to the version, since this only applies to releases
|
||||
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $Id: Makefile.in,v 1.53 2022/07/16 20:14:28 tom Exp $
|
||||
# $Id: Makefile.in,v 1.54 2022/10/22 16:36:40 tom Exp $
|
||||
##############################################################################
|
||||
# Copyright 2019-2021,2022 Thomas E. Dickey #
|
||||
# Copyright 1998-2013,2015 Free Software Foundation, Inc. #
|
||||
@ -103,4 +103,4 @@ clean: mostlyclean
|
||||
$(SHELL) $(srcdir)/make_sed.sh @MANPAGE_RENAMES@ >../edit_man.sed
|
||||
|
||||
distclean realclean: clean
|
||||
rm -f Makefile *-config.1 ../edit_man.* ../man_alias.*
|
||||
-rm -f Makefile *-config.1 ../edit_man.* ../man_alias.* man_db.renames
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
# use or other dealings in this Software without prior written #
|
||||
# authorization. #
|
||||
##############################################################################
|
||||
# $Id: man_db.renames,v 1.56 2020/02/02 23:34:34 tom Exp $
|
||||
# $Id: man_db.renames.in,v 1.58 2022/10/22 16:41:43 tom Exp $
|
||||
# Manual-page renamings for the man_db program
|
||||
#
|
||||
# Files:
|
||||
@ -183,18 +183,7 @@ regexec.3x regexec.3
|
||||
vprintf.3 vprintf.3
|
||||
#
|
||||
# The following are pages which may be generated depending on configuration:
|
||||
adacurses-config.1 adacurses-config.1
|
||||
adacurses5-config.1 adacurses5-config.1
|
||||
adacurses6-config.1 adacurses6-config.1
|
||||
#
|
||||
ncurses5-config.1 ncurses5-config.1
|
||||
ncursesw5-config.1 ncursesw5-config.1
|
||||
ncursest5-config.1 ncursest5-config.1
|
||||
ncursestw5-config.1 ncursestw5-config.1
|
||||
#
|
||||
ncurses6-config.1 ncurses6-config.1
|
||||
ncursesw6-config.1 ncursesw6-config.1
|
||||
ncursest6-config.1 ncursest6-config.1
|
||||
ncursestw6-config.1 ncursestw6-config.1
|
||||
adacurses@USE_CFG_SUFFIX@-config.1 adacurses@USE_CFG_SUFFIX@-config.1
|
||||
ncurses@USE_CFG_SUFFIX@-config.1 ncurses@USE_CFG_SUFFIX@-config.1
|
||||
#
|
||||
# vile:cfgmode
|
||||
@ -54,7 +54,7 @@
|
||||
#undef CUR
|
||||
#define CUR SP_TERMTYPE
|
||||
|
||||
MODULE_ID("$Id: lib_set_term.c,v 1.182 2022/08/13 23:14:26 tom Exp $")
|
||||
MODULE_ID("$Id: lib_set_term.c,v 1.183 2022/10/22 19:32:40 tom Exp $")
|
||||
|
||||
#ifdef USE_TERM_DRIVER
|
||||
#define MaxColors InfoOf(sp).maxcolors
|
||||
@ -747,6 +747,7 @@ NCURSES_SP_NAME(_nc_setupscreen) (
|
||||
}
|
||||
|
||||
T(("creating stdscr"));
|
||||
(void) bottom_stolen;
|
||||
assert((sp->_lines_avail + sp->_topstolen + bottom_stolen) == slines);
|
||||
if ((StdScreen(sp) = NCURSES_SP_NAME(newwin) (NCURSES_SP_ARGx
|
||||
sp->_lines_avail,
|
||||
|
||||
@ -35,7 +35,7 @@
|
||||
****************************************************************************/
|
||||
|
||||
/*
|
||||
* $Id: curses.priv.h,v 1.652 2022/10/15 13:09:05 Mikhail.Korolev Exp $
|
||||
* $Id: curses.priv.h,v 1.653 2022/10/23 13:29:26 tom Exp $
|
||||
*
|
||||
* curses.priv.h
|
||||
*
|
||||
@ -141,6 +141,10 @@ extern int errno;
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#ifndef PRIxPTR
|
||||
# define PRIxPTR "lx"
|
||||
#endif
|
||||
|
||||
/* include signal.h before curses.h to work-around defect in glibc 2.1.3 */
|
||||
#include <signal.h>
|
||||
|
||||
|
||||
@ -48,7 +48,7 @@
|
||||
|
||||
#include <tic.h>
|
||||
|
||||
MODULE_ID("$Id: comp_parse.c,v 1.128 2022/10/15 19:31:00 tom Exp $")
|
||||
MODULE_ID("$Id: comp_parse.c,v 1.131 2022/10/23 13:15:58 tom Exp $")
|
||||
|
||||
static void sanity_check2(TERMTYPE2 *, bool);
|
||||
NCURSES_IMPEXP void (NCURSES_API *_nc_check_termtype2) (TERMTYPE2 *, bool) = sanity_check2;
|
||||
@ -222,8 +222,10 @@ _nc_read_entry_source(FILE *fp, char *buf,
|
||||
int immediate = 0;
|
||||
|
||||
DEBUG(2,
|
||||
(T_CALLED("_nc_read_entry_source(file=%p, buf=%p, literal=%d, silent=%d, hook=%p)"),
|
||||
(void *) fp, buf, literal, silent, (void *) hook));
|
||||
(T_CALLED("_nc_read_entry_source("
|
||||
"file=%p, buf=%p, literal=%d, silent=%d, hook=%#"
|
||||
PRIxPTR ")"),
|
||||
(void *) fp, buf, literal, silent, (intptr_t) hook));
|
||||
|
||||
if (silent)
|
||||
_nc_suppress_warnings = TRUE; /* shut the lexer up, too */
|
||||
@ -571,7 +573,7 @@ _nc_resolve_uses2(bool fullresolve, bool literal)
|
||||
* (reverse) order.
|
||||
*/
|
||||
for (; qp->nuses; qp->nuses--) {
|
||||
int n = qp->nuses - 1;
|
||||
int n = (int) (qp->nuses - 1);
|
||||
validate_merge(&merged, qp->uses[n].link);
|
||||
_nc_merge_entry(&merged, qp->uses[n].link);
|
||||
free(qp->uses[n].name);
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
ncurses6 (6.3+20221015) unstable; urgency=low
|
||||
ncurses6 (6.3+20221023) unstable; urgency=low
|
||||
|
||||
* latest weekly patch
|
||||
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 15 Oct 2022 07:57:10 -0400
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sun, 23 Oct 2022 07:32:30 -0400
|
||||
|
||||
ncurses6 (5.9-20131005) unstable; urgency=low
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
ncurses6 (6.3+20221015) unstable; urgency=low
|
||||
ncurses6 (6.3+20221023) unstable; urgency=low
|
||||
|
||||
* latest weekly patch
|
||||
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 15 Oct 2022 07:57:10 -0400
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sun, 23 Oct 2022 07:32:30 -0400
|
||||
|
||||
ncurses6 (5.9-20131005) unstable; urgency=low
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
ncurses6 (6.3+20221015) unstable; urgency=low
|
||||
ncurses6 (6.3+20221023) unstable; urgency=low
|
||||
|
||||
* latest weekly patch
|
||||
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 15 Oct 2022 07:57:10 -0400
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sun, 23 Oct 2022 07:32:30 -0400
|
||||
|
||||
ncurses6 (5.9-20120608) unstable; urgency=low
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#!/usr/bin/make -f
|
||||
# $Id: rules,v 1.44 2022/01/30 01:09:39 tom Exp $
|
||||
# $Id: rules,v 1.45 2022/10/22 18:35:38 tom Exp $
|
||||
|
||||
# Uncomment this to turn on verbose mode.
|
||||
#export DH_VERBOSE=1
|
||||
@ -135,8 +135,8 @@ patch-ncurses6-stamp:
|
||||
-e 's/\.3menu$$/.3menu6/' \
|
||||
-e 's/\.3panel$$/.3panel6/' \
|
||||
-e 's/\.\([157]\)$$/6.\1/' \
|
||||
man/man_db.renames
|
||||
diff -u man/man_db.renames.bak man/man_db.renames || true
|
||||
man/man_db.renames.in
|
||||
diff -u man/man_db.renames.in.bak man/man_db.renames.in || true
|
||||
touch $@
|
||||
|
||||
config-ncurses6-stamp: patch-ncurses6-stamp
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; $Id: mingw-ncurses.nsi,v 1.546 2022/10/15 11:57:10 tom Exp $
|
||||
; $Id: mingw-ncurses.nsi,v 1.548 2022/10/23 11:32:30 tom Exp $
|
||||
|
||||
; TODO add examples
|
||||
; TODO bump ABI to 6
|
||||
@ -10,7 +10,7 @@
|
||||
!define VERSION_MAJOR "6"
|
||||
!define VERSION_MINOR "3"
|
||||
!define VERSION_YYYY "2022"
|
||||
!define VERSION_MMDD "1015"
|
||||
!define VERSION_MMDD "1023"
|
||||
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
|
||||
|
||||
!define MY_ABI "5"
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
Summary: shared libraries for terminal handling
|
||||
Name: mingw32-ncurses6
|
||||
Version: 6.3
|
||||
Release: 20221015
|
||||
Release: 20221023
|
||||
License: X11
|
||||
Group: Development/Libraries
|
||||
Source: ncurses-%{version}-%{release}.tgz
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
Summary: shared libraries for terminal handling
|
||||
Name: ncurses6
|
||||
Version: 6.3
|
||||
Release: 20221015
|
||||
Release: 20221023
|
||||
License: X11
|
||||
Group: Development/Libraries
|
||||
Source: ncurses-%{version}-%{release}.tgz
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
Summary: Curses library with POSIX thread support.
|
||||
Name: ncursest6
|
||||
Version: 6.3
|
||||
Release: 20221015
|
||||
Release: 20221023
|
||||
License: X11
|
||||
Group: Development/Libraries
|
||||
Source: ncurses-%{version}-%{release}.tgz
|
||||
|
||||
Loading…
Reference in New Issue
Block a user