mirror of
https://github.com/Aigor44/ncursesw-morphos.git
synced 2025-01-30 15:19:27 +08:00
ncurses 5.6 - patch 20070317
+ ignore --with-chtype=unsigned since unsigned is always added to the type in curses.h; do the same for --with-mmask-t. + change warning regarding --enable-ext-colors and wide-character in the configure script to an error. + tweak error message in CF_WITH_LIBTOOL to distinguish other programs such as Darwin's libtool program (report by Michail Vidiassov) + modify edit_man.sh to allow for multiple substitutions per line. + set locale in misc/ncurses-config.in since it uses a range + change permissions libncurses++.a install (report by Michail Vidiassov). + corrected length of temporary buffer in wide-character version of set_field_buffer() (related to report by Bryan Christ).
This commit is contained in:
Thomas E. Dickey
parent
b5a763d403
commit
65d8011455
16
NEWS
16
NEWS
@ -25,7 +25,7 @@
|
||||
-- sale, use or other dealings in this Software without prior written --
|
||||
-- authorization. --
|
||||
-------------------------------------------------------------------------------
|
||||
-- $Id: NEWS,v 1.1100 2007/03/11 13:57:53 tom Exp $
|
||||
-- $Id: NEWS,v 1.1104 2007/03/17 20:43:25 tom Exp $
|
||||
-------------------------------------------------------------------------------
|
||||
|
||||
This is a log of changes that ncurses has gone through since Zeyd started
|
||||
@ -45,6 +45,20 @@ 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.
|
||||
|
||||
20070317
|
||||
+ ignore --with-chtype=unsigned since unsigned is always added to
|
||||
the type in curses.h; do the same for --with-mmask-t.
|
||||
+ change warning regarding --enable-ext-colors and wide-character
|
||||
in the configure script to an error.
|
||||
+ tweak error message in CF_WITH_LIBTOOL to distinguish other programs
|
||||
such as Darwin's libtool program (report by Michail Vidiassov)
|
||||
+ modify edit_man.sh to allow for multiple substitutions per line.
|
||||
+ set locale in misc/ncurses-config.in since it uses a range
|
||||
+ change permissions libncurses++.a install (report by Michail
|
||||
Vidiassov).
|
||||
+ corrected length of temporary buffer in wide-character version
|
||||
of set_field_buffer() (related to report by Bryan Christ).
|
||||
|
||||
20070311
|
||||
+ fix mk-1st.awk script install_shlib() function, broken in 20070224
|
||||
changes for cygwin (report by Michail Vidiassov).
|
||||
|
||||
20
aclocal.m4
vendored
20
aclocal.m4
vendored
@ -28,7 +28,7 @@ dnl***************************************************************************
|
||||
dnl
|
||||
dnl Author: Thomas E. Dickey 1995-on
|
||||
dnl
|
||||
dnl $Id: aclocal.m4,v 1.425 2007/02/24 23:59:46 tom Exp $
|
||||
dnl $Id: aclocal.m4,v 1.426 2007/03/17 20:18:53 tom Exp $
|
||||
dnl Macros used in NCURSES auto-configuration script.
|
||||
dnl
|
||||
dnl These macros are maintained separately from NCURSES. The copyright on
|
||||
@ -2690,7 +2690,7 @@ AC_ARG_WITH(manpage-tbl,
|
||||
AC_MSG_RESULT($MANPAGE_TBL)
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_MAN_PAGES version: 33 updated: 2007/02/24 14:42:36
|
||||
dnl CF_MAN_PAGES version: 34 updated: 2007/03/17 16:15:10
|
||||
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
|
||||
@ -2808,12 +2808,12 @@ case \$i in #(vi
|
||||
# replace variables in man page
|
||||
if test ! -f $cf_man_alias ; then
|
||||
cat >>$cf_man_alias <<-CF_EOF2
|
||||
s,@DATADIR@,\$datadir,
|
||||
s,@TERMINFO@,\$TERMINFO,
|
||||
s,@NCURSES_MAJOR@,\$NCURSES_MAJOR,
|
||||
s,@NCURSES_MINOR@,\$NCURSES_MINOR,
|
||||
s,@NCURSES_PATCH@,\$NCURSES_PATCH,
|
||||
s,@NCURSES_OSPEED@,\$NCURSES_OSPEED,
|
||||
s,@DATADIR@,\$datadir,g
|
||||
s,@TERMINFO@,\$TERMINFO,g
|
||||
s,@NCURSES_MAJOR@,\$NCURSES_MAJOR,g
|
||||
s,@NCURSES_MINOR@,\$NCURSES_MINOR,g
|
||||
s,@NCURSES_PATCH@,\$NCURSES_PATCH,g
|
||||
s,@NCURSES_OSPEED@,\$NCURSES_OSPEED,g
|
||||
CF_EOF
|
||||
ifelse($1,,,[
|
||||
for cf_name in $1
|
||||
@ -4591,7 +4591,7 @@ if test "$with_gpm" != no ; then
|
||||
fi
|
||||
])
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_WITH_LIBTOOL version: 13 updated: 2007/01/27 17:52:16
|
||||
dnl CF_WITH_LIBTOOL version: 15 updated: 2007/03/17 16:15:10
|
||||
dnl ---------------
|
||||
dnl Provide a configure option to incorporate libtool. Define several useful
|
||||
dnl symbols for the makefile rules.
|
||||
@ -4685,7 +4685,7 @@ ifdef([AC_PROG_LIBTOOL],[
|
||||
cf_cv_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' |sed -e '2,$d' -e 's/([[^)]]*)//g' -e 's/^[[^1-9]]*//' -e 's/[[^0-9.]].*//'`
|
||||
AC_MSG_RESULT($cf_cv_libtool_version)
|
||||
if test -z "$cf_cv_libtool_version" ; then
|
||||
AC_MSG_ERROR(This is not libtool)
|
||||
AC_MSG_ERROR(This is not GNU libtool)
|
||||
fi
|
||||
|
||||
# special hack to add --tag option for C++ compiler
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# $Id: Makefile.in,v 1.79 2007/03/03 20:51:25 tom Exp $
|
||||
# $Id: Makefile.in,v 1.80 2007/03/17 18:28:05 tom Exp $
|
||||
##############################################################################
|
||||
# Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. #
|
||||
# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. #
|
||||
# #
|
||||
# Permission is hereby granted, free of charge, to any person obtaining a #
|
||||
# copy of this software and associated documentation files (the "Software"), #
|
||||
@ -57,6 +57,7 @@ LIBTOOL_INSTALL = @LIB_INSTALL@
|
||||
LIBTOOL_UNINSTALL = @LIB_UNINSTALL@
|
||||
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_LIB = @INSTALL@ @INSTALL_LIB@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
|
||||
AR = @AR@
|
||||
@ -177,7 +178,7 @@ $(DESTDIR)$(libdir) :
|
||||
|
||||
install \
|
||||
install.libs:: ../lib/$(LIBNAME) $(DESTDIR)$(libdir)
|
||||
$(LIBTOOL_INSTALL) $(INSTALL) ../lib/$(LIBNAME) $(DESTDIR)$(libdir)/$(LIBNAME)
|
||||
$(LIBTOOL_INSTALL) $(INSTALL_LIB) ../lib/$(LIBNAME) $(DESTDIR)$(libdir)/$(LIBNAME)
|
||||
|
||||
uninstall \
|
||||
uninstall.libs::
|
||||
|
||||
12
configure.in
12
configure.in
@ -28,14 +28,14 @@ dnl***************************************************************************
|
||||
dnl
|
||||
dnl Author: Thomas E. Dickey 1995-on
|
||||
dnl
|
||||
dnl $Id: configure.in,v 1.406 2007/03/10 18:06:55 tom Exp $
|
||||
dnl $Id: configure.in,v 1.408 2007/03/17 20:47:14 tom Exp $
|
||||
dnl Process this file with autoconf to produce a configure script.
|
||||
dnl
|
||||
dnl See http://invisible-island.net/autoconf/ for additional information.
|
||||
dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
AC_PREREQ(2.13.20020210)
|
||||
AC_REVISION($Revision: 1.406 $)
|
||||
AC_REVISION($Revision: 1.408 $)
|
||||
AC_INIT(ncurses/base/lib_initscr.c)
|
||||
AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
|
||||
|
||||
@ -919,7 +919,7 @@ AC_MSG_RESULT($with_ext_colors)
|
||||
NCURSES_EXT_COLORS=0
|
||||
if test "$with_ext_colors" = yes ; then
|
||||
if test "$with_widec" != yes ; then
|
||||
AC_MSG_WARN(This option applies only to wide-character library)
|
||||
AC_MSG_ERROR(This option applies only to wide-character library)
|
||||
else
|
||||
# cannot be ABI 5 since it changes sizeof(cchar_t)
|
||||
CF_NCURSES_ABI_6
|
||||
@ -1153,12 +1153,13 @@ if test $NCURSES_CHTYPE = auto ; then
|
||||
else
|
||||
cf_cv_typeof_chtype=$NCURSES_CHTYPE
|
||||
fi
|
||||
test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
|
||||
AC_SUBST(cf_cv_typeof_chtype)
|
||||
|
||||
CF_UNSIGNED_LITERALS
|
||||
cf_cv_1UL="1"
|
||||
test "$cf_cv_unsigned_literals" = yes && cf_cv_1UL="${cf_cv_1UL}U"
|
||||
test "$cf_cv_typeof_chtype" = long && cf_cv_1UL="${cf_cv_1UL}L"
|
||||
test ".$cf_cv_unsigned_literals" = .yes && cf_cv_1UL="${cf_cv_1UL}U"
|
||||
test ".$cf_cv_typeof_chtype" = .long && cf_cv_1UL="${cf_cv_1UL}L"
|
||||
AC_SUBST(cf_cv_1UL)
|
||||
|
||||
if test $NCURSES_MMASK_T = auto ; then
|
||||
@ -1166,6 +1167,7 @@ if test $NCURSES_MMASK_T = auto ; then
|
||||
else
|
||||
cf_cv_typeof_mmask_t=$NCURSES_MMASK_T
|
||||
fi
|
||||
test "$cf_cv_typeof_mmask_t" = unsigned && cf_cv_typeof_mmask_t=""
|
||||
AC_SUBST(cf_cv_typeof_mmask_t)
|
||||
|
||||
### Checks for external-data
|
||||
|
||||
4
dist.mk
4
dist.mk
@ -25,7 +25,7 @@
|
||||
# use or other dealings in this Software without prior written #
|
||||
# authorization. #
|
||||
##############################################################################
|
||||
# $Id: dist.mk,v 1.583 2007/03/11 13:39:46 tom Exp $
|
||||
# $Id: dist.mk,v 1.584 2007/03/12 21:50:47 tom Exp $
|
||||
# Makefile for creating ncurses distributions.
|
||||
#
|
||||
# This only needs to be used directly as a makefile by developers, but
|
||||
@ -37,7 +37,7 @@ SHELL = /bin/sh
|
||||
# These define the major/minor/patch versions of ncurses.
|
||||
NCURSES_MAJOR = 5
|
||||
NCURSES_MINOR = 6
|
||||
NCURSES_PATCH = 20070311
|
||||
NCURSES_PATCH = 20070317
|
||||
|
||||
# We don't append the patch to the version, since this only applies to releases
|
||||
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
|
||||
#include "form.priv.h"
|
||||
|
||||
MODULE_ID("$Id: frm_driver.c,v 1.78 2007/02/04 00:28:38 tom Exp $")
|
||||
MODULE_ID("$Id: frm_driver.c,v 1.79 2007/03/12 21:49:00 tom Exp $")
|
||||
|
||||
/*----------------------------------------------------------------------------
|
||||
This is the core module of the form library. It contains the majority
|
||||
@ -4274,7 +4274,7 @@ set_field_buffer(FIELD *field, int buffer, const char *value)
|
||||
wclear(field->working);
|
||||
mvwaddstr(field->working, 0, 0, value);
|
||||
|
||||
if ((widevalue = (FIELD_CELL *)calloc(len, sizeof(FIELD_CELL))) == 0)
|
||||
if ((widevalue = (FIELD_CELL *)calloc(len + 1, sizeof(FIELD_CELL))) == 0)
|
||||
{
|
||||
RETURN(E_SYSTEM_ERROR);
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
'\" t
|
||||
.\"***************************************************************************
|
||||
.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
|
||||
.\" Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. *
|
||||
.\" *
|
||||
.\" Permission is hereby granted, free of charge, to any person obtaining a *
|
||||
.\" copy of this software and associated documentation files (the *
|
||||
@ -27,7 +27,7 @@
|
||||
.\" authorization. *
|
||||
.\"***************************************************************************
|
||||
.\"
|
||||
.\" $Id: curs_attr.3x,v 1.30 2006/07/15 18:39:05 tom Exp $
|
||||
.\" $Id: curs_attr.3x,v 1.31 2007/03/17 20:30:33 tom Exp $
|
||||
.TH curs_attr 3X ""
|
||||
.na
|
||||
.hy 0
|
||||
@ -253,6 +253,9 @@ This implementation returns an error
|
||||
if the window pointer is null.
|
||||
The \fBwcolor_set\fP function returns an error if the color pair parameter
|
||||
is outside the range 0..COLOR_PAIRS-1.
|
||||
This implementation also provides
|
||||
\fBgetattrs\fR
|
||||
for compatibility with older versions of curses.
|
||||
.SH SEE ALSO
|
||||
\fBcurses\fR(3X),
|
||||
\fBcurs_addch\fR(3X),
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
.\"***************************************************************************
|
||||
.\" Copyright (c) 1998-2003,2006 Free Software Foundation, Inc. *
|
||||
.\" Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. *
|
||||
.\" *
|
||||
.\" Permission is hereby granted, free of charge, to any person obtaining a *
|
||||
.\" copy of this software and associated documentation files (the *
|
||||
@ -26,7 +26,7 @@
|
||||
.\" authorization. *
|
||||
.\"***************************************************************************
|
||||
.\"
|
||||
.\" $Id: curs_getyx.3x,v 1.13 2006/05/27 20:28:05 tom Exp $
|
||||
.\" $Id: curs_getyx.3x,v 1.14 2007/03/17 20:22:45 tom Exp $
|
||||
.TH curs_getyx 3X ""
|
||||
.SH NAME
|
||||
\fBgetyx\fR,
|
||||
@ -79,8 +79,6 @@ This implementation also provides
|
||||
\fBgetparx\fR and
|
||||
\fBgetpary\fR
|
||||
for compatibility with older versions of curses.
|
||||
X/Open does not define a corresponding \fBgetcuryx\fP function,
|
||||
though that would be needed to make references to the WINDOW structure opaque.
|
||||
.SH SEE ALSO
|
||||
\fBcurses\fR(3X)
|
||||
.\"#
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
'\" t
|
||||
.\"***************************************************************************
|
||||
.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
|
||||
.\" Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. *
|
||||
.\" *
|
||||
.\" Permission is hereby granted, free of charge, to any person obtaining a *
|
||||
.\" copy of this software and associated documentation files (the *
|
||||
@ -27,7 +27,7 @@
|
||||
.\" authorization. *
|
||||
.\"***************************************************************************
|
||||
.\"
|
||||
.\" $Id: ncurses.3x,v 1.82 2006/12/24 14:44:05 tom Exp $
|
||||
.\" $Id: ncurses.3x,v 1.84 2007/03/17 20:30:11 tom Exp $
|
||||
.hy 0
|
||||
.TH ncurses 3X ""
|
||||
.ds n 5
|
||||
@ -275,15 +275,24 @@ flash/\fBcurs_beep\fR(3X)
|
||||
flushinp/\fBcurs_util\fR(3X)
|
||||
get_wch/\fBcurs_get_wch\fR(3X)
|
||||
get_wstr/\fBcurs_get_wstr\fR(3X)
|
||||
getattrs/\fBcurs_attr\fR(3X)
|
||||
getbegx/\fBcurs_getyx\fR(3X)
|
||||
getbegy/\fBcurs_getyx\fR(3X)
|
||||
getbegyx/\fBcurs_getyx\fR(3X)
|
||||
getbkgd/\fBcurs_bkgd\fR(3X)
|
||||
getbkgrnd/\fBcurs_bkgrnd\fR(3X)
|
||||
getcchar/\fBcurs_getcchar\fR(3X)
|
||||
getch/\fBcurs_getch\fR(3X)
|
||||
getcurx/\fBcurs_getyx\fR(3X)
|
||||
getcury/\fBcurs_getyx\fR(3X)
|
||||
getmaxx/\fBcurs_getyx\fR(3X)
|
||||
getmaxy/\fBcurs_getyx\fR(3X)
|
||||
getmaxyx/\fBcurs_getyx\fR(3X)
|
||||
getmouse/\fBcurs_mouse\fR(3X)*
|
||||
getn_wstr/\fBcurs_get_wstr\fR(3X)
|
||||
getnstr/\fBcurs_getstr\fR(3X)
|
||||
getparx/\fBcurs_getyx\fR(3X)
|
||||
getpary/\fBcurs_getyx\fR(3X)
|
||||
getparyx/\fBcurs_getyx\fR(3X)
|
||||
getstr/\fBcurs_getstr\fR(3X)
|
||||
getsyx/\fBcurs_kernel\fR(3X)
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#!@SHELL@
|
||||
# $Id: ncurses-config.in,v 1.11 2006/10/28 20:22:52 tom Exp $
|
||||
# $Id: ncurses-config.in,v 1.12 2007/03/17 20:02:19 tom Exp $
|
||||
##############################################################################
|
||||
# Copyright (c) 2006 Free Software Foundation, Inc. #
|
||||
# Copyright (c) 2006,2007 Free Software Foundation, Inc. #
|
||||
# #
|
||||
# Permission is hereby granted, free of charge, to any person obtaining a #
|
||||
# copy of this software and associated documentation files (the "Software"), #
|
||||
@ -40,6 +40,11 @@ mandir="@mandir@"
|
||||
|
||||
THIS="ncurses@DFT_ARG_SUFFIX@"
|
||||
|
||||
LANG=C; export LANG
|
||||
LANGUAGE=C; export LANGUAGE
|
||||
LC_ALL=C; export LC_ALL
|
||||
LC_CTYPE=C; export LC_CTYPE
|
||||
|
||||
test $# = 0 && exec @SHELL@ $0 --error
|
||||
|
||||
while test $# -gt 0; do
|
||||
|
||||
Loading…
Reference in New Issue
Block a user