Skip to content

Commit

Permalink
ncurses 6.0 - patch 20171125
Browse files Browse the repository at this point in the history
+ modify MKlib_gen.sh to avoid tracing result from getstr/getnstr
  before initialized.
+ add "-a" aspect-ratio option to picsmap.
+ add configure check for default path of rgb.txt, used in picsmap.
+ modify _nc_write_entry() to truncate too-long filename (report by
  Hosein Askari, Debian #882620).
+ build-fix for ncurses-examples with NetBSD curses:
  + it lacks the use_env() function.
  + it lacks libpanel; a recent change used the wrong ifdef symbol.
+ add a macro for is_linetouched() and adjust the function's return
  value to make it possible for most applications to check for an
  error-return (report by Midolikawa H).
+ additional manpage cleanup.
+ update config.guess, config.sub from
	http://git.savannah.gnu.org/cgit/config.git
  • Loading branch information
ThomasDickey committed Nov 26, 2017
1 parent 06078d3 commit 8d3ea90
Show file tree
Hide file tree
Showing 103 changed files with 4,480 additions and 3,948 deletions.
19 changes: 18 additions & 1 deletion NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
-- $Id: NEWS,v 1.3004 2017/11/19 01:32:47 tom Exp $
-- $Id: NEWS,v 1.3014 2017/11/25 23:04:42 tom Exp $
-------------------------------------------------------------------------------

This is a log of changes that ncurses has gone through since Zeyd started
Expand All @@ -45,6 +45,23 @@ 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.

20171125
+ modify MKlib_gen.sh to avoid tracing result from getstr/getnstr
before initialized.
+ add "-a" aspect-ratio option to picsmap.
+ add configure check for default path of rgb.txt, used in picsmap.
+ modify _nc_write_entry() to truncate too-long filename (report by
Hosein Askari, Debian #882620).
+ build-fix for ncurses-examples with NetBSD curses:
+ it lacks the use_env() function.
+ it lacks libpanel; a recent change used the wrong ifdef symbol.
+ add a macro for is_linetouched() and adjust the function's return
value to make it possible for most applications to check for an
error-return (report by Midolikawa H).
+ additional manpage cleanup.
+ update config.guess, config.sub from
http://git.savannah.gnu.org/cgit/config.git

20171118
+ add a note to curs_addch.3x on portability.
+ add a note to curs_pad.3x on the origin and portability of pads.
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5:0:9 6.0 20171118
5:0:9 6.0 20171125
88 changes: 87 additions & 1 deletion aclocal.m4
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ dnl***************************************************************************
dnl
dnl Author: Thomas E. Dickey 1995-on
dnl
dnl $Id: aclocal.m4,v 1.812 2017/09/30 19:44:51 tom Exp $
dnl $Id: aclocal.m4,v 1.816 2017/11/25 22:33:41 tom Exp $
dnl Macros used in NCURSES auto-configuration script.
dnl
dnl These macros are maintained separately from NCURSES. The copyright on
Expand Down Expand Up @@ -7900,6 +7900,92 @@ AC_SUBST(VERSIONED_SYMS)
AC_SUBST(WILDCARD_SYMS)
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_WITH_X11_RGB version: 1 updated: 2017/11/25 17:32:16
dnl ---------------
dnl Handle configure option "--with-x11-rgb", setting these shell
dnl variables:
dnl
dnl $RGB_PATH is the option value, used for finding the X11 rgb file.
dnl $no_x11_rgb is a "#" (comment) if "--without-x11-rgb" is given.
dnl
dnl Most Linux's use this:
dnl /usr/share/X11/rgb.txt
dnl Debian uses this:
dnl /etc/X11/rgb.txt
dnl DragonFlyBSD ports uses this:
dnl /usr/pkg/lib/X11/rgb.txt
dnl FreeBSD ports use these:
dnl /usr/local/lib/X11/rgb.txt
dnl /usr/local/share/X11/rgb.txt
dnl Mandriva has these:
dnl /usr/lib/X11/rgb.txt
dnl /usr/lib64/X11/rgb.txt
dnl NetBSD has these
dnl /usr/X11R7/lib/X11/rgb.txt
dnl OpenSolaris uses
dnl 32-bit:
dnl /usr/X11/etc/X11/rgb.txt
dnl /usr/X11/share/X11/rgb.txt
dnl /usr/X11/lib/X11/rgb.txt
dnl OSX uses
dnl /opt/local/share/X11/rgb.txt (MacPorts)
dnl /opt/X11/share/X11/rgb.txt (non-ports)
dnl 64-bit:
dnl /usr/X11/etc/X11/rgb.txt
dnl /usr/X11/share/X11/rgb.txt (perhaps)
dnl /usr/X11/lib/amd64/X11/rgb.txt
dnl Solaris10 uses (in this order):
dnl /usr/openwin/lib/X11/rgb.txt
dnl /usr/X11/lib/X11/rgb.txt
AC_DEFUN([CF_WITH_X11_RGB],[
AC_MSG_CHECKING(for X11 rgb file)
AC_ARG_WITH(x11-rgb,
[ --with-x11-rgb=FILE file containing X11 rgb information (EPREFIX/lib/X11/rgb.txt)],
[RGB_PATH=$withval],
[RGB_PATH=auto])
if test "x[$]RGB_PATH" = xauto
then
RGB_PATH='${exec_prefix}/lib/X11/rgb.txt'
for cf_path in \
/opt/local/share/X11/rgb.txt \
/opt/X11/share/X11/rgb.txt \
/usr/share/X11/rgb.txt \
/usr/X11/share/X11/rgb.txt \
/usr/X11/lib/X11/rgb.txt \
/usr/lib/X11/rgb.txt \
/etc/X11/rgb.txt \
/usr/pkg/lib/X11/rgb.txt \
/usr/X11R7/lib/X11/rgb.txt \
/usr/X11R6/lib/X11/rgb.txt \
/usr/X11R5/lib/X11/rgb.txt \
/usr/X11R4/lib/X11/rgb.txt \
/usr/local/lib/X11/rgb.txt \
/usr/local/share/X11/rgb.txt \
/usr/lib64/X11/rgb.txt
do
if test -f "$cf_path" ; then
RGB_PATH="$cf_path"
break
fi
done
else
cf_path=$RGB_PATH
CF_PATH_SYNTAX(cf_path)
fi
AC_MSG_RESULT($RGB_PATH)
AC_SUBST(RGB_PATH)
AC_DEFINE_UNQUOTED(RGB_PATH,"$cf_path")
no_x11_rgb=
if test "$RGB_PATH" = no
then
no_x11_rgb="#"
fi
AC_SUBST(no_x11_rgb)
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_XOPEN_SOURCE version: 52 updated: 2016/08/27 12:21:42
dnl ---------------
dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
Expand Down
10 changes: 8 additions & 2 deletions c++/cursesw.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#ifndef NCURSES_CURSESW_H_incl
#define NCURSES_CURSESW_H_incl 1

// $Id: cursesw.h,v 1.51 2017/06/24 22:05:30 tom Exp $
// $Id: cursesw.h,v 1.53 2017/11/21 00:37:23 tom Exp $

extern "C" {
# include <curses.h>
Expand Down Expand Up @@ -324,6 +324,12 @@ inline void UNDEF(intrflush)(WINDOW *win, bool bf) { intrflush(); }
#define intrflush UNDEF(intrflush)
#endif

#ifdef is_linetouched
inline int UNDEF(is_linetouched)(WINDOW *w, int l) { return is_linetouched(w,l); }
#undef is_linetouched
#define is_linetouched UNDEF(is_linetouched)
#endif

#ifdef leaveok
inline int UNDEF(leaveok)(WINDOW* win, bool bf) { return leaveok(win, bf); }
#undef leaveok
Expand Down Expand Up @@ -1241,7 +1247,7 @@ class NCURSES_IMPEXP NCursesWindow
// on the value of the changed flag.

bool is_linetouched(int line) const {
return (::is_linetouched(w, line) ? TRUE:FALSE); }
return (::is_linetouched(w, line) == TRUE ? TRUE:FALSE); }
// Return TRUE if line is marked as changed, FALSE otherwise

bool is_wintouched() const {
Expand Down
77 changes: 32 additions & 45 deletions config.guess
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Attempt to guess a canonical system name.
# Copyright 1992-2017 Free Software Foundation, Inc.

timestamp='2017-08-08'
timestamp='2017-11-07'

# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
Expand All @@ -15,7 +15,7 @@ timestamp='2017-08-08'
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, see <http://www.gnu.org/licenses/>.
# along with this program; if not, see <https://www.gnu.org/licenses/>.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
Expand All @@ -27,7 +27,7 @@ timestamp='2017-08-08'
# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
#
# You can get the latest version of this script from:
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
#
# Please send patches to <[email protected]>.

Expand All @@ -39,7 +39,7 @@ Usage: $0 [OPTION]
Output the configuration name of the system \`$me' is run on.
Operation modes:
Options:
-h, --help print this help, then exit
-t, --time-stamp print date of last modification, then exit
-v, --version print version number, then exit
Expand Down Expand Up @@ -244,6 +244,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
exit ;;
*:MidnightBSD:*:*)
echo ${UNAME_MACHINE}-unknown-midnightbsd${UNAME_RELEASE}
exit ;;
*:ekkoBSD:*:*)
echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
exit ;;
Expand Down Expand Up @@ -318,15 +321,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
exitcode=$?
trap '' 0
exit $exitcode ;;
Alpha\ *:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# Should we change UNAME_MACHINE based on the output of uname instead
# of the specific Alpha model?
echo alpha-pc-interix
exit ;;
21064:Windows_NT:50:3)
echo alpha-dec-winnt3.5
exit ;;
Amiga*:UNIX_System_V:4.0:*)
echo m68k-unknown-sysv4
exit ;;
Expand Down Expand Up @@ -488,13 +482,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
#endif
#if defined (host_mips) && defined (MIPSEB)
#if defined (SYSTYPE_SYSV)
printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0);
#endif
#if defined (SYSTYPE_SVR4)
printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0);
#endif
#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0);
#endif
#endif
exit (-1);
Expand Down Expand Up @@ -617,7 +611,7 @@ EOF
*:AIX:*:*)
echo rs6000-ibm-aix
exit ;;
ibmrt:4.4BSD:*|romp-ibm:BSD:*)
ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*)
echo romp-ibm-bsd4.4
exit ;;
ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
Expand All @@ -638,8 +632,8 @@ EOF
9000/[34678]??:HP-UX:*:*)
HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
case "${UNAME_MACHINE}" in
9000/31? ) HP_ARCH=m68000 ;;
9000/[34]?? ) HP_ARCH=m68k ;;
9000/31?) HP_ARCH=m68000 ;;
9000/[34]??) HP_ARCH=m68k ;;
9000/[678][0-9][0-9])
if [ -x /usr/bin/getconf ]; then
sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
Expand Down Expand Up @@ -752,7 +746,7 @@ EOF
{ echo "$SYSTEM_NAME"; exit; }
echo unknown-hitachi-hiuxwe2
exit ;;
9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*)
echo hppa1.1-hp-bsd
exit ;;
9000/8??:4.3bsd:*:*)
Expand All @@ -761,7 +755,7 @@ EOF
*9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
echo hppa1.0-hp-mpeix
exit ;;
hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*)
echo hppa1.1-hp-osf
exit ;;
hp8??:OSF1:*:*)
Expand Down Expand Up @@ -858,10 +852,6 @@ EOF
*:MSYS*:*)
echo ${UNAME_MACHINE}-pc-msys
exit ;;
i*:windows32*:*)
# uname -m includes "-pc" on this system.
echo ${UNAME_MACHINE}-mingw32
exit ;;
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
Expand All @@ -877,27 +867,12 @@ EOF
echo ia64-unknown-interix${UNAME_RELEASE}
exit ;;
esac ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
exit ;;
8664:Windows_NT:*)
echo x86_64-pc-mks
exit ;;
i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
# UNAME_MACHINE based on the output of uname instead of i386?
echo i586-pc-interix
exit ;;
i*:UWIN*:*)
echo ${UNAME_MACHINE}-pc-uwin
exit ;;
amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
echo x86_64-unknown-cygwin
exit ;;
p*:CYGWIN*:*)
echo powerpcle-unknown-cygwin
exit ;;
prep*:SunOS:5.*:*)
echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
Expand Down Expand Up @@ -1100,7 +1075,7 @@ EOF
i*86:*DOS:*:*)
echo ${UNAME_MACHINE}-pc-msdosdjgpp
exit ;;
i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
i*86:*:4.*:*)
UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
Expand Down Expand Up @@ -1428,16 +1403,28 @@ EOF
exit ;;
esac

echo "$0: unable to guess system type" >&2

case "${UNAME_MACHINE}:${UNAME_SYSTEM}" in
mips:Linux | mips64:Linux)
# If we got here on MIPS GNU/Linux, output extra information.
cat >&2 <<EOF
NOTE: MIPS GNU/Linux systems require a C compiler to fully recognize
the system type. Please install a C compiler and try again.
EOF
;;
esac

cat >&2 <<EOF
$0: unable to guess system type
This script (version $timestamp), has failed to recognize the
operating system you are using. If your script is old, overwrite *all*
copies of config.guess and config.sub with the latest versions from:
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
and
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
If $0 has already been updated, send the following data and any
information you think might be pertinent to [email protected] to
Expand Down Expand Up @@ -1469,7 +1456,7 @@ EOF
exit 1

# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
# eval: (add-hook 'write-file-functions 'time-stamp)
# time-stamp-start: "timestamp='"
# time-stamp-format: "%:y-%02m-%02d"
# time-stamp-end: "'"
Expand Down
Loading

0 comments on commit 8d3ea90

Please sign in to comment.