rpms/ncurses
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 6.0.20170121 [release 6.0.20170121-1mamba;Fri Jan 27 2017]

Browse Source
This commit is contained in:
Silvan Calarco 2024-01-06 07:33:56 +01:00
parent 1f12ee7fd1
commit 6d8059674e
44 changed files with 85198 additions and 115484 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

187
ncurses-6.0-20150810.patch
View File

@ -1,187 +0,0 @@
# ncurses 6.0 - patch 20150810 - Thomas E. Dickey
#
# ------------------------------------------------------------------------------
#
# Ncurses 6.0 is at
# ftp.gnu.org:/pub/gnu
#
# Patches for ncurses 6.0 are in the subdirectory
# ftp://invisible-island.net/ncurses/6.0
#
# ------------------------------------------------------------------------------
# ftp://invisible-island.net/ncurses/5.9/ncurses-6.0-20150810.patch.gz
# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created Mon Aug 10 09:27:53 UTC 2015
# ------------------------------------------------------------------------------
# NEWS | 7 ++++++-
# VERSION | 2 +-
# dist.mk | 4 ++--
# ncurses/base/MKlib_gen.sh | 4 ++--
# package/debian-mingw/changelog | 4 ++--
# package/debian-mingw64/changelog | 4 ++--
# package/debian/changelog | 4 ++--
# package/mingw-ncurses.nsi | 4 ++--
# package/mingw-ncurses.spec | 2 +-
# package/ncurses.spec | 2 +-
# 10 files changed, 21 insertions(+), 16 deletions(-)
# ------------------------------------------------------------------------------
Index: NEWS
Prereq: 1.2476
--- ncurses-6.0-20150808+/NEWS 2015-08-08 23:29:51.000000000 +0000
+++ ncurses-6.0-20150810/NEWS 2015-08-10 09:27:32.000000000 +0000
@@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.2476 2015/08/08 23:29:51 tom Exp $
+-- $Id: NEWS,v 1.2478 2015/08/10 09:27:32 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
@@ -45,6 +45,11 @@
Changes through 1.9.9e did not credit all contributions;
it is not possible to add this information.
+20150810
+ + workaround for Debian #65617, which was fixed in mawk's upstream
+ releases in 2009 (report by Sven Joachim). See
+ http://invisible-island.net/mawk/CHANGES.html#t20090727
+
20150808 6.0 release for upload to ftp.gnu.org
20150808
Index: VERSION
--- ncurses-6.0-20150808+/VERSION 2015-08-06 23:13:39.000000000 +0000
+++ ncurses-6.0-20150810/VERSION 2015-08-10 09:10:29.000000000 +0000
@@ -1 +1 @@
-5:0:9 6.0 20150808
+5:0:9 6.0 20150810
Index: dist.mk
Prereq: 1.1064
--- ncurses-6.0-20150808+/dist.mk 2015-08-06 23:13:39.000000000 +0000
+++ ncurses-6.0-20150810/dist.mk 2015-08-10 09:10:29.000000000 +0000
@@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.1064 2015/08/06 23:13:39 tom Exp $
+# $Id: dist.mk,v 1.1065 2015/08/10 09:10:29 tom Exp $
# Makefile for creating ncurses distributions.
#
# This only needs to be used directly as a makefile by developers, but
@@ -37,7 +37,7 @@
# These define the major/minor/patch versions of ncurses.
NCURSES_MAJOR = 6
NCURSES_MINOR = 0
-NCURSES_PATCH = 20150808
+NCURSES_PATCH = 20150810
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
Index: ncurses/base/MKlib_gen.sh
Prereq: 1.50
--- ncurses-6.0-20150808+/ncurses/base/MKlib_gen.sh 2015-08-07 00:48:24.000000000 +0000
+++ ncurses-6.0-20150810/ncurses/base/MKlib_gen.sh 2015-08-10 08:56:39.000000000 +0000
@@ -2,7 +2,7 @@
#
# MKlib_gen.sh -- generate sources from curses.h macro definitions
#
-# ($Id: MKlib_gen.sh,v 1.50 2015/08/07 00:48:24 tom Exp $)
+# ($Id: MKlib_gen.sh,v 1.51 2015/08/10 08:56:39 tom Exp $)
#
##############################################################################
# Copyright (c) 1998-2014,2015 Free Software Foundation, Inc. #
@@ -72,7 +72,7 @@
# appears in gcc 5.0 and (with modification) in 5.1, making it necessary to
# determine if we are using gcc, and if so, what version because the proposed
# solution uses a nonstandard option.
-PRG=`echo "$1" | $AWK '{ sub(/^[[:space:]]*/,""); sub(/[[:space:]].*$/, ""); print; }' || exit 0`
+PRG=`echo "$1" | $AWK '{ sub(/^[ ]*/,""); sub(/[ ].*$/, ""); print; }' || exit 0`
FSF=`"$PRG" --version 2>/dev/null || exit 0 | fgrep "Free Software Foundation" | head -n 1`
ALL=`"$PRG" -dumpversion 2>/dev/null || exit 0`
ONE=`echo "$ALL" | sed -e 's/\..*$//'`
Index: package/debian-mingw/changelog
--- ncurses-6.0-20150808+/package/debian-mingw/changelog 2015-08-06 23:13:39.000000000 +0000
+++ ncurses-6.0-20150810/package/debian-mingw/changelog 2015-08-10 09:10:30.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20150808) unstable; urgency=low
+ncurses6 (6.0+20150810) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Thu, 06 Aug 2015 19:13:39 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Mon, 10 Aug 2015 05:10:30 -0400
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian-mingw64/changelog
--- ncurses-6.0-20150808+/package/debian-mingw64/changelog 2015-08-06 23:13:39.000000000 +0000
+++ ncurses-6.0-20150810/package/debian-mingw64/changelog 2015-08-10 09:10:30.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20150808) unstable; urgency=low
+ncurses6 (6.0+20150810) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Thu, 06 Aug 2015 19:13:39 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Mon, 10 Aug 2015 05:10:30 -0400
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian/changelog
--- ncurses-6.0-20150808+/package/debian/changelog 2015-08-06 23:13:39.000000000 +0000
+++ ncurses-6.0-20150810/package/debian/changelog 2015-08-10 09:10:29.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20150808) unstable; urgency=low
+ncurses6 (6.0+20150810) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Thu, 06 Aug 2015 19:13:39 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Mon, 10 Aug 2015 05:10:29 -0400
ncurses6 (5.9-20120608) unstable; urgency=low
Index: package/mingw-ncurses.nsi
Prereq: 1.117
--- ncurses-6.0-20150808+/package/mingw-ncurses.nsi 2015-08-06 23:13:39.000000000 +0000
+++ ncurses-6.0-20150810/package/mingw-ncurses.nsi 2015-08-10 09:10:30.000000000 +0000
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.117 2015/08/06 23:13:39 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.118 2015/08/10 09:10:30 tom Exp $
; TODO add examples
; TODO bump ABI to 6
@@ -10,7 +10,7 @@
!define VERSION_MAJOR "6"
!define VERSION_MINOR "0"
!define VERSION_YYYY "2015"
-!define VERSION_MMDD "0808"
+!define VERSION_MMDD "0810"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"
Index: package/mingw-ncurses.spec
--- ncurses-6.0-20150808+/package/mingw-ncurses.spec 2015-08-06 23:13:39.000000000 +0000
+++ ncurses-6.0-20150810/package/mingw-ncurses.spec 2015-08-10 09:10:29.000000000 +0000
@@ -3,7 +3,7 @@
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 6.0
-Release: 20150808
+Release: 20150810
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncurses.spec
--- ncurses-6.0-20150808+/package/ncurses.spec 2015-08-06 23:13:39.000000000 +0000
+++ ncurses-6.0-20150810/package/ncurses.spec 2015-08-10 09:10:29.000000000 +0000
@@ -1,7 +1,7 @@
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 6.0
-Release: 20150808
+Release: 20150810
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz

11415
ncurses-6.0-20150815.patch
View File

File diff suppressed because it is too large Load Diff

19082
ncurses-6.0-20150822.patch
View File

File diff suppressed because it is too large Load Diff

1911
ncurses-6.0-20150905.patch
View File

File diff suppressed because it is too large Load Diff

10769
ncurses-6.0-20150912.patch
View File

File diff suppressed because it is too large Load Diff

9184
ncurses-6.0-20150919.patch
View File

File diff suppressed because it is too large Load Diff

596
ncurses-6.0-20150926.patch
View File

@ -1,596 +0,0 @@
# ncurses 6.0 - patch 20150926 - Thomas E. Dickey
#
# ------------------------------------------------------------------------------
#
# Ncurses 6.0 is at
# ftp.gnu.org:/pub/gnu
#
# Patches for ncurses 6.0 can be found at
# ftp://invisible-island.net/ncurses/6.0
# http://invisible-mirror.net/archives/ncurses/6.0
#
# ------------------------------------------------------------------------------
# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20150926.patch.gz
# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created Sun Sep 27 01:08:16 UTC 2015
# ------------------------------------------------------------------------------
# INSTALL | 5 ++++-
# NEWS | 8 +++++++-
# VERSION | 2 +-
# aclocal.m4 | 6 +++---
# configure | 2 +-
# dist.mk | 4 ++--
# doc/html/man/captoinfo.1m.html | 2 +-
# doc/html/man/clear.1.html | 2 +-
# doc/html/man/curs_attr.3x.html | 2 +-
# doc/html/man/form.3x.html | 2 +-
# doc/html/man/infocmp.1m.html | 2 +-
# doc/html/man/infotocap.1m.html | 2 +-
# doc/html/man/menu.3x.html | 2 +-
# doc/html/man/ncurses.3x.html | 2 +-
# doc/html/man/panel.3x.html | 2 +-
# doc/html/man/resizeterm.3x.html | 17 ++++++++++++++++-
# doc/html/man/tabs.1.html | 2 +-
# doc/html/man/terminfo.5.html | 2 +-
# doc/html/man/tic.1m.html | 2 +-
# doc/html/man/toe.1m.html | 2 +-
# doc/html/man/tput.1.html | 2 +-
# doc/html/man/tset.1.html | 2 +-
# doc/html/man/wresize.3x.html | 13 +++++++++++--
# man/resizeterm.3x | 15 ++++++++++++++-
# man/wresize.3x | 10 ++++++++--
# package/debian-mingw/changelog | 4 ++--
# package/debian-mingw64/changelog | 4 ++--
# package/debian/changelog | 4 ++--
# package/debian/rules | 1 +
# package/mingw-ncurses.nsi | 4 ++--
# package/mingw-ncurses.spec | 2 +-
# package/ncurses.spec | 2 +-
# 32 files changed, 93 insertions(+), 40 deletions(-)
# ------------------------------------------------------------------------------
Index: INSTALL
Prereq: 1.192
--- ncurses-6.0-20150919+/INSTALL 2015-08-15 20:11:48.000000000 +0000
+++ ncurses-6.0-20150926/INSTALL 2015-09-26 21:34:14.000000000 +0000
@@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: INSTALL,v 1.192 2015/08/15 20:11:48 tom Exp $
+-- $Id: INSTALL,v 1.193 2015/09/26 21:34:14 tom Exp $
---------------------------------------------------------------------
How to install Ncurses/Terminfo on your system
---------------------------------------------------------------------
@@ -1093,6 +1093,9 @@
Specify a search-list of terminfo directories which will be compiled
into the ncurses library (default: DATADIR/terminfo)
+ This is a colon-separated list, like the TERMINFO_DIRS environment
+ variable.
+
--with-termlib[=XXX]
When building the ncurses library, organize this as two parts: the
curses library (libncurses) and the low-level terminfo library
Index: NEWS
Prereq: 1.2496
--- ncurses-6.0-20150919+/NEWS 2015-09-19 23:04:21.000000000 +0000
+++ ncurses-6.0-20150926/NEWS 2015-09-26 21:58:14.000000000 +0000
@@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.2496 2015/09/19 23:04:21 tom Exp $
+-- $Id: NEWS,v 1.2499 2015/09/26 21:58:14 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
@@ -45,6 +45,12 @@
Changes through 1.9.9e did not credit all contributions;
it is not possible to add this information.
+20150926
+ + change makefile rule for removing resulting.map to distclean rather
+ than clean.
+ + add /lib/terminfo to terminfo-dirs in ".deb" test-package.
+ + add note on portability of resizeterm and wresize to manual pages.
+
20150919
+ clarify in resizeterm.3x how KEY_RESIZE is pushed onto the input
stream.
Index: VERSION
--- ncurses-6.0-20150919+/VERSION 2015-09-19 19:40:14.000000000 +0000
+++ ncurses-6.0-20150926/VERSION 2015-09-26 18:50:05.000000000 +0000
@@ -1 +1 @@
-5:0:9 6.0 20150919
+5:0:9 6.0 20150926
Index: aclocal.m4
Prereq: 1.767
--- ncurses-6.0-20150919+/aclocal.m4 2015-09-12 20:00:59.000000000 +0000
+++ ncurses-6.0-20150926/aclocal.m4 2015-09-26 21:56:12.000000000 +0000
@@ -28,7 +28,7 @@
dnl
dnl Author: Thomas E. Dickey 1995-on
dnl
-dnl $Id: aclocal.m4,v 1.767 2015/09/12 20:00:59 tom Exp $
+dnl $Id: aclocal.m4,v 1.768 2015/09/26 21:56:12 tom Exp $
dnl Macros used in NCURSES auto-configuration script.
dnl
dnl These macros are maintained separately from NCURSES. The copyright on
@@ -3228,7 +3228,7 @@
AC_SUBST(LIB_PREFIX)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_LIB_RULES version: 83 updated: 2015/08/05 20:44:28
+dnl CF_LIB_RULES version: 84 updated: 2015/09/26 17:54:46
dnl ------------
dnl Append definitions and rules for the given models to the subdirectory
dnl Makefiles, and the recursion rule for the top-level Makefile. If the
@@ -3301,7 +3301,7 @@
resulting.map: $UNALTERED_SYMS
sed $cf_sed_options < $UNALTERED_SYMS >\[$]@
-clean::
+distclean::
rm -f resulting.map
CF_EOF
fi
Index: configure
--- ncurses-6.0-20150919+/configure 2015-09-12 20:01:47.000000000 +0000
+++ ncurses-6.0-20150926/configure 2015-09-26 21:56:47.000000000 +0000
@@ -23555,7 +23555,7 @@
resulting.map: $UNALTERED_SYMS
sed $cf_sed_options < $UNALTERED_SYMS >\$@
-clean::
+distclean::
rm -f resulting.map
CF_EOF
fi
Index: dist.mk
Prereq: 1.1071
--- ncurses-6.0-20150919+/dist.mk 2015-09-19 19:40:14.000000000 +0000
+++ ncurses-6.0-20150926/dist.mk 2015-09-26 18:50:05.000000000 +0000
@@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.1071 2015/09/19 19:40:14 tom Exp $
+# $Id: dist.mk,v 1.1072 2015/09/26 18:50:05 tom Exp $
# Makefile for creating ncurses distributions.
#
# This only needs to be used directly as a makefile by developers, but
@@ -37,7 +37,7 @@
# These define the major/minor/patch versions of ncurses.
NCURSES_MAJOR = 6
NCURSES_MINOR = 0
-NCURSES_PATCH = 20150919
+NCURSES_PATCH = 20150926
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
Index: doc/html/man/captoinfo.1m.html
--- ncurses-6.0-20150919+/doc/html/man/captoinfo.1m.html 2015-09-19 23:18:49.000000000 +0000
+++ ncurses-6.0-20150926/doc/html/man/captoinfo.1m.html 2015-09-26 22:08:45.000000000 +0000
@@ -205,7 +205,7 @@
<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.0 (patch 20150919).
+ This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150926).
</PRE>
Index: doc/html/man/clear.1.html
--- ncurses-6.0-20150919+/doc/html/man/clear.1.html 2015-09-19 23:18:49.000000000 +0000
+++ ncurses-6.0-20150926/doc/html/man/clear.1.html 2015-09-26 22:08:45.000000000 +0000
@@ -71,7 +71,7 @@
<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.0 (patch 20150919).
+ This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150926).
Index: doc/html/man/curs_attr.3x.html
--- ncurses-6.0-20150919+/doc/html/man/curs_attr.3x.html 2015-09-05 23:05:55.000000000 +0000
+++ ncurses-6.0-20150926/doc/html/man/curs_attr.3x.html 2015-09-26 23:25:17.000000000 +0000
@@ -27,7 +27,7 @@
* sale, use or other dealings in this Software without prior written *
* authorization. *
****************************************************************************
- * @Id: curs_attr.3x,v 1.40 2015/07/20 23:35:38 tom Exp @
+ * @Id: curs_attr.3x,v 1.41 2015/09/05 21:13:25 tom Exp @
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
<HTML>
Index: doc/html/man/form.3x.html
--- ncurses-6.0-20150919+/doc/html/man/form.3x.html 2015-09-19 23:18:53.000000000 +0000
+++ ncurses-6.0-20150926/doc/html/man/form.3x.html 2015-09-26 22:08:49.000000000 +0000
@@ -245,7 +245,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.0 (patch 20150919).
+ This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150926).
Index: doc/html/man/infocmp.1m.html
--- ncurses-6.0-20150919+/doc/html/man/infocmp.1m.html 2015-09-19 23:18:54.000000000 +0000
+++ ncurses-6.0-20150926/doc/html/man/infocmp.1m.html 2015-09-26 22:08:50.000000000 +0000
@@ -487,7 +487,7 @@
http://invisible-island.net/ncurses/tctest.html
- This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150919).
+ This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150926).
</PRE>
Index: doc/html/man/infotocap.1m.html
--- ncurses-6.0-20150919+/doc/html/man/infotocap.1m.html 2015-09-19 23:18:54.000000000 +0000
+++ ncurses-6.0-20150926/doc/html/man/infotocap.1m.html 2015-09-26 22:08:50.000000000 +0000
@@ -94,7 +94,7 @@
<H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
<STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
- This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150919).
+ This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150926).
</PRE>
Index: doc/html/man/menu.3x.html
--- ncurses-6.0-20150919+/doc/html/man/menu.3x.html 2015-09-19 23:18:55.000000000 +0000
+++ ncurses-6.0-20150926/doc/html/man/menu.3x.html 2015-09-26 22:08:51.000000000 +0000
@@ -227,7 +227,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.0 (patch 20150919).
+ This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150926).
Index: doc/html/man/ncurses.3x.html
--- ncurses-6.0-20150919+/doc/html/man/ncurses.3x.html 2015-09-19 23:18:56.000000000 +0000
+++ ncurses-6.0-20150926/doc/html/man/ncurses.3x.html 2015-09-26 22:08:52.000000000 +0000
@@ -63,7 +63,7 @@
sonable optimization. This implementation is "new curses"
(ncurses) and is the approved replacement for 4.4BSD clas-
sic curses, which has been discontinued. This describes
- <STRONG>ncurses</STRONG> version 6.0 (patch 20150919).
+ <STRONG>ncurses</STRONG> version 6.0 (patch 20150926).
The <STRONG>ncurses</STRONG> library emulates the curses library of System
V Release 4 UNIX, and XPG4 (X/Open Portability Guide)
Index: doc/html/man/panel.3x.html
--- ncurses-6.0-20150919+/doc/html/man/panel.3x.html 2015-09-19 23:18:56.000000000 +0000
+++ ncurses-6.0-20150926/doc/html/man/panel.3x.html 2015-09-26 22:08:52.000000000 +0000
@@ -218,7 +218,7 @@
<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.0 (patch 20150919).
+ This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150926).
</PRE>
Index: doc/html/man/resizeterm.3x.html
--- ncurses-6.0-20150919+/doc/html/man/resizeterm.3x.html 2015-09-19 23:18:56.000000000 +0000
+++ ncurses-6.0-20150926/doc/html/man/resizeterm.3x.html 2015-09-26 22:08:52.000000000 +0000
@@ -27,7 +27,7 @@
* authorization. *
****************************************************************************
* Author: Thomas E. Dickey 1996-on
- * @Id: resizeterm.3x,v 1.20 2015/09/19 22:53:26 tom Exp @
+ * @Id: resizeterm.3x,v 1.21 2015/09/26 19:55:32 tom Exp @
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
<HTML>
@@ -144,6 +144,20 @@
</PRE>
+<H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
+ It is possible to resize the screen with SVr4 curses, by
+
+ <STRONG>o</STRONG> exiting curses with <STRONG><A HREF="endwin.3x.html">endwin(3x)</A></STRONG> and
+
+ <STRONG>o</STRONG> resuming using <STRONG><A HREF="refresh.3x.html">refresh(3x)</A></STRONG>.
+
+ Doing that clears the screen and is visually distracting.
+
+ This extension of ncurses was introduced in mid-1995. It
+ was adopted in NetBSD curses (2001) and PDCurses (2003).
+
+
+</PRE>
<H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
<STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>, <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>.
@@ -170,6 +184,7 @@
</li>
<li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
<li><a href="#h2-NOTES">NOTES</a></li>
+<li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
<li><a href="#h2-AUTHOR">AUTHOR</a></li>
</ul>
Index: doc/html/man/tabs.1.html
--- ncurses-6.0-20150919+/doc/html/man/tabs.1.html 2015-09-19 23:18:56.000000000 +0000
+++ ncurses-6.0-20150926/doc/html/man/tabs.1.html 2015-09-26 22:08:52.000000000 +0000
@@ -168,7 +168,7 @@
<H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
<STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <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.0 (patch 20150919).
+ This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150926).
Index: doc/html/man/terminfo.5.html
--- ncurses-6.0-20150919+/doc/html/man/terminfo.5.html 2015-09-19 23:18:56.000000000 +0000
+++ ncurses-6.0-20150926/doc/html/man/terminfo.5.html 2015-09-26 22:08:53.000000000 +0000
@@ -78,7 +78,7 @@
nals by giving a set of capabilities which they have, by
specifying how to perform screen operations, and by speci-
fying padding requirements and initialization sequences.
- This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150919).
+ This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150926).
Entries in <EM>terminfo</EM> consist of a sequence of `,' separated
fields (embedded commas may be escaped with a backslash or
Index: doc/html/man/tic.1m.html
--- ncurses-6.0-20150919+/doc/html/man/tic.1m.html 2015-09-19 23:18:57.000000000 +0000
+++ ncurses-6.0-20150926/doc/html/man/tic.1m.html 2015-09-26 22:08:53.000000000 +0000
@@ -408,7 +408,7 @@
<STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="captoinfo.1m.html">captoinfo(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>.
- This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150919).
+ This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150926).
</PRE>
Index: doc/html/man/toe.1m.html
--- ncurses-6.0-20150919+/doc/html/man/toe.1m.html 2015-09-19 23:18:57.000000000 +0000
+++ ncurses-6.0-20150926/doc/html/man/toe.1m.html 2015-09-26 22:08:53.000000000 +0000
@@ -122,7 +122,7 @@
<STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>, <STRONG><A HREF="infotocap.1m.html">infotocap(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.0 (patch 20150919).
+ This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150926).
Index: doc/html/man/tput.1.html
--- ncurses-6.0-20150919+/doc/html/man/tput.1.html 2015-09-19 23:18:57.000000000 +0000
+++ ncurses-6.0-20150926/doc/html/man/tput.1.html 2015-09-26 22:08:53.000000000 +0000
@@ -338,7 +338,7 @@
<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="terminfo.5.html">terminfo(5)</A></STRONG>, <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>.
- This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150919).
+ This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150926).
Index: doc/html/man/tset.1.html
--- ncurses-6.0-20150919+/doc/html/man/tset.1.html 2015-09-19 23:18:57.000000000 +0000
+++ ncurses-6.0-20150926/doc/html/man/tset.1.html 2015-09-26 22:08:53.000000000 +0000
@@ -319,7 +319,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.0 (patch 20150919).
+ This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150926).
Index: doc/html/man/wresize.3x.html
--- ncurses-6.0-20150919+/doc/html/man/wresize.3x.html 2015-05-13 19:27:50.000000000 +0000
+++ ncurses-6.0-20150926/doc/html/man/wresize.3x.html 2015-09-26 22:08:53.000000000 +0000
@@ -1,6 +1,6 @@
<!--
****************************************************************************
- * Copyright (c) 1998-2006,2010 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2010,2015 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. *
****************************************************************************
* Author: Thomas E. Dickey 1996
- * @Id: wresize.3x,v 1.13 2010/12/04 18:40:45 tom Exp @
+ * @Id: wresize.3x,v 1.14 2015/09/26 19:57:24 tom Exp @
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
<HTML>
@@ -86,6 +86,14 @@
</PRE>
+<H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
+ It is not possible to resize windows with SVr4 curses.
+
+ This extension of ncurses was introduced in mid-1995. It
+ was adopted in NetBSD curses (2001) and PDCurses (2003).
+
+
+</PRE>
<H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
<STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>.
@@ -106,6 +114,7 @@
<li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
<li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
<li><a href="#h2-NOTES">NOTES</a></li>
+<li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
<li><a href="#h2-AUTHOR">AUTHOR</a></li>
</ul>
Index: man/resizeterm.3x
Prereq: 1.20
--- ncurses-6.0-20150919+/man/resizeterm.3x 2015-09-19 22:53:26.000000000 +0000
+++ ncurses-6.0-20150926/man/resizeterm.3x 2015-09-26 19:55:32.000000000 +0000
@@ -28,7 +28,7 @@
.\"
.\" Author: Thomas E. Dickey 1996-on
.\"
-.\" $Id: resizeterm.3x,v 1.20 2015/09/19 22:53:26 tom Exp $
+.\" $Id: resizeterm.3x,v 1.21 2015/09/26 19:55:32 tom Exp $
.TH resizeterm 3X ""
.de bP
.IP \(bu 4
@@ -108,6 +108,19 @@
the operating system.
Thus, even if a SIGWINCH is received,
no screen size change may be recorded.
+.SH PORTABILITY
+.PP
+It is possible to resize the screen with SVr4 curses,
+by
+.bP
+exiting curses with \fBendwin\fP(3X) and
+.bP
+resuming using \fBrefresh\fP(3X).
+.PP
+Doing that clears the screen and is visually distracting.
+.PP
+This extension of ncurses was introduced in mid-1995.
+It was adopted in NetBSD curses (2001) and PDCurses (2003).
.SH SEE ALSO
\fBcurs_getch\fR(3X),
\fBcurs_variables\fR(3X),
Index: man/wresize.3x
Prereq: 1.13
--- ncurses-6.0-20150919+/man/wresize.3x 2010-12-04 18:40:45.000000000 +0000
+++ ncurses-6.0-20150926/man/wresize.3x 2015-09-26 19:57:24.000000000 +0000
@@ -1,5 +1,5 @@
.\"***************************************************************************
-.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc. *
+.\" Copyright (c) 1998-2010,2015 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 *
@@ -28,7 +28,7 @@
.\"
.\" Author: Thomas E. Dickey 1996
.\"
-.\" $Id: wresize.3x,v 1.13 2010/12/04 18:40:45 tom Exp $
+.\" $Id: wresize.3x,v 1.14 2015/09/26 19:57:24 tom Exp $
.TH wresize 3X ""
.SH NAME
\fBwresize\fR \- resize a curses window
@@ -53,6 +53,12 @@
simplify the logic of \fBresizeterm\fR.
The caller must ensure that the window's dimensions fit within the
actual screen dimensions.
+.SH PORTABILITY
+.PP
+It is not possible to resize windows with SVr4 curses.
+.PP
+This extension of ncurses was introduced in mid-1995.
+It was adopted in NetBSD curses (2001) and PDCurses (2003).
.SH SEE ALSO
\fBresizeterm\fR(3X).
.SH AUTHOR
Index: package/debian-mingw/changelog
--- ncurses-6.0-20150919+/package/debian-mingw/changelog 2015-09-19 19:40:14.000000000 +0000
+++ ncurses-6.0-20150926/package/debian-mingw/changelog 2015-09-26 18:50:05.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20150919) unstable; urgency=low
+ncurses6 (6.0+20150926) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 19 Sep 2015 15:40:14 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 26 Sep 2015 14:50:05 -0400
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian-mingw64/changelog
--- ncurses-6.0-20150919+/package/debian-mingw64/changelog 2015-09-19 19:40:14.000000000 +0000
+++ ncurses-6.0-20150926/package/debian-mingw64/changelog 2015-09-26 18:50:05.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20150919) unstable; urgency=low
+ncurses6 (6.0+20150926) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 19 Sep 2015 15:40:14 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 26 Sep 2015 14:50:05 -0400
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian/changelog
--- ncurses-6.0-20150919+/package/debian/changelog 2015-09-19 19:40:14.000000000 +0000
+++ ncurses-6.0-20150926/package/debian/changelog 2015-09-26 18:50:05.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20150919) unstable; urgency=low
+ncurses6 (6.0+20150926) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 19 Sep 2015 15:40:14 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 26 Sep 2015 14:50:05 -0400
ncurses6 (5.9-20120608) unstable; urgency=low
Index: package/debian/rules
--- ncurses-6.0-20150919+/package/debian/rules 2015-07-11 22:42:03.000000000 +0000
+++ ncurses-6.0-20150926/package/debian/rules 2015-09-26 21:29:58.000000000 +0000
@@ -78,6 +78,7 @@
--with-ticlib \
--with-trace \
--with-cxx-shared \
+ --with-terminfo-dirs=/lib/terminfo:/usr/share/terminfo \
--with-versioned-syms \
--with-xterm-kbs=DEL \
--without-ada \
Index: package/mingw-ncurses.nsi
Prereq: 1.124
--- ncurses-6.0-20150919+/package/mingw-ncurses.nsi 2015-09-19 19:40:14.000000000 +0000
+++ ncurses-6.0-20150926/package/mingw-ncurses.nsi 2015-09-26 18:50:05.000000000 +0000
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.124 2015/09/19 19:40:14 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.125 2015/09/26 18:50:05 tom Exp $
; TODO add examples
; TODO bump ABI to 6
@@ -10,7 +10,7 @@
!define VERSION_MAJOR "6"
!define VERSION_MINOR "0"
!define VERSION_YYYY "2015"
-!define VERSION_MMDD "0919"
+!define VERSION_MMDD "0926"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"
Index: package/mingw-ncurses.spec
--- ncurses-6.0-20150919+/package/mingw-ncurses.spec 2015-09-19 19:40:14.000000000 +0000
+++ ncurses-6.0-20150926/package/mingw-ncurses.spec 2015-09-26 18:50:05.000000000 +0000
@@ -3,7 +3,7 @@
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 6.0
-Release: 20150919
+Release: 20150926
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncurses.spec
--- ncurses-6.0-20150919+/package/ncurses.spec 2015-09-19 19:40:14.000000000 +0000
+++ ncurses-6.0-20150926/package/ncurses.spec 2015-09-26 18:50:05.000000000 +0000
@@ -1,7 +1,7 @@
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 6.0
-Release: 20150919
+Release: 20150926
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz

5485
ncurses-6.0-20151010.patch
View File

File diff suppressed because it is too large Load Diff

975
ncurses-6.0-20151024.patch
View File

@ -1,975 +0,0 @@
# ncurses 6.0 - patch 20151024 - Thomas E. Dickey
#
# ------------------------------------------------------------------------------
#
# Ncurses 6.0 is at
# ftp.gnu.org:/pub/gnu
#
# Patches for ncurses 6.0 can be found at
# ftp://invisible-island.net/ncurses/6.0
# http://invisible-mirror.net/archives/ncurses/6.0
#
# ------------------------------------------------------------------------------
# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20151024.patch.gz
# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created Sun Oct 25 00:51:43 UTC 2015
# ------------------------------------------------------------------------------
# INSTALL | 4 -
# NEWS | 23 ++++++
# VERSION | 2
# aclocal.m4 | 8 +-
# config.guess | 14 ++--
# config.sub | 11 ++-
# configure | 8 +-
# configure.in | 6 -
# dist.mk | 4 -
# doc/html/man/captoinfo.1m.html | 2
# doc/html/man/clear.1.html | 2
# doc/html/man/curs_attr.3x.html | 4 -
# doc/html/man/form.3x.html | 2
# doc/html/man/infocmp.1m.html | 2
# doc/html/man/infotocap.1m.html | 2
# doc/html/man/menu.3x.html | 2
# doc/html/man/ncurses.3x.html | 2
# doc/html/man/panel.3x.html | 2
# doc/html/man/tabs.1.html | 2
# doc/html/man/terminfo.5.html | 2
# doc/html/man/tic.1m.html | 2
# doc/html/man/toe.1m.html | 2
# doc/html/man/tput.1.html | 2
# doc/html/man/tset.1.html | 2
# man/curs_attr.3x | 4 -
# misc/terminfo.src | 124 ++++++++++++++++++++++++++++---------
# ncurses/tty/MKexpanded.sh | 6 -
# package/debian-mingw/changelog | 4 -
# package/debian-mingw64/changelog | 4 -
# package/debian/changelog | 4 -
# package/mingw-ncurses.nsi | 4 -
# package/mingw-ncurses.spec | 2
# package/ncurses.spec | 2
# test/ncurses.c | 26 +++----
# 34 files changed, 195 insertions(+), 97 deletions(-)
# ------------------------------------------------------------------------------
Index: INSTALL
Prereq: 1.193
--- ncurses-6.0-20151017+/INSTALL 2015-09-26 21:34:14.000000000 +0000
+++ ncurses-6.0-20151024/INSTALL 2015-10-24 19:03:42.000000000 +0000
@@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: INSTALL,v 1.193 2015/09/26 21:34:14 tom Exp $
+-- $Id: INSTALL,v 1.194 2015/10/24 19:03:42 Tomas.Cech Exp $
---------------------------------------------------------------------
How to install Ncurses/Terminfo on your system
---------------------------------------------------------------------
@@ -978,7 +978,7 @@
copying the man-page for each alias.
--with-manpage-tbl
- Tell the configure script that you with to preprocess the manpages
+ Tell the configure script that you wish to preprocess the manpages
by running them through tbl to generate tables understandable by
nroff.
Index: NEWS
Prereq: 1.2509
--- ncurses-6.0-20151017+/NEWS 2015-10-17 22:02:46.000000000 +0000
+++ ncurses-6.0-20151024/NEWS 2015-10-25 00:17:28.000000000 +0000
@@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.2509 2015/10/17 22:02:46 tom Exp $
+-- $Id: NEWS,v 1.2516 2015/10/25 00:17:28 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
@@ -45,6 +45,27 @@
Changes through 1.9.9e did not credit all contributions;
it is not possible to add this information.
+20151024
+ + modify MKexpanded.c to update the expansion of a temporary filename
+ to "expanded.c", for use in trace statements.
+ + modify layout of b/B tests in test/ncurses.c to allow for additional
+ annotation on the right margin; some terminals with partial support
+ did not display well.
+ + fix typo in curs_attr.3x (patch by Sven Joachim).
+ + fix typo in INSTALL (patch by Tomas Cech).
+ + improve configure check for setting WILDCARD_SYMS variable; on ppc64
+ the variable is in the Data section rather than Text (patch by Michel
+ Normand).
+ + using configure option "--without-fallbacks" incorrectly caused
+ FALLBACK_LIST to be set to "no" (patch by Tomas Cech).
+ + updated minitel entries to fix kel problem with emacs, and add
+ minitel1b-nb (Alexandre Montaron).
+ + reviewed/updated nsterm entry Terminal.app in OSX -TD
+ + replace some dead URLs in comments with equivalents from the
+ Internet Archive -TD
+ + update config.guess, config.sub from
+ http://git.savannah.gnu.org/cgit/config.git
+
20151017
+ modify ncurses/Makefile.in to sort keys.list in POSIX locale
(Debian #801864, patch by Esa Peuha).
Index: VERSION
--- ncurses-6.0-20151017+/VERSION 2015-10-17 20:29:47.000000000 +0000
+++ ncurses-6.0-20151024/VERSION 2015-10-24 13:10:18.000000000 +0000
@@ -1 +1 @@
-5:0:9 6.0 20151017
+5:0:9 6.0 20151024
Index: aclocal.m4
Prereq: 1.774
--- ncurses-6.0-20151017+/aclocal.m4 2015-10-17 23:05:09.000000000 +0000
+++ ncurses-6.0-20151024/aclocal.m4 2015-10-25 00:51:20.000000000 +0000
@@ -28,7 +28,7 @@
dnl
dnl Author: Thomas E. Dickey 1995-on
dnl
-dnl $Id: aclocal.m4,v 1.774 2015/10/17 23:05:09 tom Exp $
+dnl $Id: aclocal.m4,v 1.779 2015/10/25 00:51:20 tom Exp $
dnl Macros used in NCURSES auto-configuration script.
dnl
dnl These macros are maintained separately from NCURSES. The copyright on
@@ -7524,7 +7524,7 @@
[USE_VALGRIND])
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_WITH_VERSIONED_SYMS version: 5 updated: 2015/04/17 21:13:04
+dnl CF_WITH_VERSIONED_SYMS version: 7 updated: 2015/10/24 20:50:26
dnl ----------------------
dnl Use this when building shared library with ELF, to markup symbols with the
dnl version identifier from the given input file. Generally that identifier is
@@ -7638,8 +7638,8 @@
# compile source, make library
if make -f conftest.mk 2>&AC_FD_CC >/dev/null
then
- # test for missing symbol
- cf_missing=`nm -P conftest.so 2>&AC_FD_CC |fgrep _ismissing | egrep '[[ ]]T[[ ]]'`
+ # test for missing symbol in either Data or Text section
+ cf_missing=`nm -P conftest.so 2>&AC_FD_CC |fgrep _ismissing | egrep '[[ ]][[DT]][[ ]]'`
test -n "$cf_missing" && WILDCARD_SYMS=yes
fi
AC_MSG_RESULT($WILDCARD_SYMS)
Index: config.guess
--- ncurses-6.0-20151017+/config.guess 2015-05-02 11:52:27.000000000 +0000
+++ ncurses-6.0-20151024/config.guess 2015-10-24 18:37:54.000000000 +0000
@@ -2,7 +2,7 @@
# Attempt to guess a canonical system name.
# Copyright 1992-2015 Free Software Foundation, Inc.
-timestamp='2015-03-04'
+timestamp='2015-10-21'
# 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
@@ -221,7 +221,7 @@
release='-gnu'
;;
*)
- release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+ release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2`
;;
esac
# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
@@ -249,6 +249,9 @@
*:MirBSD:*:*)
echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
exit ;;
+ *:Sortix:*:*)
+ echo ${UNAME_MACHINE}-unknown-sortix
+ exit ;;
alpha:OSF1:*:*)
case $UNAME_RELEASE in
*4.0)
@@ -962,6 +965,9 @@
ia64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
+ k1om:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
m32r*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
@@ -1038,7 +1044,7 @@
echo ${UNAME_MACHINE}-dec-linux-${LIBC}
exit ;;
x86_64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-pc-linux-${LIBC}
exit ;;
xtensa*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
@@ -1117,7 +1123,7 @@
# uname -m prints for DJGPP always 'pc', but it prints nothing about
# the processor, so we play safe by assuming i586.
# Note: whatever this is, it MUST be the same as what config.sub
- # prints for the "djgpp" host, or else GDB configury will decide that
+ # prints for the "djgpp" host, or else GDB configure will decide that
# this is a cross-build.
echo i586-pc-msdosdjgpp
exit ;;
Index: config.sub
--- ncurses-6.0-20151017+/config.sub 2015-05-02 11:52:04.000000000 +0000
+++ ncurses-6.0-20151024/config.sub 2015-10-24 18:37:37.000000000 +0000
@@ -2,7 +2,7 @@
# Configuration validation subroutine script.
# Copyright 1992-2015 Free Software Foundation, Inc.
-timestamp='2015-03-08'
+timestamp='2015-08-20'
# 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
@@ -255,6 +255,7 @@
| arc | arceb \
| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
| avr | avr32 \
+ | ba \
| be32 | be64 \
| bfin \
| c4x | c8051 | clipper \
@@ -305,7 +306,7 @@
| riscv32 | riscv64 \
| rl78 | rx \
| score \
- | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
@@ -376,6 +377,7 @@
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* | avr32-* \
+ | ba-* \
| be32-* | be64-* \
| bfin-* | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* \
@@ -428,12 +430,13 @@
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
| pyramid-* \
+ | riscv32-* | riscv64-* \
| rl78-* | romp-* | rs6000-* | rx-* \
| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
| sparclite-* \
- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
| tahoe-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
| tile*-* \
@@ -1376,7 +1379,7 @@
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
| -sym* | -kopensolaris* | -plan9* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
- | -aos* | -aros* | -cloudabi* \
+ | -aos* | -aros* | -cloudabi* | -sortix* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
Index: configure
--- ncurses-6.0-20151017+/configure 2015-10-17 23:05:27.000000000 +0000
+++ ncurses-6.0-20151024/configure 2015-10-24 22:43:05.000000000 +0000
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 1.620 .
+# From configure.in Revision: 1.621 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by Autoconf 2.52.20150926.
#
@@ -6663,8 +6663,8 @@
# compile source, make library
if make -f conftest.mk 2>&5 >/dev/null
then
- # test for missing symbol
- cf_missing=`nm -P conftest.so 2>&5 |fgrep _ismissing | egrep '[ ]T[ ]'`
+ # test for missing symbol in either Data or Text section
+ cf_missing=`nm -P conftest.so 2>&5 |fgrep _ismissing | egrep '[ ][DT][ ]'`
test -n "$cf_missing" && WILDCARD_SYMS=yes
fi
echo "$as_me:6670: result: $WILDCARD_SYMS" >&5
@@ -7060,7 +7060,7 @@
fi;
echo "$as_me:7061: result: $with_fallback" >&5
echo "${ECHO_T}$with_fallback" >&6
-FALLBACK_LIST=`echo "$with_fallback" | sed -e 's/,/ /g'`
+FALLBACK_LIST=`test "$with_fallback" != no && echo "$with_fallback" | sed -e 's/,/ /g'`
echo "$as_me:7065: checking if you want modern xterm or antique" >&5
echo $ECHO_N "checking if you want modern xterm or antique... $ECHO_C" >&6
Index: configure.in
Prereq: 1.620
--- ncurses-6.0-20151017+/configure.in 2015-10-17 23:01:54.000000000 +0000
+++ ncurses-6.0-20151024/configure.in 2015-10-24 17:57:55.000000000 +0000
@@ -28,14 +28,14 @@
dnl
dnl Author: Thomas E. Dickey 1995-on
dnl
-dnl $Id: configure.in,v 1.620 2015/10/17 23:01:54 tom Exp $
+dnl $Id: configure.in,v 1.621 2015/10/24 17:57:55 Tomas.Cech 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.52.20030208)
-AC_REVISION($Revision: 1.620 $)
+AC_REVISION($Revision: 1.621 $)
AC_INIT(ncurses/base/lib_initscr.c)
AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
@@ -566,7 +566,7 @@
[with_fallback=$withval],
[with_fallback=])
AC_MSG_RESULT($with_fallback)
-FALLBACK_LIST=`echo "$with_fallback" | sed -e 's/,/ /g'`
+FALLBACK_LIST=`test "$with_fallback" != no && echo "$with_fallback" | sed -e 's/,/ /g'`
AC_SUBST(FALLBACK_LIST)
AC_MSG_CHECKING(if you want modern xterm or antique)
Index: dist.mk
Prereq: 1.1074
--- ncurses-6.0-20151017+/dist.mk 2015-10-17 20:29:47.000000000 +0000
+++ ncurses-6.0-20151024/dist.mk 2015-10-24 13:10:18.000000000 +0000
@@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.1074 2015/10/17 20:29:47 tom Exp $
+# $Id: dist.mk,v 1.1075 2015/10/24 13:10:18 tom Exp $
# Makefile for creating ncurses distributions.
#
# This only needs to be used directly as a makefile by developers, but
@@ -37,7 +37,7 @@
# These define the major/minor/patch versions of ncurses.
NCURSES_MAJOR = 6
NCURSES_MINOR = 0
-NCURSES_PATCH = 20151017
+NCURSES_PATCH = 20151024
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
Index: doc/html/man/captoinfo.1m.html
--- ncurses-6.0-20151017+/doc/html/man/captoinfo.1m.html 2015-09-26 22:08:45.000000000 +0000
+++ ncurses-6.0-20151024/doc/html/man/captoinfo.1m.html 2015-10-25 00:21:09.000000000 +0000
@@ -205,7 +205,7 @@
<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.0 (patch 20150926).
+ This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20151024).
</PRE>
Index: doc/html/man/clear.1.html
--- ncurses-6.0-20151017+/doc/html/man/clear.1.html 2015-09-26 22:08:45.000000000 +0000
+++ ncurses-6.0-20151024/doc/html/man/clear.1.html 2015-10-25 00:21:09.000000000 +0000
@@ -71,7 +71,7 @@
<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.0 (patch 20150926).
+ This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20151024).
Index: doc/html/man/curs_attr.3x.html
--- ncurses-6.0-20151017+/doc/html/man/curs_attr.3x.html 2015-09-26 23:25:17.000000000 +0000
+++ ncurses-6.0-20151024/doc/html/man/curs_attr.3x.html 2015-10-25 00:23:27.000000000 +0000
@@ -27,7 +27,7 @@
* sale, use or other dealings in this Software without prior written *
* authorization. *
****************************************************************************
- * @Id: curs_attr.3x,v 1.41 2015/09/05 21:13:25 tom Exp @
+ * @Id: curs_attr.3x,v 1.42 2015/10/24 19:10:42 Sven.Joachim Exp @
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
<HTML>
@@ -126,7 +126,7 @@
<H3><a name="h3-attr_set">attr_set</a></H3><PRE>
The <STRONG>attrset</STRONG> routine is actually a legacy feature predating
SVr4 curses but kept in X/Open Curses for the same reason
- that SVr4 curses kept it: compatbility. The routine <STRONG>at-</STRONG>
+ that SVr4 curses kept it: compatibility. The routine <STRONG>at-</STRONG>
<STRONG>tr_set</STRONG> provides for passing a color-pair parameter.
The remaining <STRONG>attr_</STRONG>* functions operate exactly like the
Index: doc/html/man/form.3x.html
--- ncurses-6.0-20151017+/doc/html/man/form.3x.html 2015-09-26 22:08:49.000000000 +0000
+++ ncurses-6.0-20151024/doc/html/man/form.3x.html 2015-10-25 00:21:13.000000000 +0000
@@ -245,7 +245,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.0 (patch 20150926).
+ This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20151024).
Index: doc/html/man/infocmp.1m.html
--- ncurses-6.0-20151017+/doc/html/man/infocmp.1m.html 2015-09-26 22:08:50.000000000 +0000
+++ ncurses-6.0-20151024/doc/html/man/infocmp.1m.html 2015-10-25 00:21:14.000000000 +0000
@@ -487,7 +487,7 @@
http://invisible-island.net/ncurses/tctest.html
- This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150926).
+ This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20151024).
</PRE>
Index: doc/html/man/infotocap.1m.html
--- ncurses-6.0-20151017+/doc/html/man/infotocap.1m.html 2015-09-26 22:08:50.000000000 +0000
+++ ncurses-6.0-20151024/doc/html/man/infotocap.1m.html 2015-10-25 00:21:14.000000000 +0000
@@ -94,7 +94,7 @@
<H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
<STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
- This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150926).
+ This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20151024).
</PRE>
Index: doc/html/man/menu.3x.html
--- ncurses-6.0-20151017+/doc/html/man/menu.3x.html 2015-09-26 22:08:51.000000000 +0000
+++ ncurses-6.0-20151024/doc/html/man/menu.3x.html 2015-10-25 00:21:15.000000000 +0000
@@ -227,7 +227,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.0 (patch 20150926).
+ This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20151024).
Index: doc/html/man/ncurses.3x.html
--- ncurses-6.0-20151017+/doc/html/man/ncurses.3x.html 2015-09-26 22:08:52.000000000 +0000
+++ ncurses-6.0-20151024/doc/html/man/ncurses.3x.html 2015-10-25 00:21:16.000000000 +0000
@@ -63,7 +63,7 @@
sonable optimization. This implementation is "new curses"
(ncurses) and is the approved replacement for 4.4BSD clas-
sic curses, which has been discontinued. This describes
- <STRONG>ncurses</STRONG> version 6.0 (patch 20150926).
+ <STRONG>ncurses</STRONG> version 6.0 (patch 20151024).
The <STRONG>ncurses</STRONG> library emulates the curses library of System
V Release 4 UNIX, and XPG4 (X/Open Portability Guide)
Index: doc/html/man/panel.3x.html
--- ncurses-6.0-20151017+/doc/html/man/panel.3x.html 2015-09-26 22:08:52.000000000 +0000
+++ ncurses-6.0-20151024/doc/html/man/panel.3x.html 2015-10-25 00:21:16.000000000 +0000
@@ -218,7 +218,7 @@
<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.0 (patch 20150926).
+ This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20151024).
</PRE>
Index: doc/html/man/tabs.1.html
--- ncurses-6.0-20151017+/doc/html/man/tabs.1.html 2015-09-26 22:08:52.000000000 +0000
+++ ncurses-6.0-20151024/doc/html/man/tabs.1.html 2015-10-25 00:21:16.000000000 +0000
@@ -168,7 +168,7 @@
<H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
<STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <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.0 (patch 20150926).
+ This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20151024).
Index: doc/html/man/terminfo.5.html
--- ncurses-6.0-20151017+/doc/html/man/terminfo.5.html 2015-09-26 22:08:53.000000000 +0000
+++ ncurses-6.0-20151024/doc/html/man/terminfo.5.html 2015-10-25 00:21:17.000000000 +0000
@@ -78,7 +78,7 @@
nals by giving a set of capabilities which they have, by
specifying how to perform screen operations, and by speci-
fying padding requirements and initialization sequences.
- This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150926).
+ This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20151024).
Entries in <EM>terminfo</EM> consist of a sequence of `,' separated
fields (embedded commas may be escaped with a backslash or
Index: doc/html/man/tic.1m.html
--- ncurses-6.0-20151017+/doc/html/man/tic.1m.html 2015-09-26 22:08:53.000000000 +0000
+++ ncurses-6.0-20151024/doc/html/man/tic.1m.html 2015-10-25 00:21:17.000000000 +0000
@@ -408,7 +408,7 @@
<STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="captoinfo.1m.html">captoinfo(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>.
- This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150926).
+ This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20151024).
</PRE>
Index: doc/html/man/toe.1m.html
--- ncurses-6.0-20151017+/doc/html/man/toe.1m.html 2015-09-26 22:08:53.000000000 +0000
+++ ncurses-6.0-20151024/doc/html/man/toe.1m.html 2015-10-25 00:21:17.000000000 +0000
@@ -122,7 +122,7 @@
<STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>, <STRONG><A HREF="infotocap.1m.html">infotocap(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.0 (patch 20150926).
+ This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20151024).
Index: doc/html/man/tput.1.html
--- ncurses-6.0-20151017+/doc/html/man/tput.1.html 2015-09-26 22:08:53.000000000 +0000
+++ ncurses-6.0-20151024/doc/html/man/tput.1.html 2015-10-25 00:21:17.000000000 +0000
@@ -338,7 +338,7 @@
<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="terminfo.5.html">terminfo(5)</A></STRONG>, <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>.
- This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150926).
+ This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20151024).
Index: doc/html/man/tset.1.html
--- ncurses-6.0-20151017+/doc/html/man/tset.1.html 2015-09-26 22:08:53.000000000 +0000
+++ ncurses-6.0-20151024/doc/html/man/tset.1.html 2015-10-25 00:21:17.000000000 +0000
@@ -319,7 +319,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.0 (patch 20150926).
+ This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20151024).
Index: man/curs_attr.3x
Prereq: 1.41
--- ncurses-6.0-20151017+/man/curs_attr.3x 2015-09-05 21:13:25.000000000 +0000
+++ ncurses-6.0-20151024/man/curs_attr.3x 2015-10-24 19:10:42.000000000 +0000
@@ -27,7 +27,7 @@
.\" authorization. *
.\"***************************************************************************
.\"
-.\" $Id: curs_attr.3x,v 1.41 2015/09/05 21:13:25 tom Exp $
+.\" $Id: curs_attr.3x,v 1.42 2015/10/24 19:10:42 Sven.Joachim Exp $
.TH curs_attr 3X ""
.na
.hy 0
@@ -148,7 +148,7 @@
.SS attr_set
The \fBattrset\fP routine is actually a legacy feature predating SVr4 curses
but kept in X/Open Curses for the same reason that SVr4 curses kept it:
-compatbility.
+compatibility.
The routine \fBattr_set\fP provides for passing a color-pair parameter.
.PP
The remaining \fBattr_\fR* functions operate exactly like the corresponding
Index: misc/terminfo.src
--- ncurses-6.0-20151017+/misc/terminfo.src 2015-07-25 19:27:20.000000000 +0000
+++ ncurses-6.0-20151024/misc/terminfo.src 2015-10-24 17:56:55.000000000 +0000
@@ -6,8 +6,8 @@
# Report bugs and new terminal descriptions to
# bug-ncurses@gnu.org
#
-# $Revision: 1.549 $
-# $Date: 2015/07/25 19:27:20 $
+# $Revision: 1.554 $
+# $Date: 2015/10/24 16:00:04 $
#
# 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
@@ -1246,9 +1246,50 @@
nsterm-build343|Terminal.app in OS X 10.10,
kend=\EOF, khome=\EOH, use=nsterm-build326,
+# reviewed Terminal.app in El Capitan (version 2.6 build 361) -TD
+# Using vttest:
+# + no vt52 mode for cursor keys, though vt52 screen works in vttest
+# + f1-f4 map to pf1-pf4
+# + no vt220 support aside from DECTCEM and ECH
+# + there are no protected areas. Forget about anything above vt220.
+# + in ECMA-48 cursor movement, VPR and HPR fail. Others work.
+# + vttest color 11.6.4 and 11.6.5 (bce for ED/EL and ECH/indexing) are bce
+# + but bce fails for 11.6.7.2 (test repeat).
+# + SD (11.6.7.3) also fails, but SL/SR/SU work.
+# + 11.6.6 (test insert/delete char/line with bce) has several failures.
+# + normal (not X10 or Highlight tracking) mouse now works.
+# + mouse any-event works
+# + mouse button-event works
+# + in alternate screen:
+# mode 47/48 work
+# mode 1047 fails to restore cursor position (do not use)
+# mode 1049 fails to restore screen contents (do not use)
+# + dtterm window-modify operations work (some messages are not printed)
+# + dtterm window-report gives size of window in characters/pixels as
+# well as state of window.
+# Using tack:
+# + there is no difference between cnorm/cvvis
+# + has dim/invis/blink (no protect of course)
+# + most function keys with shift/control modifiers give beep
+# (user can configure, but out-of-the-box is what I record)
+# + shift-F5 is \E[25~ through shift-F12 is \E[34~ (skips \E[30~ between
+# F8 and F9).
+# + kLFT5/kRIT5 work, but not up/down with control-modifier
+# + kLFT/kRIT work, but not up/down with shift-modifier
+# + there are a few predefined bindings with Alt, but no clear pattern.
+# + uses alt-key as UTF-8 "meta" something like xterm altSendsEscape
+# Using ncurses test-program with xterm-new:
+# + no italics
+# Using xterm's scripts:
+# + palette for 256-colors is hardcoded.
+# + no support for "dynamic colors"
+# + no support for tcap-query.
+nsterm-build361|Terminal.app in OS X 10.11,
+ kmous=\E[M, use=nsterm-build343,
+
# This is an alias which should always point to the "current" version
nsterm|Apple_Terminal|AppKit Terminal.app,
- use=nsterm-build343,
+ use=nsterm-build361,
# iTerm.app from http://iterm.sourceforge.net/ is an alternative (and
# more featureful) terminal emulator for Mac OS X. It is similar
@@ -6278,7 +6319,7 @@
#### Pilot Pro Palm-Top
#
# Termcap for Top Gun Telnet and SSH on the Palm Pilot.
-# http://www.ai/~iang/TGssh/
+# https://web.archive.org/web/20051103015726/http://www.ai/~iang/TGssh/
pilot|tgtelnet|Top Gun Telnet on the Palm Pilot Professional,
OTbs, am, xenl,
cols#39, lines#16,
@@ -6429,7 +6470,7 @@
# underline and standout.
#
# Since the documentation and terminfo do not agree, see also current code at
-# http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/uts/common/io/tem_safe.c
+# https://web.archive.org/web/20091231042744/http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/uts/common/io/tem_safe.c
#
# That (actually a different driver which "supports" sun-color) also supports
# these features:
@@ -9708,7 +9749,8 @@
# Wyse sales can be reached by phone at 1-800-GET-WYSE. Tech support is at
# (800)-800-WYSE (option 5 gets you a human). There's a Web page at the
# obvious address, <http://www.wyse.com>. They keep terminfo entries at
-# <http://www.wyse.co.uk/support/appnotes/idxappnt.htm>.
+# https://web.archive.org/web/19970712022641/http://www.wyse.co.uk/support/appnotes/idxappnt.htm
+#
#
# Wyse bought out Link Technology, Inc. in 1990 and closed it down in 1995.
# They now own the Qume and Amdek brands, too. So these are the people to
@@ -12980,7 +13022,7 @@
#
# Update by TD - 2004:
# Adapted from
-# http://www.cs.utk.edu/~shuford/terminal/adds_viewpoint_news.txt
+# https://web.archive.org/web/19990922005103/http://www.cs.utk.edu/~shuford/terminal/adds_viewpoint_news.txt
#
# COMMANDS ASCII CODE
#
@@ -18456,7 +18498,7 @@
#
# See
-# http://www.minix3.org/manpages/html4/console.html
+# https://web.archive.org/web/20120703021949/http://www.minix3.org/manpages/html4/console.html
minix|minix console (v3),
acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330}\234~\376,
kdch1=\177, kend=\E[Y, kf0=\E[21~, kf1=\E[11~, kf10=\E[21~,
@@ -18644,16 +18686,19 @@
minitel1|minitel 1,
am, bw, eslok, hs, hz, msgr,
colors#8, cols#40, lines#24, pairs#8,
- acsc=+.\,\,./f0g1, bel=^G, blink=\EH, civis=^T, clear=^L,
- cnorm=^Q, cr=^M, cub1=^H, cud1=^J, cuf1=^I,
- cup=\037%p1%{65}%+%c%p2%{65}%+%c, cuu1=^K, el=^X,
- enacs=^Y, fsl=^J, home=^^, ind=^J,
- is2=\E;`ZQ\E\:iC\E\:iE\021, nel=^M^J, op=\EG,
- rep=%p1%c\022%p2%{63}%+%c, rev=\E], ri=^K, rmso=\E\\,
- setf=\E%?%p1%{1}%=%tD%e%p1%{3}%=%tF%e%p1%{4}%=%tA%e%p1%{6}%=%tC%e%p1%{64}%+%c%;,
+ bel=^G, blink=\EH, civis=^T, clear=^L, cnorm=^Q, cr=^M,
+ cub1=^H, cud1=^J, cuf1=^I,
+ cup=\037%p1%'A'%+%c%p2%'A'%+%c, cuu1=^K, el=^X,
+ flash=\037@A\EW \177\022\177\022P\r\030\n, fsl=^J,
+ home=^^, ind=^J, is2=\E;`ZQ\E\:iC\E\:iE\021, nel=^M^J,
+ op=\EG, rep=%p1%c\022%p2%'?'%+%c, rev=\E], ri=^K,
+ rmso=\E\\,
+ setf=\E%?%p1%{1}%=%tD%e%p1%{3}%=%tF%e%p1%{4}%=%tA%e%p1%{6}%=%tC%e%p1%'@'%+%c%;,
sgr=%?%p1%t\E]%;%?%p3%t\E]%;%?%p4%t\EH%;,
- sgr0=\EI\E\\, smso=\E], tsl=\037@%p1%{65}%+%c,
-# is2=Fnct TE, Fnct MR, Fnct CM et pour finir: curseur ON.
+ sgr0=\EI\E\\, smso=\E], tsl=\037@%p1%'A'%+%c,
+ u6=\037%c%'A'%-%c%'A'%-, u7=\Ea, .acsc=}#f0g1\,\,+../,
+ .enacs=^Y, .rs2=^L, .u8=\001Br4\004, .u9=\E9{,
+# is2=Fnct TE, Fnct ER, Fnct CM et pour finir: curseur ON.
minitel1b|minitel 1-bistandard (in 40cols mode),
mir,
cub=\E[%p1%dD, cud=\E[%p1%dB, cuf=\E[%p1%dC,
@@ -18661,21 +18706,37 @@
dl1=\E[M, ed=\E[J, el1=\E[1K, il=\E[%p1%dL, il1=\E[L,
is1=\E;iYA\E;jYC, kclr=\E[2J, kctab=^I, kcub1=\E[D,
kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[P, kdl1=\E[M,
- kel=^X, khome=\E[H, kich1=\E[4h, kil1=\E[L, rmir=\E[4l,
- smir=\E[4h, smkx=\E;iYA\E;jYC, use=minitel1,
-# <rmkx> posait des problemes (logout en sortant de vi).
+ khome=\E[H, kich1=\E[4h, kil1=\E[L, rmir=\E[4l, smir=\E[4h,
+ .ich=\E[%p1%d@, .ich1=\E[@, .kel=^X, .rmkx=\E;jYA,
+ .smkx=\E;iYA\E;jYC, .u8=\001Cu<\004, use=minitel1,
+# rmkx posait des problemes (logout en sortant de vi).
minitel1b-80|minitel 1-bistandard (standard teleinformatique),
am@, bw@, hz@,
colors@, cols#80, it#8, pairs@,
blink=\E[5m, bold=\E[1m, civis=\037@A\024\n,
- clear=\E[H\E[2J, cnorm=\037@A\021\n, cuf1=\E[C,
+ clear=\E[H\E[J, cnorm=\037@A\021\n, cuf1=\E[C,
cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, el=\E[K, home=\E[H,
- ht=^I, ind=\ED, is1@, is2@, kent=\EOM, kf0=\EOp, kf1=\EOq,
- kf2=\EOr, kf3=\EOs, kf4=\EOt, kf5=\EOu, kf6=\EOv, kf7=\EOw,
- kf8=\EOx, kf9=\EOy, nel=\EE, op@, rc=\E8, rep@, rev=\E[7m,
- ri=\EM, rmkx@, rmso=\E[27m, rmul=\E[24m, sc=\E7, setf@,
- sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;m,
- sgr0=\E[m, smkx@, smso=\E[7m, smul=\E[4m, use=minitel1b,
+ ht=^I, ind=\ED, is1@, is2@, kbs=\EOl, kcan=\EOQ, kent=\EOM,
+ kf0=\EOp, kf1=\EOq, kf2=\EOr, kf3=\EOs, kf4=\EOt, kf5=\EOu,
+ kf6=\EOv, kf7=\EOw, kf8=\EOx, kf9=\EOy, khlp=\EOm, knp=\EOn,
+ kpp=\EOR, krfr=\EOS, nel=\EE, op@, rc=\E8, rep@, rev=\E[7m,
+ ri=\EM, rmkx@, rmso=\E[27m, rmul=\E[24m, rs2=\E[H\E[J\E[m,
+ sc=\E7, setf@, sgr@, sgr0=\E[m, smkx@, smso=\E[7m, smul=\E[4m,
+ u6@, u7@, .acsc=}#f[, .enacs=^O, .mc0=\E[i, .rmacs=^O,
+ .rs2=\Ec,
+ .sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;m,
+ .smacs=^N, use=minitel1b,
+minitel1b-nb|minitel 1b (40cols) noir & blanc sans couleurs avec bold et dim ...,
+ colors@, pairs@,
+ acsc=`>a9f!j%k4l<m-n=p#q\,rpt=u5v-w<x5yvzy|l~$,
+ bold=\EG, clear=^L\EB, cup=\E[%i%p1%d;%p2%dH, dim=\ED,
+ home=^^\EB, kend=\E)4\r, kf0=^Y0, kf1=\E$4\r, kf11=^Y1,
+ kf12=^Y/, kf2=\E#4\r, kf3=\E&4\r, kf4=\E!4\r, kf5=\E'4\r,
+ kf6=\E/4\r, kf7=^Y8, kf8=^Y\,, kf9=^Y., knp=\E(4\r,
+ kpp=\E"4\r, op@, rmacs=^O, setf@,
+ sgr=%?%p1%p3%O%t\E]%;%?%p4%t\EH%;%?%p5%t\ED%;%?%p6%t\EG%;,
+ sgr0=\EI\E\\\EB, smacs=^N, .invis=\E@, .rs2=^L\EB,
+ .u8=\001Cu|\004, use=minitel1b,
######## OBSOLETE VDT TYPES
#
@@ -23374,7 +23435,7 @@
# FreeMiNT by Guido Flohr (from patch/report by Alan Hourihane).
#
# 2010-06-12
-# * add mlterm+256color entry -TD
+# * add mlterm-256color entry -TD
#
# 2010-07-17
# * add hard-reset for rs2 to wsvt25 to help ensure that reset ends
@@ -23702,4 +23763,11 @@
# + add status line to tmux via xterm+sl (patch by Nicholas Marriott).
# + fixes for st 0.5 from testing with tack -TD
#
+# 2015-10-24
+# + updated minitel entries to fix kel problem with emacs, and add
+# minitel1b-nb (Alexandre Montaron).
+# + reviewed/updated nsterm entry Terminal.app in OSX -TD
+# + replace some dead URLs in comments with equivalents from the
+# Internet Archive -TD
+#
######## SHANTIH! SHANTIH! SHANTIH!
Index: ncurses/tty/MKexpanded.sh
Prereq: 1.17
--- ncurses-6.0-20151017+/ncurses/tty/MKexpanded.sh 2010-01-23 17:57:43.000000000 +0000
+++ ncurses-6.0-20151024/ncurses/tty/MKexpanded.sh 2015-10-24 23:39:24.000000000 +0000
@@ -1,6 +1,6 @@
#! /bin/sh
##############################################################################
-# Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. #
+# Copyright (c) 1998-2010,2015 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"), #
@@ -29,7 +29,7 @@
#
# Author: Thomas E. Dickey, 1997-on
#
-# $Id: MKexpanded.sh,v 1.17 2010/01/23 17:57:43 tom Exp $
+# $Id: MKexpanded.sh,v 1.18 2015/10/24 23:39:24 tom Exp $
#
# Script to generate 'expanded.c', a dummy source that contains functions
# corresponding to complex macros used in this library. By making functions,
@@ -125,7 +125,7 @@
EOF
$preprocessor $TMP 2>/dev/null | \
- sed -e '1,/^IGNORE$/d' -e 's/^@/#/' -e 's/^#if_/#if /'
+ sed -e '1,/^IGNORE$/d' -e 's/^@/#/' -e 's/^#if_/#if /' -e "s,$TMP,expanded.c,"
cat <<EOF
#else /* ! NCURSES_EXPANDED */
Index: package/debian-mingw/changelog
--- ncurses-6.0-20151017+/package/debian-mingw/changelog 2015-10-17 20:29:47.000000000 +0000
+++ ncurses-6.0-20151024/package/debian-mingw/changelog 2015-10-24 13:10:18.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20151017) unstable; urgency=low
+ncurses6 (6.0+20151024) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 17 Oct 2015 16:29:47 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 24 Oct 2015 09:10:18 -0400
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian-mingw64/changelog
--- ncurses-6.0-20151017+/package/debian-mingw64/changelog 2015-10-17 20:29:47.000000000 +0000
+++ ncurses-6.0-20151024/package/debian-mingw64/changelog 2015-10-24 13:10:18.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20151017) unstable; urgency=low
+ncurses6 (6.0+20151024) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 17 Oct 2015 16:29:47 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 24 Oct 2015 09:10:18 -0400
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian/changelog
--- ncurses-6.0-20151017+/package/debian/changelog 2015-10-17 20:29:47.000000000 +0000
+++ ncurses-6.0-20151024/package/debian/changelog 2015-10-24 13:10:18.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20151017) unstable; urgency=low
+ncurses6 (6.0+20151024) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 17 Oct 2015 16:29:47 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 24 Oct 2015 09:10:18 -0400
ncurses6 (5.9-20120608) unstable; urgency=low
Index: package/mingw-ncurses.nsi
Prereq: 1.127
--- ncurses-6.0-20151017+/package/mingw-ncurses.nsi 2015-10-17 20:29:47.000000000 +0000
+++ ncurses-6.0-20151024/package/mingw-ncurses.nsi 2015-10-24 13:10:18.000000000 +0000
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.127 2015/10/17 20:29:47 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.128 2015/10/24 13:10:18 tom Exp $
; TODO add examples
; TODO bump ABI to 6
@@ -10,7 +10,7 @@
!define VERSION_MAJOR "6"
!define VERSION_MINOR "0"
!define VERSION_YYYY "2015"
-!define VERSION_MMDD "1017"
+!define VERSION_MMDD "1024"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"
Index: package/mingw-ncurses.spec
--- ncurses-6.0-20151017+/package/mingw-ncurses.spec 2015-10-17 20:29:47.000000000 +0000
+++ ncurses-6.0-20151024/package/mingw-ncurses.spec 2015-10-24 13:10:18.000000000 +0000
@@ -3,7 +3,7 @@
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 6.0
-Release: 20151017
+Release: 20151024
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncurses.spec
--- ncurses-6.0-20151017+/package/ncurses.spec 2015-10-17 20:29:47.000000000 +0000
+++ ncurses-6.0-20151024/package/ncurses.spec 2015-10-24 13:10:18.000000000 +0000
@@ -1,7 +1,7 @@
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 6.0
-Release: 20151017
+Release: 20151024
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: test/ncurses.c
Prereq: 1.420
--- ncurses-6.0-20151017+/test/ncurses.c 2015-05-23 23:41:25.000000000 +0000
+++ ncurses-6.0-20151024/test/ncurses.c 2015-10-24 23:32:57.000000000 +0000
@@ -40,7 +40,7 @@
Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993
Thomas E. Dickey (beginning revision 1.27 in 1996).
-$Id: ncurses.c,v 1.420 2015/05/23 23:41:25 tom Exp $
+$Id: ncurses.c,v 1.421 2015/10/24 23:32:57 tom Exp $
***************************************************************************/
@@ -1255,9 +1255,10 @@
#define ATTRSTRING_1ST 32 /* ' ' */
#define ATTRSTRING_END 126 /* '~' */
-#define COL_ATTRSTRING 25
-#define MARGIN_4_ATTRS (COL_ATTRSTRING + 8)
-#define LEN_ATTRSTRING (COLS - MARGIN_4_ATTRS)
+#define COLS_PRE_ATTRS 5
+#define COLS_AFT_ATTRS 15
+#define COL_ATTRSTRING (COLS_PRE_ATTRS + 17)
+#define LEN_ATTRSTRING (COLS - (COL_ATTRSTRING + COLS_AFT_ATTRS))
#define MAX_ATTRSTRING (ATTRSTRING_END + 1 - ATTRSTRING_1ST)
static char attr_test_string[MAX_ATTRSTRING + 1];
@@ -1415,8 +1416,8 @@
chtype test = attr & (chtype) (~A_ALTCHARSET);
if (arrow)
- MvPrintw(row, 5, "-->");
- MvPrintw(row, 8, "%s mode:", name);
+ MvPrintw(row, COLS_PRE_ATTRS - 3, "-->");
+ MvPrintw(row, COLS_PRE_ATTRS, "%s mode:", name);
MvPrintw(row, COL_ATTRSTRING - 1, "|");
if (skip)
printw("%*s", skip, " ");
@@ -1661,10 +1662,10 @@
my_list[j].name);
}
- MvPrintw(row, 8,
+ MvPrintw(row, COLS_PRE_ATTRS,
"This terminal does %shave the magic-cookie glitch",
get_xmc() > -1 ? "" : "not ");
- MvPrintw(row + 1, 8, "Enter '?' for help.");
+ MvPrintw(row + 1, COLS_PRE_ATTRS, "Enter '?' for help.");
show_color_attr(fg, bg, tx);
printw(" ACS (%d)", ac != 0);
@@ -1802,8 +1803,8 @@
chtype test = attr & ~WA_ALTCHARSET;
if (arrow)
- MvPrintw(row, 5, "-->");
- MvPrintw(row, 8, "%s mode:", name);
+ MvPrintw(row, COLS_PRE_ATTRS - 3, "-->");
+ MvPrintw(row, COLS_PRE_ATTRS, "%s mode:", name);
MvPrintw(row, COL_ATTRSTRING - 1, "|");
if (skip)
printw("%*s", skip, " ");
@@ -2012,10 +2013,10 @@
my_list[j].name);
}
- MvPrintw(row, 8,
+ MvPrintw(row, COLS_PRE_ATTRS,
"This terminal does %shave the magic-cookie glitch",
get_xmc() > -1 ? "" : "not ");
- MvPrintw(row + 1, 8, "Enter '?' for help.");
+ MvPrintw(row + 1, COLS_PRE_ATTRS, "Enter '?' for help.");
show_color_attr(fg, bg, tx);
printw(" ACS (%d)", ac != 0);
@@ -5523,7 +5524,6 @@
Cannot("cannot create requested pad");
return;
}
-
#ifdef A_COLOR
if (colored && use_colors) {
init_pair(1, COLOR_BLACK, COLOR_GREEN);

12290
ncurses-6.0-20151101.patch
View File

File diff suppressed because it is too large Load Diff

694
ncurses-6.0-20151107.patch
View File

@ -1,694 +0,0 @@
# ncurses 6.0 - patch 20151107 - Thomas E. Dickey
#
# ------------------------------------------------------------------------------
#
# Ncurses 6.0 is at
# ftp.gnu.org:/pub/gnu
#
# Patches for ncurses 6.0 can be found at
# ftp://invisible-island.net/ncurses/6.0
# http://invisible-mirror.net/archives/ncurses/6.0
#
# ------------------------------------------------------------------------------
# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20151107.patch.gz
# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created Sun Nov 8 02:34:05 UTC 2015
# ------------------------------------------------------------------------------
# NEWS | 15 +++++
# VERSION | 2
# aclocal.m4 | 10 +--
# configure | 96 +++++++++++++++++++------------------
# configure.in | 10 ++-
# dist.mk | 4 -
# package/debian-mingw/changelog | 4 -
# package/debian-mingw64/changelog | 4 -
# package/debian/changelog | 4 -
# package/mingw-ncurses.nsi | 4 -
# package/mingw-ncurses.spec | 2
# package/ncurses.spec | 2
# progs/tset.c | 7 --
# 13 files changed, 91 insertions(+), 73 deletions(-)
# ------------------------------------------------------------------------------
Index: NEWS
Prereq: 1.2522
--- ncurses-6.0-20151101+/NEWS 2015-11-01 10:27:24.000000000 +0000
+++ ncurses-6.0-20151107/NEWS 2015-11-08 01:57:15.000000000 +0000
@@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.2522 2015/11/01 10:27:24 tom Exp $
+-- $Id: NEWS,v 1.2526 2015/11/08 01:57:15 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
@@ -45,6 +45,19 @@
Changes through 1.9.9e did not credit all contributions;
it is not possible to add this information.
+20151107
+ + modify tset's assignment to TERM in its output to reflect the name by
+ which the terminal description is found, rather than the primary
+ name. That was an unnecessary part from the initial conversion of
+ tset from termcap to terminfo. The termcap program in 4.3BSD did
+ this to avoid using the short 2-character name (report by Rich
+ Burridge).
+ + minor fix to configure script to ensure that rules for resulting.map
+ are only generated when needed (cf: 20151101).
+ + modify configure script to handle the case where tic-library is
+ renamed, but the --with-debug option is used by itself without
+ normal or shared libraries (prompted by comment in Debian #803482).
+
20151101
+ amend change for pkg-config which allows build of pc-files when no
valid pkg-config library directory was configured to suppress the
Index: VERSION
--- ncurses-6.0-20151101+/VERSION 2015-11-01 10:25:33.000000000 +0000
+++ ncurses-6.0-20151107/VERSION 2015-11-06 00:44:10.000000000 +0000
@@ -1 +1 @@
-5:0:9 6.0 20151101
+5:0:9 6.0 20151107
Index: aclocal.m4
Prereq: 1.783
--- ncurses-6.0-20151101+/aclocal.m4 2015-11-01 10:29:05.000000000 +0000
+++ ncurses-6.0-20151107/aclocal.m4 2015-11-08 01:03:06.000000000 +0000
@@ -28,7 +28,7 @@
dnl
dnl Author: Thomas E. Dickey 1995-on
dnl
-dnl $Id: aclocal.m4,v 1.783 2015/11/01 10:29:05 tom Exp $
+dnl $Id: aclocal.m4,v 1.785 2015/11/08 01:03:06 tom Exp $
dnl Macros used in NCURSES auto-configuration script.
dnl
dnl These macros are maintained separately from NCURSES. The copyright on
@@ -3241,7 +3241,7 @@
AC_SUBST(LIB_PREFIX)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_LIB_RULES version: 85 updated: 2015/10/31 20:06:35
+dnl CF_LIB_RULES version: 86 updated: 2015/11/07 20:01:34
dnl ------------
dnl Append definitions and rules for the given models to the subdirectory
dnl Makefiles, and the recursion rule for the top-level Makefile. If the
@@ -3293,8 +3293,7 @@
SHARED_LIB=
Libs_To_Make=
-
- cf_awk_program="BEGIN { skip = 1; last=\"\"; }"
+ cf_awk_program=
if test -n "${cf_cv_abi_version}" && test "x${cf_cv_abi_version}" != "x5"
then
cf_awk_program="$cf_awk_program\
@@ -3316,7 +3315,8 @@
# Generated by CF_LIB_RULES
resulting.map: $UNALTERED_SYMS
- $AWK '$cf_awk_program \
+ $AWK 'BEGIN { skip = 1; last=""; } \
+$cf_awk_program \
{ if ( last != "" && ( skip == 0 || \[$]\[$]0 !~ /}/ ) ) { print last; }\
skip = 0; last = \[$]\[$]0; } \
END { print last; }' < $UNALTERED_SYMS >\[$]@
Index: configure
--- ncurses-6.0-20151101+/configure 2015-11-01 10:12:02.000000000 +0000
+++ ncurses-6.0-20151107/configure 2015-11-08 01:06:42.000000000 +0000
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 1.622 .
+# From configure.in Revision: 1.623 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by Autoconf 2.52.20150926.
#
@@ -21722,17 +21722,20 @@
if test "x$with_ticlib" != xyes ; then
TICS_NAME=$with_ticlib
+ TICS_SUFFIX="`echo ${DFT_LIB_SUFFIX}|sed -e "s/^${USE_LIB_SUFFIX}//"`"
TICS_ARG_SUFFIX="${with_ticlib}`echo ${USE_ARG_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`"
TICS_DEP_SUFFIX="${with_ticlib}`echo ${DFT_DEP_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`"
TICS_LIB_SUFFIX="${with_ticlib}"
else
+ TICS_SUFFIX=${DFT_LIB_SUFFIX}
TICS_ARG_SUFFIX="${TICS_NAME}${USE_ARG_SUFFIX}"
TICS_DEP_SUFFIX="${TICS_NAME}${DFT_DEP_SUFFIX}"
TICS_LIB_SUFFIX="${TICS_NAME}${USE_LIB_SUFFIX}"
fi
TICS_LDFLAGS="-L${LIB_DIR}"
- TICS_LIBS="-l${TICS_LIB_SUFFIX}"
+ TICS_LIBS="-l${TICS_ARG_SUFFIX}"
else
+ TICS_SUFFIX=${DFT_LIB_SUFFIX}
TICS_LDFLAGS="-L${LIB_DIR}"
TICS_LIBS="-l${LIB_NAME}${USE_ARG_SUFFIX}"
fi
@@ -21856,19 +21859,19 @@
if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
then
- echo "$as_me:21859: checking if linker supports switching between static/dynamic" >&5
+ echo "$as_me:21862: checking if linker supports switching between static/dynamic" >&5
echo $ECHO_N "checking if linker supports switching between static/dynamic... $ECHO_C" >&6
rm -f libconftest.a
cat >conftest.$ac_ext <<EOF
-#line 21864 "configure"
+#line 21867 "configure"
#include <stdio.h>
int cf_ldflags_static(FILE *fp) { return fflush(fp); }
EOF
- if { (eval echo "$as_me:21868: \"$ac_compile\"") >&5
+ if { (eval echo "$as_me:21871: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:21871: \$? = $ac_status" >&5
+ echo "$as_me:21874: \$? = $ac_status" >&5
(exit $ac_status); } ; then
( $AR $ARFLAGS libconftest.a conftest.o ) 2>&5 1>/dev/null
( eval $RANLIB libconftest.a ) 2>&5 >/dev/null
@@ -21879,10 +21882,10 @@
LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 21882 "configure"
+#line 21885 "configure"
#include "confdefs.h"
-#line 21885 "configure"
+#line 21888 "configure"
#include <stdio.h>
int cf_ldflags_static(FILE *fp);
@@ -21897,16 +21900,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21900: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21903: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:21903: \$? = $ac_status" >&5
+ echo "$as_me:21906: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:21906: \"$ac_try\"") >&5
+ { (eval echo "$as_me:21909: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:21909: \$? = $ac_status" >&5
+ echo "$as_me:21912: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
# some linkers simply ignore the -dynamic
@@ -21929,7 +21932,7 @@
rm -f libconftest.*
LIBS="$cf_save_LIBS"
- echo "$as_me:21932: result: $cf_ldflags_static" >&5
+ echo "$as_me:21935: result: $cf_ldflags_static" >&5
echo "${ECHO_T}$cf_ldflags_static" >&6
if test $cf_ldflags_static != yes
@@ -21945,7 +21948,7 @@
;;
esac
-echo "$as_me:21948: checking where we will install curses.h" >&5
+echo "$as_me:21951: checking where we will install curses.h" >&5
echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
includesubdir=
@@ -21955,7 +21958,7 @@
then
includesubdir="/ncurses${USE_LIB_SUFFIX}"
fi
-echo "$as_me:21958: result: ${includedir}${includesubdir}" >&5
+echo "$as_me:21961: result: ${includedir}${includesubdir}" >&5
echo "${ECHO_T}${includedir}${includesubdir}" >&6
### Resolve a conflict between normal and wide-curses by forcing applications
@@ -21963,7 +21966,7 @@
if test "$with_overwrite" != no ; then
if test "$NCURSES_LIBUTF8" = 1 ; then
NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
- { echo "$as_me:21966: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
+ { echo "$as_me:21969: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;}
fi
fi
@@ -21981,7 +21984,7 @@
### Construct the list of subdirectories for which we'll customize makefiles
### with the appropriate compile-rules.
-echo "$as_me:21984: checking for src modules" >&5
+echo "$as_me:21987: checking for src modules" >&5
echo $ECHO_N "checking for src modules... $ECHO_C" >&6
# dependencies and linker-arguments for test-programs
@@ -22046,7 +22049,7 @@
fi
fi
done
-echo "$as_me:22049: result: $cf_cv_src_modules" >&5
+echo "$as_me:22052: result: $cf_cv_src_modules" >&5
echo "${ECHO_T}$cf_cv_src_modules" >&6
TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
@@ -22263,7 +22266,7 @@
# Extract the first word of "tic", so it can be a program name with args.
set dummy tic; ac_word=$2
-echo "$as_me:22266: checking for $ac_word" >&5
+echo "$as_me:22269: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_TIC_PATH+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22280,7 +22283,7 @@
test -z "$ac_dir" && ac_dir=.
if $as_executable_p "$ac_dir/$ac_word"; then
ac_cv_path_TIC_PATH="$ac_dir/$ac_word"
- echo "$as_me:22283: found $ac_dir/$ac_word" >&5
+ echo "$as_me:22286: found $ac_dir/$ac_word" >&5
break
fi
done
@@ -22292,10 +22295,10 @@
TIC_PATH=$ac_cv_path_TIC_PATH
if test -n "$TIC_PATH"; then
- echo "$as_me:22295: result: $TIC_PATH" >&5
+ echo "$as_me:22298: result: $TIC_PATH" >&5
echo "${ECHO_T}$TIC_PATH" >&6
else
- echo "$as_me:22298: result: no" >&5
+ echo "$as_me:22301: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -22303,7 +22306,7 @@
then
if test "$TIC_PATH" = unknown
then
- { echo "$as_me:22306: WARNING: no tic program found for fallbacks" >&5
+ { echo "$as_me:22309: WARNING: no tic program found for fallbacks" >&5
echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
fi
fi
@@ -22339,7 +22342,7 @@
(*-D_XOPEN_SOURCE_EXTENDED*)
test -n "$verbose" && echo " moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
-echo "${as_me:-configure}:22342: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
+echo "${as_me:-configure}:22345: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED"
CPPFLAGS=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/-D_XOPEN_SOURCE_EXTENDED//'`
@@ -22350,7 +22353,7 @@
# Help to automatically enable the extended curses features when using either
# the *-config or the ".pc" files by adding defines.
-echo "$as_me:22353: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
+echo "$as_me:22356: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script... $ECHO_C" >&6
PKG_CFLAGS=
for cf_loop1 in $CPPFLAGS_after_XOPEN
@@ -22366,7 +22369,7 @@
done
test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
done
-echo "$as_me:22369: result: $PKG_CFLAGS" >&5
+echo "$as_me:22372: result: $PKG_CFLAGS" >&5
echo "${ECHO_T}$PKG_CFLAGS" >&6
# AC_CHECK_SIZEOF demands a literal parameter, no variables. So we do this.
@@ -22423,7 +22426,7 @@
cf_filter_syms=$cf_dft_filter_syms
test -n "$verbose" && echo " will map symbols to ABI=$cf_cv_abi_version" 1>&6
-echo "${as_me:-configure}:22426: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
+echo "${as_me:-configure}:22429: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
fi
@@ -22525,7 +22528,7 @@
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:22528: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:22531: creating $CONFIG_STATUS" >&5
echo "$as_me: creating $CONFIG_STATUS" >&6;}
cat >$CONFIG_STATUS <<_ACEOF
#! $SHELL
@@ -22701,7 +22704,7 @@
echo "$ac_cs_version"; exit 0 ;;
--he | --h)
# Conflict between --help and --header
- { { echo "$as_me:22704: error: ambiguous option: $1
+ { { echo "$as_me:22707: error: ambiguous option: $1
Try \`$0 --help' for more information." >&5
echo "$as_me: error: ambiguous option: $1
Try \`$0 --help' for more information." >&2;}
@@ -22720,7 +22723,7 @@
ac_need_defaults=false;;
# This is an error.
- -*) { { echo "$as_me:22723: error: unrecognized option: $1
+ -*) { { echo "$as_me:22726: error: unrecognized option: $1
Try \`$0 --help' for more information." >&5
echo "$as_me: error: unrecognized option: $1
Try \`$0 --help' for more information." >&2;}
@@ -22782,6 +22785,7 @@
TICS_ARG_SUFFIX="$TICS_ARG_SUFFIX"
TICS_LIB_SUFFIX="$TICS_LIB_SUFFIX"
TICS_NAME="$TICS_NAME"
+TICS_SUFFIX="$TICS_SUFFIX"
TIC_PATH="$TIC_PATH"
TINFO_ARG_SUFFIX="$TINFO_ARG_SUFFIX"
TINFO_LIB_SUFFIX="$TINFO_LIB_SUFFIX"
@@ -22838,7 +22842,7 @@
"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
"include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
- *) { { echo "$as_me:22841: error: invalid argument: $ac_config_target" >&5
+ *) { { echo "$as_me:22845: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
{ (exit 1); exit 1; }; };;
esac
@@ -23312,7 +23316,7 @@
esac
if test x"$ac_file" != x-; then
- { echo "$as_me:23315: creating $ac_file" >&5
+ { echo "$as_me:23319: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
rm -f "$ac_file"
fi
@@ -23330,7 +23334,7 @@
-) echo $tmp/stdin ;;
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
- test -f "$f" || { { echo "$as_me:23333: error: cannot find input file: $f" >&5
+ test -f "$f" || { { echo "$as_me:23337: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
echo $f;;
@@ -23343,7 +23347,7 @@
echo $srcdir/$f
else
# /dev/null tree
- { { echo "$as_me:23346: error: cannot find input file: $f" >&5
+ { { echo "$as_me:23350: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
fi;;
@@ -23359,7 +23363,7 @@
if test -n "$ac_seen"; then
ac_used=`grep '@datarootdir@' $ac_item`
if test -z "$ac_used"; then
- { echo "$as_me:23362: WARNING: datarootdir was used implicitly but not set:
+ { echo "$as_me:23366: WARNING: datarootdir was used implicitly but not set:
$ac_seen" >&5
echo "$as_me: WARNING: datarootdir was used implicitly but not set:
$ac_seen" >&2;}
@@ -23368,7 +23372,7 @@
fi
ac_seen=`grep '${datarootdir}' $ac_item`
if test -n "$ac_seen"; then
- { echo "$as_me:23371: WARNING: datarootdir was used explicitly but not set:
+ { echo "$as_me:23375: WARNING: datarootdir was used explicitly but not set:
$ac_seen" >&5
echo "$as_me: WARNING: datarootdir was used explicitly but not set:
$ac_seen" >&2;}
@@ -23405,7 +23409,7 @@
ac_init=`egrep '[ ]*'$ac_name'[ ]*=' $ac_file`
if test -z "$ac_init"; then
ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
- { echo "$as_me:23408: WARNING: Variable $ac_name is used but was not set:
+ { echo "$as_me:23412: WARNING: Variable $ac_name is used but was not set:
$ac_seen" >&5
echo "$as_me: WARNING: Variable $ac_name is used but was not set:
$ac_seen" >&2;}
@@ -23416,7 +23420,7 @@
egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
if test -s $tmp/out; then
ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
- { echo "$as_me:23419: WARNING: Some variables may not be substituted:
+ { echo "$as_me:23423: WARNING: Some variables may not be substituted:
$ac_seen" >&5
echo "$as_me: WARNING: Some variables may not be substituted:
$ac_seen" >&2;}
@@ -23465,7 +23469,7 @@
* ) ac_file_in=$ac_file.in ;;
esac
- test x"$ac_file" != x- && { echo "$as_me:23468: creating $ac_file" >&5
+ test x"$ac_file" != x- && { echo "$as_me:23472: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
# First look for the input files in the build tree, otherwise in the
@@ -23476,7 +23480,7 @@
-) echo $tmp/stdin ;;
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
- test -f "$f" || { { echo "$as_me:23479: error: cannot find input file: $f" >&5
+ test -f "$f" || { { echo "$as_me:23483: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
echo $f;;
@@ -23489,7 +23493,7 @@
echo $srcdir/$f
else
# /dev/null tree
- { { echo "$as_me:23492: error: cannot find input file: $f" >&5
+ { { echo "$as_me:23496: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
fi;;
@@ -23547,7 +23551,7 @@
rm -f $tmp/in
if test x"$ac_file" != x-; then
if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
- { echo "$as_me:23550: $ac_file is unchanged" >&5
+ { echo "$as_me:23554: $ac_file is unchanged" >&5
echo "$as_me: $ac_file is unchanged" >&6;}
else
ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -23645,8 +23649,7 @@
SHARED_LIB=
Libs_To_Make=
-
- cf_awk_program="BEGIN { skip = 1; last=\"\"; }"
+ cf_awk_program=
if test -n "${cf_cv_abi_version}" && test "x${cf_cv_abi_version}" != "x5"
then
cf_awk_program="$cf_awk_program\
@@ -23668,7 +23671,8 @@
# Generated by CF_LIB_RULES
resulting.map: $UNALTERED_SYMS
- $AWK '$cf_awk_program \
+ $AWK 'BEGIN { skip = 1; last=""; } \
+$cf_awk_program \
{ if ( last != "" && ( skip == 0 || \$\$0 !~ /}/ ) ) { print last; }\
skip = 0; last = \$\$0; } \
END { print last; }' < $UNALTERED_SYMS >\$@
@@ -23892,7 +23896,7 @@
(cygdll|msysdll|mingw)
test "x$with_shared_cxx" = xno && test -n "$verbose" && echo " overriding CXX_MODEL to SHARED" 1>&6
-echo "${as_me:-configure}:23895: testing overriding CXX_MODEL to SHARED ..." 1>&5
+echo "${as_me:-configure}:23899: testing overriding CXX_MODEL to SHARED ..." 1>&5
with_shared_cxx=yes
;;
Index: configure.in
Prereq: 1.622
--- ncurses-6.0-20151101+/configure.in 2015-11-01 01:22:57.000000000 +0000
+++ ncurses-6.0-20151107/configure.in 2015-11-07 22:41:37.000000000 +0000
@@ -28,14 +28,14 @@
dnl
dnl Author: Thomas E. Dickey 1995-on
dnl
-dnl $Id: configure.in,v 1.622 2015/11/01 01:22:57 tom Exp $
+dnl $Id: configure.in,v 1.623 2015/11/07 22:41:37 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.52.20030208)
-AC_REVISION($Revision: 1.622 $)
+AC_REVISION($Revision: 1.623 $)
AC_INIT(ncurses/base/lib_initscr.c)
AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
@@ -1859,17 +1859,20 @@
if test "x$with_ticlib" != xyes ; then
TICS_NAME=$with_ticlib
+ TICS_SUFFIX="`echo ${DFT_LIB_SUFFIX}|sed -e "s/^${USE_LIB_SUFFIX}//"`"
TICS_ARG_SUFFIX="${with_ticlib}`echo ${USE_ARG_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`"
TICS_DEP_SUFFIX="${with_ticlib}`echo ${DFT_DEP_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`"
TICS_LIB_SUFFIX="${with_ticlib}"
else
+ TICS_SUFFIX=${DFT_LIB_SUFFIX}
TICS_ARG_SUFFIX="${TICS_NAME}${USE_ARG_SUFFIX}"
TICS_DEP_SUFFIX="${TICS_NAME}${DFT_DEP_SUFFIX}"
TICS_LIB_SUFFIX="${TICS_NAME}${USE_LIB_SUFFIX}"
fi
TICS_LDFLAGS="-L${LIB_DIR}"
- TICS_LIBS="-l${TICS_LIB_SUFFIX}"
+ TICS_LIBS="-l${TICS_ARG_SUFFIX}"
else
+ TICS_SUFFIX=${DFT_LIB_SUFFIX}
TICS_LDFLAGS="-L${LIB_DIR}"
TICS_LIBS="-l${LIB_NAME}${USE_ARG_SUFFIX}"
fi
@@ -2236,6 +2239,7 @@
TICS_ARG_SUFFIX="$TICS_ARG_SUFFIX"
TICS_LIB_SUFFIX="$TICS_LIB_SUFFIX"
TICS_NAME="$TICS_NAME"
+TICS_SUFFIX="$TICS_SUFFIX"
TIC_PATH="$TIC_PATH"
TINFO_ARG_SUFFIX="$TINFO_ARG_SUFFIX"
TINFO_LIB_SUFFIX="$TINFO_LIB_SUFFIX"
Index: dist.mk
Prereq: 1.1077
--- ncurses-6.0-20151101+/dist.mk 2015-11-01 10:25:33.000000000 +0000
+++ ncurses-6.0-20151107/dist.mk 2015-11-06 00:44:10.000000000 +0000
@@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.1077 2015/11/01 10:25:33 tom Exp $
+# $Id: dist.mk,v 1.1078 2015/11/06 00:44:10 tom Exp $
# Makefile for creating ncurses distributions.
#
# This only needs to be used directly as a makefile by developers, but
@@ -37,7 +37,7 @@
# These define the major/minor/patch versions of ncurses.
NCURSES_MAJOR = 6
NCURSES_MINOR = 0
-NCURSES_PATCH = 20151101
+NCURSES_PATCH = 20151107
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
Index: package/debian-mingw/changelog
--- ncurses-6.0-20151101+/package/debian-mingw/changelog 2015-11-01 10:25:33.000000000 +0000
+++ ncurses-6.0-20151107/package/debian-mingw/changelog 2015-11-06 00:44:10.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20151101) unstable; urgency=low
+ncurses6 (6.0+20151107) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sun, 01 Nov 2015 05:25:33 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Thu, 05 Nov 2015 19:44:10 -0500
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian-mingw64/changelog
--- ncurses-6.0-20151101+/package/debian-mingw64/changelog 2015-11-01 10:25:33.000000000 +0000
+++ ncurses-6.0-20151107/package/debian-mingw64/changelog 2015-11-06 00:44:10.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20151101) unstable; urgency=low
+ncurses6 (6.0+20151107) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sun, 01 Nov 2015 05:25:33 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Thu, 05 Nov 2015 19:44:10 -0500
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian/changelog
--- ncurses-6.0-20151101+/package/debian/changelog 2015-11-01 10:25:33.000000000 +0000
+++ ncurses-6.0-20151107/package/debian/changelog 2015-11-06 00:44:10.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20151101) unstable; urgency=low
+ncurses6 (6.0+20151107) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sun, 01 Nov 2015 05:25:33 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Thu, 05 Nov 2015 19:44:10 -0500
ncurses6 (5.9-20120608) unstable; urgency=low
Index: package/mingw-ncurses.nsi
Prereq: 1.130
--- ncurses-6.0-20151101+/package/mingw-ncurses.nsi 2015-11-01 10:25:33.000000000 +0000
+++ ncurses-6.0-20151107/package/mingw-ncurses.nsi 2015-11-06 00:44:10.000000000 +0000
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.130 2015/11/01 10:25:33 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.131 2015/11/06 00:44:10 tom Exp $
; TODO add examples
; TODO bump ABI to 6
@@ -10,7 +10,7 @@
!define VERSION_MAJOR "6"
!define VERSION_MINOR "0"
!define VERSION_YYYY "2015"
-!define VERSION_MMDD "1101"
+!define VERSION_MMDD "1107"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"
Index: package/mingw-ncurses.spec
--- ncurses-6.0-20151101+/package/mingw-ncurses.spec 2015-11-01 10:25:33.000000000 +0000
+++ ncurses-6.0-20151107/package/mingw-ncurses.spec 2015-11-06 00:44:10.000000000 +0000
@@ -3,7 +3,7 @@
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 6.0
-Release: 20151101
+Release: 20151107
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncurses.spec
--- ncurses-6.0-20151101+/package/ncurses.spec 2015-11-01 10:25:33.000000000 +0000
+++ ncurses-6.0-20151107/package/ncurses.spec 2015-11-06 00:44:10.000000000 +0000
@@ -1,7 +1,7 @@
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 6.0
-Release: 20151101
+Release: 20151107
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: progs/tset.c
Prereq: 1.96
--- ncurses-6.0-20151101+/progs/tset.c 2015-04-12 15:36:06.000000000 +0000
+++ ncurses-6.0-20151107/progs/tset.c 2015-11-08 01:45:47.000000000 +0000
@@ -119,7 +119,7 @@
#include <dump_entry.h>
#include <transform.h>
-MODULE_ID("$Id: tset.c,v 1.96 2015/04/12 15:36:06 tom Exp $")
+MODULE_ID("$Id: tset.c,v 1.97 2015/11/08 01:45:47 tom Exp $")
/*
* SCO defines TIOCGSIZE and the corresponding struct. Other systems (SunOS,
@@ -1293,7 +1293,7 @@
reset_mode();
}
- (void) get_termcap_entry(*argv);
+ ttype = get_termcap_entry(*argv);
if (!noset) {
#if HAVE_SIZECHANGE
@@ -1327,9 +1327,6 @@
}
}
- /* Get the terminal name from the entry. */
- ttype = _nc_first_name(cur_term->type.term_names);
-
if (noset)
(void) printf("%s\n", ttype);
else {

720
ncurses-6.0-20151121.patch
View File

@ -1,720 +0,0 @@
# ncurses 6.0 - patch 20151121 - Thomas E. Dickey
#
# ------------------------------------------------------------------------------
#
# Ncurses 6.0 is at
# ftp.gnu.org:/pub/gnu
#
# Patches for ncurses 6.0 can be found at
# ftp://invisible-island.net/ncurses/6.0
# http://invisible-mirror.net/archives/ncurses/6.0
#
# ------------------------------------------------------------------------------
# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20151121.patch.gz
# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created Sun Nov 22 02:17:21 UTC 2015
# ------------------------------------------------------------------------------
# MANIFEST | 1
# NEWS | 8
# VERSION | 2
# dist.mk | 4
# man/curs_bkgd.3x | 3
# misc/terminfo.src | 56 +++--
# ncurses-6.0-20151121/test/test_sgr.c | 363 +++++++++++++++++++++++++++++++++
# package/debian-mingw/changelog | 4
# package/debian-mingw64/changelog | 4
# package/debian/changelog | 4
# package/mingw-ncurses.nsi | 4
# package/mingw-ncurses.spec | 2
# package/ncurses.spec | 2
# test/modules | 3
# test/programs | 3
# 15 files changed, 428 insertions(+), 35 deletions(-)
# ------------------------------------------------------------------------------
Index: MANIFEST
--- ncurses-6.0-20151107+/MANIFEST 2015-06-27 19:49:54.000000000 +0000
+++ ncurses-6.0-20151121/MANIFEST 2015-11-22 01:12:19.000000000 +0000
@@ -1162,6 +1162,7 @@
./test/test_inwstr.c
./test/test_opaque.c
./test/test_setupterm.c
+./test/test_sgr.c
./test/test_vid_puts.c
./test/test_vidputs.c
./test/testaddch.c
Index: NEWS
Prereq: 1.2526
--- ncurses-6.0-20151107+/NEWS 2015-11-08 01:57:15.000000000 +0000
+++ ncurses-6.0-20151121/NEWS 2015-11-21 23:33:30.000000000 +0000
@@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.2526 2015/11/08 01:57:15 tom Exp $
+-- $Id: NEWS,v 1.2530 2015/11/21 23:33:30 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
@@ -45,6 +45,12 @@
Changes through 1.9.9e did not credit all contributions;
it is not possible to add this information.
+20151121
+ + fix some inconsistencies in the pccon* entries -TD
+ + add bold to pccon+sgr+acs and pccon-base (Tati Chevron).
+ + add keys f12-f124 to pccon+keys (Tati Chevron).
+ + add test/test_sgr.c program to exercise all combinations of sgr.
+
20151107
+ modify tset's assignment to TERM in its output to reflect the name by
which the terminal description is found, rather than the primary
Index: VERSION
--- ncurses-6.0-20151107+/VERSION 2015-11-06 00:44:10.000000000 +0000
+++ ncurses-6.0-20151121/VERSION 2015-11-21 15:55:51.000000000 +0000
@@ -1 +1 @@
-5:0:9 6.0 20151107
+5:0:9 6.0 20151121
Index: dist.mk
Prereq: 1.1078
--- ncurses-6.0-20151107+/dist.mk 2015-11-06 00:44:10.000000000 +0000
+++ ncurses-6.0-20151121/dist.mk 2015-11-21 15:55:51.000000000 +0000
@@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.1078 2015/11/06 00:44:10 tom Exp $
+# $Id: dist.mk,v 1.1080 2015/11/21 15:55:51 tom Exp $
# Makefile for creating ncurses distributions.
#
# This only needs to be used directly as a makefile by developers, but
@@ -37,7 +37,7 @@
# These define the major/minor/patch versions of ncurses.
NCURSES_MAJOR = 6
NCURSES_MINOR = 0
-NCURSES_PATCH = 20151107
+NCURSES_PATCH = 20151121
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
Index: man/curs_bkgd.3x
Prereq: 1.23
--- ncurses-6.0-20151107+/man/curs_bkgd.3x 2015-07-21 00:11:05.000000000 +0000
+++ ncurses-6.0-20151121/man/curs_bkgd.3x 2015-11-21 01:53:42.000000000 +0000
@@ -26,7 +26,7 @@
.\" authorization. *
.\"***************************************************************************
.\"
-.\" $Id: curs_bkgd.3x,v 1.23 2015/07/21 00:11:05 tom Exp $
+.\" $Id: curs_bkgd.3x,v 1.24 2015/11/21 01:53:42 tom Exp $
.de bP
.IP \(bu 4
..
@@ -76,7 +76,6 @@
.bP
Wherever the former background character
appears, it is changed to the new background character.
-.RE
.SS getbkgd
.PP
The \fBgetbkgd\fR function returns the given window's current background
Index: misc/terminfo.src
--- ncurses-6.0-20151107+/misc/terminfo.src 2015-10-24 17:56:55.000000000 +0000
+++ ncurses-6.0-20151121/misc/terminfo.src 2015-11-22 01:01:00.000000000 +0000
@@ -6,8 +6,8 @@
# Report bugs and new terminal descriptions to
# bug-ncurses@gnu.org
#
-# $Revision: 1.554 $
-# $Date: 2015/10/24 16:00:04 $
+# $Revision: 1.558 $
+# $Date: 2015/11/22 01:01:00 $
#
# 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
@@ -1277,7 +1277,7 @@
# + kLFT5/kRIT5 work, but not up/down with control-modifier
# + kLFT/kRIT work, but not up/down with shift-modifier
# + there are a few predefined bindings with Alt, but no clear pattern.
-# + uses alt-key as UTF-8 "meta" something like xterm altSendsEscape
+# + uses alt-key as UTF-8 "meta" something like xterm altSendsEscape
# Using ncurses test-program with xterm-new:
# + no italics
# Using xterm's scripts:
@@ -2211,37 +2211,52 @@
# Added several capabilities to pccon+base, reading wsemul_vt100_subr.c -TD
# Changed kbs to DEL and removed keys that duplicate stty settings -TD
#
+# Notes from testing with vttest:
+# fails wrapping test
+# no 8-bit controls
+# identifies as vt200 with selective erase, but does not implement DECSCA
+# no vt52 mode
+# also lacks these:
+# ESC # 8 DEC Screen Alignment Test (DECALN).
+# CSI ? 5 h Reverse Video (DECSCNM).
+#
pccon+keys|OpenBSD PC keyboard keys,
kbs=\177, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
kdch1=\E[3~, kend=\E[8~, kent=^M, kf1=\E[11~, kf10=\E[21~,
- kf11=\E[23~, kf12=\E[24~, kf2=\E[12~, kf3=\E[13~,
+ kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~,
+ kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, kf18=\E[32~,
+ kf19=\E[33~, kf2=\E[12~, kf20=\E[34~, kf21=\E[35~,
+ kf22=\E[36~, kf23=\E[37~, kf24=\E[38~, kf3=\E[13~,
kf4=\E[14~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~,
kf9=\E[20~, khome=\E[7~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~,
krfr=^R,
pccon+sgr+acs0|sgr and simple ASCII pseudographics for OpenBSD PC console,
acsc=+>\,<-\^.v0#`+a\:f\\h#i#j+k+l+m+n+o~p-q-r-s_t+u+v+w+x|y#z#{*|!}#~o,
- sgr=\E[0%?%p1%p3%|%t;7%;m, sgr0=\E[m,
+ sgr=\E[0%?%p1%p3%|%t;7%;%?%p6%t;1%;%?%p2%t;4%;m,
+ sgr0=\E[m,
pccon+sgr+acs|sgr and default ASCII pseudographics for OpenBSD PC console,
acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
enacs=\E)0$<5>, rmacs=\E(B$<5>,
- sgr=\E[0%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;$<5>,
+ sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;$<2>,
sgr0=\E[m\E(B$<5>, smacs=\E(0$<5>,
+# underline renders as color
pccon+colors|ANSI colors for OpenBSD PC console,
bce,
- colors#8, pairs#64,
- op=\E[m, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+ colors#8, ncv#2, pairs#64,
+ op=\E[47;30m, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
pccon+base|base capabilities for OpenBSD PC console,
am, km, mc5i, msgr, npc, nxon, xenl, xon,
cols#80, it#8, lines#24,
- bel=^G, clear=\E[H\E[J, cr=^M, cub1=^H, cud1=^J, cuf1=\E[C,
- cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch=\E[%p1%dP,
- dch1=\E[P, dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K,
- el1=\E[1K, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@,
+ bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=^M, cub1=^H, cud1=^J,
+ cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A,
+ dch=\E[%p1%dP, dch1=\E[P, dl1=\E[M, ech=\E[%p1%dX, ed=\E[J,
+ el=\E[K, el1=\E[1K, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@,
il1=\E[L, ind=\ED, nel=\EE, rev=\E[7m, ri=\EM, rmam=\E[?7l,
- rmso=\E[m, rs2=\Ec$<50>, smam=\E[?7h, smso=\E[7m,
- tbc=\E[3g, u6=\E[%i%d;%dR, u7=\E[6n,
+ rmso=\E[27m, rmul=\E[24m, rs2=\Ec$<50>, smam=\E[?7h,
+ smso=\E[7m, smul=\E[4m, tbc=\E[3g, u6=\E[%i%d;%dR,
+ u7=\E[6n,
pccon0-m|OpenBSD PC console without colors & with simple ASCII pseudographics,
- use=pccon+base, use=pccon+sgr+acs0, use=pccon+keys,
+ use=pccon+sgr+acs0, use=pccon+base, use=pccon+keys,
pccon0|OpenBSD PC console with simple ASCII pseudographics,
use=pccon0-m, use=pccon+colors,
pccon-m|OpenBSD PC console without colors,
@@ -9750,7 +9765,7 @@
# (800)-800-WYSE (option 5 gets you a human). There's a Web page at the
# obvious address, <http://www.wyse.com>. They keep terminfo entries at
# https://web.archive.org/web/19970712022641/http://www.wyse.co.uk/support/appnotes/idxappnt.htm
-#
+#
#
# Wyse bought out Link Technology, Inc. in 1990 and closed it down in 1995.
# They now own the Qume and Amdek brands, too. So these are the people to
@@ -23767,7 +23782,14 @@
# + updated minitel entries to fix kel problem with emacs, and add
# minitel1b-nb (Alexandre Montaron).
# + reviewed/updated nsterm entry Terminal.app in OSX -TD
-# + replace some dead URLs in comments with equivalents from the
+# + replace some dead URLs in commands with equivalents from the
# Internet Archive -TD
#
+# 2015-11-14
+# + add bold to pccon+sgr+acs and pccon-base (Tati Chevron).
+# + add keys f12-f124 to pccon+keys (Tati Chevron).
+#
+# 2015-11-21
+# + fix some inconsistencies in the pccon* entries -TD
+#
######## SHANTIH! SHANTIH! SHANTIH!
Index: package/debian-mingw/changelog
--- ncurses-6.0-20151107+/package/debian-mingw/changelog 2015-11-06 00:44:10.000000000 +0000
+++ ncurses-6.0-20151121/package/debian-mingw/changelog 2015-11-21 15:55:51.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20151107) unstable; urgency=low
+ncurses6 (6.0+20151121) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Thu, 05 Nov 2015 19:44:10 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 21 Nov 2015 10:55:51 -0500
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian-mingw64/changelog
--- ncurses-6.0-20151107+/package/debian-mingw64/changelog 2015-11-06 00:44:10.000000000 +0000
+++ ncurses-6.0-20151121/package/debian-mingw64/changelog 2015-11-21 15:55:51.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20151107) unstable; urgency=low
+ncurses6 (6.0+20151121) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Thu, 05 Nov 2015 19:44:10 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 21 Nov 2015 10:55:51 -0500
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian/changelog
--- ncurses-6.0-20151107+/package/debian/changelog 2015-11-06 00:44:10.000000000 +0000
+++ ncurses-6.0-20151121/package/debian/changelog 2015-11-21 15:55:51.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20151107) unstable; urgency=low
+ncurses6 (6.0+20151121) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Thu, 05 Nov 2015 19:44:10 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 21 Nov 2015 10:55:51 -0500
ncurses6 (5.9-20120608) unstable; urgency=low
Index: package/mingw-ncurses.nsi
Prereq: 1.131
--- ncurses-6.0-20151107+/package/mingw-ncurses.nsi 2015-11-06 00:44:10.000000000 +0000
+++ ncurses-6.0-20151121/package/mingw-ncurses.nsi 2015-11-21 15:55:51.000000000 +0000
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.131 2015/11/06 00:44:10 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.133 2015/11/21 15:55:51 tom Exp $
; TODO add examples
; TODO bump ABI to 6
@@ -10,7 +10,7 @@
!define VERSION_MAJOR "6"
!define VERSION_MINOR "0"
!define VERSION_YYYY "2015"
-!define VERSION_MMDD "1107"
+!define VERSION_MMDD "1121"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"
Index: package/mingw-ncurses.spec
--- ncurses-6.0-20151107+/package/mingw-ncurses.spec 2015-11-06 00:44:10.000000000 +0000
+++ ncurses-6.0-20151121/package/mingw-ncurses.spec 2015-11-21 15:55:51.000000000 +0000
@@ -3,7 +3,7 @@
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 6.0
-Release: 20151107
+Release: 20151121
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncurses.spec
--- ncurses-6.0-20151107+/package/ncurses.spec 2015-11-06 00:44:10.000000000 +0000
+++ ncurses-6.0-20151121/package/ncurses.spec 2015-11-21 15:55:51.000000000 +0000
@@ -1,7 +1,7 @@
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 6.0
-Release: 20151107
+Release: 20151121
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: test/modules
Prereq: 1.52
--- ncurses-6.0-20151107+/test/modules 2015-06-27 10:40:27.000000000 +0000
+++ ncurses-6.0-20151121/test/modules 2015-11-21 16:05:48.000000000 +0000
@@ -1,4 +1,4 @@
-# $Id: modules,v 1.52 2015/06/27 10:40:27 tom Exp $
+# $Id: modules,v 1.53 2015/11/21 16:05:48 tom Exp $
##############################################################################
# Copyright (c) 1998-2014,2015 Free Software Foundation, Inc. #
# #
@@ -90,6 +90,7 @@
test_inwstr progs $(srcdir) $(HEADER_DEPS)
test_opaque progs $(srcdir) $(HEADER_DEPS)
test_setupterm progs $(srcdir) $(HEADER_DEPS)
+test_sgr progs $(srcdir) $(HEADER_DEPS)
test_vid_puts progs $(srcdir) $(HEADER_DEPS)
test_vidputs progs $(srcdir) $(HEADER_DEPS)
testaddch progs $(srcdir) $(HEADER_DEPS)
Index: test/programs
Prereq: 1.26
--- ncurses-6.0-20151107+/test/programs 2015-06-27 10:40:53.000000000 +0000
+++ ncurses-6.0-20151121/test/programs 2015-11-21 16:06:12.000000000 +0000
@@ -1,4 +1,4 @@
-# $Id: programs,v 1.26 2015/06/27 10:40:53 tom Exp $
+# $Id: programs,v 1.27 2015/11/21 16:06:12 tom Exp $
##############################################################################
# Copyright (c) 2006-2014,2015 Free Software Foundation, Inc. #
# #
@@ -87,6 +87,7 @@
test_inwstr $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_inwstr
test_opaque $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_opaque
test_setupterm $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_setupterm
+test_sgr $(LDFLAGS_TINFO) $(LOCAL_LIBS) test_sgr
test_vid_puts $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_vid_puts
test_vidputs $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_vidputs
testaddch $(LDFLAGS_CURSES) $(LOCAL_LIBS) testaddch
Index: test/test_sgr.c
--- /dev/null 2015-11-21 12:05:05.835999855 +0000
+++ ncurses-6.0-20151121/test/test_sgr.c 2015-11-21 22:43:50.000000000 +0000
@@ -0,0 +1,363 @@
+/****************************************************************************
+ * Copyright (c) 2015 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"), to deal in the Software without restriction, including *
+ * without limitation the rights to use, copy, modify, merge, publish, *
+ * distribute, distribute with modifications, sublicense, and/or sell *
+ * copies of the Software, and to permit persons to whom the Software is *
+ * furnished to do so, subject to the following conditions: *
+ * *
+ * The above copyright notice and this permission notice shall be included *
+ * in all copies or substantial portions of the Software. *
+ * *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
+ * *
+ * Except as contained in this notice, the name(s) of the above copyright *
+ * holders shall not be used in advertising or otherwise to promote the *
+ * sale, use or other dealings in this Software without prior written *
+ * authorization. *
+ ****************************************************************************/
+
+/*
+ * Author: Thomas E. Dickey
+ *
+ * $Id: test_sgr.c,v 1.4 2015/11/21 22:43:50 tom Exp $
+ *
+ * A simple demo of the sgr/sgr0 terminal capabilities.
+ */
+#define USE_TINFO
+#include <test.priv.h>
+
+static void failed(const char *) GCC_NORETURN;
+
+static void
+failed(const char *msg)
+{
+ fprintf(stderr, "%s\n", msg);
+ ExitProgram(EXIT_FAILURE);
+}
+
+#if HAVE_TIGETSTR
+
+static bool q_opt = FALSE;
+
+static char *d_opt;
+static char *e_opt;
+static char **db_list;
+static int db_item;
+
+static long total_values;
+
+static char *
+make_dbitem(char *p, char *q)
+{
+ char *result = malloc(strlen(e_opt) + 2 + (size_t) (p - q));
+ sprintf(result, "%s=%.*s", e_opt, (int) (p - q), q);
+ return result;
+}
+
+static void
+make_dblist(void)
+{
+ if (d_opt && e_opt) {
+ int pass;
+
+ for (pass = 0; pass < 2; ++pass) {
+ char *p, *q;
+ size_t count = 0;
+
+ for (p = q = d_opt; *p != '\0'; ++p) {
+ if (*p == ':') {
+ if (p != q + 1) {
+ if (pass) {
+ db_list[count] = make_dbitem(p, q);
+ }
+ count++;
+ }
+ q = p + 1;
+ }
+ }
+ if (p != q + 1) {
+ if (pass) {
+ db_list[count] = make_dbitem(p, q);
+ }
+ count++;
+ }
+ if (!pass) {
+ db_list = typeCalloc(char *, count + 1);
+ }
+ }
+ }
+}
+
+static char *
+next_dbitem(void)
+{
+ char *result = 0;
+
+ if (db_list) {
+ if ((result = db_list[db_item]) == 0) {
+ db_item = 0;
+ result = db_list[0];
+ } else {
+ db_item++;
+ }
+ }
+ printf("** %s\n", result);
+ return result;
+}
+
+#ifdef NO_LEAKS
+static void
+free_dblist(void)
+{
+ if (db_list) {
+ int n;
+ for (n = 0; db_list[n]; ++n)
+ free(db_list[n]);
+ free(db_list);
+ db_list = 0;
+ }
+}
+#endif
+
+#define MAXPAR 9
+#define MAXSGR (1 << MAXPAR)
+#define BITS2P(n) (count & (1 << (n - 1)))
+#define MASK_SMSO (1 << 0)
+#define MASK_BOLD (1 << 5)
+#define MASK_REV (1 << 2)
+
+static void
+dumpit(unsigned bits, unsigned ignore, const char *sgr, const char *sgr0)
+{
+ static const char sample[] = "abcdefghijklm";
+ static char params[] = "SURBDBIPA";
+ unsigned n;
+
+ printf("%4d ", bits);
+ bits &= ~ignore;
+ for (n = 0; n < MAXPAR; ++n) {
+ putchar((bits & (1 << n)) ? params[n] : '-');
+ }
+ putchar(' ');
+ putp(sgr);
+ putp(sample);
+ putp(sgr0);
+ putchar('\n');
+}
+
+static bool
+one_bit(unsigned a, unsigned b)
+{
+ unsigned c = (a ^ b);
+ bool result = FALSE;
+ if (c) {
+ while (!(c & 1)) {
+ c >>= 1;
+ }
+ result = (c == 1);
+ }
+ return result;
+}
+
+static void
+brute_force(const char *name)
+{
+ unsigned count;
+ char *my_sgr;
+ char *my_sgr0;
+ char *my_bold;
+ char *my_revs;
+ char *my_smso;
+
+ if (db_list) {
+ putenv(next_dbitem());
+ }
+ if (!q_opt)
+ printf("Terminal type \"%s\"\n", name);
+ setupterm((NCURSES_CONST char *) name, 1, (int *) 0);
+ if (!q_opt) {
+ if (strcmp(name, ttytype))
+ printf("... actual \"%s\"\n", ttytype);
+ }
+
+ my_sgr = tigetstr("sgr");
+ my_sgr0 = tigetstr("sgr0");
+ my_bold = tigetstr("bold");
+ my_revs = tigetstr("rev");
+ my_smso = tigetstr("smso");
+
+ if (!VALID_STRING(my_sgr)) {
+ fprintf(stderr, "no \"sgr\" capability found\n");
+ } else if (!VALID_STRING(my_sgr0)) {
+ fprintf(stderr, "no \"sgr0\" capability found\n");
+ } else {
+ char *values[MAXSGR];
+ unsigned j;
+ unsigned ignore = 0;
+ unsigned reason = 0;
+ unsigned repeat = 0;
+ for (count = 0; count < MAXSGR; ++count) {
+ values[count] = tparm(my_sgr,
+ BITS2P(1),
+ BITS2P(2),
+ BITS2P(3),
+ BITS2P(4),
+ BITS2P(5),
+ BITS2P(6),
+ BITS2P(7),
+ BITS2P(8),
+ BITS2P(9));
+ if (values[count] != 0) {
+ values[count] = strdup(values[count]);
+ }
+ }
+ for (count = 0; count < MAXSGR; ++count) {
+ if (values[count] != 0) {
+ for (j = count + 1; j < MAXSGR; ++j) {
+ if (values[j] == 0)
+ continue;
+ if (strcmp(values[count], values[j]))
+ continue;
+ if (one_bit(count, j)) {
+ free(values[j]);
+ values[j] = 0;
+ }
+ }
+ }
+ }
+ for (j = 0; j < MAXPAR; ++j) {
+ unsigned mask = (1 << j);
+ for (count = 0; count < MAXSGR; ++count) {
+ if ((count & mask) != 0)
+ continue;
+ if (values[count] != 0 && values[count + mask] != 0) {
+ mask = 0;
+ break;
+ }
+ }
+ ignore |= mask;
+ }
+ /* smso is tested first, but often duplicates bold or reverse. */
+ if (VALID_STRING(my_smso)) {
+ if (VALID_STRING(my_bold) && !strcmp(my_bold, my_smso)) {
+ repeat |= MASK_SMSO;
+ reason = MASK_BOLD;
+ }
+ if (VALID_STRING(my_revs) && !strcmp(my_revs, my_smso)) {
+ repeat |= MASK_SMSO;
+ reason = MASK_REV;
+ }
+ }
+ for (count = 0; count < MAXSGR; ++count) {
+ if (values[count] != 0) {
+ bool found = FALSE;
+ if ((repeat & MASK_SMSO) != 0
+ && (count & MASK_SMSO) != 0) {
+ found = TRUE;
+ } else {
+ for (j = 0; j < count; ++j) {
+ if (values[j] != 0 && !strcmp(values[j], values[count])) {
+ if ((repeat & MASK_SMSO) != 0
+ && (j & MASK_SMSO) != 0
+ && (count & reason) != 0) {
+ continue;
+ }
+ found = TRUE;
+ break;
+ }
+ }
+ }
+ if (!found) {
+ dumpit(count, ignore, values[count], my_sgr0);
+ ++total_values;
+ }
+ }
+ }
+ }
+ del_curterm(cur_term);
+}
+
+static void
+usage(void)
+{
+ static const char *msg[] =
+ {
+ "Usage: test_sgr [options] [terminal]",
+ "",
+ "Print all distinct combinations of sgr capability.",
+ "",
+ "Options:",
+ " -d LIST colon-separated list of databases to use",
+ " -e NAME environment variable to set with -d option",
+ " -q quiet (prints only counts)",
+ };
+ unsigned n;
+ for (n = 0; n < SIZEOF(msg); ++n) {
+ fprintf(stderr, "%s\n", msg[n]);
+ }
+ ExitProgram(EXIT_FAILURE);
+}
+
+int
+main(int argc, char *argv[])
+{
+ int n;
+ char *name;
+
+ while ((n = getopt(argc, argv, "d:e:q")) != -1) {
+ switch (n) {
+ case 'd':
+ d_opt = optarg;
+ break;
+ case 'e':
+ e_opt = optarg;
+ break;
+ case 'q':
+ q_opt = TRUE;
+ break;
+ default:
+ usage();
+ break;
+ }
+ }
+
+ make_dblist();
+
+ if (optind < argc) {
+ for (n = optind; n < argc; ++n) {
+ brute_force(argv[n]);
+ }
+ } else if ((name = getenv("TERM")) != 0) {
+ brute_force(name);
+ } else {
+ static char dumb[] = "dumb";
+ brute_force(dumb);
+ }
+
+ printf("%ld distinct values\n", total_values);
+
+#ifdef NO_LEAKS
+ free_dblist();
+#endif
+
+ ExitProgram(EXIT_SUCCESS);
+}
+
+#else /* !HAVE_TIGETSTR */
+int
+main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
+{
+ failed("This program requires the terminfo functions such as tigetstr");
+ ExitProgram(EXIT_FAILURE);
+}
+#endif /* HAVE_TIGETSTR */

612
ncurses-6.0-20151128.patch
View File

@ -1,612 +0,0 @@
# ncurses 6.0 - patch 20151128 - Thomas E. Dickey
#
# ------------------------------------------------------------------------------
#
# Ncurses 6.0 is at
# ftp.gnu.org:/pub/gnu
#
# Patches for ncurses 6.0 can be found at
# ftp://invisible-island.net/ncurses/6.0
# http://invisible-mirror.net/archives/ncurses/6.0
#
# ------------------------------------------------------------------------------
# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20151128.patch.gz
# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created Sun Nov 29 01:57:16 UTC 2015
# ------------------------------------------------------------------------------
# NEWS | 11 ++++++++-
# VERSION | 2 -
# dist.mk | 4 +--
# form/form.h | 5 ++--
# form/form.priv.h | 7 +++--
# form/frm_driver.c | 12 ++++++----
# man/curs_inopts.3x | 12 +++++-----
# man/form_field_opts.3x | 9 +++++--
# misc/terminfo.src | 26 ++++++++++++++++++++-
# ncurses/base/lib_getch.c | 4 ++-
# package/debian-mingw/changelog | 4 +--
# package/debian-mingw64/changelog | 4 +--
# package/debian/changelog | 4 +--
# package/mingw-ncurses.nsi | 4 +--
# package/mingw-ncurses.spec | 2 -
# package/ncurses.spec | 2 -
# progs/dump_entry.c | 6 ++++-
# test/ncurses.c | 44 +++++++++++++++++++++++++------------
# 18 files changed, 112 insertions(+), 50 deletions(-)
# ------------------------------------------------------------------------------
Index: NEWS
Prereq: 1.2530
--- ncurses-6.0-20151121+/NEWS 2015-11-21 23:33:30.000000000 +0000
+++ ncurses-6.0-20151128/NEWS 2015-11-29 01:31:02.000000000 +0000
@@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.2530 2015/11/21 23:33:30 tom Exp $
+-- $Id: NEWS,v 1.2536 2015/11/29 01:31:02 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
@@ -45,6 +45,15 @@
Changes through 1.9.9e did not credit all contributions;
it is not possible to add this information.
+20151128
+ + add missing assignment in lib_getch.c to make notimeout() work
+ (Debian #805618).
+ + add 't' toggle for notimeout() function in test/ncurses.c a/A screens
+ + add viewdata terminal description (Alexandre Montaron).
+ + fix a case in tic/infocmp for formatting capabilities where a
+ backslash at the end of a string was mishandled.
+ + fix some typos in curs_inopts.3x (Benno Schulenberg).
+
20151121
+ fix some inconsistencies in the pccon* entries -TD
+ add bold to pccon+sgr+acs and pccon-base (Tati Chevron).
Index: VERSION
--- ncurses-6.0-20151121+/VERSION 2015-11-21 15:55:51.000000000 +0000
+++ ncurses-6.0-20151128/VERSION 2015-11-28 16:31:05.000000000 +0000
@@ -1 +1 @@
-5:0:9 6.0 20151121
+5:0:9 6.0 20151128
Index: dist.mk
Prereq: 1.1080
--- ncurses-6.0-20151121+/dist.mk 2015-11-21 15:55:51.000000000 +0000
+++ ncurses-6.0-20151128/dist.mk 2015-11-28 16:31:05.000000000 +0000
@@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.1080 2015/11/21 15:55:51 tom Exp $
+# $Id: dist.mk,v 1.1081 2015/11/28 16:31:05 tom Exp $
# Makefile for creating ncurses distributions.
#
# This only needs to be used directly as a makefile by developers, but
@@ -37,7 +37,7 @@
# These define the major/minor/patch versions of ncurses.
NCURSES_MAJOR = 6
NCURSES_MINOR = 0
-NCURSES_PATCH = 20151121
+NCURSES_PATCH = 20151128
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
Index: form/form.h
Prereq: 0.24
--- ncurses-6.0-20151121+/form/form.h 2014-07-26 20:52:28.000000000 +0000
+++ ncurses-6.0-20151128/form/form.h 2015-11-28 20:13:39.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2013,2014 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2014,2015 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 *
@@ -30,7 +30,7 @@
* Author: Juergen Pfeifer, 1995,1997 *
****************************************************************************/
-/* $Id: form.h,v 0.24 2014/07/26 20:52:28 tom Exp $ */
+/* $Id: form.h,v 0.25 2015/11/28 20:13:39 Leon.Winter Exp $ */
#ifndef FORM_H
#define FORM_H
@@ -205,6 +205,7 @@
#define O_PASSOK (0x0100U)
#define O_STATIC (0x0200U)
#define O_DYNAMIC_JUSTIFY (0x0400U) /* ncurses extension */
+#define O_NO_LEFT_STRIP (0x0800U) /* ncurses extension */
/* form options */
#define O_NL_OVERLOAD (0x0001U)
Index: form/form.priv.h
Prereq: 0.38
--- ncurses-6.0-20151121+/form/form.priv.h 2014-11-01 13:56:14.000000000 +0000
+++ ncurses-6.0-20151128/form/form.priv.h 2015-11-28 20:13:39.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2012,2014 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2014,2015 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 *
@@ -30,7 +30,7 @@
* Author: Juergen Pfeifer, 1995,1997 *
****************************************************************************/
-/* $Id: form.priv.h,v 0.38 2014/11/01 13:56:14 tom Exp $ */
+/* $Id: form.priv.h,v 0.39 2015/11/28 20:13:39 Leon.Winter Exp $ */
#ifndef FORM_PRIV_H
#define FORM_PRIV_H 1
@@ -162,7 +162,8 @@
#define ALL_FIELD_OPTS (Field_Options)( \
STD_FIELD_OPTS |\
- O_DYNAMIC_JUSTIFY)
+ O_DYNAMIC_JUSTIFY |\
+ O_NO_LEFT_STRIP)
#define C_BLANK ' '
#define is_blank(c) ((c)==C_BLANK)
Index: form/frm_driver.c
Prereq: 1.115
--- ncurses-6.0-20151121+/form/frm_driver.c 2014-09-25 21:55:24.000000000 +0000
+++ ncurses-6.0-20151128/form/frm_driver.c 2015-11-28 20:39:09.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2013,2014 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2014,2015 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 *
@@ -32,7 +32,7 @@
#include "form.priv.h"
-MODULE_ID("$Id: frm_driver.c,v 1.115 2014/09/25 21:55:24 tom Exp $")
+MODULE_ID("$Id: frm_driver.c,v 1.117 2015/11/28 20:39:09 tom Exp $")
/*----------------------------------------------------------------------------
This is the core module of the form library. It contains the majority
@@ -979,7 +979,9 @@
int len;
int col = 0;
- bp = Get_Start_Of_Data(field->buf, Buffer_Length(field));
+ bp = (Field_Has_Option(field, O_NO_LEFT_STRIP)
+ ? field->buf
+ : Get_Start_Of_Data(field->buf, Buffer_Length(field)));
len = (int)(After_End_Of_Data(field->buf, Buffer_Length(field)) - bp);
if (len > 0)
@@ -1023,7 +1025,9 @@
FIELD_CELL *bp;
int len;
- bp = Get_Start_Of_Data(field->buf, Buffer_Length(field));
+ bp = (Field_Has_Option(field, O_NO_LEFT_STRIP)
+ ? field->buf
+ : Get_Start_Of_Data(field->buf, Buffer_Length(field)));
len = (int)(After_End_Of_Data(field->buf, Buffer_Length(field)) - bp);
if (len > 0)
Index: man/curs_inopts.3x
Prereq: 1.19
--- ncurses-6.0-20151121+/man/curs_inopts.3x 2015-04-11 10:21:38.000000000 +0000
+++ ncurses-6.0-20151128/man/curs_inopts.3x 2015-11-28 19:03:12.000000000 +0000
@@ -26,7 +26,7 @@
.\" authorization. *
.\"***************************************************************************
.\"
-.\" $Id: curs_inopts.3x,v 1.19 2015/04/11 10:21:38 tom Exp $
+.\" $Id: curs_inopts.3x,v 1.20 2015/11/28 19:03:12 Benno.Schulenberg Exp $
.TH curs_inopts 3X ""
.ie \n(.g .ds `` \(lq
.el .ds `` ``
@@ -93,7 +93,7 @@
.br
.SH DESCRIPTION
The \fBncurses\fP library provides several functions which let an application
-change way input from the terminal is handled.
+change the way input from the terminal is handled.
Some are global, applying to all windows.
Others apply only to a specific window.
Window-specific settings are not automatically applied to new or derived
@@ -141,19 +141,19 @@
available to the program.
However, after blocking for \fItenths\fR tenths of
seconds, ERR is returned if nothing has been typed.
-The value of \fBtenths\fR
+The value of \fItenths\fR
must be a number between 1 and 255.
Use \fBnocbreak\fR to leave half-delay
mode.
.\"
.SS intrflush
.PP
-If the \fBintrflush\fR option is enabled, (\fIbf\fR is \fBTRUE\fR), when an
-interrupt key is pressed on the keyboard (interrupt, break, quit) all output in
+If the \fBintrflush\fR option is enabled (\fIbf\fR is \fBTRUE\fR), and an
+interrupt key is pressed on the keyboard (interrupt, break, quit), all output in
the tty driver queue will be flushed, giving the effect of faster response to
the interrupt, but causing \fBcurses\fR to have the wrong idea of what is on
the screen.
-Disabling (\fIbf\fR is \fBFALSE\fR), the option prevents the
+Disabling the option (\fIbf\fR is \fBFALSE\fR) prevents the
flush.
The default for the option is inherited from the tty driver settings.
The window argument is ignored.
Index: man/form_field_opts.3x
Prereq: 1.17
--- ncurses-6.0-20151121+/man/form_field_opts.3x 2014-07-26 21:21:57.000000000 +0000
+++ ncurses-6.0-20151128/man/form_field_opts.3x 2015-11-28 20:40:13.000000000 +0000
@@ -1,6 +1,6 @@
'\" t
.\"***************************************************************************
-.\" Copyright (c) 1998-2010,2014 Free Software Foundation, Inc. *
+.\" Copyright (c) 1998-2014,2015 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: form_field_opts.3x,v 1.17 2014/07/26 21:21:57 tom Exp $
+.\" $Id: form_field_opts.3x,v 1.19 2015/11/28 20:40:13 tom Exp $
.TH form_field_opts 3X ""
.SH NAME
\fBform_field_opts\fR \- set and get field options
@@ -91,10 +91,13 @@
Words that do not fit on a line are wrapped to the next line. Words are
blank-separated.
.PP
-One extension option is defined (extensions are off by default):
+These extension options are defined (extensions are off by default):
.TP 5
O_DYNAMIC_JUSTIFY
Permit dynamic fields to be justified, like static fields.
+.TP 5
+O_NO_LEFT_STRIP
+Preserve leading whitespace in the field buffer, which is normally discarded.
.SH RETURN VALUE
Except for \fBfield_opts\fR, each routine returns one of the following:
.TP 5
Index: misc/terminfo.src
--- ncurses-6.0-20151121+/misc/terminfo.src 2015-11-22 01:01:00.000000000 +0000
+++ ncurses-6.0-20151128/misc/terminfo.src 2015-11-28 21:35:00.000000000 +0000
@@ -6,8 +6,8 @@
# Report bugs and new terminal descriptions to
# bug-ncurses@gnu.org
#
-# $Revision: 1.558 $
-# $Date: 2015/11/22 01:01:00 $
+# $Revision: 1.559 $
+# $Date: 2015/11/28 21:35:00 $
#
# 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
@@ -18753,6 +18753,25 @@
sgr0=\EI\E\\\EB, smacs=^N, .invis=\E@, .rs2=^L\EB,
.u8=\001Cu|\004, use=minitel1b,
+# From: Alexandre Montaron, 19 Nov 2015
+#
+# He comments:
+# viewdata lacks a true cup capabilitie,
+# so I achieved it with home and cud1/cuf1 sequences only !
+viewdata|prestel/viewdata terminals,
+ am, bw, eslok, hz,
+ cols#40, lines#24,
+ bel=^G, civis=^T, clear=^L, cnorm=^Q, cr=^M, cub1=^H, cud1=^J,
+ cuf1=^I,
+ cup=\036%?%p1%{07}%>%t\n\n\n\n\n\n\n\n%;%?%p1%{15}%>%t\n\n\n\n\n\n\n\n%;%?%p1%{4}%&%t\n\n\n\n%;%?%p1%{2}%&%t\n\n%;%?%p1%{1}%&%t\n%;%?%p2%{07}%>%t\011\011\011\011\011\011\011\011%;%?%p2%{15}%>%t\011\011\011\011\011\011\011\011%;%?%p2%{23}%>%t\011\011\011\011\011\011\011\011%;%?%p2%{31}%>%t\011\011\011\011\011\011\011\011%;%?%p2%{4}%&%t\011\011\011\011%;%?%p2%{2}%&%t\011\011%;%?%p2%{1}%&%t\011%;,
+ cuu1=^K, home=^^, nel=^M^J, .el=^X, .ind=^J,
+ .rep=%p1%c\022%p2%'?'%+%c, .ri=^K,
+# Also:
+# viewdata-rv works with some applications (e.g. emacs, xemacs) but fails with vim.
+viewdata-rv|prestel/viewdata terminals with reverse capabilitie (as green),
+ xmc#1,
+ rmso=\EG, smso=\EB, use=viewdata,
+
######## OBSOLETE VDT TYPES
#
# These terminals are *long* dead -- these entries are retained for
@@ -23792,4 +23811,7 @@
# 2015-11-21
# + fix some inconsistencies in the pccon* entries -TD
#
+# 2015-11-28
+# add viewdata (Alexandre Montaron).
+#
######## SHANTIH! SHANTIH! SHANTIH!
Index: ncurses/base/lib_getch.c
Prereq: 1.132
--- ncurses-6.0-20151121+/ncurses/base/lib_getch.c 2015-05-09 17:10:41.000000000 +0000
+++ ncurses-6.0-20151128/ncurses/base/lib_getch.c 2015-11-29 01:28:52.000000000 +0000
@@ -42,7 +42,7 @@
#include <curses.priv.h>
-MODULE_ID("$Id: lib_getch.c,v 1.132 2015/05/09 17:10:41 tom Exp $")
+MODULE_ID("$Id: lib_getch.c,v 1.133 2015/11/29 01:28:52 tom Exp $")
#include <fifo_defs.h>
@@ -497,6 +497,8 @@
TR(TRACE_IEVENT, ("timed delay in wgetch()"));
if (sp->_cbreak > 1)
delay = (sp->_cbreak - 1) * 100;
+ else if (win->_notimeout)
+ delay = 0;
else
delay = win->_delay;
Index: package/debian-mingw/changelog
--- ncurses-6.0-20151121+/package/debian-mingw/changelog 2015-11-21 15:55:51.000000000 +0000
+++ ncurses-6.0-20151128/package/debian-mingw/changelog 2015-11-28 16:31:05.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20151121) unstable; urgency=low
+ncurses6 (6.0+20151128) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 21 Nov 2015 10:55:51 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 28 Nov 2015 11:31:05 -0500
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian-mingw64/changelog
--- ncurses-6.0-20151121+/package/debian-mingw64/changelog 2015-11-21 15:55:51.000000000 +0000
+++ ncurses-6.0-20151128/package/debian-mingw64/changelog 2015-11-28 16:31:05.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20151121) unstable; urgency=low
+ncurses6 (6.0+20151128) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 21 Nov 2015 10:55:51 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 28 Nov 2015 11:31:05 -0500
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian/changelog
--- ncurses-6.0-20151121+/package/debian/changelog 2015-11-21 15:55:51.000000000 +0000
+++ ncurses-6.0-20151128/package/debian/changelog 2015-11-28 16:31:05.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20151121) unstable; urgency=low
+ncurses6 (6.0+20151128) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 21 Nov 2015 10:55:51 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 28 Nov 2015 11:31:05 -0500
ncurses6 (5.9-20120608) unstable; urgency=low
Index: package/mingw-ncurses.nsi
Prereq: 1.133
--- ncurses-6.0-20151121+/package/mingw-ncurses.nsi 2015-11-21 15:55:51.000000000 +0000
+++ ncurses-6.0-20151128/package/mingw-ncurses.nsi 2015-11-28 16:31:05.000000000 +0000
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.133 2015/11/21 15:55:51 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.134 2015/11/28 16:31:05 tom Exp $
; TODO add examples
; TODO bump ABI to 6
@@ -10,7 +10,7 @@
!define VERSION_MAJOR "6"
!define VERSION_MINOR "0"
!define VERSION_YYYY "2015"
-!define VERSION_MMDD "1121"
+!define VERSION_MMDD "1128"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"
Index: package/mingw-ncurses.spec
--- ncurses-6.0-20151121+/package/mingw-ncurses.spec 2015-11-21 15:55:51.000000000 +0000
+++ ncurses-6.0-20151128/package/mingw-ncurses.spec 2015-11-28 16:31:05.000000000 +0000
@@ -3,7 +3,7 @@
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 6.0
-Release: 20151121
+Release: 20151128
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncurses.spec
--- ncurses-6.0-20151121+/package/ncurses.spec 2015-11-21 15:55:51.000000000 +0000
+++ ncurses-6.0-20151128/package/ncurses.spec 2015-11-28 16:31:05.000000000 +0000
@@ -1,7 +1,7 @@
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 6.0
-Release: 20151121
+Release: 20151128
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: progs/dump_entry.c
Prereq: 1.123
--- ncurses-6.0-20151121+/progs/dump_entry.c 2015-09-05 23:31:12.000000000 +0000
+++ ncurses-6.0-20151128/progs/dump_entry.c 2015-11-28 22:54:33.000000000 +0000
@@ -39,7 +39,7 @@
#include "termsort.c" /* this C file is generated */
#include <parametrized.h> /* so is this */
-MODULE_ID("$Id: dump_entry.c,v 1.123 2015/09/05 23:31:12 tom Exp $")
+MODULE_ID("$Id: dump_entry.c,v 1.124 2015/11/28 22:54:33 tom Exp $")
#define DISCARD(string) string = ABSENT_STRING
#define PRINTF (void) printf
@@ -510,6 +510,10 @@
while (*src != '\0') {
switch (*src) {
+ case '^':
+ percent = FALSE;
+ strncpy_DYN(&tmpbuf, src++, (size_t) 1);
+ break;
case '\\':
percent = FALSE;
strncpy_DYN(&tmpbuf, src++, (size_t) 1);
Index: test/ncurses.c
Prereq: 1.423
--- ncurses-6.0-20151121+/test/ncurses.c 2015-10-31 19:53:06.000000000 +0000
+++ ncurses-6.0-20151128/test/ncurses.c 2015-11-29 01:26:41.000000000 +0000
@@ -40,7 +40,7 @@
Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993
Thomas E. Dickey (beginning revision 1.27 in 1996).
-$Id: ncurses.c,v 1.423 2015/10/31 19:53:06 tom Exp $
+$Id: ncurses.c,v 1.425 2015/11/29 01:26:41 tom Exp $
***************************************************************************/
@@ -636,15 +636,22 @@
}
static void
-init_getch(WINDOW *win, GetchFlags flags)
+init_getch(WINDOW *win, GetchFlags flags, int delay)
{
memset(flags, FALSE, NUM_GETCH_FLAGS);
flags[UChar('k')] = (win == stdscr);
flags[UChar('m')] = TRUE;
+ flags[UChar('t')] = (delay != 0);
setup_getch(win, flags);
}
+static bool
+blocking_getch(GetchFlags flags, int delay)
+{
+ return ((delay < 0) && flags['t']);
+}
+
static void
wgetch_help(WINDOW *win, GetchFlags flags)
{
@@ -655,7 +662,8 @@
,"k -- toggle keypad/literal mode"
,"m -- toggle meta (7-bit/8-bit) mode"
,"^q -- quit"
- ,"s -- shell out\n"
+ ,"s -- shell out"
+ ,"t -- toggle timeout"
,"w -- create a new window"
#ifdef SIGTSTP
,"z -- suspend this process"
@@ -810,9 +818,9 @@
int c;
int incount = 0;
GetchFlags flags;
- bool blocking = (delay < 0);
- init_getch(win, flags);
+ init_getch(win, flags, delay);
+ notimeout(win, FALSE);
wtimeout(win, delay);
getyx(win, first_y, first_x);
@@ -823,7 +831,7 @@
for (;;) {
while ((c = wGetchar(win)) == ERR) {
incount++;
- if (blocking) {
+ if (blocking_getch(flags, delay)) {
(void) wprintw(win, "%05d: input error", incount);
break;
} else {
@@ -831,7 +839,7 @@
}
wgetch_wrap(win, first_y);
}
- if (c == ERR && blocking) {
+ if (c == ERR && blocking_getch(flags, delay)) {
wprintw(win, "ERR");
wgetch_wrap(win, first_y);
} else if (isQuit(c)) {
@@ -860,6 +868,10 @@
wgetch_help(win, flags);
} else if (c == 's') {
ShellOut(TRUE);
+ } else if (c == 't') {
+ notimeout(win, flags[UChar('t')]);
+ flags[UChar('t')] = !flags[UChar('t')];
+ wgetch_help(win, flags);
} else if (c == 'w') {
int high = getmaxy(win) - 1 - first_y + 1;
int wide = getmaxx(win) - first_x;
@@ -931,7 +943,7 @@
wtimeout(win, -1);
if (!level)
- init_getch(win, flags);
+ init_getch(win, flags, delay);
}
static int
@@ -958,7 +970,7 @@
delay = -1;
}
raw();
- move(5, 0);
+ move(6, 0);
return delay;
}
@@ -1060,11 +1072,11 @@
wint_t c;
int incount = 0;
GetchFlags flags;
- bool blocking = (delay < 0);
int code;
char *temp;
- init_getch(win, flags);
+ init_getch(win, flags, delay);
+ notimeout(win, FALSE);
wtimeout(win, delay);
getyx(win, first_y, first_x);
@@ -1075,7 +1087,7 @@
for (;;) {
while ((code = wGet_wchar(win, &c)) == ERR) {
incount++;
- if (blocking) {
+ if (blocking_getch(flags, delay)) {
(void) wprintw(win, "%05d: input error", incount);
break;
} else {
@@ -1083,7 +1095,7 @@
}
wgetch_wrap(win, first_y);
}
- if (code == ERR && blocking) {
+ if (code == ERR && blocking_getch(flags, delay)) {
wprintw(win, "ERR");
wgetch_wrap(win, first_y);
} else if (isQuit((int) c)) {
@@ -1125,6 +1137,10 @@
wgetch_help(win, flags);
} else if (c == 's') {
ShellOut(TRUE);
+ } else if (c == 't') {
+ notimeout(win, flags[UChar('t')]);
+ flags[UChar('t')] = !flags[UChar('t')];
+ wgetch_help(win, flags);
} else if (c == 'w') {
int high = getmaxy(win) - 1 - first_y + 1;
int wide = getmaxx(win) - first_x;
@@ -1184,7 +1200,7 @@
wtimeout(win, -1);
if (!level)
- init_getch(win, flags);
+ init_getch(win, flags, delay);
}
static void

3819
ncurses-6.0-20151205.patch
View File

File diff suppressed because it is too large Load Diff

2912
ncurses-6.0-20151212.patch
View File

File diff suppressed because it is too large Load Diff

9098
ncurses-6.0-20151219.patch
View File

File diff suppressed because it is too large Load Diff

366
ncurses-6.0-20151226.patch
View File

@ -1,366 +0,0 @@
# ncurses 6.0 - patch 20151226 - Thomas E. Dickey
#
# ------------------------------------------------------------------------------
#
# Ncurses 6.0 is at
# ftp.gnu.org:/pub/gnu
#
# Patches for ncurses 6.0 can be found at
# ftp://invisible-island.net/ncurses/6.0
# http://invisible-mirror.net/archives/ncurses/6.0
#
# ------------------------------------------------------------------------------
# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20151226.patch.gz
# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created Sun Dec 27 01:49:34 UTC 2015
# ------------------------------------------------------------------------------
# NEWS | 7 +
# VERSION | 2
# dist.mk | 4 -
# package/debian-mingw/changelog | 4 -
# package/debian-mingw64/changelog | 4 -
# package/debian/changelog | 4 -
# package/mingw-ncurses.nsi | 4 -
# package/mingw-ncurses.spec | 2
# package/ncurses.spec | 2
# progs/tic.c | 140 +++++++++++++++++++++++++++++++------
# 10 files changed, 139 insertions(+), 34 deletions(-)
# ------------------------------------------------------------------------------
Index: NEWS
Prereq: 1.2547
--- ncurses-6.0-20151219+/NEWS 2015-12-20 02:03:35.000000000 +0000
+++ ncurses-6.0-20151226/NEWS 2015-12-27 01:01:41.000000000 +0000
@@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.2547 2015/12/20 02:03:35 tom Exp $
+-- $Id: NEWS,v 1.2550 2015/12/27 01:01:41 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
@@ -45,6 +45,11 @@
Changes through 1.9.9e did not credit all contributions;
it is not possible to add this information.
+20151226
+ + add check in tic for use of bold, etc., video attributes in the
+ color capabilities, accounting whether the feature is listed in ncv.
+ + add check in tic for conflict between ritm, rmso, rmul versus sgr0.
+
20151219
+ add a paragraph to curs_getch.3x discussing key naming (discussion
with James Crippen).
Index: VERSION
--- ncurses-6.0-20151219+/VERSION 2015-12-13 14:53:53.000000000 +0000
+++ ncurses-6.0-20151226/VERSION 2015-12-26 15:21:12.000000000 +0000
@@ -1 +1 @@
-5:0:9 6.0 20151219
+5:0:9 6.0 20151226
Index: dist.mk
Prereq: 1.1084
--- ncurses-6.0-20151219+/dist.mk 2015-12-13 14:53:53.000000000 +0000
+++ ncurses-6.0-20151226/dist.mk 2015-12-26 15:21:12.000000000 +0000
@@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.1084 2015/12/13 14:53:53 tom Exp $
+# $Id: dist.mk,v 1.1085 2015/12/26 15:21:12 tom Exp $
# Makefile for creating ncurses distributions.
#
# This only needs to be used directly as a makefile by developers, but
@@ -37,7 +37,7 @@
# These define the major/minor/patch versions of ncurses.
NCURSES_MAJOR = 6
NCURSES_MINOR = 0
-NCURSES_PATCH = 20151219
+NCURSES_PATCH = 20151226
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
Index: package/debian-mingw/changelog
--- ncurses-6.0-20151219+/package/debian-mingw/changelog 2015-12-13 14:53:53.000000000 +0000
+++ ncurses-6.0-20151226/package/debian-mingw/changelog 2015-12-26 15:21:12.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20151219) unstable; urgency=low
+ncurses6 (6.0+20151226) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sun, 13 Dec 2015 09:53:53 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 26 Dec 2015 10:21:12 -0500
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian-mingw64/changelog
--- ncurses-6.0-20151219+/package/debian-mingw64/changelog 2015-12-13 14:53:53.000000000 +0000
+++ ncurses-6.0-20151226/package/debian-mingw64/changelog 2015-12-26 15:21:12.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20151219) unstable; urgency=low
+ncurses6 (6.0+20151226) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sun, 13 Dec 2015 09:53:53 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 26 Dec 2015 10:21:12 -0500
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian/changelog
--- ncurses-6.0-20151219+/package/debian/changelog 2015-12-13 14:53:53.000000000 +0000
+++ ncurses-6.0-20151226/package/debian/changelog 2015-12-26 15:21:12.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20151219) unstable; urgency=low
+ncurses6 (6.0+20151226) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sun, 13 Dec 2015 09:53:53 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 26 Dec 2015 10:21:12 -0500
ncurses6 (5.9-20120608) unstable; urgency=low
Index: package/mingw-ncurses.nsi
Prereq: 1.137
--- ncurses-6.0-20151219+/package/mingw-ncurses.nsi 2015-12-13 14:53:53.000000000 +0000
+++ ncurses-6.0-20151226/package/mingw-ncurses.nsi 2015-12-26 15:21:12.000000000 +0000
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.137 2015/12/13 14:53:53 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.138 2015/12/26 15:21:12 tom Exp $
; TODO add examples
; TODO bump ABI to 6
@@ -10,7 +10,7 @@
!define VERSION_MAJOR "6"
!define VERSION_MINOR "0"
!define VERSION_YYYY "2015"
-!define VERSION_MMDD "1219"
+!define VERSION_MMDD "1226"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"
Index: package/mingw-ncurses.spec
--- ncurses-6.0-20151219+/package/mingw-ncurses.spec 2015-12-13 14:53:53.000000000 +0000
+++ ncurses-6.0-20151226/package/mingw-ncurses.spec 2015-12-26 15:21:12.000000000 +0000
@@ -3,7 +3,7 @@
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 6.0
-Release: 20151219
+Release: 20151226
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncurses.spec
--- ncurses-6.0-20151219+/package/ncurses.spec 2015-12-13 14:53:53.000000000 +0000
+++ ncurses-6.0-20151226/package/ncurses.spec 2015-12-26 15:21:12.000000000 +0000
@@ -1,7 +1,7 @@
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 6.0
-Release: 20151219
+Release: 20151226
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: progs/tic.c
Prereq: 1.216
--- ncurses-6.0-20151219+/progs/tic.c 2015-09-05 19:22:49.000000000 +0000
+++ ncurses-6.0-20151226/progs/tic.c 2015-12-27 01:46:01.000000000 +0000
@@ -48,7 +48,7 @@
#include <parametrized.h>
#include <transform.h>
-MODULE_ID("$Id: tic.c,v 1.216 2015/09/05 19:22:49 tom Exp $")
+MODULE_ID("$Id: tic.c,v 1.220 2015/12/27 01:46:01 tom Exp $")
#define STDIN_NAME "<stdin>"
@@ -2028,6 +2028,23 @@
return s;
}
+#define DATA(name) { #name }
+static const char sgr_names[][11] =
+{
+ DATA(none),
+ DATA(standout),
+ DATA(underline),
+ DATA(reverse),
+ DATA(blink),
+ DATA(dim),
+ DATA(bold),
+ DATA(invis),
+ DATA(protect),
+ DATA(altcharset),
+ ""
+};
+#undef DATA
+
/*
* An sgr string may contain several settings other than the one we're
* interested in, essentially sgr0 + rmacs + whatever. As long as the
@@ -2037,21 +2054,6 @@
static bool
similar_sgr(int num, char *a, char *b)
{
-#define DATA(name) { #name }
- static const char names[][11] =
- {
- DATA(none),
- DATA(standout),
- DATA(underline),
- DATA(reverse),
- DATA(blink),
- DATA(dim),
- DATA(bold),
- DATA(invis),
- DATA(protect),
- DATA(altcharset),
- };
-#undef DATA
char *base_a = a;
char *base_b = b;
int delaying = 0;
@@ -2059,12 +2061,14 @@
while (*b != 0) {
while (*a != *b) {
if (*a == 0) {
- if (b[0] == '$'
- && b[1] == '<') {
+ if (num < 0) {
+ ;
+ } else if (b[0] == '$'
+ && b[1] == '<') {
_nc_warning("Did not find delay %s", _nc_visbuf(b));
} else {
_nc_warning("checking sgr(%s) %s\n\tcompare to %s\n\tunmatched %s",
- names[num], _nc_visbuf2(1, base_a),
+ sgr_names[num], _nc_visbuf2(1, base_a),
_nc_visbuf2(2, base_b),
_nc_visbuf2(3, b));
}
@@ -2264,6 +2268,92 @@
}
}
+/*
+ * Exiting a video mode should not duplicate sgr0
+ */
+static void
+check_exit_attribute(const char *name, char *test, char *trimmed, char *untrimmed)
+{
+ if (VALID_STRING(test)) {
+ if (similar_sgr(-1, trimmed, test) ||
+ similar_sgr(-1, untrimmed, test)) {
+ _nc_warning("%s matches exit_attribute_mode", name);
+ }
+ }
+}
+
+/*
+ * Returns true if the string looks like a standard SGR string.
+ */
+static bool
+is_sgr_string(char *value)
+{
+ bool result = FALSE;
+
+ if (VALID_STRING(value)) {
+ if (value[0] == '\033' && value[1] == '[') {
+ result = TRUE;
+ value += 2;
+ } else if (UChar(value[0]) == 0x9a) {
+ result = TRUE;
+ value += 1;
+ }
+ if (result) {
+ int ch;
+ while ((ch = UChar(*value++)) != '\0') {
+ if (isdigit(ch) || ch == ';') {
+ ;
+ } else if (ch == 'm' && *value == '\0') {
+ ;
+ } else {
+ result = FALSE;
+ break;
+ }
+ }
+ }
+ }
+ return result;
+}
+
+/*
+ * Check if the given capability contains a given SGR attribute.
+ */
+static void
+check_sgr_param(TERMTYPE *tp, int code, const char *name, char *value)
+{
+ if (VALID_STRING(value)) {
+ int ncv = ((code != 0) ? (1 << (code - 1)) : 0);
+ char *test = tgoto(value, 0, 0);
+ if (is_sgr_string(test)) {
+ int param = 0;
+ int count = 0;
+ while (*test != 0) {
+ if (isdigit(UChar(*test))) {
+ param = 10 * param + (*test - '0');
+ ++count;
+ } else {
+ if (count) {
+ if (param == code)
+ break;
+ }
+ count = 0;
+ param = 0;
+ }
+ ++test;
+ }
+ if (count != 0 && param == code) {
+ if (code == 0 ||
+ no_color_video < 0 ||
+ !(no_color_video & ncv)) {
+ _nc_warning("\"%s\" SGR-attribute used in %s",
+ sgr_names[code],
+ name);
+ }
+ }
+ }
+ }
+}
+
/* other sanity-checks (things that we don't want in the normal
* logic that reads a terminfo entry)
*/
@@ -2346,7 +2436,7 @@
if (_nc_syntax == SYN_TERMINFO)
_nc_warning("missing sgr string");
}
-
+#define CHECK_SGR0(name) check_exit_attribute(#name, name, check_sgr0, exit_attribute_mode)
if (PRESENT(exit_attribute_mode)) {
char *check_sgr0 = _nc_trim_sgr0(tp);
@@ -2365,10 +2455,20 @@
_nc_visbuf(exit_attribute_mode)));
}
}
+ CHECK_SGR0(exit_italics_mode);
+ CHECK_SGR0(exit_standout_mode);
+ CHECK_SGR0(exit_underline_mode);
if (check_sgr0 != exit_attribute_mode) {
free(check_sgr0);
}
}
+#define CHECK_SGR_PARAM(code, name) check_sgr_param(tp, (int)code, #name, name)
+ for (j = 0; *sgr_names[j] != '\0'; ++j) {
+ CHECK_SGR_PARAM(j, set_a_foreground);
+ CHECK_SGR_PARAM(j, set_a_background);
+ CHECK_SGR_PARAM(j, set_foreground);
+ CHECK_SGR_PARAM(j, set_background);
+ }
#ifdef TRACE
show_where(2);
if (!auto_right_margin) {

524
ncurses-6.0-20160102.patch
View File

@ -1,524 +0,0 @@
# ncurses 6.0 - patch 20160102 - Thomas E. Dickey
#
# ------------------------------------------------------------------------------
#
# Ncurses 6.0 is at
# ftp.gnu.org:/pub/gnu
#
# Patches for ncurses 6.0 can be found at
# ftp://invisible-island.net/ncurses/6.0
# http://invisible-mirror.net/archives/ncurses/6.0
#
# ------------------------------------------------------------------------------
# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20160102.patch.gz
# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created Sun Jan 3 01:50:40 UTC 2016
# ------------------------------------------------------------------------------
# Ada95/package/debian/copyright | 4 +-
# COPYING | 4 +-
# NEWS | 10 +++++-
# VERSION | 2 -
# dist.mk | 6 +--
# package/debian-mingw/changelog | 4 +-
# package/debian-mingw/copyright | 4 +-
# package/debian-mingw64/changelog | 4 +-
# package/debian-mingw64/copyright | 4 +-
# package/debian/changelog | 4 +-
# package/debian/copyright | 4 +-
# package/mingw-ncurses.nsi | 6 +--
# package/mingw-ncurses.spec | 2 -
# package/ncurses.spec | 2 -
# progs/tic.c | 16 ++++++++--
# test/ncurses.c | 51 +++++++++++++++++++++++++-------
# test/package/debian-mingw/copyright | 4 +-
# test/package/debian-mingw64/copyright | 4 +-
# test/package/debian/copyright | 4 +-
# 19 files changed, 93 insertions(+), 46 deletions(-)
# ------------------------------------------------------------------------------
Index: Ada95/package/debian/copyright
--- ncurses-6.0-20151226+/Ada95/package/debian/copyright 2015-05-09 18:00:51.000000000 +0000
+++ ncurses-6.0-20160102/Ada95/package/debian/copyright 2016-01-02 20:24:37.000000000 +0000
@@ -4,11 +4,11 @@
-------------------------------------------------------------------------------
Files: *
-Copyright: 1998-2014,2015 Free Software Foundation, Inc.
+Copyright: 1998-2015,2016 Free Software Foundation, Inc.
Licence: X11
Files: aclocal.m4 package
-Copyright: 2010-2014,2015 by Thomas E. Dickey
+Copyright: 2010-2015,2016 by Thomas E. Dickey
Licence: X11
Permission is hereby granted, free of charge, to any person obtaining a
Index: COPYING
Prereq: 1.3
--- ncurses-6.0-20151226+/COPYING 2015-01-03 20:12:01.000000000 +0000
+++ ncurses-6.0-20160102/COPYING 2016-01-02 20:24:37.000000000 +0000
@@ -1,4 +1,4 @@
-Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.
+Copyright (c) 1998-2015,2016 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
@@ -25,4 +25,4 @@
authorization.
-- vile:txtmode fc=72
--- $Id: COPYING,v 1.3 2015/01/03 20:12:01 tom Exp $
+-- $Id: COPYING,v 1.4 2016/01/02 20:24:37 tom Exp $
Index: NEWS
Prereq: 1.2550
--- ncurses-6.0-20151226+/NEWS 2015-12-27 01:01:41.000000000 +0000
+++ ncurses-6.0-20160102/NEWS 2016-01-03 01:17:55.000000000 +0000
@@ -1,5 +1,5 @@
-------------------------------------------------------------------------------
--- Copyright (c) 1998-2014,2015 Free Software Foundation, Inc. --
+-- Copyright (c) 1998-2015,2016 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 --
@@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.2550 2015/12/27 01:01:41 tom Exp $
+-- $Id: NEWS,v 1.2554 2016/01/03 01:17:55 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
@@ -45,6 +45,12 @@
Changes through 1.9.9e did not credit all contributions;
it is not possible to add this information.
+20160102
+ + modify ncurses c/C color test-screens to take advantage of wide
+ screens, reducing the number of lines used for 88- and 256-colors.
+ + minor refinement to check versus ncv to ignore two parameters of
+ SGR 38 and 48 when those come from color-capabilities.
+
20151226
+ add check in tic for use of bold, etc., video attributes in the
color capabilities, accounting whether the feature is listed in ncv.
Index: VERSION
--- ncurses-6.0-20151226+/VERSION 2015-12-26 15:21:12.000000000 +0000
+++ ncurses-6.0-20160102/VERSION 2016-01-02 18:42:09.000000000 +0000
@@ -1 +1 @@
-5:0:9 6.0 20151226
+5:0:9 6.0 20160102
Index: dist.mk
Prereq: 1.1085
--- ncurses-6.0-20151226+/dist.mk 2015-12-26 15:21:12.000000000 +0000
+++ ncurses-6.0-20160102/dist.mk 2016-01-02 20:24:37.000000000 +0000
@@ -1,5 +1,5 @@
##############################################################################
-# Copyright (c) 1998-2014,2015 Free Software Foundation, Inc. #
+# Copyright (c) 1998-2015,2016 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"), #
@@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.1085 2015/12/26 15:21:12 tom Exp $
+# $Id: dist.mk,v 1.1087 2016/01/02 20:24:37 tom Exp $
# Makefile for creating ncurses distributions.
#
# This only needs to be used directly as a makefile by developers, but
@@ -37,7 +37,7 @@
# These define the major/minor/patch versions of ncurses.
NCURSES_MAJOR = 6
NCURSES_MINOR = 0
-NCURSES_PATCH = 20151226
+NCURSES_PATCH = 20160102
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
Index: package/debian-mingw/changelog
--- ncurses-6.0-20151226+/package/debian-mingw/changelog 2015-12-26 15:21:12.000000000 +0000
+++ ncurses-6.0-20160102/package/debian-mingw/changelog 2016-01-02 18:42:09.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20151226) unstable; urgency=low
+ncurses6 (6.0+20160102) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 26 Dec 2015 10:21:12 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 02 Jan 2016 13:42:09 -0500
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian-mingw/copyright
--- ncurses-6.0-20151226+/package/debian-mingw/copyright 2015-05-09 18:11:06.000000000 +0000
+++ ncurses-6.0-20160102/package/debian-mingw/copyright 2016-01-02 20:24:37.000000000 +0000
@@ -5,11 +5,11 @@
-------------------------------------------------------------------------------
Files: *
-Copyright: 1998-2014,2015 Free Software Foundation, Inc.
+Copyright: 1998-2015,2016 Free Software Foundation, Inc.
Licence: X11
Files: aclocal.m4 package
-Copyright: 1996-2014,2015 by Thomas E. Dickey
+Copyright: 1996-2015,2016 by Thomas E. Dickey
Licence: X11
Files: doc/html/NCURSES-Programming-HOWTO.html
Index: package/debian-mingw64/changelog
--- ncurses-6.0-20151226+/package/debian-mingw64/changelog 2015-12-26 15:21:12.000000000 +0000
+++ ncurses-6.0-20160102/package/debian-mingw64/changelog 2016-01-02 18:42:09.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20151226) unstable; urgency=low
+ncurses6 (6.0+20160102) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 26 Dec 2015 10:21:12 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 02 Jan 2016 13:42:09 -0500
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian-mingw64/copyright
--- ncurses-6.0-20151226+/package/debian-mingw64/copyright 2015-05-09 18:11:06.000000000 +0000
+++ ncurses-6.0-20160102/package/debian-mingw64/copyright 2016-01-02 20:24:37.000000000 +0000
@@ -5,11 +5,11 @@
-------------------------------------------------------------------------------
Files: *
-Copyright: 1998-2014,2015 Free Software Foundation, Inc.
+Copyright: 1998-2015,2016 Free Software Foundation, Inc.
Licence: X11
Files: aclocal.m4 package
-Copyright: 1996-2014,2015 by Thomas E. Dickey
+Copyright: 1996-2015,2016 by Thomas E. Dickey
Licence: X11
Files: doc/html/NCURSES-Programming-HOWTO.html
Index: package/debian/changelog
--- ncurses-6.0-20151226+/package/debian/changelog 2015-12-26 15:21:12.000000000 +0000
+++ ncurses-6.0-20160102/package/debian/changelog 2016-01-02 18:42:09.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20151226) unstable; urgency=low
+ncurses6 (6.0+20160102) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 26 Dec 2015 10:21:12 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 02 Jan 2016 13:42:09 -0500
ncurses6 (5.9-20120608) unstable; urgency=low
Index: package/debian/copyright
--- ncurses-6.0-20151226+/package/debian/copyright 2015-05-09 18:11:06.000000000 +0000
+++ ncurses-6.0-20160102/package/debian/copyright 2016-01-02 20:24:37.000000000 +0000
@@ -5,11 +5,11 @@
-------------------------------------------------------------------------------
Files: *
-Copyright: 1998-2014,2015 Free Software Foundation, Inc.
+Copyright: 1998-2015,2016 Free Software Foundation, Inc.
Licence: X11
Files: aclocal.m4 package
-Copyright: 1996-2014,2015 by Thomas E. Dickey
+Copyright: 1996-2015,2016 by Thomas E. Dickey
Licence: X11
Files: doc/html/NCURSES-Programming-HOWTO.html
Index: package/mingw-ncurses.nsi
Prereq: 1.138
--- ncurses-6.0-20151226+/package/mingw-ncurses.nsi 2015-12-26 15:21:12.000000000 +0000
+++ ncurses-6.0-20160102/package/mingw-ncurses.nsi 2016-01-02 18:42:09.000000000 +0000
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.138 2015/12/26 15:21:12 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.139 2016/01/02 18:42:09 tom Exp $
; TODO add examples
; TODO bump ABI to 6
@@ -9,8 +9,8 @@
!define VERSION_MAJOR "6"
!define VERSION_MINOR "0"
-!define VERSION_YYYY "2015"
-!define VERSION_MMDD "1226"
+!define VERSION_YYYY "2016"
+!define VERSION_MMDD "0102"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"
Index: package/mingw-ncurses.spec
--- ncurses-6.0-20151226+/package/mingw-ncurses.spec 2015-12-26 15:21:12.000000000 +0000
+++ ncurses-6.0-20160102/package/mingw-ncurses.spec 2016-01-02 18:42:09.000000000 +0000
@@ -3,7 +3,7 @@
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 6.0
-Release: 20151226
+Release: 20160102
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncurses.spec
--- ncurses-6.0-20151226+/package/ncurses.spec 2015-12-26 15:21:12.000000000 +0000
+++ ncurses-6.0-20160102/package/ncurses.spec 2016-01-02 18:42:09.000000000 +0000
@@ -1,7 +1,7 @@
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 6.0
-Release: 20151226
+Release: 20160102
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: progs/tic.c
Prereq: 1.220
--- ncurses-6.0-20151226+/progs/tic.c 2015-12-27 01:46:01.000000000 +0000
+++ ncurses-6.0-20160102/progs/tic.c 2016-01-02 20:04:37.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2014,2015 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2015,2016 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 *
@@ -48,7 +48,7 @@
#include <parametrized.h>
#include <transform.h>
-MODULE_ID("$Id: tic.c,v 1.220 2015/12/27 01:46:01 tom Exp $")
+MODULE_ID("$Id: tic.c,v 1.221 2016/01/02 20:04:37 tom Exp $")
#define STDIN_NAME "<stdin>"
@@ -2327,13 +2327,23 @@
if (is_sgr_string(test)) {
int param = 0;
int count = 0;
+ int skips = 0;
+ int color = (value == set_a_foreground ||
+ value == set_a_background ||
+ value == set_foreground ||
+ value == set_background);
while (*test != 0) {
if (isdigit(UChar(*test))) {
param = 10 * param + (*test - '0');
++count;
} else {
if (count) {
- if (param == code)
+ /*
+ * Avoid unnecessary warning for xterm 256color codes.
+ */
+ if (color && (param == 38 || param == 48))
+ skips = 3;
+ if ((skips-- <= 0) && (param == code))
break;
}
count = 0;
Index: test/ncurses.c
Prereq: 1.425
--- ncurses-6.0-20151226+/test/ncurses.c 2015-11-29 01:26:41.000000000 +0000
+++ ncurses-6.0-20160102/test/ncurses.c 2016-01-03 01:50:10.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2014,2015 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2015,2016 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 *
@@ -40,7 +40,7 @@
Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993
Thomas E. Dickey (beginning revision 1.27 in 1996).
-$Id: ncurses.c,v 1.425 2015/11/29 01:26:41 tom Exp $
+$Id: ncurses.c,v 1.429 2016/01/03 01:50:10 tom Exp $
***************************************************************************/
@@ -2185,9 +2185,10 @@
int page_size = (LINES - grid_top);
int pairs_max;
int colors_max = COLORS;
+ int col_limit;
int row_limit;
int per_row;
- char numbered[80];
+ char *numbered = 0;
const char *hello;
bool done = FALSE;
bool opt_acsc = FALSE;
@@ -2197,6 +2198,15 @@
bool opt_wide = FALSE;
WINDOW *helpwin;
+ numbered = (char *) calloc((size_t) (COLS + 1), sizeof(char));
+ done = ((COLS < 16) || (numbered == 0));
+
+ /*
+ * Because the number of colors is usually a power of two, we also use
+ * a power of two for the number of colors shown per line (to be tidy).
+ */
+ for (col_limit = 1; col_limit * 2 < COLS; col_limit *= 2) ;
+
while (!done) {
int shown = 0;
@@ -2214,11 +2224,11 @@
if (opt_wide) {
width = 4;
hello = "Test";
- per_row = (colors_max > 8) ? 16 : 8;
+ per_row = (col_limit / ((colors_max > 8) ? 4 : 8));
} else {
width = 8;
hello = "Hello";
- per_row = 8;
+ per_row = (col_limit / 8);
}
per_row -= min_colors;
@@ -2249,6 +2259,9 @@
int col = (i % per_row + 1) * width;
NCURSES_PAIRS_T pair = i;
+ if ((i / per_row) > row_limit)
+ break;
+
#define InxToFG(i) (NCURSES_COLOR_T) ((i % (colors_max - min_colors)) + min_colors)
#define InxToBG(i) (NCURSES_COLOR_T) ((i / (colors_max - min_colors)) + min_colors)
if (row >= 0 && move(row, col) != ERR) {
@@ -2375,6 +2388,8 @@
erase();
endwin();
+
+ free(numbered);
}
#if USE_WIDEC_SUPPORT
@@ -2389,9 +2404,10 @@
int page_size = (LINES - grid_top);
int pairs_max = (unsigned short) (-1);
int colors_max = COLORS;
+ int col_limit;
int row_limit;
int per_row;
- char numbered[80];
+ char *numbered = 0;
const char *hello;
bool done = FALSE;
bool opt_acsc = FALSE;
@@ -2400,9 +2416,19 @@
bool opt_wide = FALSE;
bool opt_nums = FALSE;
bool opt_xchr = FALSE;
- wchar_t buffer[80];
+ wchar_t *buffer = 0;
WINDOW *helpwin;
+ numbered = (char *) calloc((size_t) (COLS + 1), sizeof(char));
+ buffer = (wchar_t *) calloc((size_t) (COLS + 1), sizeof(wchar_t));
+ done = ((COLS < 16) || (numbered == 0) || (buffer == 0));
+
+ /*
+ * Because the number of colors is usually a power of two, we also use
+ * a power of two for the number of colors shown per line (to be tidy).
+ */
+ for (col_limit = 1; col_limit * 2 < COLS; col_limit *= 2) ;
+
while (!done) {
int shown = 0;
@@ -2416,15 +2442,14 @@
pairs_max = COLOR_PAIRS;
}
- /* this assumes an 80-column line */
if (opt_wide) {
width = 4;
hello = "Test";
- per_row = (colors_max > 8) ? 16 : 8;
+ per_row = (col_limit / ((colors_max > 8) ? 4 : 8));
} else {
width = 8;
hello = "Hello";
- per_row = 8;
+ per_row = (col_limit / 8);
}
per_row -= min_colors;
@@ -2463,6 +2488,9 @@
int col = (i % per_row + 1) * width;
NCURSES_PAIRS_T pair = (NCURSES_PAIRS_T) i;
+ if ((i / per_row) > row_limit)
+ break;
+
if (row >= 0 && move(row, col) != ERR) {
init_pair(pair, InxToFG(i), InxToBG(i));
(void) color_set(pair, NULL);
@@ -2594,6 +2622,9 @@
erase();
endwin();
+
+ free(numbered);
+ free(buffer);
}
#endif /* USE_WIDEC_SUPPORT */
Index: test/package/debian-mingw/copyright
--- ncurses-6.0-20151226+/test/package/debian-mingw/copyright 2015-05-09 17:59:53.000000000 +0000
+++ ncurses-6.0-20160102/test/package/debian-mingw/copyright 2016-01-02 20:24:37.000000000 +0000
@@ -4,11 +4,11 @@
-------------------------------------------------------------------------------
Files: *
-Copyright: 1998-2014,2015 Free Software Foundation, Inc.
+Copyright: 1998-2015,2016 Free Software Foundation, Inc.
Licence: X11
Files: aclocal.m4 package
-Copyright: 2003-2014,2015 by Thomas E. Dickey
+Copyright: 2003-2015,2016 by Thomas E. Dickey
Licence: X11
Permission is hereby granted, free of charge, to any person obtaining a
Index: test/package/debian-mingw64/copyright
--- ncurses-6.0-20151226+/test/package/debian-mingw64/copyright 2015-05-09 17:59:53.000000000 +0000
+++ ncurses-6.0-20160102/test/package/debian-mingw64/copyright 2016-01-02 20:24:37.000000000 +0000
@@ -4,11 +4,11 @@
-------------------------------------------------------------------------------
Files: *
-Copyright: 1998-2014,2015 Free Software Foundation, Inc.
+Copyright: 1998-2015,2016 Free Software Foundation, Inc.
Licence: X11
Files: aclocal.m4 package
-Copyright: 2003-2014,2015 by Thomas E. Dickey
+Copyright: 2003-2015,2016 by Thomas E. Dickey
Licence: X11
Permission is hereby granted, free of charge, to any person obtaining a
Index: test/package/debian/copyright
--- ncurses-6.0-20151226+/test/package/debian/copyright 2015-05-09 17:59:33.000000000 +0000
+++ ncurses-6.0-20160102/test/package/debian/copyright 2016-01-02 20:24:37.000000000 +0000
@@ -4,11 +4,11 @@
-------------------------------------------------------------------------------
Files: *
-Copyright: 1998-2014,2015 Free Software Foundation, Inc.
+Copyright: 1998-2015,2016 Free Software Foundation, Inc.
Licence: X11
Files: aclocal.m4 package
-Copyright: 2003-2014,2015 by Thomas E. Dickey
+Copyright: 2003-2015,2016 by Thomas E. Dickey
Licence: X11
Permission is hereby granted, free of charge, to any person obtaining a

474
ncurses-6.0-20160116.patch
View File

@ -1,474 +0,0 @@
# ncurses 6.0 - patch 20160116 - Thomas E. Dickey
#
# ------------------------------------------------------------------------------
#
# Ncurses 6.0 is at
# ftp.gnu.org:/pub/gnu
#
# Patches for ncurses 6.0 can be found at
# ftp://invisible-island.net/ncurses/6.0
# http://invisible-mirror.net/archives/ncurses/6.0
#
# ------------------------------------------------------------------------------
# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20160116.patch.gz
# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created Sun Jan 17 02:21:18 UTC 2016
# ------------------------------------------------------------------------------
# NEWS | 15 ++++++++++++++-
# VERSION | 2 +-
# dist.mk | 4 ++--
# misc/terminfo.src | 37 +++++++++++++++++++++++--------------
# ncurses/base/lib_addstr.c | 6 ++++--
# ncurses/curses.priv.h | 6 +++---
# ncurses/trace/lib_traceatr.c | 13 ++++++++++---
# ncurses/trace/visbuf.c | 15 ++++++++++-----
# package/debian-mingw/changelog | 4 ++--
# package/debian-mingw64/changelog | 4 ++--
# package/debian/changelog | 4 ++--
# package/mingw-ncurses.nsi | 4 ++--
# package/mingw-ncurses.spec | 2 +-
# package/ncurses.spec | 2 +-
# test/test_sgr.c | 8 ++++----
# 15 files changed, 81 insertions(+), 45 deletions(-)
# ------------------------------------------------------------------------------
Index: NEWS
Prereq: 1.2554
--- ncurses-6.0-20160102+/NEWS 2016-01-03 01:17:55.000000000 +0000
+++ ncurses-6.0-20160116/NEWS 2016-01-17 00:37:27.000000000 +0000
@@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.2554 2016/01/03 01:17:55 tom Exp $
+-- $Id: NEWS,v 1.2560 2016/01/17 00:37:27 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
@@ -45,6 +45,19 @@
Changes through 1.9.9e did not credit all contributions;
it is not possible to add this information.
+20160116
+ + tidy up comments about hardcoded 256color palette (report by
+ Leonardo Brondani Schenkel) -TD
+ + add putty-noapp entry, and amend putty entry to use application mode
+ for better consistency with xterm (report by Leonardo Brondani
+ Schenkel) -TD
+ + modify _nc_viscbuf2() and _tracecchar_t2() to trace wide-characters
+ as a whole rather than their multibyte equivalents.
+ + minor fix in wadd_wchnstr() to ensure that each cell has nonzero
+ width.
+ + move PUTC_INIT calls next to wcrtomb calls, to avoid carry-over of
+ error status when processing Unicode values which are not mapped.
+
20160102
+ modify ncurses c/C color test-screens to take advantage of wide
screens, reducing the number of lines used for 88- and 256-colors.
Index: VERSION
--- ncurses-6.0-20160102+/VERSION 2016-01-02 18:42:09.000000000 +0000
+++ ncurses-6.0-20160116/VERSION 2016-01-16 21:24:23.000000000 +0000
@@ -1 +1 @@
-5:0:9 6.0 20160102
+5:0:9 6.0 20160116
Index: dist.mk
Prereq: 1.1087
--- ncurses-6.0-20160102+/dist.mk 2016-01-02 20:24:37.000000000 +0000
+++ ncurses-6.0-20160116/dist.mk 2016-01-16 21:24:23.000000000 +0000
@@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.1087 2016/01/02 20:24:37 tom Exp $
+# $Id: dist.mk,v 1.1089 2016/01/16 21:24:23 tom Exp $
# Makefile for creating ncurses distributions.
#
# This only needs to be used directly as a makefile by developers, but
@@ -37,7 +37,7 @@
# These define the major/minor/patch versions of ncurses.
NCURSES_MAJOR = 6
NCURSES_MINOR = 0
-NCURSES_PATCH = 20160102
+NCURSES_PATCH = 20160116
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
Index: misc/terminfo.src
--- ncurses-6.0-20160102+/misc/terminfo.src 2015-11-28 21:35:00.000000000 +0000
+++ ncurses-6.0-20160116/misc/terminfo.src 2016-01-17 00:25:26.000000000 +0000
@@ -6,8 +6,8 @@
# Report bugs and new terminal descriptions to
# bug-ncurses@gnu.org
#
-# $Revision: 1.559 $
-# $Date: 2015/11/28 21:35:00 $
+# $Revision: 1.561 $
+# $Date: 2016/01/17 00:25:26 $
#
# 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
@@ -3580,28 +3580,31 @@
ind=^J, indn=\E[%p1%dS,
initc=\E]P%p1%x%p2%{255}%*%{1000}%/%02x%p3%{255}%*%{1000}%/%02x%p4%{255}%*%{1000}%/%02x,
is2=\E7\E[r\E[m\E[?7h\E[?1;4;6l\E[4l\E8\E>\E]R,
- kLFT=\EOD, kRIT=\EOC, kb2=\E[G, kbs=\177, kcbt=\E[Z,
- kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
+ kLFT=\E[D, kRIT=\E[C, kb2=\E[G, kbs=\177, kcbt=\E[Z,
+ kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
kdch1=\E[3~, kend=\E[4~, khome=\E[1~, kich1=\E[2~,
- kind=\EOB, kmous=\E[M, knp=\E[6~, kpp=\E[5~, kri=\EOA,
+ kind=\E[B, kmous=\E[M, knp=\E[6~, kpp=\E[5~, kri=\E[A,
kspd=^Z, nel=^M^J, oc=\E]R, op=\E[39;49m, rc=\E8, rev=\E[7m,
ri=\EM, rin=\E[%p1%dT, rmacs=^O, rmam=\E[?7l,
- rmcup=\E[2J\E[?47l, rmir=\E[4l, rmpch=\E[10m,
- rmso=\E[27m, rmul=\E[24m,
+ rmcup=\E[2J\E[?47l, rmir=\E[4l, rmkx=\E[?1l\E>,
+ rmpch=\E[10m, rmso=\E[27m, rmul=\E[24m,
rs2=\E<\E["p\E[50;6"p\Ec\E[?3l\E]R\E[?1000l,
s0ds=\E[10m, s1ds=\E[11m, s2ds=\E[12m, sc=\E7,
setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;,
sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smcup=\E[?47h,
- smir=\E[4h, smpch=\E[11m, smso=\E[7m, smul=\E[4m,
- tbc=\E[3g, vpa=\E[%i%p1%dd, E3=\E[3J, use=putty+fnkeys,
- use=vt102+enq, use=xterm+sl,
+ smir=\E[4h, smkx=\E[?1h\E=, smpch=\E[11m, smso=\E[7m,
+ smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd, E3=\E[3J,
+ use=putty+fnkeys, use=vt102+enq, use=xterm+sl,
vt100-putty|Reset PuTTY to pure vt100,
rs2=\E<\E["p\Ec\E[?3l\E]R\E[40"p\E[61"p\E[50;1;2"p,
use=vt100,
-# palette is hardcoded...
putty-256color|PuTTY 0.58 with xterm 256-colors,
use=xterm+256setaf, use=putty,
+putty-noapp|putty with cursor keys in normal mode,
+ kLFT=\EOD, kRIT=\EOC, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
+ kcuu1=\E[A, kind=\EOB, kri=\EOA, rmkx=\E>, smkx=\E=,
+ use=putty,
# One of the keyboard selections is "VT100+".
# pterm (the X11 port) uses shifted F1-F10 as F11-F20
@@ -4235,6 +4238,7 @@
setaf=\E[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m,
setb@, setf@,
+# palette is hardcoded...
xterm+256setaf|xterm 256-color (set-only),
ccc@,
colors#256, pairs#32767,
@@ -4876,7 +4880,6 @@
vte|VTE aka GNOME Terminal,
use=vte-2014,
-# palette is hardcoded...
vte-256color|VTE with xterm 256-colors,
use=xterm+256color, use=vte,
gnome-256color|GNOME Terminal with xterm 256-colors,
@@ -4996,7 +4999,6 @@
konsole|KDE console window,
use=konsole-xf4x,
-# palette is hardcoded...
konsole-256color|KDE console window with xterm 256-colors,
use=xterm+256setaf, use=konsole,
@@ -23812,6 +23814,13 @@
# + fix some inconsistencies in the pccon* entries -TD
#
# 2015-11-28
-# add viewdata (Alexandre Montaron).
+# + add viewdata (Alexandre Montaron).
+#
+# 2016-01-16
+# + tidy up comments about hardcoded 256color palette (report by
+# Leonardo Brondani Schenkel) -TD
+# + add putty-noapp entry, and amend putty entry to use application mode
+# for better consistency with xterm (report by Leonardo Brondani
+# Schenkel) -TD
#
######## SHANTIH! SHANTIH! SHANTIH!
Index: ncurses/base/lib_addstr.c
Prereq: 1.52
--- ncurses-6.0-20160102+/ncurses/base/lib_addstr.c 2011-05-28 23:02:09.000000000 +0000
+++ ncurses-6.0-20160116/ncurses/base/lib_addstr.c 2016-01-16 21:00:53.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2011,2016 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 *
@@ -44,7 +44,7 @@
#include <curses.priv.h>
-MODULE_ID("$Id: lib_addstr.c,v 1.52 2011/05/28 23:02:09 tom Exp $")
+MODULE_ID("$Id: lib_addstr.c,v 1.53 2016/01/16 21:00:53 tom Exp $")
NCURSES_EXPORT(int)
waddnstr(WINDOW *win, const char *astr, int n)
@@ -194,6 +194,8 @@
}
SetWidecExt(line->text[x + j], j);
}
+ } else {
+ len = 1;
}
x = (NCURSES_SIZE_T) (x + len);
end += len - 1;
Index: ncurses/curses.priv.h
Prereq: 1.547
--- ncurses-6.0-20160102+/ncurses/curses.priv.h 2015-06-27 01:22:16.000000000 +0000
+++ ncurses-6.0-20160116/ncurses/curses.priv.h 2016-01-10 22:17:19.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2014,2015 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2015,2016 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 *
@@ -34,7 +34,7 @@
****************************************************************************/
/*
- * $Id: curses.priv.h,v 1.547 2015/06/27 01:22:16 tom Exp $
+ * $Id: curses.priv.h,v 1.548 2016/01/10 22:17:19 tom Exp $
*
* curses.priv.h
*
@@ -1428,11 +1428,11 @@
NCURSES_OUTC_FUNC (NCURSES_SP_ARGx CharOf(ch)); \
COUNT_OUTCHARS(1); \
} else { \
- PUTC_INIT; \
for (PUTC_i = 0; PUTC_i < CCHARW_MAX; ++PUTC_i) { \
PUTC_ch = (ch).chars[PUTC_i]; \
if (PUTC_ch == L'\0') \
break; \
+ PUTC_INIT; \
PUTC_n = (int) wcrtomb(PUTC_buf, \
(ch).chars[PUTC_i], &PUT_st); \
if (PUTC_n <= 0) { \
Index: ncurses/trace/lib_traceatr.c
Prereq: 1.83
--- ncurses-6.0-20160102+/ncurses/trace/lib_traceatr.c 2015-04-04 13:41:37.000000000 +0000
+++ ncurses-6.0-20160116/ncurses/trace/lib_traceatr.c 2016-01-16 21:23:43.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2013,2014 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2014,2016 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 *
@@ -43,7 +43,7 @@
#define CUR SP_TERMTYPE
#endif
-MODULE_ID("$Id: lib_traceatr.c,v 1.83 2015/04/04 13:41:37 tom Exp $")
+MODULE_ID("$Id: lib_traceatr.c,v 1.85 2016/01/16 21:23:43 tom Exp $")
#define COLOR_OF(c) ((c < 0) ? "default" : (c > 7 ? color_of(c) : colors[c].name))
@@ -338,7 +338,6 @@
PUTC_DATA;
int n;
- PUTC_INIT;
(void) _nc_trace_bufcat(bufnum, "{ ");
for (PUTC_i = 0; PUTC_i < CCHARW_MAX; ++PUTC_i) {
PUTC_ch = ch->chars[PUTC_i];
@@ -347,6 +346,7 @@
(void) _nc_trace_bufcat(bufnum, "\\000");
break;
}
+ PUTC_INIT;
PUTC_n = (int) wcrtomb(PUTC_buf, ch->chars[PUTC_i], &PUT_st);
if (PUTC_n <= 0) {
if (PUTC_ch != L'\0') {
@@ -356,6 +356,13 @@
UChar(ch->chars[PUTC_i])));
}
break;
+ } else if (ch->chars[PUTC_i] > 255) {
+ char temp[80];
+ sprintf(temp, "{%d:\\u%x}",
+ wcwidth(ch->chars[PUTC_i]),
+ ch->chars[PUTC_i]);
+ (void) _nc_trace_bufcat(bufnum, temp);
+ break;
}
for (n = 0; n < PUTC_n; n++) {
if (n)
Index: ncurses/trace/visbuf.c
Prereq: 1.44
--- ncurses-6.0-20160102+/ncurses/trace/visbuf.c 2014-09-25 08:51:13.000000000 +0000
+++ ncurses-6.0-20160116/ncurses/trace/visbuf.c 2016-01-10 23:51:56.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 2001-2012,2014 Free Software Foundation, Inc. *
+ * Copyright (c) 2001-2014,2016 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 *
@@ -42,7 +42,7 @@
#include <tic.h>
#include <ctype.h>
-MODULE_ID("$Id: visbuf.c,v 1.44 2014/09/25 08:51:13 tom Exp $")
+MODULE_ID("$Id: visbuf.c,v 1.46 2016/01/10 23:51:56 tom Exp $")
#define NUM_VISBUFS 4
@@ -315,9 +315,9 @@
if (!isWidecExt(buf[j])) {
PUTC_DATA;
- PUTC_INIT;
for (PUTC_i = 0; PUTC_i < CCHARW_MAX; ++PUTC_i) {
int k;
+ char temp[80];
PUTC_ch = buf[j].chars[PUTC_i];
if (PUTC_ch == L'\0') {
@@ -325,12 +325,17 @@
(void) _nc_trace_bufcat(bufnum, "\\000");
break;
}
+ PUTC_INIT;
PUTC_n = (int) wcrtomb(PUTC_buf,
buf[j].chars[PUTC_i], &PUT_st);
- if (PUTC_n <= 0)
+ if (PUTC_n <= 0 || buf[j].chars[PUTC_i] > 255) {
+ sprintf(temp, "{%d:\\u%x}",
+ wcwidth(buf[j].chars[PUTC_i]),
+ buf[j].chars[PUTC_i]);
+ (void) _nc_trace_bufcat(bufnum, temp);
break;
+ }
for (k = 0; k < PUTC_n; k++) {
- char temp[80];
VisChar(temp, UChar(PUTC_buf[k]), sizeof(temp));
(void) _nc_trace_bufcat(bufnum, temp);
}
Index: package/debian-mingw/changelog
--- ncurses-6.0-20160102+/package/debian-mingw/changelog 2016-01-02 18:42:09.000000000 +0000
+++ ncurses-6.0-20160116/package/debian-mingw/changelog 2016-01-16 21:24:23.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20160102) unstable; urgency=low
+ncurses6 (6.0+20160116) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 02 Jan 2016 13:42:09 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 16 Jan 2016 16:24:23 -0500
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian-mingw64/changelog
--- ncurses-6.0-20160102+/package/debian-mingw64/changelog 2016-01-02 18:42:09.000000000 +0000
+++ ncurses-6.0-20160116/package/debian-mingw64/changelog 2016-01-16 21:24:23.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20160102) unstable; urgency=low
+ncurses6 (6.0+20160116) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 02 Jan 2016 13:42:09 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 16 Jan 2016 16:24:23 -0500
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian/changelog
--- ncurses-6.0-20160102+/package/debian/changelog 2016-01-02 18:42:09.000000000 +0000
+++ ncurses-6.0-20160116/package/debian/changelog 2016-01-16 21:24:23.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20160102) unstable; urgency=low
+ncurses6 (6.0+20160116) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 02 Jan 2016 13:42:09 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 16 Jan 2016 16:24:23 -0500
ncurses6 (5.9-20120608) unstable; urgency=low
Index: package/mingw-ncurses.nsi
Prereq: 1.139
--- ncurses-6.0-20160102+/package/mingw-ncurses.nsi 2016-01-02 18:42:09.000000000 +0000
+++ ncurses-6.0-20160116/package/mingw-ncurses.nsi 2016-01-16 21:24:23.000000000 +0000
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.139 2016/01/02 18:42:09 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.141 2016/01/16 21:24:23 tom Exp $
; TODO add examples
; TODO bump ABI to 6
@@ -10,7 +10,7 @@
!define VERSION_MAJOR "6"
!define VERSION_MINOR "0"
!define VERSION_YYYY "2016"
-!define VERSION_MMDD "0102"
+!define VERSION_MMDD "0116"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"
Index: package/mingw-ncurses.spec
--- ncurses-6.0-20160102+/package/mingw-ncurses.spec 2016-01-02 18:42:09.000000000 +0000
+++ ncurses-6.0-20160116/package/mingw-ncurses.spec 2016-01-16 21:24:23.000000000 +0000
@@ -3,7 +3,7 @@
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 6.0
-Release: 20160102
+Release: 20160116
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncurses.spec
--- ncurses-6.0-20160102+/package/ncurses.spec 2016-01-02 18:42:09.000000000 +0000
+++ ncurses-6.0-20160116/package/ncurses.spec 2016-01-16 21:24:23.000000000 +0000
@@ -1,7 +1,7 @@
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 6.0
-Release: 20160102
+Release: 20160116
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: test/test_sgr.c
Prereq: 1.4
--- ncurses-6.0-20160102+/test/test_sgr.c 2015-11-21 22:43:50.000000000 +0000
+++ ncurses-6.0-20160116/test/test_sgr.c 2016-01-09 18:15:53.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 2015 Free Software Foundation, Inc. *
+ * Copyright (c) 2015,2016 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 *
@@ -29,7 +29,7 @@
/*
* Author: Thomas E. Dickey
*
- * $Id: test_sgr.c,v 1.4 2015/11/21 22:43:50 tom Exp $
+ * $Id: test_sgr.c,v 1.5 2016/01/09 18:15:53 tom Exp $
*
* A simple demo of the sgr/sgr0 terminal capabilities.
*/
@@ -146,7 +146,7 @@
printf("%4d ", bits);
bits &= ~ignore;
for (n = 0; n < MAXPAR; ++n) {
- putchar((bits & (1 << n)) ? params[n] : '-');
+ putchar((int) ((bits & (unsigned) (1 << n)) ? params[n] : '-'));
}
putchar(' ');
putp(sgr);
@@ -236,7 +236,7 @@
}
}
for (j = 0; j < MAXPAR; ++j) {
- unsigned mask = (1 << j);
+ unsigned mask = (unsigned) (1 << j);
for (count = 0; count < MAXSGR; ++count) {
if ((count & mask) != 0)
continue;

702
ncurses-6.0-20160123.patch
View File

@ -1,702 +0,0 @@
# ncurses 6.0 - patch 20160123 - Thomas E. Dickey
#
# ------------------------------------------------------------------------------
#
# Ncurses 6.0 is at
# ftp.gnu.org:/pub/gnu
#
# Patches for ncurses 6.0 can be found at
# ftp://invisible-island.net/ncurses/6.0
# http://invisible-mirror.net/archives/ncurses/6.0
#
# ------------------------------------------------------------------------------
# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20160123.patch.gz
# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created Sun Jan 24 02:28:05 UTC 2016
# ------------------------------------------------------------------------------
# NEWS | 7 ++++++-
# VERSION | 2 +-
# dist.mk | 4 ++--
# form/f_trace.c | 6 +++---
# form/fld_arg.c | 6 +++---
# form/fld_attr.c | 6 +++---
# form/fld_ftchoice.c | 6 +++---
# form/fld_newftyp.c | 6 +++---
# form/frm_hook.c | 6 +++---
# form/fty_generic.c | 10 +++++++---
# include/curses.h.in | 12 ++++++------
# include/curses.tail | 4 +++-
# menu/m_hook.c | 6 +++---
# menu/m_trace.c | 6 +++---
# ncurses/Makefile.in | 7 ++++---
# ncurses/base/lib_getch.c | 6 +++---
# ncurses/base/lib_set_term.c | 6 +++---
# ncurses/base/use_window.c | 6 +++---
# ncurses/curses.priv.h | 7 +++++--
# ncurses/tinfo/lib_tputs.c | 6 +++---
# ncurses/tinfo/use_screen.c | 6 +++---
# package/debian-mingw/changelog | 4 ++--
# package/debian-mingw64/changelog | 4 ++--
# package/debian/changelog | 4 ++--
# package/mingw-ncurses.nsi | 4 ++--
# package/mingw-ncurses.spec | 2 +-
# package/ncurses.spec | 2 +-
# 27 files changed, 83 insertions(+), 68 deletions(-)
# ------------------------------------------------------------------------------
Index: NEWS
Prereq: 1.2560
--- ncurses-6.0-20160116+/NEWS 2016-01-17 00:37:27.000000000 +0000
+++ ncurses-6.0-20160123/NEWS 2016-01-24 01:17:56.000000000 +0000
@@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.2560 2016/01/17 00:37:27 tom Exp $
+-- $Id: NEWS,v 1.2564 2016/01/24 01:17:56 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
@@ -45,6 +45,11 @@
Changes through 1.9.9e did not credit all contributions;
it is not possible to add this information.
+20160123
+ + ifdef'd header-file definition of mouse_trafo() with NCURSES_NOMACROS
+ (report by Corey Minyard).
+ + fix some strict compiler-warnings in traces.
+
20160116
+ tidy up comments about hardcoded 256color palette (report by
Leonardo Brondani Schenkel) -TD
Index: VERSION
--- ncurses-6.0-20160116+/VERSION 2016-01-16 21:24:23.000000000 +0000
+++ ncurses-6.0-20160123/VERSION 2016-01-23 17:00:00.000000000 +0000
@@ -1 +1 @@
-5:0:9 6.0 20160116
+5:0:9 6.0 20160123
Index: dist.mk
Prereq: 1.1089
--- ncurses-6.0-20160116+/dist.mk 2016-01-16 21:24:23.000000000 +0000
+++ ncurses-6.0-20160123/dist.mk 2016-01-23 17:00:00.000000000 +0000
@@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.1089 2016/01/16 21:24:23 tom Exp $
+# $Id: dist.mk,v 1.1090 2016/01/23 17:00:00 tom Exp $
# Makefile for creating ncurses distributions.
#
# This only needs to be used directly as a makefile by developers, but
@@ -37,7 +37,7 @@
# These define the major/minor/patch versions of ncurses.
NCURSES_MAJOR = 6
NCURSES_MINOR = 0
-NCURSES_PATCH = 20160116
+NCURSES_PATCH = 20160123
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
Index: form/f_trace.c
Prereq: 1.2
--- ncurses-6.0-20160116+/form/f_trace.c 2010-01-23 21:14:36.000000000 +0000
+++ ncurses-6.0-20160123/form/f_trace.c 2016-01-23 21:32:00.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 2004,2010 Free Software Foundation, Inc. *
+ * Copyright (c) 2004-2010,2016 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 *
@@ -32,7 +32,7 @@
#include "form.priv.h"
-MODULE_ID("$Id: f_trace.c,v 1.2 2010/01/23 21:14:36 tom Exp $")
+MODULE_ID("$Id: f_trace.c,v 1.3 2016/01/23 21:32:00 tom Exp $")
NCURSES_EXPORT(FIELD **)
_nc_retrace_field_ptr(FIELD **code)
@@ -65,6 +65,6 @@
NCURSES_EXPORT(Form_Hook)
_nc_retrace_form_hook(Form_Hook code)
{
- T((T_RETURN("%p"), code));
+ T((T_RETURN("%p"), TR_FUNC(code)));
return code;
}
Index: form/fld_arg.c
Prereq: 1.13
--- ncurses-6.0-20160116+/form/fld_arg.c 2012-06-10 00:27:49.000000000 +0000
+++ ncurses-6.0-20160123/form/fld_arg.c 2016-01-23 21:32:00.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2012,2016 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 *
@@ -32,7 +32,7 @@
#include "form.priv.h"
-MODULE_ID("$Id: fld_arg.c,v 1.13 2012/06/10 00:27:49 tom Exp $")
+MODULE_ID("$Id: fld_arg.c,v 1.14 2016/01/23 21:32:00 tom Exp $")
/*---------------------------------------------------------------------------
| Facility : libnform
@@ -67,7 +67,7 @@
void (*const free_arg) (void *))
{
T((T_CALLED("set_fieldtype_arg(%p,%p,%p,%p)"),
- (void *)typ, make_arg, copy_arg, free_arg));
+ (void *)typ, TR_FUNC(make_arg), TR_FUNC(copy_arg), TR_FUNC(free_arg)));
if (typ != 0 && make_arg != (void *)0)
{
Index: form/fld_attr.c
Prereq: 1.11
--- ncurses-6.0-20160116+/form/fld_attr.c 2010-01-23 21:12:08.000000000 +0000
+++ ncurses-6.0-20160123/form/fld_attr.c 2016-01-23 21:32:00.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2004,2010 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2010,2016 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 *
@@ -32,7 +32,7 @@
#include "form.priv.h"
-MODULE_ID("$Id: fld_attr.c,v 1.11 2010/01/23 21:12:08 tom Exp $")
+MODULE_ID("$Id: fld_attr.c,v 1.12 2016/01/23 21:32:00 tom Exp $")
/*----------------------------------------------------------------------------
Field-Attribute manipulation routines
@@ -42,7 +42,7 @@
NCURSES_IMPEXP int NCURSES_API set_field_ ## name (FIELD * field, chtype attr)\
{\
int res = E_BAD_ARGUMENT;\
- T((T_CALLED("set_field_" #name "(%p,%s)"), field, _traceattr(attr)));\
+ T((T_CALLED("set_field_" #name "(%p,%s)"), (void *)field, _traceattr(attr)));\
if ( attr==A_NORMAL || ((attr & A_ATTRIBUTES)==attr) )\
{\
Normalize_Field( field );\
Index: form/fld_ftchoice.c
Prereq: 1.13
--- ncurses-6.0-20160116+/form/fld_ftchoice.c 2012-06-10 00:27:49.000000000 +0000
+++ ncurses-6.0-20160123/form/fld_ftchoice.c 2016-01-23 21:32:00.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2012,2016 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 *
@@ -32,7 +32,7 @@
#include "form.priv.h"
-MODULE_ID("$Id: fld_ftchoice.c,v 1.13 2012/06/10 00:27:49 tom Exp $")
+MODULE_ID("$Id: fld_ftchoice.c,v 1.14 2016/01/23 21:32:00 tom Exp $")
/*---------------------------------------------------------------------------
| Facility : libnform
@@ -51,7 +51,7 @@
bool (*const next_choice) (FIELD *, const void *),
bool (*const prev_choice) (FIELD *, const void *))
{
- T((T_CALLED("set_fieldtype_choice(%p,%p,%p)"), (void *)typ, next_choice, prev_choice));
+ T((T_CALLED("set_fieldtype_choice(%p,%p,%p)"), (void *)typ, TR_FUNC(next_choice), TR_FUNC(prev_choice)));
if (!typ || !next_choice || !prev_choice)
RETURN(E_BAD_ARGUMENT);
Index: form/fld_newftyp.c
Prereq: 1.19
--- ncurses-6.0-20160116+/form/fld_newftyp.c 2010-01-23 21:14:36.000000000 +0000
+++ ncurses-6.0-20160123/form/fld_newftyp.c 2016-01-23 21:32:00.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2010,2016 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 *
@@ -32,7 +32,7 @@
#include "form.priv.h"
-MODULE_ID("$Id: fld_newftyp.c,v 1.19 2010/01/23 21:14:36 tom Exp $")
+MODULE_ID("$Id: fld_newftyp.c,v 1.20 2016/01/23 21:32:00 tom Exp $")
static FIELDTYPE default_fieldtype =
{
@@ -76,7 +76,7 @@
{
FIELDTYPE *nftyp = (FIELDTYPE *)0;
- T((T_CALLED("new_fieldtype(%p,%p)"), field_check, char_check));
+ T((T_CALLED("new_fieldtype(%p,%p)"), TR_FUNC(field_check), TR_FUNC(char_check)));
if ((field_check) || (char_check))
{
nftyp = typeMalloc(FIELDTYPE, 1);
Index: form/frm_hook.c
Prereq: 1.16
--- ncurses-6.0-20160116+/form/frm_hook.c 2012-03-11 00:37:16.000000000 +0000
+++ ncurses-6.0-20160123/form/frm_hook.c 2016-01-23 21:32:00.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2012,2016 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 *
@@ -32,13 +32,13 @@
#include "form.priv.h"
-MODULE_ID("$Id: frm_hook.c,v 1.16 2012/03/11 00:37:16 tom Exp $")
+MODULE_ID("$Id: frm_hook.c,v 1.17 2016/01/23 21:32:00 tom Exp $")
/* "Template" macro to generate function to set application specific hook */
#define GEN_HOOK_SET_FUNCTION( typ, name ) \
NCURSES_IMPEXP int NCURSES_API set_ ## typ ## _ ## name (FORM *form, Form_Hook func)\
{\
- T((T_CALLED("set_" #typ"_"#name"(%p,%p)"), (void *) form, func));\
+ T((T_CALLED("set_" #typ"_"#name"(%p,%p)"), (void *) form, TR_FUNC(func)));\
(Normalize_Form( form ) -> typ ## name) = func ;\
RETURN(E_OK);\
}
Index: form/fty_generic.c
Prereq: 1.6
--- ncurses-6.0-20160116+/form/fty_generic.c 2012-06-10 00:27:49.000000000 +0000
+++ ncurses-6.0-20160123/form/fty_generic.c 2016-01-23 21:32:00.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 2008-2010,2012 Free Software Foundation, Inc. *
+ * Copyright (c) 2008-2012,2016 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 *
@@ -34,7 +34,7 @@
#include "form.priv.h"
-MODULE_ID("$Id: fty_generic.c,v 1.6 2012/06/10 00:27:49 tom Exp $")
+MODULE_ID("$Id: fty_generic.c,v 1.7 2016/01/23 21:32:00 tom Exp $")
/*
* This is not a full implementation of a field type, but adds some
@@ -110,7 +110,11 @@
FIELDTYPE *res = (FIELDTYPE *)0;
T((T_CALLED("_nc_generic_fieldtype(%p,%p,%p,%p,%p)"),
- field_check, char_check, next, prev, freecallback));
+ TR_FUNC(field_check),
+ TR_FUNC(char_check),
+ TR_FUNC(next),
+ TR_FUNC(prev),
+ TR_FUNC(freecallback)));
if (field_check || char_check)
{
Index: include/curses.h.in
Prereq: 1.242
--- ncurses-6.0-20160116+/include/curses.h.in 2015-12-19 23:08:31.000000000 +0000
+++ ncurses-6.0-20160123/include/curses.h.in 2016-01-23 22:20:31.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2014,2015 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2015,2016 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 *
@@ -32,7 +32,7 @@
* and: Thomas E. Dickey 1996-on *
****************************************************************************/
-/* $Id: curses.h.in,v 1.242 2015/12/19 23:08:31 tom Exp $ */
+/* $Id: curses.h.in,v 1.243 2016/01/23 22:20:31 tom Exp $ */
#ifndef __NCURSES_H
#define __NCURSES_H
@@ -1204,13 +1204,13 @@
#define addchstr(str) waddchstr(stdscr,(str))
#define addnstr(str,n) waddnstr(stdscr,(str),(n))
#define addstr(str) waddnstr(stdscr,(str),-1)
-#define attroff(at) wattroff(stdscr,(at))
-#define attron(at) wattron(stdscr,(at))
-#define attrset(at) wattrset(stdscr,(at))
#define attr_get(ap,cp,o) wattr_get(stdscr,(ap),(cp),(o))
#define attr_off(a,o) wattr_off(stdscr,(a),(o))
#define attr_on(a,o) wattr_on(stdscr,(a),(o))
#define attr_set(a,c,o) wattr_set(stdscr,(a),(c),(o))
+#define attroff(at) wattroff(stdscr,(at))
+#define attron(at) wattron(stdscr,(at))
+#define attrset(at) wattrset(stdscr,(at))
#define bkgd(ch) wbkgd(stdscr,(ch))
#define bkgdset(ch) wbkgdset(stdscr,(ch))
#define chgat(n,a,c,o) wchgat(stdscr,(n),(a),(c),(o))
@@ -1253,8 +1253,8 @@
#define mvwaddchstr(win,y,x,str) (wmove((win),(y),(x)) == ERR ? ERR : waddchnstr((win),(str),-1))
#define mvwaddnstr(win,y,x,str,n) (wmove((win),(y),(x)) == ERR ? ERR : waddnstr((win),(str),(n)))
#define mvwaddstr(win,y,x,str) (wmove((win),(y),(x)) == ERR ? ERR : waddnstr((win),(str),-1))
-#define mvwdelch(win,y,x) (wmove((win),(y),(x)) == ERR ? ERR : wdelch(win))
#define mvwchgat(win,y,x,n,a,c,o) (wmove((win),(y),(x)) == ERR ? ERR : wchgat((win),(n),(a),(c),(o)))
+#define mvwdelch(win,y,x) (wmove((win),(y),(x)) == ERR ? ERR : wdelch(win))
#define mvwgetch(win,y,x) (wmove((win),(y),(x)) == ERR ? ERR : wgetch(win))
#define mvwgetnstr(win,y,x,str,n) (wmove((win),(y),(x)) == ERR ? ERR : wgetnstr((win),(str),(n)))
#define mvwgetstr(win,y,x,str) (wmove((win),(y),(x)) == ERR ? ERR : wgetstr((win),(str)))
Index: include/curses.tail
Prereq: 1.21
--- ncurses-6.0-20160116+/include/curses.tail 2011-10-29 20:03:22.000000000 +0000
+++ ncurses-6.0-20160123/include/curses.tail 2016-01-23 22:03:27.000000000 +0000
@@ -1,4 +1,4 @@
-/* $Id: curses.tail,v 1.21 2011/10/29 20:03:22 tom Exp $ */
+/* $Id: curses.tail,v 1.22 2016/01/23 22:03:27 tom Exp $ */
/*
* vile:cmode:
* This file is part of ncurses, designed to be appended after curses.h.in
@@ -111,7 +111,9 @@
extern NCURSES_EXPORT(int) NCURSES_SP_NAME(mouseinterval) (SCREEN*, int);
#endif
+#ifndef NCURSES_NOMACROS
#define mouse_trafo(y,x,to_screen) wmouse_trafo(stdscr,y,x,to_screen)
+#endif
/* other non-XSI functions */
Index: menu/m_hook.c
Prereq: 1.16
--- ncurses-6.0-20160116+/menu/m_hook.c 2012-03-10 23:43:41.000000000 +0000
+++ ncurses-6.0-20160123/menu/m_hook.c 2016-01-23 21:32:00.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2012,2016 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 *
@@ -37,13 +37,13 @@
#include "menu.priv.h"
-MODULE_ID("$Id: m_hook.c,v 1.16 2012/03/10 23:43:41 tom Exp $")
+MODULE_ID("$Id: m_hook.c,v 1.17 2016/01/23 21:32:00 tom Exp $")
/* "Template" macro to generate function to set application specific hook */
#define GEN_HOOK_SET_FUNCTION( typ, name ) \
NCURSES_IMPEXP int NCURSES_API set_ ## typ ## _ ## name (MENU *menu, Menu_Hook func )\
{\
- T((T_CALLED("set_" #typ "_" #name "(%p,%p)"), (void *) menu, func));\
+ T((T_CALLED("set_" #typ "_" #name "(%p,%p)"), (void *) menu, TR_FUNC(func)));\
(Normalize_Menu(menu) -> typ ## name = func );\
RETURN(E_OK);\
}
Index: menu/m_trace.c
Prereq: 1.4
--- ncurses-6.0-20160116+/menu/m_trace.c 2010-01-23 21:20:10.000000000 +0000
+++ ncurses-6.0-20160123/menu/m_trace.c 2016-01-23 21:32:00.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 2004-2005,2010 Free Software Foundation, Inc. *
+ * Copyright (c) 2004-2010,2016 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 *
@@ -32,7 +32,7 @@
#include "menu.priv.h"
-MODULE_ID("$Id: m_trace.c,v 1.4 2010/01/23 21:20:10 tom Exp $")
+MODULE_ID("$Id: m_trace.c,v 1.5 2016/01/23 21:32:00 tom Exp $")
NCURSES_EXPORT(ITEM *)
_nc_retrace_item(ITEM * code)
@@ -65,7 +65,7 @@
NCURSES_EXPORT(Menu_Hook)
_nc_retrace_menu_hook(Menu_Hook code)
{
- T((T_RETURN("%p"), code));
+ T((T_RETURN("%p"), TR_FUNC(code)));
return code;
}
Index: ncurses/Makefile.in
Prereq: 1.148
--- ncurses-6.0-20160116+/ncurses/Makefile.in 2015-10-17 21:48:15.000000000 +0000
+++ ncurses-6.0-20160123/ncurses/Makefile.in 2016-01-23 21:32:00.000000000 +0000
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.148 2015/10/17 21:48:15 Esa.Peuha Exp $
+# $Id: Makefile.in,v 1.149 2016/01/23 21:32:00 tom Exp $
##############################################################################
-# Copyright (c) 1998-2014,2015 Free Software Foundation, Inc. #
+# Copyright (c) 1998-2015,2016 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"), #
@@ -266,7 +266,8 @@
@MAKE_UPPER_TAGS@ $(ETAGS) *.[ch] */*.[ch]
mostlyclean ::
- -rm -f core tags TAGS *~ *.bak *.i *.ln *.atac trace
+ -rm -f core tags TAGS *~ *.bak *.i *.ln *.atac
+ -test -f trace || rm -f trace
-rm -f $(TEST_PROGS)
clean :: mostlyclean
Index: ncurses/base/lib_getch.c
Prereq: 1.133
--- ncurses-6.0-20160116+/ncurses/base/lib_getch.c 2015-11-29 01:28:52.000000000 +0000
+++ ncurses-6.0-20160123/ncurses/base/lib_getch.c 2016-01-23 21:32:00.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2014,2015 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2015,2016 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 *
@@ -42,7 +42,7 @@
#include <curses.priv.h>
-MODULE_ID("$Id: lib_getch.c,v 1.133 2015/11/29 01:28:52 tom Exp $")
+MODULE_ID("$Id: lib_getch.c,v 1.134 2016/01/23 21:32:00 tom Exp $")
#include <fifo_defs.h>
@@ -651,7 +651,7 @@
int code;
int value;
- T((T_CALLED("wgetch_events(%p,%p)"), win, evl));
+ T((T_CALLED("wgetch_events(%p,%p)"), (void *) win, (void *)evl));
code = _nc_wgetch(win,
&value,
_nc_use_meta(win)
Index: ncurses/base/lib_set_term.c
Prereq: 1.153
--- ncurses-6.0-20160116+/ncurses/base/lib_set_term.c 2015-08-07 23:57:58.000000000 +0000
+++ ncurses-6.0-20160123/ncurses/base/lib_set_term.c 2016-01-23 21:32:00.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2014,2015 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2015,2016 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 *
@@ -47,7 +47,7 @@
#define CUR SP_TERMTYPE
#endif
-MODULE_ID("$Id: lib_set_term.c,v 1.153 2015/08/07 23:57:58 tom Exp $")
+MODULE_ID("$Id: lib_set_term.c,v 1.154 2016/01/23 21:32:00 tom Exp $")
#ifdef USE_TERM_DRIVER
#define MaxColors InfoOf(sp).maxcolors
@@ -726,7 +726,7 @@
int code = ERR;
START_TRACE();
- T((T_CALLED("ripoffline(%p,%d,%p)"), (void *) SP_PARM, line, init));
+ T((T_CALLED("ripoffline(%p,%d,%p)"), (void *) SP_PARM, line, TR_FUNC(init)));
#if NCURSES_SP_FUNCS
if (SP_PARM != 0 && SP_PARM->_prescreen)
Index: ncurses/base/use_window.c
Prereq: 1.9
--- ncurses-6.0-20160116+/ncurses/base/use_window.c 2009-10-24 22:40:24.000000000 +0000
+++ ncurses-6.0-20160123/ncurses/base/use_window.c 2016-01-23 21:32:00.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 2007-2008,2009 Free Software Foundation, Inc. *
+ * Copyright (c) 2007-2009,2016 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 *
@@ -32,14 +32,14 @@
#include <curses.priv.h>
-MODULE_ID("$Id: use_window.c,v 1.9 2009/10/24 22:40:24 tom Exp $")
+MODULE_ID("$Id: use_window.c,v 1.10 2016/01/23 21:32:00 tom Exp $")
NCURSES_EXPORT(int)
use_window(WINDOW *win, NCURSES_WINDOW_CB func, void *data)
{
int code = OK;
- T((T_CALLED("use_window(%p,%p,%p)"), (void *) win, func, data));
+ T((T_CALLED("use_window(%p,%p,%p)"), (void *) win, TR_FUNC(func), data));
_nc_lock_global(curses);
code = func(win, data);
_nc_unlock_global(curses);
Index: ncurses/curses.priv.h
Prereq: 1.548
--- ncurses-6.0-20160116+/ncurses/curses.priv.h 2016-01-10 22:17:19.000000000 +0000
+++ ncurses-6.0-20160123/ncurses/curses.priv.h 2016-01-24 01:39:09.000000000 +0000
@@ -34,7 +34,7 @@
****************************************************************************/
/*
- * $Id: curses.priv.h,v 1.548 2016/01/10 22:17:19 tom Exp $
+ * $Id: curses.priv.h,v 1.551 2016/01/24 01:39:09 tom Exp $
*
* curses.priv.h
*
@@ -1630,7 +1630,10 @@
#define TRACE_RETURN2(value,dst,src) return _nc_retrace_##dst##_##src(value)
#define TRACE_RETURN_SP(value,type) return _nc_retrace_##type(SP_PARM, value)
-#define NonNull(s) ((s) != 0 ? s : "<null>")
+typedef void VoidFunc(void);
+
+#define TR_FUNC(value) ((const char*) &(value))
+#define NonNull(s) ((s) != 0 ? s : "<null>")
#define returnAttr(code) TRACE_RETURN(code,attr_t)
#define returnBits(code) TRACE_RETURN(code,unsigned)
Index: ncurses/tinfo/lib_tputs.c
Prereq: 1.96
--- ncurses-6.0-20160116+/ncurses/tinfo/lib_tputs.c 2015-01-03 23:51:23.000000000 +0000
+++ ncurses-6.0-20160123/ncurses/tinfo/lib_tputs.c 2016-01-23 21:32:00.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2013,2015 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2015,2016 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 *
@@ -51,7 +51,7 @@
#include <termcap.h> /* ospeed */
#include <tic.h>
-MODULE_ID("$Id: lib_tputs.c,v 1.96 2015/01/03 23:51:23 tom Exp $")
+MODULE_ID("$Id: lib_tputs.c,v 1.97 2016/01/23 21:32:00 tom Exp $")
NCURSES_EXPORT_VAR(char) PC = 0; /* used by termcap library */
NCURSES_EXPORT_VAR(NCURSES_OSPEED) ospeed = 0; /* used by termcap library */
@@ -277,7 +277,7 @@
if (outc == NCURSES_SP_NAME(_nc_outch))
_nc_STRCPY(addrbuf, "_nc_outch", sizeof(addrbuf));
else
- _nc_SPRINTF(addrbuf, _nc_SLIMIT(sizeof(addrbuf)) "%p", outc);
+ _nc_SPRINTF(addrbuf, _nc_SLIMIT(sizeof(addrbuf)) "%p", TR_FUNC(outc));
if (_nc_tputs_trace) {
_tracef("tputs(%s = %s, %d, %s) called", _nc_tputs_trace,
_nc_visbuf(string), affcnt, addrbuf);
Index: ncurses/tinfo/use_screen.c
Prereq: 1.8
--- ncurses-6.0-20160116+/ncurses/tinfo/use_screen.c 2009-10-24 22:40:20.000000000 +0000
+++ ncurses-6.0-20160123/ncurses/tinfo/use_screen.c 2016-01-23 21:32:00.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 2007-2008,2009 Free Software Foundation, Inc. *
+ * Copyright (c) 2007-2009,2016 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 *
@@ -32,7 +32,7 @@
#include <curses.priv.h>
-MODULE_ID("$Id: use_screen.c,v 1.8 2009/10/24 22:40:20 tom Exp $")
+MODULE_ID("$Id: use_screen.c,v 1.9 2016/01/23 21:32:00 tom Exp $")
NCURSES_EXPORT(int)
use_screen(SCREEN *screen, NCURSES_SCREEN_CB func, void *data)
@@ -40,7 +40,7 @@
SCREEN *save_SP;
int code = OK;
- T((T_CALLED("use_screen(%p,%p,%p)"), (void *) screen, func, (void *) data));
+ T((T_CALLED("use_screen(%p,%p,%p)"), (void *) screen, TR_FUNC(func), (void *) data));
/*
* FIXME - add a flag so a given thread can check if _it_ has already
Index: package/debian-mingw/changelog
--- ncurses-6.0-20160116+/package/debian-mingw/changelog 2016-01-16 21:24:23.000000000 +0000
+++ ncurses-6.0-20160123/package/debian-mingw/changelog 2016-01-23 17:00:00.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20160116) unstable; urgency=low
+ncurses6 (6.0+20160123) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 16 Jan 2016 16:24:23 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 23 Jan 2016 12:00:36 -0500
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian-mingw64/changelog
--- ncurses-6.0-20160116+/package/debian-mingw64/changelog 2016-01-16 21:24:23.000000000 +0000
+++ ncurses-6.0-20160123/package/debian-mingw64/changelog 2016-01-23 17:00:00.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20160116) unstable; urgency=low
+ncurses6 (6.0+20160123) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 16 Jan 2016 16:24:23 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 23 Jan 2016 12:00:36 -0500
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian/changelog
--- ncurses-6.0-20160116+/package/debian/changelog 2016-01-16 21:24:23.000000000 +0000
+++ ncurses-6.0-20160123/package/debian/changelog 2016-01-23 17:00:00.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20160116) unstable; urgency=low
+ncurses6 (6.0+20160123) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 16 Jan 2016 16:24:23 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 23 Jan 2016 12:00:36 -0500
ncurses6 (5.9-20120608) unstable; urgency=low
Index: package/mingw-ncurses.nsi
Prereq: 1.141
--- ncurses-6.0-20160116+/package/mingw-ncurses.nsi 2016-01-16 21:24:23.000000000 +0000
+++ ncurses-6.0-20160123/package/mingw-ncurses.nsi 2016-01-23 17:00:00.000000000 +0000
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.141 2016/01/16 21:24:23 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.142 2016/01/23 17:00:00 tom Exp $
; TODO add examples
; TODO bump ABI to 6
@@ -10,7 +10,7 @@
!define VERSION_MAJOR "6"
!define VERSION_MINOR "0"
!define VERSION_YYYY "2016"
-!define VERSION_MMDD "0116"
+!define VERSION_MMDD "0123"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"
Index: package/mingw-ncurses.spec
--- ncurses-6.0-20160116+/package/mingw-ncurses.spec 2016-01-16 21:24:23.000000000 +0000
+++ ncurses-6.0-20160123/package/mingw-ncurses.spec 2016-01-23 17:00:00.000000000 +0000
@@ -3,7 +3,7 @@
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 6.0
-Release: 20160116
+Release: 20160123
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncurses.spec
--- ncurses-6.0-20160116+/package/ncurses.spec 2016-01-16 21:24:23.000000000 +0000
+++ ncurses-6.0-20160123/package/ncurses.spec 2016-01-23 17:00:00.000000000 +0000
@@ -1,7 +1,7 @@
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 6.0
-Release: 20160116
+Release: 20160123
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz

11519
ncurses-6.0-20160130.patch
View File

File diff suppressed because it is too large Load Diff

265
ncurses-6.0-20160206.patch
View File

@ -1,265 +0,0 @@
# ncurses 6.0 - patch 20160206 - Thomas E. Dickey
#
# ------------------------------------------------------------------------------
#
# Ncurses 6.0 is at
# ftp.gnu.org:/pub/gnu
#
# Patches for ncurses 6.0 can be found at
# ftp://invisible-island.net/ncurses/6.0
# http://invisible-mirror.net/archives/ncurses/6.0
#
# ------------------------------------------------------------------------------
# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20160206.patch.gz
# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created Sun Feb 7 01:06:54 UTC 2016
# ------------------------------------------------------------------------------
# NEWS | 8 +++++++-
# VERSION | 2 +-
# configure | 4 ++--
# configure.in | 8 ++++----
# dist.mk | 4 ++--
# package/debian-mingw/changelog | 4 ++--
# package/debian-mingw64/changelog | 4 ++--
# package/debian/changelog | 4 ++--
# package/mingw-ncurses.nsi | 4 ++--
# package/mingw-ncurses.spec | 2 +-
# package/ncurses.spec | 2 +-
# test/ditto.c | 10 +++++++---
# 12 files changed, 33 insertions(+), 23 deletions(-)
# ------------------------------------------------------------------------------
Index: NEWS
Prereq: 1.2566
--- ncurses-6.0-20160130+/NEWS 2016-01-30 19:38:41.000000000 +0000
+++ ncurses-6.0-20160206/NEWS 2016-02-06 22:10:53.000000000 +0000
@@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.2566 2016/01/30 19:38:41 tom Exp $
+-- $Id: NEWS,v 1.2568 2016/02/06 22:10:53 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
@@ -45,6 +45,12 @@
Changes through 1.9.9e did not credit all contributions;
it is not possible to add this information.
+20160206
+ + define WIN32_LEAN_AND_MEAN for MinGW port, making builds faster.
+ + modify test/ditto.c to allow $XTERM_PROG environment variable to
+ override "xterm" as the name of the program to run in the threaded
+ configuration.
+
20160130
+ improve formatting of man/curs_refresh.3x and man/tset.1 manpages
+ regenerate HTML manpages using newer man2html to eliminate some
Index: VERSION
--- ncurses-6.0-20160130+/VERSION 2016-01-30 15:30:48.000000000 +0000
+++ ncurses-6.0-20160206/VERSION 2016-02-06 17:26:30.000000000 +0000
@@ -1 +1 @@
-5:0:9 6.0 20160130
+5:0:9 6.0 20160206
Index: configure
--- ncurses-6.0-20160130+/configure 2015-12-20 02:07:50.000000000 +0000
+++ ncurses-6.0-20160206/configure 2016-02-06 21:59:36.000000000 +0000
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 1.625 .
+# From configure.in Revision: 1.626 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by Autoconf 2.52.20150926.
#
@@ -14499,7 +14499,7 @@
### Checks for libraries.
case $cf_cv_system_name in
(*mingw32*|*mingw64*)
- CPPFLAGS="$CPPFLAGS -DWINVER=0x0501"
+ CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
LIBS=" -lpsapi $LIBS"
;;
(*)
Index: configure.in
Prereq: 1.625
--- ncurses-6.0-20160130+/configure.in 2015-12-20 02:07:23.000000000 +0000
+++ ncurses-6.0-20160206/configure.in 2016-02-06 21:59:17.000000000 +0000
@@ -1,5 +1,5 @@
dnl***************************************************************************
-dnl Copyright (c) 1998-2014,2015 Free Software Foundation, Inc. *
+dnl Copyright (c) 1998-2015,2016 Free Software Foundation, Inc. *
dnl *
dnl Permission is hereby granted, free of charge, to any person obtaining a *
dnl copy of this software and associated documentation files (the *
@@ -28,14 +28,14 @@
dnl
dnl Author: Thomas E. Dickey 1995-on
dnl
-dnl $Id: configure.in,v 1.625 2015/12/20 02:07:23 tom Exp $
+dnl $Id: configure.in,v 1.626 2016/02/06 21:59:17 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.52.20030208)
-AC_REVISION($Revision: 1.625 $)
+AC_REVISION($Revision: 1.626 $)
AC_INIT(ncurses/base/lib_initscr.c)
AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
@@ -1449,7 +1449,7 @@
### Checks for libraries.
case $cf_cv_system_name in
(*mingw32*|*mingw64*)
- CPPFLAGS="$CPPFLAGS -DWINVER=0x0501"
+ CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
LIBS=" -lpsapi $LIBS"
;;
(*)
Index: dist.mk
Prereq: 1.1091
--- ncurses-6.0-20160130+/dist.mk 2016-01-30 15:30:48.000000000 +0000
+++ ncurses-6.0-20160206/dist.mk 2016-02-06 17:26:30.000000000 +0000
@@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.1091 2016/01/30 15:30:48 tom Exp $
+# $Id: dist.mk,v 1.1092 2016/02/06 17:26:30 tom Exp $
# Makefile for creating ncurses distributions.
#
# This only needs to be used directly as a makefile by developers, but
@@ -37,7 +37,7 @@
# These define the major/minor/patch versions of ncurses.
NCURSES_MAJOR = 6
NCURSES_MINOR = 0
-NCURSES_PATCH = 20160130
+NCURSES_PATCH = 20160206
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
Index: package/debian-mingw/changelog
--- ncurses-6.0-20160130+/package/debian-mingw/changelog 2016-01-30 15:30:48.000000000 +0000
+++ ncurses-6.0-20160206/package/debian-mingw/changelog 2016-02-06 17:26:30.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20160130) unstable; urgency=low
+ncurses6 (6.0+20160206) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 30 Jan 2016 10:30:48 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 06 Feb 2016 12:26:30 -0500
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian-mingw64/changelog
--- ncurses-6.0-20160130+/package/debian-mingw64/changelog 2016-01-30 15:30:48.000000000 +0000
+++ ncurses-6.0-20160206/package/debian-mingw64/changelog 2016-02-06 17:26:30.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20160130) unstable; urgency=low
+ncurses6 (6.0+20160206) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 30 Jan 2016 10:30:48 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 06 Feb 2016 12:26:30 -0500
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian/changelog
--- ncurses-6.0-20160130+/package/debian/changelog 2016-01-30 15:30:48.000000000 +0000
+++ ncurses-6.0-20160206/package/debian/changelog 2016-02-06 17:26:30.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20160130) unstable; urgency=low
+ncurses6 (6.0+20160206) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 30 Jan 2016 10:30:48 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 06 Feb 2016 12:26:30 -0500
ncurses6 (5.9-20120608) unstable; urgency=low
Index: package/mingw-ncurses.nsi
Prereq: 1.143
--- ncurses-6.0-20160130+/package/mingw-ncurses.nsi 2016-01-30 15:30:48.000000000 +0000
+++ ncurses-6.0-20160206/package/mingw-ncurses.nsi 2016-02-06 17:26:30.000000000 +0000
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.143 2016/01/30 15:30:48 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.144 2016/02/06 17:26:30 tom Exp $
; TODO add examples
; TODO bump ABI to 6
@@ -10,7 +10,7 @@
!define VERSION_MAJOR "6"
!define VERSION_MINOR "0"
!define VERSION_YYYY "2016"
-!define VERSION_MMDD "0130"
+!define VERSION_MMDD "0206"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"
Index: package/mingw-ncurses.spec
--- ncurses-6.0-20160130+/package/mingw-ncurses.spec 2016-01-30 15:30:48.000000000 +0000
+++ ncurses-6.0-20160206/package/mingw-ncurses.spec 2016-02-06 17:26:30.000000000 +0000
@@ -3,7 +3,7 @@
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 6.0
-Release: 20160130
+Release: 20160206
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncurses.spec
--- ncurses-6.0-20160130+/package/ncurses.spec 2016-01-30 15:30:48.000000000 +0000
+++ ncurses-6.0-20160206/package/ncurses.spec 2016-02-06 17:26:30.000000000 +0000
@@ -1,7 +1,7 @@
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 6.0
-Release: 20160130
+Release: 20160206
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: test/ditto.c
Prereq: 1.42
--- ncurses-6.0-20160130+/test/ditto.c 2012-11-24 20:16:18.000000000 +0000
+++ ncurses-6.0-20160206/test/ditto.c 2016-02-06 21:19:28.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2012,2016 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 *
@@ -29,7 +29,7 @@
/*
* Author: Thomas E. Dickey (1998-on)
*
- * $Id: ditto.c,v 1.42 2012/11/24 20:16:18 tom Exp $
+ * $Id: ditto.c,v 1.43 2016/02/06 21:19:28 tom Exp $
*
* The program illustrates how to set up multiple screens from a single
* program.
@@ -155,6 +155,10 @@
int aslave;
char slave_name[1024];
char s_option[sizeof(slave_name) + 80];
+ const char *xterm_prog = 0;
+
+ if ((xterm_prog = getenv("XTERM_PROG")) == 0)
+ xterm_prog = "xterm";
if (openpty(&amaster, &aslave, slave_name, 0, 0) != 0
|| strlen(slave_name) > sizeof(slave_name) - 1)
@@ -165,7 +169,7 @@
}
sprintf(s_option, "-S%s/%d", slave_name, aslave);
if (fork()) {
- execlp("xterm", "xterm", s_option, "-title", path, (char *) 0);
+ execlp(xterm_prog, xterm_prog, s_option, "-title", path, (char *) 0);
_exit(0);
}
fp = fdopen(amaster, "r+");

344
ncurses-6.0-20160213.patch
View File

@ -1,344 +0,0 @@
# ncurses 6.0 - patch 20160213 - Thomas E. Dickey
#
# ------------------------------------------------------------------------------
#
# Ncurses 6.0 is at
# ftp.gnu.org:/pub/gnu
#
# Patches for ncurses 6.0 can be found at
# ftp://invisible-island.net/ncurses/6.0
# http://invisible-mirror.net/archives/ncurses/6.0
#
# ------------------------------------------------------------------------------
# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20160213.patch.gz
# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created Sun Feb 14 00:43:22 UTC 2016
# ------------------------------------------------------------------------------
# Ada95/gen/gen.c | 6 +++---
# NEWS | 8 +++++++-
# VERSION | 2 +-
# dist.mk | 4 ++--
# include/curses.tail | 5 +----
# ncurses/curses.priv.h | 6 +++++-
# ncurses/tinfo/lib_setup.c | 32 +++++++++++++++-----------------
# package/debian-mingw/changelog | 4 ++--
# package/debian-mingw64/changelog | 4 ++--
# package/debian/changelog | 4 ++--
# package/mingw-ncurses.nsi | 4 ++--
# package/mingw-ncurses.spec | 2 +-
# package/ncurses.spec | 2 +-
# test/test_sgr.c | 4 +++-
# 14 files changed, 47 insertions(+), 40 deletions(-)
# ------------------------------------------------------------------------------
Index: Ada95/gen/gen.c
Prereq: 1.69
--- ncurses-6.0-20160206+/Ada95/gen/gen.c 2014-05-31 21:00:08.000000000 +0000
+++ ncurses-6.0-20160213/Ada95/gen/gen.c 2016-02-13 22:00:22.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2013,2014 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2014,2016 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 *
@@ -32,7 +32,7 @@
/*
Version Control
- $Id: gen.c,v 1.69 2014/05/31 21:00:08 tom Exp $
+ $Id: gen.c,v 1.70 2016/02/13 22:00:22 tom Exp $
--------------------------------------------------------------------------*/
/*
This program prints on its standard output the source for the
@@ -108,7 +108,7 @@
else /* or */
bit = ~offset; /* 7 - offset */
bit &= 7; /* modulo 8 */
- return byte & (UCHAR) (1 << bit);
+ return (UCHAR) (byte & (1 << bit));
}
/* Find lowest and highest used offset in a byte array. */
Index: NEWS
Prereq: 1.2568
--- ncurses-6.0-20160206+/NEWS 2016-02-06 22:10:53.000000000 +0000
+++ ncurses-6.0-20160213/NEWS 2016-02-13 21:16:08.000000000 +0000
@@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.2568 2016/02/06 22:10:53 tom Exp $
+-- $Id: NEWS,v 1.2571 2016/02/13 21:16:08 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
@@ -45,6 +45,12 @@
Changes through 1.9.9e did not credit all contributions;
it is not possible to add this information.
+20160213
+ + amend fix for _nc_ripoffline from 20091031 to make test/ditto.c work
+ in threaded configuration.
+ + move _nc_tracebits, _tracedump and _tracemouse to curses.priv.h,
+ since they are not part of the suggested ABI6.
+
20160206
+ define WIN32_LEAN_AND_MEAN for MinGW port, making builds faster.
+ modify test/ditto.c to allow $XTERM_PROG environment variable to
Index: VERSION
--- ncurses-6.0-20160206+/VERSION 2016-02-06 17:26:30.000000000 +0000
+++ ncurses-6.0-20160213/VERSION 2016-02-13 15:02:20.000000000 +0000
@@ -1 +1 @@
-5:0:9 6.0 20160206
+5:0:9 6.0 20160213
Index: dist.mk
Prereq: 1.1092
--- ncurses-6.0-20160206+/dist.mk 2016-02-06 17:26:30.000000000 +0000
+++ ncurses-6.0-20160213/dist.mk 2016-02-13 15:02:20.000000000 +0000
@@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.1092 2016/02/06 17:26:30 tom Exp $
+# $Id: dist.mk,v 1.1093 2016/02/13 15:02:20 tom Exp $
# Makefile for creating ncurses distributions.
#
# This only needs to be used directly as a makefile by developers, but
@@ -37,7 +37,7 @@
# These define the major/minor/patch versions of ncurses.
NCURSES_MAJOR = 6
NCURSES_MINOR = 0
-NCURSES_PATCH = 20160206
+NCURSES_PATCH = 20160213
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
Index: include/curses.tail
Prereq: 1.22
--- ncurses-6.0-20160206+/include/curses.tail 2016-01-23 22:03:27.000000000 +0000
+++ ncurses-6.0-20160213/include/curses.tail 2016-02-13 16:37:45.000000000 +0000
@@ -1,4 +1,4 @@
-/* $Id: curses.tail,v 1.22 2016/01/23 22:03:27 tom Exp $ */
+/* $Id: curses.tail,v 1.23 2016/02/13 16:37:45 tom Exp $ */
/*
* vile:cmode:
* This file is part of ncurses, designed to be appended after curses.h.in
@@ -128,10 +128,8 @@
/* Debugging : use with libncurses_g.a */
extern NCURSES_EXPORT(void) _tracef (const char *, ...) GCC_PRINTFLIKE(1,2);
-extern NCURSES_EXPORT(void) _tracedump (const char *, WINDOW *);
extern NCURSES_EXPORT(char *) _traceattr (attr_t);
extern NCURSES_EXPORT(char *) _traceattr2 (int, chtype);
-extern NCURSES_EXPORT(char *) _nc_tracebits (void);
extern NCURSES_EXPORT(char *) _tracechar (int);
extern NCURSES_EXPORT(char *) _tracechtype (chtype);
extern NCURSES_EXPORT(char *) _tracechtype2 (int, chtype);
@@ -144,7 +142,6 @@
#define _tracech_t _tracechtype
#define _tracech_t2 _tracechtype2
#endif
-extern NCURSES_EXPORT(char *) _tracemouse (const MEVENT *);
extern NCURSES_EXPORT(void) trace (const unsigned int);
/* trace masks */
Index: ncurses/curses.priv.h
Prereq: 1.551
--- ncurses-6.0-20160206+/ncurses/curses.priv.h 2016-01-24 01:39:09.000000000 +0000
+++ ncurses-6.0-20160213/ncurses/curses.priv.h 2016-02-13 16:37:24.000000000 +0000
@@ -34,7 +34,7 @@
****************************************************************************/
/*
- * $Id: curses.priv.h,v 1.551 2016/01/24 01:39:09 tom Exp $
+ * $Id: curses.priv.h,v 1.552 2016/02/13 16:37:24 tom Exp $
*
* curses.priv.h
*
@@ -1684,6 +1684,10 @@
extern NCURSES_EXPORT_VAR(unsigned) _nc_tracing;
+extern NCURSES_EXPORT(char *) _nc_tracebits (void);
+extern NCURSES_EXPORT(char *) _tracemouse (const MEVENT *);
+extern NCURSES_EXPORT(void) _tracedump (const char *, WINDOW *);
+
#if USE_WIDEC_SUPPORT
extern NCURSES_EXPORT(const char *) _nc_viswbuf2 (int, const wchar_t *);
extern NCURSES_EXPORT(const char *) _nc_viswbufn (const wchar_t *, int);
Index: ncurses/tinfo/lib_setup.c
Prereq: 1.164
--- ncurses-6.0-20160206+/ncurses/tinfo/lib_setup.c 2015-06-27 18:10:55.000000000 +0000
+++ ncurses-6.0-20160213/ncurses/tinfo/lib_setup.c 2016-02-13 21:20:05.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2014,2015 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2015,2016 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 *
@@ -48,7 +48,7 @@
#include <locale.h>
#endif
-MODULE_ID("$Id: lib_setup.c,v 1.164 2015/06/27 18:10:55 tom Exp $")
+MODULE_ID("$Id: lib_setup.c,v 1.165 2016/02/13 21:20:05 tom Exp $")
/****************************************************************************
*
@@ -808,29 +808,27 @@
NCURSES_EXPORT(SCREEN *)
new_prescr(void)
{
- static SCREEN *sp;
+ SCREEN *sp;
START_TRACE();
T((T_CALLED("new_prescr()")));
- if (sp == 0) {
- sp = _nc_alloc_screen_sp();
- if (sp != 0) {
- sp->rsp = sp->rippedoff;
- sp->_filtered = _nc_prescreen.filter_mode;
- sp->_use_env = _nc_prescreen.use_env;
+ sp = _nc_alloc_screen_sp();
+ if (sp != 0) {
+ sp->rsp = sp->rippedoff;
+ sp->_filtered = _nc_prescreen.filter_mode;
+ sp->_use_env = _nc_prescreen.use_env;
#if NCURSES_NO_PADDING
- sp->_no_padding = _nc_prescreen._no_padding;
+ sp->_no_padding = _nc_prescreen._no_padding;
#endif
- sp->slk_format = 0;
- sp->_slk = 0;
- sp->_prescreen = TRUE;
- SP_PRE_INIT(sp);
+ sp->slk_format = 0;
+ sp->_slk = 0;
+ sp->_prescreen = TRUE;
+ SP_PRE_INIT(sp);
#if USE_REENTRANT
- sp->_TABSIZE = _nc_prescreen._TABSIZE;
- sp->_ESCDELAY = _nc_prescreen._ESCDELAY;
+ sp->_TABSIZE = _nc_prescreen._TABSIZE;
+ sp->_ESCDELAY = _nc_prescreen._ESCDELAY;
#endif
- }
}
returnSP(sp);
}
Index: package/debian-mingw/changelog
--- ncurses-6.0-20160206+/package/debian-mingw/changelog 2016-02-06 17:26:30.000000000 +0000
+++ ncurses-6.0-20160213/package/debian-mingw/changelog 2016-02-13 15:02:20.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20160206) unstable; urgency=low
+ncurses6 (6.0+20160213) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 06 Feb 2016 12:26:30 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 13 Feb 2016 10:02:21 -0500
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian-mingw64/changelog
--- ncurses-6.0-20160206+/package/debian-mingw64/changelog 2016-02-06 17:26:30.000000000 +0000
+++ ncurses-6.0-20160213/package/debian-mingw64/changelog 2016-02-13 15:02:20.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20160206) unstable; urgency=low
+ncurses6 (6.0+20160213) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 06 Feb 2016 12:26:30 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 13 Feb 2016 10:02:21 -0500
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian/changelog
--- ncurses-6.0-20160206+/package/debian/changelog 2016-02-06 17:26:30.000000000 +0000
+++ ncurses-6.0-20160213/package/debian/changelog 2016-02-13 15:02:20.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20160206) unstable; urgency=low
+ncurses6 (6.0+20160213) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 06 Feb 2016 12:26:30 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 13 Feb 2016 10:02:21 -0500
ncurses6 (5.9-20120608) unstable; urgency=low
Index: package/mingw-ncurses.nsi
Prereq: 1.144
--- ncurses-6.0-20160206+/package/mingw-ncurses.nsi 2016-02-06 17:26:30.000000000 +0000
+++ ncurses-6.0-20160213/package/mingw-ncurses.nsi 2016-02-13 15:02:20.000000000 +0000
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.144 2016/02/06 17:26:30 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.145 2016/02/13 15:02:20 tom Exp $
; TODO add examples
; TODO bump ABI to 6
@@ -10,7 +10,7 @@
!define VERSION_MAJOR "6"
!define VERSION_MINOR "0"
!define VERSION_YYYY "2016"
-!define VERSION_MMDD "0206"
+!define VERSION_MMDD "0213"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"
Index: package/mingw-ncurses.spec
--- ncurses-6.0-20160206+/package/mingw-ncurses.spec 2016-02-06 17:26:30.000000000 +0000
+++ ncurses-6.0-20160213/package/mingw-ncurses.spec 2016-02-13 15:02:20.000000000 +0000
@@ -3,7 +3,7 @@
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 6.0
-Release: 20160206
+Release: 20160213
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncurses.spec
--- ncurses-6.0-20160206+/package/ncurses.spec 2016-02-06 17:26:30.000000000 +0000
+++ ncurses-6.0-20160213/package/ncurses.spec 2016-02-13 15:02:20.000000000 +0000
@@ -1,7 +1,7 @@
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 6.0
-Release: 20160206
+Release: 20160213
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: test/test_sgr.c
Prereq: 1.5
--- ncurses-6.0-20160206+/test/test_sgr.c 2016-01-09 18:15:53.000000000 +0000
+++ ncurses-6.0-20160213/test/test_sgr.c 2016-02-13 22:08:16.000000000 +0000
@@ -29,13 +29,14 @@
/*
* Author: Thomas E. Dickey
*
- * $Id: test_sgr.c,v 1.5 2016/01/09 18:15:53 tom Exp $
+ * $Id: test_sgr.c,v 1.6 2016/02/13 22:08:16 tom Exp $
*
* A simple demo of the sgr/sgr0 terminal capabilities.
*/
#define USE_TINFO
#include <test.priv.h>
+#if !HAVE_TIGETSTR
static void failed(const char *) GCC_NORETURN;
static void
@@ -44,6 +45,7 @@
fprintf(stderr, "%s\n", msg);
ExitProgram(EXIT_FAILURE);
}
+#endif
#if HAVE_TIGETSTR

481
ncurses-6.0-20160917.patch Normal file
View File

@ -0,0 +1,481 @@
# ncurses 6.0 - patch 20160917 - Thomas E. Dickey
#
# ------------------------------------------------------------------------------
#
# Ncurses 6.0 is at
# ftp.gnu.org:/pub/gnu
#
# Patches for ncurses 6.0 can be found at
# ftp://invisible-island.net/ncurses/6.0
# http://invisible-mirror.net/archives/ncurses/6.0
#
# ------------------------------------------------------------------------------
# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20160917.patch.gz
# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created Sun Sep 18 02:03:51 UTC 2016
# ------------------------------------------------------------------------------
# Ada95/src/Makefile.in | 8 ++-
# Ada95/src/library.gpr | 7 +--
# MANIFEST | 1
# NEWS | 6 ++
# VERSION | 2
# dist.mk | 4 -
# ncurses-6.0-20160917/Ada95/src/library-cfg.sh | 50 ++++++++++++++++++++++++
# ncurses/tinfo/MKfallback.sh | 14 +++---
# ncurses/tinfo/write_entry.c | 4 -
# ncurses/win32con/win_driver.c | 6 +-
# package/debian-mingw/changelog | 4 -
# package/debian-mingw64/changelog | 4 -
# package/debian/changelog | 4 -
# package/mingw-ncurses.nsi | 4 -
# package/mingw-ncurses.spec | 2
# package/ncurses.spec | 2
# test/ncurses.c | 9 ++--
# test/worm.c | 10 ++--
# 18 files changed, 102 insertions(+), 39 deletions(-)
# ------------------------------------------------------------------------------
Index: Ada95/src/Makefile.in
Prereq: 1.72
--- ncurses-6.0-20160910+/Ada95/src/Makefile.in 2016-08-13 18:04:27.000000000 +0000
+++ ncurses-6.0-20160917/Ada95/src/Makefile.in 2016-09-18 00:25:32.000000000 +0000
@@ -28,7 +28,7 @@
#
# Author: Juergen Pfeifer, 1996
#
-# $Id: Makefile.in,v 1.72 2016/08/13 18:04:27 tom Exp $
+# $Id: Makefile.in,v 1.73 2016/09/18 00:25:32 tom Exp $
#
.SUFFIXES:
@@ -90,7 +90,7 @@
LIB_NAME = AdaCurses
SONAME = @ADA_SHAREDLIB@
-GNAT_PROJECT = $(srcdir)/library.gpr
+GNAT_PROJECT = AdaCurses.gpr
# build/source are the Ada95 tree
BUILD_DIR = ..
@@ -270,8 +270,10 @@
@USE_GNAT_PROJECTS@ $(ABASE)-trace.adb \
@USE_GNAT_PROJECTS@ $(STATIC_C_OBJS) \
@USE_GNAT_PROJECTS@ $(STATIC_DIRS)
+@USE_GNAT_PROJECTS@ $(SHELL) $(srcdir)/library-cfg.sh $(srcdir)/library.gpr $(CFLAGS_NORMAL) >$(GNAT_PROJECT)
@USE_GNAT_PROJECTS@ $(ADAMAKE) $(ADAMAKEFLAGS) -XLIB_KIND=static
@USE_GNAT_PROJECTS@ $(AR) $(ARFLAGS) $@ $(STATIC_C_OBJS)
+@USE_GNAT_PROJECTS@ -rm -f $(GNAT_PROJECT)
@USE_GNAT_PROJECTS@
@USE_GNAT_LIBRARIES@install \
@USE_GNAT_LIBRARIES@install.libs :: \
@@ -302,7 +304,9 @@
@MAKE_ADA_SHAREDLIB@ $(SHARED_DIRS) \
@MAKE_ADA_SHAREDLIB@ $(SHARED_OBJS)
@MAKE_ADA_SHAREDLIB@ cp $(SHARED_OBJS) $(BUILD_DIR)/dynamic-obj/
+@MAKE_ADA_SHAREDLIB@ $(SHELL) $(srcdir)/library-cfg.sh $(srcdir)/library.gpr $(CFLAGS_SHARED) >$(GNAT_PROJECT)
@MAKE_ADA_SHAREDLIB@ $(ADAMAKE) $(ADAMAKEFLAGS) -XLIB_KIND=dynamic
+@MAKE_ADA_SHAREDLIB@ -rm -f $(GNAT_PROJECT)
install \
install.libs :: $(ADA_INCLUDE)
Index: Ada95/src/library-cfg.sh
--- /dev/null 2016-09-17 11:34:54.124000970 +0000
+++ ncurses-6.0-20160917/Ada95/src/library-cfg.sh 2016-09-17 23:45:03.000000000 +0000
@@ -0,0 +1,50 @@
+#!/bin/sh
+##############################################################################
+# Copyright (c) 2016 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"), #
+# to deal in the Software without restriction, including without limitation #
+# the rights to use, copy, modify, merge, publish, distribute, distribute #
+# with modifications, sublicense, and/or sell copies of the Software, and to #
+# permit persons to whom the Software is furnished to do so, subject to the #
+# following conditions: #
+# #
+# The above copyright notice and this permission notice shall be included in #
+# all copies or substantial portions of the Software. #
+# #
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR #
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, #
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL #
+# THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER #
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING #
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER #
+# DEALINGS IN THE SOFTWARE. #
+# #
+# Except as contained in this notice, the name(s) of the above copyright #
+# holders shall not be used in advertising or otherwise to promote the sale, #
+# use or other dealings in this Software without prior written #
+# authorization. #
+##############################################################################
+#
+# $Id: library-cfg.sh,v 1.1 2016/09/17 23:45:03 tom Exp $
+#
+# Work around incompatible behavior introduced with gnat6, which causes
+# gnatmake to attempt to compile all of the C objects which might be part of
+# the project. This can only work if we provide the compiler flags (done here
+# by making a copy of the project file with that information filled in).
+input=$1
+shift 1
+param=
+while test $# != 0
+do
+ test -n "$param" && param="$param,"
+ param="$param\"$1\""
+ shift 1
+done
+
+sed \
+ -e '/for Default_Switches ("C") use/s,-- ,,' \
+ -e '/for Default_Switches ("C") use/s% use .*'%" use($param);"% \
+ $input
+exit 0
Index: Ada95/src/library.gpr
Prereq: 1.9
--- ncurses-6.0-20160910+/Ada95/src/library.gpr 2014-06-01 01:13:09.000000000 +0000
+++ ncurses-6.0-20160917/Ada95/src/library.gpr 2016-09-18 00:25:54.000000000 +0000
@@ -25,10 +25,10 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
------------------------------------------------------------------------------
--- $Id: library.gpr,v 1.9 2014/06/01 01:13:09 tom Exp $
+-- $Id: library.gpr,v 1.10 2016/09/18 00:25:54 tom Exp $
-- http://gcc.gnu.org/onlinedocs/gnat_ugn_unw/Library-Projects.html
-- http://www.adaworld.com/debian/debian-ada-policy.html
-project Library is
+project AdaCurses is
Build_Dir := External ("BUILD_DIR");
Source_Dir := External ("SOURCE_DIR");
Source_Dir2 := External ("SOURCE_DIR2");
@@ -51,6 +51,7 @@
"-gnatafno",
"-gnatVa", -- All validity checks
"-gnatwa"); -- Activate all optional errors
+ -- for Default_Switches ("C") use
end Compiler;
for Languages use ("C", "Ada");
-end Library;
+end AdaCurses;
Index: MANIFEST
--- ncurses-6.0-20160910+/MANIFEST 2016-08-06 23:46:22.000000000 +0000
+++ ncurses-6.0-20160917/MANIFEST 2016-09-18 00:39:59.000000000 +0000
@@ -132,6 +132,7 @@
./Ada95/src/c_threaded_variables.h
./Ada95/src/c_varargs_to_ada.c
./Ada95/src/c_varargs_to_ada.h
+./Ada95/src/library-cfg.sh
./Ada95/src/library.gpr
./Ada95/src/modules
./Ada95/src/ncurses_compat.c
Index: NEWS
Prereq: 1.2664
--- ncurses-6.0-20160910+/NEWS 2016-09-10 22:07:14.000000000 +0000
+++ ncurses-6.0-20160917/NEWS 2016-09-18 00:38:06.000000000 +0000
@@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.2664 2016/09/10 22:07:14 tom Exp $
+-- $Id: NEWS,v 1.2667 2016/09/18 00:38:06 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
@@ -45,6 +45,10 @@
Changes through 1.9.9e did not credit all contributions;
it is not possible to add this information.
+20160917
+ + build-fix for gnat6, which unhelpfully attempts to compile C files.
+ + fix typo in 20160910 changes (Debian #837892, patch by Sven Joachim).
+
20160910
+ trim dead code ifdef'd with HIDE_EINTR since 970830 (discussion with
Leon Winter).
Index: VERSION
--- ncurses-6.0-20160910+/VERSION 2016-09-04 17:02:31.000000000 +0000
+++ ncurses-6.0-20160917/VERSION 2016-09-17 13:25:35.000000000 +0000
@@ -1 +1 @@
-5:0:9 6.0 20160910
+5:0:9 6.0 20160917
Index: dist.mk
Prereq: 1.1123
--- ncurses-6.0-20160910+/dist.mk 2016-09-04 17:02:31.000000000 +0000
+++ ncurses-6.0-20160917/dist.mk 2016-09-17 13:25:35.000000000 +0000
@@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.1123 2016/09/04 17:02:31 tom Exp $
+# $Id: dist.mk,v 1.1124 2016/09/17 13:25:35 tom Exp $
# Makefile for creating ncurses distributions.
#
# This only needs to be used directly as a makefile by developers, but
@@ -37,7 +37,7 @@
# These define the major/minor/patch versions of ncurses.
NCURSES_MAJOR = 6
NCURSES_MINOR = 0
-NCURSES_PATCH = 20160910
+NCURSES_PATCH = 20160917
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
Index: ncurses/tinfo/MKfallback.sh
Prereq: 1.15
--- ncurses-6.0-20160910+/ncurses/tinfo/MKfallback.sh 2010-08-07 20:32:34.000000000 +0000
+++ ncurses-6.0-20160917/ncurses/tinfo/MKfallback.sh 2016-09-17 21:28:03.000000000 +0000
@@ -1,6 +1,6 @@
#!/bin/sh
##############################################################################
-# Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. #
+# Copyright (c) 1998-2010,2016 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"), #
@@ -26,7 +26,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: MKfallback.sh,v 1.15 2010/08/07 20:32:34 tom Exp $
+# $Id: MKfallback.sh,v 1.16 2016/09/17 21:28:03 tom Exp $
#
# MKfallback.sh -- create fallback table for entry reads
#
@@ -119,17 +119,19 @@
const TERMTYPE *tp;
for (tp = fallbacks;
- tp < fallbacks + sizeof(fallbacks)/sizeof(TERMTYPE);
- tp++)
- if (_nc_name_match(tp->term_names, name, "|"))
+ tp < fallbacks + sizeof(fallbacks)/sizeof(TERMTYPE);
+ tp++) {
+ if (_nc_name_match(tp->term_names, name, "|")) {
return(tp);
+ }
+ }
EOF
else
echo " /* the fallback list is empty */";
fi
cat <<EOF
- return((TERMTYPE *)0);
+ return((TERMTYPE *)0);
}
EOF
Index: ncurses/tinfo/write_entry.c
Prereq: 1.95
--- ncurses-6.0-20160910+/ncurses/tinfo/write_entry.c 2016-09-10 20:22:42.000000000 +0000
+++ ncurses-6.0-20160917/ncurses/tinfo/write_entry.c 2016-09-17 19:06:26.000000000 +0000
@@ -47,7 +47,7 @@
#define TRACE_OUT(p) /*nothing */
#endif
-MODULE_ID("$Id: write_entry.c,v 1.95 2016/09/10 20:22:42 tom Exp $")
+MODULE_ID("$Id: write_entry.c,v 1.96 2016/09/17 19:06:26 Sven.Joachim Exp $")
static int total_written;
@@ -443,7 +443,7 @@
_nc_STRNCPY(symlinkname, first_name, MY_SIZE);
} else {
_nc_STRCPY(symlinkname, "../", sizeof(symlinkname));
- _nc_STRNCPY(symlinkname + 3, first_name, MY_SIZE - 3);
+ _nc_STRNCPY(symlinkname + 3, filename, MY_SIZE - 3);
}
symlinkname[MY_SIZE] = '\0';
#endif /* USE_SYMLINKS */
Index: ncurses/win32con/win_driver.c
Prereq: 1.55
--- ncurses-6.0-20160910+/ncurses/win32con/win_driver.c 2015-02-28 21:30:23.000000000 +0000
+++ ncurses-6.0-20160917/ncurses/win32con/win_driver.c 2016-09-17 22:02:44.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2014,2015 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2015,2016 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 *
@@ -54,7 +54,7 @@
#define CUR my_term.type.
-MODULE_ID("$Id: win_driver.c,v 1.55 2015/02/28 21:30:23 tom Exp $")
+MODULE_ID("$Id: win_driver.c,v 1.56 2016/09/17 22:02:44 tom Exp $")
#ifndef __GNUC__
# error We need GCC to compile for MinGW
@@ -2108,7 +2108,7 @@
if (b && nRead > 0) {
if (rc < 0)
rc = 0;
- rc += nRead;
+ rc = rc + (int) nRead;
if (inp_rec.EventType == KEY_EVENT) {
if (!inp_rec.Event.KeyEvent.bKeyDown)
continue;
Index: package/debian-mingw/changelog
--- ncurses-6.0-20160910+/package/debian-mingw/changelog 2016-09-04 17:02:31.000000000 +0000
+++ ncurses-6.0-20160917/package/debian-mingw/changelog 2016-09-17 13:25:35.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20160910) unstable; urgency=low
+ncurses6 (6.0+20160917) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sun, 04 Sep 2016 13:02:31 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 17 Sep 2016 09:25:35 -0400
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian-mingw64/changelog
--- ncurses-6.0-20160910+/package/debian-mingw64/changelog 2016-09-04 17:02:31.000000000 +0000
+++ ncurses-6.0-20160917/package/debian-mingw64/changelog 2016-09-17 13:25:35.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20160910) unstable; urgency=low
+ncurses6 (6.0+20160917) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sun, 04 Sep 2016 13:02:31 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 17 Sep 2016 09:25:35 -0400
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian/changelog
--- ncurses-6.0-20160910+/package/debian/changelog 2016-09-04 17:02:31.000000000 +0000
+++ ncurses-6.0-20160917/package/debian/changelog 2016-09-17 13:25:35.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20160910) unstable; urgency=low
+ncurses6 (6.0+20160917) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sun, 04 Sep 2016 13:02:31 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 17 Sep 2016 09:25:35 -0400
ncurses6 (5.9-20120608) unstable; urgency=low
Index: package/mingw-ncurses.nsi
Prereq: 1.175
--- ncurses-6.0-20160910+/package/mingw-ncurses.nsi 2016-09-04 17:02:31.000000000 +0000
+++ ncurses-6.0-20160917/package/mingw-ncurses.nsi 2016-09-17 13:25:35.000000000 +0000
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.175 2016/09/04 17:02:31 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.176 2016/09/17 13:25:35 tom Exp $
; TODO add examples
; TODO bump ABI to 6
@@ -10,7 +10,7 @@
!define VERSION_MAJOR "6"
!define VERSION_MINOR "0"
!define VERSION_YYYY "2016"
-!define VERSION_MMDD "0910"
+!define VERSION_MMDD "0917"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"
Index: package/mingw-ncurses.spec
--- ncurses-6.0-20160910+/package/mingw-ncurses.spec 2016-09-04 17:02:31.000000000 +0000
+++ ncurses-6.0-20160917/package/mingw-ncurses.spec 2016-09-17 13:25:35.000000000 +0000
@@ -3,7 +3,7 @@
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 6.0
-Release: 20160910
+Release: 20160917
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncurses.spec
--- ncurses-6.0-20160910+/package/ncurses.spec 2016-09-04 17:02:31.000000000 +0000
+++ ncurses-6.0-20160917/package/ncurses.spec 2016-09-17 13:25:35.000000000 +0000
@@ -1,7 +1,7 @@
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 6.0
-Release: 20160910
+Release: 20160917
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: test/ncurses.c
Prereq: 1.445
--- ncurses-6.0-20160910+/test/ncurses.c 2016-09-10 23:30:15.000000000 +0000
+++ ncurses-6.0-20160917/test/ncurses.c 2016-09-17 21:12:04.000000000 +0000
@@ -40,7 +40,7 @@
Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993
Thomas E. Dickey (beginning revision 1.27 in 1996).
-$Id: ncurses.c,v 1.445 2016/09/10 23:30:15 tom Exp $
+$Id: ncurses.c,v 1.446 2016/09/17 21:12:04 tom Exp $
***************************************************************************/
@@ -2704,7 +2704,8 @@
int n;
int got;
char result[BUFSIZ];
- int check_n, check_r, check_g, check_b;
+ int check_n;
+ unsigned check_r, check_g, check_b;
raw();
noecho();
@@ -6925,11 +6926,11 @@
show_string_setting("longname", longname());
show_number_setting("baudrate", baudrate());
if (erasechar() > 0) {
- show_string_setting("unctrl(erasechar)", unctrl(erasechar()));
+ show_string_setting("unctrl(erasechar)", unctrl((chtype) erasechar()));
show_string_setting("keyname(erasechar)", keyname(erasechar()));
}
if (killchar() > 0) {
- show_string_setting("unctrl(killchar)", unctrl(killchar()));
+ show_string_setting("unctrl(killchar)", unctrl((chtype) killchar()));
show_string_setting("keyname(killchar)", keyname(killchar()));
}
#if USE_WIDEC_SUPPORT
Index: test/worm.c
Prereq: 1.65
--- ncurses-6.0-20160910+/test/worm.c 2013-06-22 20:01:41.000000000 +0000
+++ ncurses-6.0-20160917/test/worm.c 2016-09-17 21:12:30.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2012,2013 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2013,2016 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 *
@@ -61,7 +61,7 @@
traces will be dumped. The program stops and waits for one character of
input at the beginning and end of the interval.
- $Id: worm.c,v 1.65 2013/06/22 20:01:41 tom Exp $
+ $Id: worm.c,v 1.66 2016/09/17 21:12:30 tom Exp $
*/
#include <test.priv.h>
@@ -324,9 +324,9 @@
static bool
quit_worm(int bitnum)
{
- pending |= (1 << bitnum);
+ pending = (pending | (unsigned) (1 << bitnum));
napms(10); /* let the other thread(s) have a chance */
- pending &= ~(1 << bitnum);
+ pending = (pending & (unsigned) ~(1 << bitnum));
return quitting;
}
@@ -335,7 +335,7 @@
{
unsigned long compare = 0;
Trace(("start_worm"));
- while (!quit_worm(((struct worm *) arg) - worm)) {
+ while (!quit_worm((int) (((struct worm *) arg) - worm))) {
while (compare < sequence) {
++compare;
#if HAVE_USE_WINDOW

478
ncurses-6.0-20160924.patch Normal file
View File

@ -0,0 +1,478 @@
# ncurses 6.0 - patch 20160924 - Thomas E. Dickey
#
# ------------------------------------------------------------------------------
#
# Ncurses 6.0 is at
# ftp.gnu.org:/pub/gnu
#
# Patches for ncurses 6.0 can be found at
# ftp://invisible-island.net/ncurses/6.0
# http://invisible-mirror.net/archives/ncurses/6.0
#
# ------------------------------------------------------------------------------
# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20160924.patch.gz
# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created Sat Sep 24 23:30:47 UTC 2016
# ------------------------------------------------------------------------------
# NEWS | 7 +
# VERSION | 2
# dist.mk | 4
# misc/terminfo.src | 214 +++++++++++++++++++++++++++++--------
# ncurses/tinfo/comp_expand.c | 10 +
# package/debian-mingw/changelog | 4
# package/debian-mingw64/changelog | 4
# package/debian/changelog | 4
# package/mingw-ncurses.nsi | 4
# package/mingw-ncurses.spec | 2
# package/ncurses.spec | 2
# 11 files changed, 198 insertions(+), 59 deletions(-)
# ------------------------------------------------------------------------------
Index: NEWS
Prereq: 1.2667
--- ncurses-6.0-20160917+/NEWS 2016-09-18 00:38:06.000000000 +0000
+++ ncurses-6.0-20160924/NEWS 2016-09-24 22:47:32.000000000 +0000
@@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.2667 2016/09/18 00:38:06 tom Exp $
+-- $Id: NEWS,v 1.2670 2016/09/24 22:47:32 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
@@ -45,6 +45,11 @@
Changes through 1.9.9e did not credit all contributions;
it is not possible to add this information.
+20160924
+ + modify _nc_tic_expand to escape comma if it immediately follows a
+ percent sign, to work with minitel change.
+ + updated minitel and viewdata descriptions (Alexandre Montaron).
+
20160917
+ build-fix for gnat6, which unhelpfully attempts to compile C files.
+ fix typo in 20160910 changes (Debian #837892, patch by Sven Joachim).
Index: VERSION
--- ncurses-6.0-20160917+/VERSION 2016-09-17 13:25:35.000000000 +0000
+++ ncurses-6.0-20160924/VERSION 2016-09-24 13:36:42.000000000 +0000
@@ -1 +1 @@
-5:0:9 6.0 20160917
+5:0:9 6.0 20160924
Index: dist.mk
Prereq: 1.1124
--- ncurses-6.0-20160917+/dist.mk 2016-09-17 13:25:35.000000000 +0000
+++ ncurses-6.0-20160924/dist.mk 2016-09-24 13:36:42.000000000 +0000
@@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.1124 2016/09/17 13:25:35 tom Exp $
+# $Id: dist.mk,v 1.1125 2016/09/24 13:36:42 tom Exp $
# Makefile for creating ncurses distributions.
#
# This only needs to be used directly as a makefile by developers, but
@@ -37,7 +37,7 @@
# These define the major/minor/patch versions of ncurses.
NCURSES_MAJOR = 6
NCURSES_MINOR = 0
-NCURSES_PATCH = 20160917
+NCURSES_PATCH = 20160924
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
Index: misc/terminfo.src
--- ncurses-6.0-20160917+/misc/terminfo.src 2016-08-17 08:17:26.000000000 +0000
+++ ncurses-6.0-20160924/misc/terminfo.src 2016-09-24 22:01:35.000000000 +0000
@@ -6,8 +6,8 @@
# Report bugs and new terminal descriptions to
# bug-ncurses@gnu.org
#
-# $Revision: 1.566 $
-# $Date: 2016/08/17 08:17:26 $
+# $Revision: 1.569 $
+# $Date: 2016/09/24 22:01:35 $
#
# 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
@@ -18709,64 +18709,186 @@
smacs=^N, smir=\E[4h, smso=\E[7m, smul=\E[4m, tsl=^_@A,
u6=\E[%i%d;%dR, u7=\E[6n,
-# From: Alexandre Montaron <canal@mygale.org>, 18 Jun 1998
+# From: Alexandre Montaron <canal@mygale.org>, 18 Jun 1998, updated 19 Sep 2016
#
minitel1|minitel 1,
- am, bw, eslok, hs, hz, msgr,
- colors#8, cols#40, lines#24, pairs#8,
- bel=^G, blink=\EH, civis=^T, clear=^L, cnorm=^Q, cr=^M,
- cub1=^H, cud1=^J, cuf1=^I,
- cup=\037%p1%'A'%+%c%p2%'A'%+%c, cuu1=^K, el=^X,
+ am, bw, eslok, hs, hz, .msgr, G0,
+ colors#8, cols#40, lines#24, pairs#8, .ncv#16,
+ acsc=j+k+l+m+n+o~q`s_t+u+v+w+x|, bel=^G, blink=\EH,
+ civis=^T, clear=^L, cnorm=^Q, cr=^M, cub1=^H, cud1=^J, cuf1=^I,
+ cup=\037%p1%'A'%+%c%p2%'A'%+%c, cuu1=^K,
+ dsl=\037@A\030\n, el=^X,
flash=\037@A\EW \177\022\177\022P\r\030\n, fsl=^J,
- home=^^, ind=^J, is2=\E;`ZQ\E\:iC\E\:iE\021, nel=^M^J,
- op=\EG, rep=%p1%c\022%p2%'?'%+%c, rev=\E], ri=^K,
- rmso=\E\\,
+ home=^^, ind=^J, is2=\E;`ZQ\E\:iC\E\:iE\021, kbs=^SG,
+ kcan=^SE, kend=^SI, kent=^SA, khlp=^SD, knp=^SH, kpp=^SB,
+ krfr=^SC, nel=^M^J, op=\EG, rep=%p1%c\022%p2%'?'%+%c,
+ rev=\E], ri=^K, rmso=\E\\,
+ rs2=\024\037XA\030\n\030\n\030\n\030\n\030\n\030\n\030\n\030\n\030\n\030\n\030\n\030\n\030\n\030\n\030\n\030\n\030\n\030\n\030\n\030\n\030\n\030\n\030\n\030\014\021,
+ setab=\0, setaf=\E%p1%'@'%+%c, setb=\0,
setf=\E%?%p1%{1}%=%tD%e%p1%{3}%=%tF%e%p1%{4}%=%tA%e%p1%{6}%=%tC%e%p1%'@'%+%c%;,
sgr=%?%p1%t\E]%;%?%p3%t\E]%;%?%p4%t\EH%;,
- sgr0=\EI\E\\, smso=\E], tsl=\037@%p1%'A'%+%c,
- u6=\037%c%'A'%-%c%'A'%-, u7=\Ea, .acsc=}#f0g1\,\,+../,
- .enacs=^Y, .rs2=^L, .u8=\001Br4\004, .u9=\E9{,
-# is2=Fnct TE, Fnct ER, Fnct CM et pour finir: curseur ON.
+ sgr0=\EI\E\\\EG, smso=\E], tsl=\037@%p1%'A'%+%c,
+ u6=\037%c%'A'%-%c%'A'%-, u7=\Ea,
+ u8=\001%[BCDEFGHIJKLbcresdfg0123456789]\004, u9=\E9{,
+ .dim=\EB, .hup=\E9g, .rs2=^L, .u8=\001Br4\004,
+ C0=`>a9f!j%k4l<m-n=p#q\,rpt=u5v-w<x5yvzy|l~$, E0=^O,
+ S0=^N,
+ XC=B\031%\,\241!\,\242"\,\243#\,\244$\,\245%\,\246&\,\247'\,\250(\,\253+\,\257P\,\2600\,\2611\,\2622\,\2633\,\2655\,\2677\,\272k\,\273;\,\274<\,\275=\,\276>\,\277?\,\300AA\,\301BA\,\302CA\,\303DA\,\304HA\,\305JA\,\306a\,\307KC\,\310AE\,\311BE\,\312CE\,\313HE\,\314AI\,\315BI\,\316CI\,\317HI\,\320b\,\321DN\,\322AO\,\323BO\,\324CO\,\325DO\,\326HO\,\3274\,\330i\,\331AU\,\332BU\,\333CU\,\334HU\,\335BY\,\336l\,\337{\,\340Aa\,\341Ba\,\342Ca\,\343Da\,\344Ha\,\345Ja\,\346q\,\347Kc\,\350Ae\,\351Be\,\352Ce\,\353He\,\354Ai\,\355Bi\,\356Ci\,\357Hi\,\360r\,\361Dn\,\362Ao\,\363Bo\,\364Co\,\365Do\,\366Ho\,\3678\,\370y\,\371Au\,\372Bu\,\373Cu\,\374Hu\,\375By\,\376|\,\377Hy\,\252c\,\,0\017\031%\016\,}#\,f0\,g1\,\\\,\\\,\,+.\,./\,0\177\,--,
minitel1b|minitel 1-bistandard (in 40cols mode),
mir,
cub=\E[%p1%dD, cud=\E[%p1%dB, cuf=\E[%p1%dC,
cuu=\E[%p1%dA, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM,
dl1=\E[M, ed=\E[J, el1=\E[1K, il=\E[%p1%dL, il1=\E[L,
- is1=\E;iYA\E;jYC, kclr=\E[2J, kctab=^I, kcub1=\E[D,
- kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[P, kdl1=\E[M,
- khome=\E[H, kich1=\E[4h, kil1=\E[L, rmir=\E[4l, smir=\E[4h,
- .ich=\E[%p1%d@, .ich1=\E[@, .kel=^X, .rmkx=\E;jYA,
- .smkx=\E;iYA\E;jYC, .u8=\001Cu<\004, use=minitel1,
+ is1=\E;iYA\E;jYC, kbs@, kcan@, kclr=\E[2J, kctab=^I,
+ kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[P,
+ kdl1=\E[M, kent@, kf1=^SD, kf10=^Y0, kf11=^Y1, kf12=^Y/,
+ kf13=^Y{1, kf14=^Y{2, kf15=^Y{3, kf16=^Y{4, kf17=^Y{5,
+ kf18=^Y{6, kf19=^Y{7, kf2=^SC, kf20=^Y{8, kf21=^Y{9,
+ kf22=^Y{0, kf23=^Y{*, kf24=^Y{#, kf3=^SF, kf4=^SA, kf5=^SG,
+ kf6=^SE, kf7=^Y8, kf8=^Y\,, kf9=^Y., khlp@, khome=\E[H,
+ kich1=\E[4h, kil1=\E[L, krfr@, lf1=Guide, lf2=Repetition,
+ lf3=Sommaire, lf4=Envoi, lf5=Correction, lf6=Annulation,
+ rmir=\E[4l, smir=\E[4h,
+ u8=\001%[ABCPtuvwxyz0123456789\:;<=>?]\004,
+ .ich=\E[%p1%d@, .ich1=\E[@, .kLFT=\E[P, .kRIT=\E[4h,
+ .kb2=^Y{g, .kcbt=^Y{i, .kel=^X, .mc0=\E\:|k, .rmkx=\E;jYA,
+ .rs1=\E[4l\E[2l, .smkx=\E;iYA\E;jYC, .u8=\001Cu<\004,
+ use=minitel1,
# rmkx posait des problemes (logout en sortant de vi).
minitel1b-80|minitel 1-bistandard (standard teleinformatique),
- am@, bw@, hz@,
+ am@, bw@, eslok@, hz@, msgr, G0,
colors@, cols#80, it#8, pairs@,
- blink=\E[5m, bold=\E[1m, civis=\037@A\024\n,
+ acsc@, blink=\E[5m, bold=\E[1m, civis=\037@A\024\n,
clear=\E[H\E[J, cnorm=\037@A\021\n, cuf1=\E[C,
cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, el=\E[K, home=\E[H,
- ht=^I, ind=\ED, is1@, is2@, kbs=\EOl, kcan=\EOQ, kent=\EOM,
- kf0=\EOp, kf1=\EOq, kf2=\EOr, kf3=\EOs, kf4=\EOt, kf5=\EOu,
+ ht=^I, ind=\ED, is1@, is2@, kbs=\EOl, kcan=\EOQ, kend=\E)4\r,
+ kent=\EOM, kf1=\EOq, kf10=\EOp, kf11=\EOP1, kf12=\EOP2,
+ kf13=\EOP3, kf14=\EOP4, kf15=\EOP5, kf16=\EOP6, kf17=\EOP7,
+ kf18=\EOP8, kf19=\EOP9, kf2=\EOr, kf20=\EOP0, kf21=\EOP*,
+ kf22=\EOP#, kf23@, kf24@, kf3=\EOs, kf4=\EOt, kf5=\EOu,
kf6=\EOv, kf7=\EOw, kf8=\EOx, kf9=\EOy, khlp=\EOm, knp=\EOn,
- kpp=\EOR, krfr=\EOS, nel=\EE, op@, rc=\E8, rep@, rev=\E[7m,
- ri=\EM, rmkx@, rmso=\E[27m, rmul=\E[24m, rs2=\E[H\E[J\E[m,
- sc=\E7, setf@, sgr@, sgr0=\E[m, smkx@, smso=\E[7m, smul=\E[4m,
- u6@, u7@, .acsc=}#f[, .enacs=^O, .mc0=\E[i, .rmacs=^O,
- .rs2=\Ec,
+ kpp=\EOR, krfr=\EOS, lf1@, lf2@, lf3@, lf4@, lf5@, lf6@, nel=\EE,
+ op@, rc=\E8, rep@, rev=\E[7m, ri=\EM, rmkx@, rmso=\E[27m,
+ rmul=\E[24m,
+ rs2=\036\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[H\E[J\E[m,
+ sc=\E7, setab@, setaf@, setb@, setf@, sgr@, sgr0=\E[m, smkx@,
+ smso=\E[7m, smul=\E[4m,
+ tsl=\037@%?%p1%{63}%<%t%p1%'A'%+%c%e\177%p1%{62}%-%Pa%?%ga%{1}%&%t\011%;%?%ga%{2}%&%t\011\011%;%?%ga%{4}%&%t\011\011\011\011%;%?%ga%{07}%>%t\011\011\011\011\011\011\011\011%;%?%ga%{15}%>%t\011\011\011\011\011\011\011\011%;%;,
+ u6@, u7@, u8@, u9@, .acsc=}#f[, .enacs=^O, .kb2=\EOPg,
+ .kcbt=\EOPi, .ll=\E[24H, .mc0=\E[i, .rmacs=^O, .rs2=\Ec,
.sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;m,
- .smacs=^N, use=minitel1b,
+ .smacs=^N, C0=}#f[j+k+l+m+n+o~q=s_t+u+v+w+x!0\032,
+ E0=^O, S0=^N,
+ XC=B\016%\017\,\243#\,\247]\,\260[\,\340@\,\347\\\\\,\351{\,\350}\,\371|\,\300A\,\301A\,\302A\,\303A\,\304A\,\305A\,\306E\,\307C\,\310E\,\311E\,\312E\,\313E\,\314I\,\315I\,\316I\,\317I\,\320D\,\321N\,\322O\,\323O\,\324O\,\325O\,\326O\,\331U\,\332U\,\333U\,\334U\,\335Y\,\337s\,\341a\,\342a\,\343a\,\344a\,\345a\,\346e\,\352e\,\353e\,\354i\,\355i\,\356i\,\357i\,\360d\,\361n\,\362o\,\363o\,\364o\,\365o\,\366o\,\372u\,\373u\,\374u\,\375y\,\377y\,\267.\,\327x\,\367/\,\261\E7\E[4m+\E8\E[C\,\,0\017%\016\,x|\,y\E7\E[4m<\E8\E[C\,z\E7\E[4m>\E8\E[C\,g\E7\E[4m+\E8\E[C,
+ use=minitel1b,
+
+minitel1-nb|minitel 1 (40cols) noir & blanc sans couleurs avec bold et dim ...,
+ colors@, pairs@,
+ bold=\EG, clear=^L\EB,
+ cup=\037%p1%'A'%+%c%p2%'A'%+%c\EB, dim=\ED, home=^^\EB,
+ op@, rs2=^L\EB, setab@, setaf@, setb@, setf@,
+ sgr=%?%p1%p3%O%t\E]%;%?%p4%t\EH%;%?%p5%t\ED%;%?%p6%t\EG%;,
+ sgr0=\EI\E\\\EB, tsl=\037@%p1%'A'%+%c\EB, .invis=\E@,
+ use=minitel1,
+
minitel1b-nb|minitel 1b (40cols) noir & blanc sans couleurs avec bold et dim ...,
+ msgr,
colors@, pairs@,
acsc=`>a9f!j%k4l<m-n=p#q\,rpt=u5v-w<x5yvzy|l~$,
bold=\EG, clear=^L\EB, cup=\E[%i%p1%d;%p2%dH, dim=\ED,
- home=^^\EB, kend=\E)4\r, kf0=^Y0, kf1=\E$4\r, kf11=^Y1,
- kf12=^Y/, kf2=\E#4\r, kf3=\E&4\r, kf4=\E!4\r, kf5=\E'4\r,
- kf6=\E/4\r, kf7=^Y8, kf8=^Y\,, kf9=^Y., knp=\E(4\r,
- kpp=\E"4\r, op@, rmacs=^O, setf@,
+ home=^^\EB, kend=\E)4\r, kf1=\E$4\r, kf2=\E#4\r,
+ kf3=\E&4\r, kf4=\E!4\r, kf5=\E'4\r, kf6=\E/4\r, knp=\E(4\r,
+ kpp=\E"4\r, op@, rmacs=^O, rs2=^L\EB, setab@, setaf@, setb@,
+ setf@,
sgr=%?%p1%p3%O%t\E]%;%?%p4%t\EH%;%?%p5%t\ED%;%?%p6%t\EG%;,
- sgr0=\EI\E\\\EB, smacs=^N, .invis=\E@, .rs2=^L\EB,
- .u8=\001Cu|\004, use=minitel1b,
+ sgr0=\EI\E\\\EB, smacs=^N, tsl=\037@%p1%'A'%+%c\EB,
+ u8=\001%[ABCPpqrstuvwxyz{|}~\177]\004\r, .invis=\E@,
+ .u8=\001Cu|\004r, use=minitel1b,
+
+### Note:
+#
+# Faire, Fnct T puis "/" (TS+"?") pour activer les touches en 40cols :
+#
+# TS+Connexion/Fin(Fin),Retour(Page Up),Suite(Page Down),Guide(F1),
+# Repetition(F2),Sommaire(F3),Envoi(F4),Correction(F5),Annulation(F6),
+# Ctrl+7(F7),Ctrl+8(F8),Ctrl+9(F9),Ctrl+0(F10),Ctrl+*(F11),Ctrl+#(F12).
+#
+# Ctrl+Suite-1(F13), Ctrl+Suite-2(F14), Ctrl+Suite-3(F15),
+# Ctrl+Suite-4(F16), Ctrl+Suite-5(F17), Ctrl+Suite-6(F18),
+# Ctrl+Suite-7(F19), Ctrl+Suite-8(F20), Ctrl+Suite-9(F21),
+# Ctrl+Suite-0(F22), Ctrl+Suite-*(F23), Ctrl+Suite-#(F24).
+#
+### Fonctionne par exemple avec Midnight Commander (mc).
+
+minitel2-80|minitel 2 (80cols) avec filets vt100 (DEC),
+ G0,
+ acsc=ffggjjkkllmmnnooqqssttuuvvwwxxyyzz||}},
+ enacs=\E)0, rmacs=^O, smacs=^N, u6=\E[%i%d;%dR,
+ C0=ffggjjkkllmmnnooqqssttuuvvwwxxyyzz||}}, E0=^O,
+ S0=\E)0\016,
+ XC=B%\E(B\,\243\E(3}\,\247\E(R[\,\257\E(3v\,\260\E(3f\,\261\E(3g\,\265\E(3Y\,\267\E(3~\,\274\E(3O\,\275\E(3P\,\276\E(3Q\,\277\E(3Z\,\300A\,\301A\,\302A\,\303A\,\304\E(3R\,\305A\,\306E\,\307C\,\310E\,\311\E(3S\,\312E\,\313E\,\314\E(3T\,\315I\,\316I\,\317I\,\320D\,\321\E(3W\,\322\E(3U\,\323O\,\324O\,\325O\,\326O\,\327x\,\331U\,\332U\,\333U\,\334\E(3V\,\335Y\,\337\E(3{\,\340\E(3A\,\341a\,\342\E(3B\,\343a\,\344\E(3C\,\345a\,\346e\,\347\E(R\\\\\,\350\E(3E\,\351\E(3D\,\352\E(3F\,\353\E(3G\,\354i\,\355i\,\356\E(3H\,\357\E(3I\,\360d\,\361\E(3X\,\362o\,\363o\,\364\E(3J\,\365o\,\366\E(3K\,\367\E(3h\,\371\E(3L\,\372u\,\373\E(3M\,\374\E(3N\,\375y\,\377y\,\,0\E)3%\E)0\,\\\,m\,+k\,.l\,0\177\,-j,
+ use=minitel12-80,
+
+minitel12-80|minitel 12 (80cols),
+ G0,
+ civis=\E[<1h, cnorm=\E[<1l, is2=\E[12h, u6=\E[%i%d;%dH,
+ u7=\E[6n,
+ .acsc=ffggj+k+l+m+n+ovq-swt+u+v+w+xx}}\,m+k.l-j0\177,
+ .enacs=\E)3, .rmacs=^O, .rs3=\E[?4l, .scs=\E(%p1%c,
+ .smacs=^N,
+ C0=ffggj+k+l+m+n+ovq-swt+u+v+w+xx}}\,m+k.l-j0\177,
+ E0=^O, S0=\E)3\016,
+ XC=B%\E(B\,\243\E(3}\,\247\E(R[\,\257\E(3v\,\260\E(3f\,\261\E(3g\,\267\E(3~\,\274\E(3O\,\275\E(3P\,\276\E(3Q\,\300A\,\301A\,\302A\,\303A\,\304A\,\305A\,\306E\,\307C\,\310E\,\311E\,\312E\,\313E\,\314I\,\315I\,\316I\,\317I\,\320D\,\321N\,\322O\,\323O\,\324O\,\325O\,\326O\,\327x\,\331U\,\332U\,\333U\,\334U\,\335Y\,\337\E(3{\,\340\E(3A\,\341a\,\342\E(3B\,\343a\,\344\E(3C\,\345a\,\346e\,\347\E(R\\\\\,\350\E(3E\,\351\E(3D\,\352\E(3F\,\353\E(3G\,\354i\,\355i\,\356\E(3H\,\357\E(3I\,\360d\,\361n\,\362o\,\363o\,\364\E(3J\,\365o\,\366\E(3K\,\367\E(3h\,\371\E(3L\,\372u\,\373\E(3M\,\374\E(3N\,\375y\,\377y\,\,0\E)3%\E)0\,\\\,m\,+k\,.l\,0\177\,-j,
+ use=minitel1b-80,
+
+#
+# Add these in your ~/.screenrc for inputting some special glyphs like french
+# accentuated chars in 40 cols mode:
+#
+# bindkey ^YA digraph '`' # Saisi accent grave.
+# bindkey ^YB digraph "'" # Saisi accent aigu.
+# bindkey ^YC digraph '^' # Saisi accent circonflexe.
+# bindkey ^YH digraph '"' # Saisi accent trema.
+#
+# bindkey ^Y# stuff \243 # Livre.
+# bindkey "^Y\047" stuff \247 # Paragraphe.
+# bindkey ^Yj stuff \306 # AE
+# bindkey ^Yz stuff \346 # ae
+# bindkey ^YKc stuff \347 # c cedille.
+#
+
+screen.minitel1|Screen specific for minitel1,
+ ncv@,
+ acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz||}}~~,
+ bel=\007\E\^ \E\\, bold@, csr@, flash=\Eg\E\^ \E\\, kmous@,
+ rmul@, smul@, u6=\E[%i%d;%dR, u7=\E[6n, u8=\E[?1;2c, u9=\EZ,
+ use=screen,
+
+screen.minitel1b|Screen specific for minitel1b,
+ kclr=\E[2J, kdl1=\E[M, kf13=^Y{1, kf14=^Y{2, kf15=^Y{3,
+ kf16=^Y{4, kf17=^Y{5, kf18=^Y{6, kf19=^Y{7, kf20=^Y{8,
+ kf21=^Y{9, kf22=^Y{0, kf23=^Y{*, kf24=^Y{#, kil1=\E[L,
+ use=screen.minitel1,
+
+screen.minitel1b-80|screen.minitel2-80|screen.minitel12-80|Screen specific for minitel1b-80 minitel2-80 and minitel12-80,
+ colors@, ncv@, pairs@,
+ bold=\E[1m, kent=\EOM, kf13@, kf14@, kf15@, kf16@, kf17@, kf18@,
+ kf19@, kf20@, kf21@, kf22@, kf23@, kf24@, khlp=\EOm, op@,
+ rmul=\E[24m, setab@, setaf@, setb@, setf@, smul=\E[4m,
+ use=screen.minitel1b,
+
+screen.minitel1-nb|Screen specific for minitel1-nb,
+ colors@, ncv@, pairs@,
+ bold=\E[1m, dim=\E[2m, op@, setab@, setaf@, setb@, setf@,
+ use=screen.minitel1,
+
+screen.minitel1b-nb|Screen specific for minitel1b-nb,
+ colors@, ncv@, pairs@,
+ bold=\E[1m, dim=\E[2m, op@, setab@, setaf@, setb@, setf@,
+ use=screen.minitel1b,
-# From: Alexandre Montaron, 19 Nov 2015
+
+# From: Alexandre Montaron, 19 Nov 2015, updated 19 Sep 2016
#
# He comments:
# viewdata lacks a true cup capabilitie,
@@ -18777,13 +18899,18 @@
bel=^G, civis=^T, clear=^L, cnorm=^Q, cr=^M, cub1=^H, cud1=^J,
cuf1=^I,
cup=\036%?%p1%{07}%>%t\n\n\n\n\n\n\n\n%;%?%p1%{15}%>%t\n\n\n\n\n\n\n\n%;%?%p1%{4}%&%t\n\n\n\n%;%?%p1%{2}%&%t\n\n%;%?%p1%{1}%&%t\n%;%?%p2%{07}%>%t\011\011\011\011\011\011\011\011%;%?%p2%{15}%>%t\011\011\011\011\011\011\011\011%;%?%p2%{23}%>%t\011\011\011\011\011\011\011\011%;%?%p2%{31}%>%t\011\011\011\011\011\011\011\011%;%?%p2%{4}%&%t\011\011\011\011%;%?%p2%{2}%&%t\011\011%;%?%p2%{1}%&%t\011%;,
- cuu1=^K, home=^^, nel=^M^J, .el=^X, .ind=^J,
+ cuu1=^K, home=^^, nel=^M^J, rs2=^L, .el=^X, .ind=^J,
.rep=%p1%c\022%p2%'?'%+%c, .ri=^K,
-# Also:
-# viewdata-rv works with some applications (e.g. emacs, xemacs) but fails with vim.
+
+viewdata-o|optimized version of viewdata prestel/viewdata terminals,
+ cup=\036%p1%?%p2%{20}%>%t%?%p1%{23}%=%t%Pa%{1}%e%{1}%+%;%;%Pa%?%ga%{13}%<%t%?%ga%{07}%>%t\n\n\n\n\n\n\n\n%;%?%ga%{4}%&%t\n\n\n\n%;%?%ga%{2}%&%t\n\n%;%?%ga%{1}%&%t\n%;%e%{24}%ga%-%Pa%?%ga%{07}%>%t\013\013\013\013\013\013\013\013%;%?%ga%{4}%&%t\013\013\013\013%;%?%ga%{2}%&%t\013\013%;%?%ga%{1}%&%t\013%;%;%?%p2%{21}%<%t%?%p2%{07}%>%t\011\011\011\011\011\011\011\011%;%?%p2%{15}%>%t\011\011\011\011\011\011\011\011%;%?%p2%{4}%&%t\011\011\011\011%;%?%p2%{2}%&%t\011\011%;%?%p2%{1}%&%t\011%;%e%{40}%p2%-%Pa%?%ga%{07}%>%t\010\010\010\010\010\010\010\010%;%?%ga%{15}%>%t\010\010\010\010\010\010\010\010%;%?%ga%{4}%&%t\010\010\010\010%;%?%ga%{2}%&%t\010\010%;%?%ga%{1}%&%t\010%;%?%p1%{23}%=%t\013%;%;,
+ .ll=^^^K, use=viewdata,
+
+# Samples with TERM=viewdata and TERM=viewdata-rv: http://canal.chez.com/blog/
+
viewdata-rv|prestel/viewdata terminals with reverse capabilitie (as green),
xmc#1,
- rmso=\EG, smso=\EB, use=viewdata,
+ rmso=\EG, smso=\EB, use=viewdata-o,
######## OBSOLETE VDT TYPES
#
@@ -23854,4 +23981,9 @@
# 20160817
# + correct a typo in interix -TD
#
+# 2016-09-24
+# + updated minitel entries to use status line with screen(1), as well as
+# printing special G2 videotex chars like french accentuated glyph
+# using special cap XC= (patch by Alexandre Montaron).
+#
######## SHANTIH! SHANTIH! SHANTIH!
Index: ncurses/tinfo/comp_expand.c
Prereq: 1.25
--- ncurses-6.0-20160917+/ncurses/tinfo/comp_expand.c 2012-03-24 18:37:17.000000000 +0000
+++ ncurses-6.0-20160924/ncurses/tinfo/comp_expand.c 2016-09-24 21:15:51.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2012,2016 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 *
@@ -35,7 +35,7 @@
#include <ctype.h>
#include <tic.h>
-MODULE_ID("$Id: comp_expand.c,v 1.25 2012/03/24 18:37:17 tom Exp $")
+MODULE_ID("$Id: comp_expand.c,v 1.26 2016/09/24 21:15:51 tom Exp $")
static int
trailing_spaces(const char *src)
@@ -46,10 +46,10 @@
}
/* this deals with differences over whether 0x7f and 0x80..0x9f are controls */
-#define REALCTL(s) (UChar(*(s)) < 127 && iscntrl(UChar(*(s))))
+#define REALCTL(s) (UChar(*(s)) < 127 && iscntrl(UChar(*(s))))
#define REALPRINT(s) (UChar(*(s)) < 127 && isprint(UChar(*(s))))
-#define P_LIMIT(p) (length - (size_t)(p))
+#define P_LIMIT(p) (length - (size_t)(p))
NCURSES_EXPORT(char *)
_nc_tic_expand(const char *srcp, bool tic_format, int numbers)
@@ -133,6 +133,8 @@
}
break;
default:
+ if (*str == ',') /* minitel1 uses this */
+ buffer[bufp++] = '\\';
buffer[bufp++] = *str;
break;
}
Index: package/debian-mingw/changelog
--- ncurses-6.0-20160917+/package/debian-mingw/changelog 2016-09-17 13:25:35.000000000 +0000
+++ ncurses-6.0-20160924/package/debian-mingw/changelog 2016-09-24 13:36:42.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20160917) unstable; urgency=low
+ncurses6 (6.0+20160924) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 17 Sep 2016 09:25:35 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 24 Sep 2016 09:36:42 -0400
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian-mingw64/changelog
--- ncurses-6.0-20160917+/package/debian-mingw64/changelog 2016-09-17 13:25:35.000000000 +0000
+++ ncurses-6.0-20160924/package/debian-mingw64/changelog 2016-09-24 13:36:42.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20160917) unstable; urgency=low
+ncurses6 (6.0+20160924) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 17 Sep 2016 09:25:35 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 24 Sep 2016 09:36:42 -0400
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian/changelog
--- ncurses-6.0-20160917+/package/debian/changelog 2016-09-17 13:25:35.000000000 +0000
+++ ncurses-6.0-20160924/package/debian/changelog 2016-09-24 13:36:42.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20160917) unstable; urgency=low
+ncurses6 (6.0+20160924) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 17 Sep 2016 09:25:35 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 24 Sep 2016 09:36:42 -0400
ncurses6 (5.9-20120608) unstable; urgency=low
Index: package/mingw-ncurses.nsi
Prereq: 1.176
--- ncurses-6.0-20160917+/package/mingw-ncurses.nsi 2016-09-17 13:25:35.000000000 +0000
+++ ncurses-6.0-20160924/package/mingw-ncurses.nsi 2016-09-24 13:36:42.000000000 +0000
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.176 2016/09/17 13:25:35 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.177 2016/09/24 13:36:42 tom Exp $
; TODO add examples
; TODO bump ABI to 6
@@ -10,7 +10,7 @@
!define VERSION_MAJOR "6"
!define VERSION_MINOR "0"
!define VERSION_YYYY "2016"
-!define VERSION_MMDD "0917"
+!define VERSION_MMDD "0924"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"
Index: package/mingw-ncurses.spec
--- ncurses-6.0-20160917+/package/mingw-ncurses.spec 2016-09-17 13:25:35.000000000 +0000
+++ ncurses-6.0-20160924/package/mingw-ncurses.spec 2016-09-24 13:36:42.000000000 +0000
@@ -3,7 +3,7 @@
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 6.0
-Release: 20160917
+Release: 20160924
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncurses.spec
--- ncurses-6.0-20160917+/package/ncurses.spec 2016-09-17 13:25:35.000000000 +0000
+++ ncurses-6.0-20160924/package/ncurses.spec 2016-09-24 13:36:42.000000000 +0000
@@ -1,7 +1,7 @@
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 6.0
-Release: 20160917
+Release: 20160924
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz

5340
ncurses-6.0-20161001.patch Normal file
View File

File diff suppressed because it is too large Load Diff

15174
ncurses-6.0-20161008.patch Normal file
View File

File diff suppressed because it is too large Load Diff

5094
ncurses-6.0-20161015.patch Normal file
View File

File diff suppressed because it is too large Load Diff

1804
ncurses-6.0-20161022.patch Normal file
View File

File diff suppressed because it is too large Load Diff

782
ncurses-6.0-20161029.patch Normal file
View File

@ -0,0 +1,782 @@
# ncurses 6.0 - patch 20161029 - Thomas E. Dickey
#
# ------------------------------------------------------------------------------
#
# Ncurses 6.0 is at
# ftp.gnu.org:/pub/gnu
#
# Patches for ncurses 6.0 can be found at
# ftp://invisible-island.net/ncurses/6.0
# http://invisible-mirror.net/archives/ncurses/6.0
#
# ------------------------------------------------------------------------------
# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20161029.patch.gz
# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created Sun Oct 30 01:40:40 UTC 2016
# ------------------------------------------------------------------------------
# NEWS | 5 +
# VERSION | 2
# dist.mk | 4 -
# form/fld_current.c | 32 ++++++++++-
# form/form.h | 5 +
# form/form.priv.h | 5 +
# form/frm_driver.c | 102 ++++++++++++++++++++-----------------
# man/form.3x | 9 ++-
# man/form_page.3x | 14 +++--
# package/debian-mingw/changelog | 4 -
# package/debian-mingw64/changelog | 4 -
# package/debian/changelog | 4 -
# package/mingw-ncurses.nsi | 4 -
# package/mingw-ncurses.spec | 2
# package/ncurses.map | 12 +++-
# package/ncurses.spec | 2
# package/ncurses.sym | 6 +-
# package/ncursest.map | 11 +++
# package/ncursest.sym | 5 +
# package/ncursestw.map | 11 +++
# package/ncursestw.sym | 5 +
# package/ncursesw.map | 12 +++-
# package/ncursesw.sym | 6 +-
# 23 files changed, 178 insertions(+), 88 deletions(-)
# ------------------------------------------------------------------------------
Index: NEWS
Prereq: 1.2687
--- ncurses-6.0-20161022+/NEWS 2016-10-23 00:03:47.000000000 +0000
+++ ncurses-6.0-20161029/NEWS 2016-10-29 22:28:11.000000000 +0000
@@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.2687 2016/10/23 00:03:47 tom Exp $
+-- $Id: NEWS,v 1.2689 2016/10/29 22:28:11 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
@@ -45,6 +45,9 @@
Changes through 1.9.9e did not credit all contributions;
it is not possible to add this information.
+20161029
+ + add new function "unfocus_current_field" (Leon Winter)
+
20161022
+ modify tset -w (and tput reset) to update the program's copy of the
screensize if it was already set in the system, to improve tabstop
Index: VERSION
--- ncurses-6.0-20161022+/VERSION 2016-10-21 22:47:18.000000000 +0000
+++ ncurses-6.0-20161029/VERSION 2016-10-29 19:16:10.000000000 +0000
@@ -1 +1 @@
-5:0:9 6.0 20161022
+5:0:9 6.0 20161029
Index: dist.mk
Prereq: 1.1129
--- ncurses-6.0-20161022+/dist.mk 2016-10-21 22:47:18.000000000 +0000
+++ ncurses-6.0-20161029/dist.mk 2016-10-29 19:16:10.000000000 +0000
@@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.1129 2016/10/21 22:47:18 tom Exp $
+# $Id: dist.mk,v 1.1130 2016/10/29 19:16:10 tom Exp $
# Makefile for creating ncurses distributions.
#
# This only needs to be used directly as a makefile by developers, but
@@ -37,7 +37,7 @@
# These define the major/minor/patch versions of ncurses.
NCURSES_MAJOR = 6
NCURSES_MINOR = 0
-NCURSES_PATCH = 20161022
+NCURSES_PATCH = 20161029
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
Index: form/fld_current.c
Prereq: 1.12
--- ncurses-6.0-20161022+/form/fld_current.c 2010-01-23 21:14:35.000000000 +0000
+++ ncurses-6.0-20161029/form/fld_current.c 2016-10-29 22:30:10.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2004,2010 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2010,2016 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 *
@@ -32,7 +32,7 @@
#include "form.priv.h"
-MODULE_ID("$Id: fld_current.c,v 1.12 2010/01/23 21:14:35 tom Exp $")
+MODULE_ID("$Id: fld_current.c,v 1.14 2016/10/29 22:30:10 tom Exp $")
/*---------------------------------------------------------------------------
| Facility : libnform
@@ -76,7 +76,7 @@
{
if (form->current != field)
{
- if (!_nc_Internal_Validation(form))
+ if (form->current && !_nc_Internal_Validation(form))
{
err = E_INVALID_FIELD;
}
@@ -103,6 +103,32 @@
}
/*---------------------------------------------------------------------------
+| Facility : libnform
+| Function : int unfocus_current_field(FORM * form)
+|
+| Description : Removes focus from the current field.
+|
+| Return Values : E_OK - success
+| E_BAD_ARGUMENT - invalid form pointer
+| E_REQUEST_DENIED - there is no current field to unfocus
++--------------------------------------------------------------------------*/
+NCURSES_EXPORT(int)
+unfocus_current_field(FORM *const form)
+{
+ T((T_CALLED("unfocus_current_field(%p)"), (const void *)form));
+ if (form == 0)
+ {
+ RETURN(E_BAD_ARGUMENT);
+ }
+ else if (form->current == 0)
+ {
+ RETURN(E_REQUEST_DENIED);
+ }
+ _nc_Unset_Current_Field(form);
+ RETURN(E_OK);
+}
+
+/*---------------------------------------------------------------------------
| Facility : libnform
| Function : FIELD *current_field(const FORM * form)
|
Index: form/form.h
Prereq: 0.25
--- ncurses-6.0-20161022+/form/form.h 2015-11-28 20:13:39.000000000 +0000
+++ ncurses-6.0-20161029/form/form.h 2016-10-29 22:24:24.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2014,2015 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2015,2016 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 *
@@ -30,7 +30,7 @@
* Author: Juergen Pfeifer, 1995,1997 *
****************************************************************************/
-/* $Id: form.h,v 0.25 2015/11/28 20:13:39 Leon.Winter Exp $ */
+/* $Id: form.h,v 0.26 2016/10/29 22:24:24 Leon.Winter Exp $ */
#ifndef FORM_H
#define FORM_H
@@ -387,6 +387,7 @@
extern NCURSES_EXPORT(int) set_form_win (FORM *,WINDOW *);
extern NCURSES_EXPORT(int) set_form_sub (FORM *,WINDOW *);
extern NCURSES_EXPORT(int) set_current_field (FORM *,FIELD *);
+extern NCURSES_EXPORT(int) unfocus_current_field (FORM *);
extern NCURSES_EXPORT(int) field_index (const FIELD *);
extern NCURSES_EXPORT(int) set_form_page (FORM *,int);
extern NCURSES_EXPORT(int) form_page (const FORM *);
Index: form/form.priv.h
Prereq: 0.39
--- ncurses-6.0-20161022+/form/form.priv.h 2015-11-28 20:13:39.000000000 +0000
+++ ncurses-6.0-20161029/form/form.priv.h 2016-10-29 22:30:23.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2014,2015 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2015,2016 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 *
@@ -30,7 +30,7 @@
* Author: Juergen Pfeifer, 1995,1997 *
****************************************************************************/
-/* $Id: form.priv.h,v 0.39 2015/11/28 20:13:39 Leon.Winter Exp $ */
+/* $Id: form.priv.h,v 0.41 2016/10/29 22:30:23 tom Exp $ */
#ifndef FORM_PRIV_H
#define FORM_PRIV_H 1
@@ -184,6 +184,7 @@
extern NCURSES_EXPORT(bool) _nc_Internal_Validation (FORM*);
extern NCURSES_EXPORT(int) _nc_Set_Current_Field (FORM*, FIELD*);
extern NCURSES_EXPORT(int) _nc_Position_Form_Cursor (FORM*);
+extern NCURSES_EXPORT(void) _nc_Unset_Current_Field(FORM *form);
#if NCURSES_INTEROP_FUNCS
extern NCURSES_EXPORT(FIELDTYPE *) _nc_TYPE_INTEGER(void);
Index: form/frm_driver.c
Prereq: 1.117
--- ncurses-6.0-20161022+/form/frm_driver.c 2015-11-28 20:39:09.000000000 +0000
+++ ncurses-6.0-20161029/form/frm_driver.c 2016-10-29 22:30:10.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2014,2015 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2015,2016 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 *
@@ -32,7 +32,7 @@
#include "form.priv.h"
-MODULE_ID("$Id: frm_driver.c,v 1.117 2015/11/28 20:39:09 tom Exp $")
+MODULE_ID("$Id: frm_driver.c,v 1.119 2016/10/29 22:30:10 tom Exp $")
/*----------------------------------------------------------------------------
This is the core module of the form library. It contains the majority
@@ -1395,6 +1395,57 @@
returnCode(res);
}
+/*
+ * Removes the focus from the current field of the form.
+ */
+void
+_nc_Unset_Current_Field(FORM *form)
+{
+ FIELD *field = form->current;
+
+ _nc_Refresh_Current_Field(form);
+ if (Field_Has_Option(field, O_PUBLIC))
+ {
+ if (field->drows > field->rows)
+ {
+ if (form->toprow == 0)
+ ClrStatus(field, _NEWTOP);
+ else
+ SetStatus(field, _NEWTOP);
+ }
+ else
+ {
+ if (Justification_Allowed(field))
+ {
+ Window_To_Buffer(form, field);
+ werase(form->w);
+ Perform_Justification(field, form->w);
+ if (Field_Has_Option(field, O_DYNAMIC_JUSTIFY) &&
+ (form->w->_parent == 0))
+ {
+ copywin(form->w,
+ Get_Form_Window(form),
+ 0,
+ 0,
+ field->frow,
+ field->fcol,
+ field->frow,
+ field->cols + field->fcol - 1,
+ 0);
+ wsyncup(Get_Form_Window(form));
+ }
+ else
+ {
+ wsyncup(form->w);
+ }
+ }
+ }
+ }
+ delwin(form->w);
+ form->w = (WINDOW *)0;
+ form->current = 0;
+}
+
/*---------------------------------------------------------------------------
| Facility : libnform
| Function : int _nc_Set_Current_Field(FORM * form,
@@ -1415,7 +1466,7 @@
T((T_CALLED("_nc_Set_Current_Field(%p,%p)"), (void *)form, (void *)newfield));
- if (!form || !newfield || !form->current || (newfield->form != form))
+ if (!form || !newfield || (newfield->form != form))
returnCode(E_BAD_ARGUMENT);
if ((form->status & _IN_DRIVER))
@@ -1429,51 +1480,10 @@
if ((field != newfield) ||
!(form->status & _POSTED))
{
- if ((form->w) &&
+ if (field && (form->w) &&
(Field_Has_Option(field, O_VISIBLE)) &&
(field->form->curpage == field->page))
- {
- _nc_Refresh_Current_Field(form);
- if (Field_Has_Option(field, O_PUBLIC))
- {
- if (field->drows > field->rows)
- {
- if (form->toprow == 0)
- ClrStatus(field, _NEWTOP);
- else
- SetStatus(field, _NEWTOP);
- }
- else
- {
- if (Justification_Allowed(field))
- {
- Window_To_Buffer(form, field);
- werase(form->w);
- Perform_Justification(field, form->w);
- if (Field_Has_Option(field, O_DYNAMIC_JUSTIFY) &&
- (form->w->_parent == 0))
- {
- copywin(form->w,
- Get_Form_Window(form),
- 0,
- 0,
- field->frow,
- field->fcol,
- field->frow,
- field->cols + field->fcol - 1,
- 0);
- wsyncup(Get_Form_Window(form));
- }
- else
- {
- wsyncup(form->w);
- }
- }
- }
- }
- delwin(form->w);
- form->w = (WINDOW *)0;
- }
+ _nc_Unset_Current_Field(form);
field = newfield;
Index: man/form.3x
Prereq: 1.26
--- ncurses-6.0-20161022+/man/form.3x 2015-08-02 18:14:50.000000000 +0000
+++ ncurses-6.0-20161029/man/form.3x 2016-10-29 22:26:35.000000000 +0000
@@ -1,6 +1,6 @@
'\" t
.\"***************************************************************************
-.\" Copyright (c) 1998-2014,2015 Free Software Foundation, Inc. *
+.\" Copyright (c) 1998-2015,2016 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: form.3x,v 1.26 2015/08/02 18:14:50 tom Exp $
+.\" $Id: form.3x,v 1.28 2016/10/29 22:26:35 tom Exp $
.TH form 3X ""
.SH NAME
\fBform\fR \- curses extension for programming forms
@@ -146,6 +146,7 @@
set_form_win \fBform_win\fR(3X)
set_max_field \fBform_field_buffer\fR(3X)
set_new_page \fBform_new_page\fR(3X)
+unfocus_current_field \fBform_page\fR(3X)
unpost_form \fBform_post\fR(3X)
.TE
.SH RETURN VALUE
@@ -200,6 +201,10 @@
.SH PORTABILITY
These routines emulate the System V forms library. They were not supported on
Version 7 or BSD versions.
+.PP
+A few functions are extensions added for ncurses, e.g.,
+\fBform_driver_w\fP,
+\fBunfocus_current_field\fP.
.SH AUTHORS
Juergen Pfeifer. Manual pages and adaptation for ncurses by Eric
S. Raymond.
Index: man/form_page.3x
Prereq: 1.12
--- ncurses-6.0-20161022+/man/form_page.3x 2010-12-04 18:40:45.000000000 +0000
+++ ncurses-6.0-20161029/man/form_page.3x 2016-10-29 22:27:24.000000000 +0000
@@ -1,6 +1,6 @@
'\" t
.\"***************************************************************************
-.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc. *
+.\" Copyright (c) 1998-2010,2016 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: form_page.3x,v 1.12 2010/12/04 18:40:45 tom Exp $
+.\" $Id: form_page.3x,v 1.14 2016/10/29 22:27:24 tom Exp $
.TH form_page 3X ""
.SH NAME
\fBform_page\fR \- set and get form page number
@@ -38,6 +38,8 @@
.br
FIELD *current_field(const FORM *);
.br
+int unfocus_current_field(FORM *form);
+.br
int set_form_page(FORM *form, int n);
.br
int form_page(const FORM *form);
@@ -45,9 +47,13 @@
int field_index(const FIELD *field);
.br
.SH DESCRIPTION
-The function \fBset_current field\fR sets the current field of the given
+The function \fBset_current_field\fR sets the current field of the given
form; \fBcurrent_field\fR returns the current field of the given form.
.PP
+The function \fBunfocus_current_field\fR removes the focus from the current
+field of the form. In such state, inquiries via \fBcurrent_field\fR shall return
+a NULL pointer.
+.PP
The function \fBset_form_page\fR sets the form's page number (goes to page
\fIn\fR of the form).
.PP
@@ -85,6 +91,8 @@
.SH PORTABILITY
These routines emulate the System V forms library. They were not supported on
Version 7 or BSD versions.
+.PP
+The \fBunfocus_current_field\fP function is an ncurses extension.
.SH AUTHORS
Juergen Pfeifer. Manual pages and adaptation for new curses by Eric
S. Raymond.
Index: package/debian-mingw/changelog
--- ncurses-6.0-20161022+/package/debian-mingw/changelog 2016-10-21 22:47:18.000000000 +0000
+++ ncurses-6.0-20161029/package/debian-mingw/changelog 2016-10-29 19:16:10.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20161022) unstable; urgency=low
+ncurses6 (6.0+20161029) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Fri, 21 Oct 2016 18:47:18 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 29 Oct 2016 15:16:10 -0400
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian-mingw64/changelog
--- ncurses-6.0-20161022+/package/debian-mingw64/changelog 2016-10-21 22:47:18.000000000 +0000
+++ ncurses-6.0-20161029/package/debian-mingw64/changelog 2016-10-29 19:16:10.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20161022) unstable; urgency=low
+ncurses6 (6.0+20161029) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Fri, 21 Oct 2016 18:47:18 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 29 Oct 2016 15:16:10 -0400
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian/changelog
--- ncurses-6.0-20161022+/package/debian/changelog 2016-10-21 22:47:18.000000000 +0000
+++ ncurses-6.0-20161029/package/debian/changelog 2016-10-29 19:16:10.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20161022) unstable; urgency=low
+ncurses6 (6.0+20161029) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Fri, 21 Oct 2016 18:47:18 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 29 Oct 2016 15:16:10 -0400
ncurses6 (5.9-20120608) unstable; urgency=low
Index: package/mingw-ncurses.nsi
Prereq: 1.181
--- ncurses-6.0-20161022+/package/mingw-ncurses.nsi 2016-10-21 22:47:18.000000000 +0000
+++ ncurses-6.0-20161029/package/mingw-ncurses.nsi 2016-10-29 19:16:10.000000000 +0000
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.181 2016/10/21 22:47:18 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.182 2016/10/29 19:16:10 tom Exp $
; TODO add examples
; TODO bump ABI to 6
@@ -10,7 +10,7 @@
!define VERSION_MAJOR "6"
!define VERSION_MINOR "0"
!define VERSION_YYYY "2016"
-!define VERSION_MMDD "1022"
+!define VERSION_MMDD "1029"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"
Index: package/mingw-ncurses.spec
--- ncurses-6.0-20161022+/package/mingw-ncurses.spec 2016-10-21 22:47:18.000000000 +0000
+++ ncurses-6.0-20161029/package/mingw-ncurses.spec 2016-10-29 19:16:10.000000000 +0000
@@ -3,7 +3,7 @@
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 6.0
-Release: 20161022
+Release: 20161029
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncurses.map
Prereq: 1.35
--- ncurses-6.0-20161022+/package/ncurses.map 2015-09-05 19:27:16.000000000 +0000
+++ ncurses-6.0-20161029/package/ncurses.map 2016-10-30 01:06:37.000000000 +0000
@@ -1,4 +1,4 @@
-# $Id: ncurses.map,v 1.35 2015/09/05 19:27:16 tom Exp $
+# $Id: ncurses.map,v 1.36 2016/10/30 01:06:37 tom Exp $
# script for shared library symbol-versioning using ld
#
# This file was generated by ncu-mapsyms
@@ -740,12 +740,19 @@
global:
wgetdelay;
local:
- _*;
_nc_mvcur;
_nc_mvcur_sp;
_nc_trace_mmask_t;
} NCURSES_5.8.20110226;
+NCURSES_6.0.current {
+ global:
+ unfocus_current_field;
+ local:
+ _*;
+ _nc_Unset_Current_Field;
+} NCURSES_5.9.20150530;
+
NCURSES_TIC_5.0.19991023 {
global:
_nc_capcmp;
@@ -1107,6 +1114,7 @@
keyname_sp;
keyok_sp;
killchar_sp;
+ longname_sp;
napms_sp;
new_prescr;
nocbreak_sp;
Index: package/ncurses.spec
--- ncurses-6.0-20161022+/package/ncurses.spec 2016-10-21 22:47:18.000000000 +0000
+++ ncurses-6.0-20161029/package/ncurses.spec 2016-10-29 19:16:10.000000000 +0000
@@ -1,7 +1,7 @@
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 6.0
-Release: 20161022
+Release: 20161029
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncurses.sym
Prereq: 1.24
--- ncurses-6.0-20161022+/package/ncurses.sym 2015-09-05 19:36:49.000000000 +0000
+++ ncurses-6.0-20161029/package/ncurses.sym 2016-10-30 00:45:38.000000000 +0000
@@ -1,4 +1,4 @@
-# $Id: ncurses.sym,v 1.24 2015/09/05 19:36:49 tom Exp $
+# $Id: ncurses.sym,v 1.25 2016/10/30 00:45:38 tom Exp $
# script for shared library symbol-visibility using libtool
#
# This file was generated by ncu-mapsyms
@@ -51,7 +51,7 @@
# --disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-sp-funcs --with-termlib --with-trace
# --disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-wgetch-events --with-hashed-db --with-termlib --with-ticlib --with-trace
# --disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --with-broken_linker --with-termlib --with-ticlib --with-trace
-# Configure options (6.0.current)
+# Configure options (6.0.20161029)
# --disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-getcap --enable-getcap-cache --enable-hard-tabs --enable-termcap --with-termlib --with-trace
# --disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-interop --with-termlib --with-trace
# --disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-sp-funcs --with-broken_linker --with-hashed-db --with-termlib --with-trace
@@ -457,6 +457,7 @@
link_field
link_fieldtype
longname
+longname_sp
mcprint
mcprint_sp
menu_back
@@ -763,6 +764,7 @@
typeahead_sp
unctrl
unctrl_sp
+unfocus_current_field
ungetch
ungetch_sp
ungetmouse
Index: package/ncursest.map
Prereq: 1.31
--- ncurses-6.0-20161022+/package/ncursest.map 2015-09-05 19:35:45.000000000 +0000
+++ ncurses-6.0-20161029/package/ncursest.map 2016-10-30 01:08:04.000000000 +0000
@@ -1,4 +1,4 @@
-# $Id: ncursest.map,v 1.31 2015/09/05 19:35:45 tom Exp $
+# $Id: ncursest.map,v 1.32 2016/10/30 01:08:04 tom Exp $
# script for shared library symbol-versioning using ld
#
# This file was generated by ncu-mapsyms
@@ -1111,8 +1111,15 @@
global:
wgetdelay;
local:
- _*;
_nc_mvcur;
_nc_mvcur_sp;
_nc_trace_mmask_t;
} NCURSEST_5.8.20110226;
+
+NCURSEST_6.0.current {
+ global:
+ unfocus_current_field;
+ local:
+ _*;
+ _nc_Unset_Current_Field;
+} NCURSEST_5.9.20150530;
Index: package/ncursest.sym
Prereq: 1.26
--- ncurses-6.0-20161022+/package/ncursest.sym 2015-09-05 19:36:49.000000000 +0000
+++ ncurses-6.0-20161029/package/ncursest.sym 2016-10-30 00:55:06.000000000 +0000
@@ -1,4 +1,4 @@
-# $Id: ncursest.sym,v 1.26 2015/09/05 19:36:49 tom Exp $
+# $Id: ncursest.sym,v 1.27 2016/10/30 00:55:06 tom Exp $
# script for shared library symbol-visibility using libtool
#
# This file was generated by ncu-mapsyms
@@ -35,7 +35,7 @@
# --disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-sp-funcs --enable-weak-symbols --with-pthread --with-termlib --with-trace
# --disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-weak-symbols --enable-wgetch-events --with-hashed-db --with-pthread --with-termlib --with-ticlib --with-trace
# --disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-weak-symbols --with-broken_linker --with-pthread --with-termlib --with-ticlib --with-trace
-# Configure options (6.0.current)
+# Configure options (6.0.20161029)
# --disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-getcap --enable-getcap-cache --enable-hard-tabs --enable-termcap --enable-weak-symbols --with-pthread --with-termlib --with-trace
# --disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-interop --enable-weak-symbols --with-pthread --with-termlib --with-trace
# --disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-reentrant --enable-sp-funcs --enable-weak-symbols --with-pthread --with-termlib --with-trace
@@ -748,6 +748,7 @@
typeahead_sp
unctrl
unctrl_sp
+unfocus_current_field
ungetch
ungetch_sp
ungetmouse
Index: package/ncursestw.map
Prereq: 1.32
--- ncurses-6.0-20161022+/package/ncursestw.map 2015-09-05 19:35:05.000000000 +0000
+++ ncurses-6.0-20161029/package/ncursestw.map 2016-10-30 01:09:53.000000000 +0000
@@ -1,4 +1,4 @@
-# $Id: ncursestw.map,v 1.32 2015/09/05 19:35:05 tom Exp $
+# $Id: ncursestw.map,v 1.33 2016/10/30 01:09:53 tom Exp $
# script for shared library symbol-versioning using ld
#
# This file was generated by ncu-mapsyms
@@ -1230,8 +1230,15 @@
form_driver_w;
wgetdelay;
local:
- _*;
_nc_mvcur;
_nc_mvcur_sp;
_nc_trace_mmask_t;
} NCURSESTW_5.8.20110226;
+
+NCURSESTW_6.0.current {
+ global:
+ unfocus_current_field;
+ local:
+ _*;
+ _nc_Unset_Current_Field;
+} NCURSESTW_5.9.20150530;
Index: package/ncursestw.sym
Prereq: 1.24
--- ncurses-6.0-20161022+/package/ncursestw.sym 2015-09-05 19:36:49.000000000 +0000
+++ ncurses-6.0-20161029/package/ncursestw.sym 2016-10-30 01:00:08.000000000 +0000
@@ -1,4 +1,4 @@
-# $Id: ncursestw.sym,v 1.24 2015/09/05 19:36:49 tom Exp $
+# $Id: ncursestw.sym,v 1.25 2016/10/30 01:00:08 tom Exp $
# script for shared library symbol-visibility using libtool
#
# This file was generated by ncu-mapsyms
@@ -35,7 +35,7 @@
# --disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-sp-funcs --enable-weak-symbols --enable-widec --with-pthread --with-termlib --with-trace
# --disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-weak-symbols --enable-wgetch-events --enable-widec --with-hashed-db --with-pthread --with-termlib --with-ticlib --with-trace
# --disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-weak-symbols --enable-widec --with-broken_linker --with-pthread --with-termlib --with-ticlib --with-trace
-# Configure options (6.0.current)
+# Configure options (6.0.20161029)
# --disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-getcap --enable-getcap-cache --enable-hard-tabs --enable-termcap --enable-weak-symbols --enable-widec --with-pthread --with-termlib --with-trace
# --disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-interop --enable-weak-symbols --enable-widec --with-pthread --with-termlib --with-trace
# --disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-reentrant --enable-sp-funcs --enable-weak-symbols --enable-widec --with-pthread --with-termlib --with-trace
@@ -826,6 +826,7 @@
typeahead_sp
unctrl
unctrl_sp
+unfocus_current_field
unget_wch
unget_wch_sp
ungetch
Index: package/ncursesw.map
Prereq: 1.37
--- ncurses-6.0-20161022+/package/ncursesw.map 2015-09-05 19:33:48.000000000 +0000
+++ ncurses-6.0-20161029/package/ncursesw.map 2016-10-30 01:11:09.000000000 +0000
@@ -1,4 +1,4 @@
-# $Id: ncursesw.map,v 1.37 2015/09/05 19:33:48 tom Exp $
+# $Id: ncursesw.map,v 1.38 2016/10/30 01:11:09 tom Exp $
# script for shared library symbol-versioning using ld
#
# This file was generated by ncu-mapsyms
@@ -421,6 +421,7 @@
keyname_sp;
keyok_sp;
killchar_sp;
+ longname_sp;
napms_sp;
new_prescr;
nocbreak_sp;
@@ -1254,8 +1255,15 @@
form_driver_w;
wgetdelay;
local:
- _*;
_nc_mvcur;
_nc_mvcur_sp;
_nc_trace_mmask_t;
} NCURSESW_5.8.20110226;
+
+NCURSESW_6.0.current {
+ global:
+ unfocus_current_field;
+ local:
+ _*;
+ _nc_Unset_Current_Field;
+} NCURSESW_5.9.20150530;
Index: package/ncursesw.sym
Prereq: 1.25
--- ncurses-6.0-20161022+/package/ncursesw.sym 2015-09-05 19:36:49.000000000 +0000
+++ ncurses-6.0-20161029/package/ncursesw.sym 2016-10-30 00:50:36.000000000 +0000
@@ -1,4 +1,4 @@
-# $Id: ncursesw.sym,v 1.25 2015/09/05 19:36:49 tom Exp $
+# $Id: ncursesw.sym,v 1.26 2016/10/30 00:50:36 tom Exp $
# script for shared library symbol-visibility using libtool
#
# This file was generated by ncu-mapsyms
@@ -46,7 +46,7 @@
# --disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-sp-funcs --enable-widec --with-termlib --with-trace
# --disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-wgetch-events --enable-widec --with-hashed-db --with-termlib --with-ticlib --with-trace
# --disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-widec --with-broken_linker --with-termlib --with-ticlib --with-trace
-# Configure options (6.0.current)
+# Configure options (6.0.20161029)
# --disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-getcap --enable-getcap-cache --enable-hard-tabs --enable-termcap --enable-widec --with-termlib --with-trace
# --disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-interop --enable-widec --with-termlib --with-trace
# --disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-sp-funcs --enable-widec --with-broken_linker --with-hashed-db --with-termlib --with-trace
@@ -489,6 +489,7 @@
link_field
link_fieldtype
longname
+longname_sp
mcprint
mcprint_sp
menu_back
@@ -836,6 +837,7 @@
typeahead_sp
unctrl
unctrl_sp
+unfocus_current_field
unget_wch
unget_wch_sp
ungetch

266
ncurses-6.0-20161105.patch Normal file
View File

@ -0,0 +1,266 @@
# ncurses 6.0 - patch 20161105 - Thomas E. Dickey
#
# ------------------------------------------------------------------------------
#
# Ncurses 6.0 is at
# ftp.gnu.org:/pub/gnu
#
# Patches for ncurses 6.0 can be found at
# ftp://invisible-island.net/ncurses/6.0
# http://invisible-mirror.net/archives/ncurses/6.0
#
# ------------------------------------------------------------------------------
# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20161105.patch.gz
# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created Sun Nov 6 00:04:10 UTC 2016
# ------------------------------------------------------------------------------
# Ada95/gen/adacurses-config.in | 9 +++++----
# NEWS | 6 +++++-
# VERSION | 2 +-
# dist.mk | 4 ++--
# man/MKada_config.in | 13 +++++++------
# man/terminfo.tail | 4 ++--
# package/debian-mingw/changelog | 4 ++--
# package/debian-mingw64/changelog | 4 ++--
# package/debian/changelog | 4 ++--
# package/mingw-ncurses.nsi | 4 ++--
# package/mingw-ncurses.spec | 2 +-
# package/ncurses.spec | 2 +-
# 12 files changed, 32 insertions(+), 26 deletions(-)
# ------------------------------------------------------------------------------
Index: Ada95/gen/adacurses-config.in
Prereq: 1.9
--- ncurses-6.0-20161029+/Ada95/gen/adacurses-config.in 2014-06-07 19:32:22.000000000 +0000
+++ ncurses-6.0-20161105/Ada95/gen/adacurses-config.in 2016-11-05 20:48:35.000000000 +0000
@@ -1,7 +1,7 @@
#! /bin/sh
-# $Id: adacurses-config.in,v 1.9 2014/06/07 19:32:22 Pascal.Pignard Exp $
+# $Id: adacurses-config.in,v 1.11 2016/11/05 20:48:35 tom Exp $
##############################################################################
-# Copyright (c) 2007-2010,2014 Free Software Foundation, Inc. #
+# Copyright (c) 2007-2012,2016 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"), #
@@ -44,6 +44,7 @@
LIBS="-L$ADA_OBJECTS -lAdaCurses"
THIS="adacurses"
+THIS_CFG="$THIS@DFT_ARG_SUFFIX@-config"
case "x$1" in
x--version)
@@ -61,7 +62,7 @@
;;
x--help)
cat <<ENDHELP
-Usage: ${THIS}-config [options]
+Usage: ${THIS_CFG} [options]
Options:
--cflags echos the gnat (Ada compiler) flags needed to compile with ${THIS}
@@ -75,7 +76,7 @@
ENDHELP
;;
*)
- echo 'Usage: adacurses@DFT_ARG_SUFFIX@-config [--version | --cflags | --libs]' >&2
+ echo 'Usage: $THIS_CFG [--version | --cflags | --libs]' >&2
exit 1
;;
esac
Index: NEWS
Prereq: 1.2689
--- ncurses-6.0-20161029+/NEWS 2016-10-29 22:28:11.000000000 +0000
+++ ncurses-6.0-20161105/NEWS 2016-11-05 21:17:13.000000000 +0000
@@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.2689 2016/10/29 22:28:11 tom Exp $
+-- $Id: NEWS,v 1.2692 2016/11/05 21:17:13 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
@@ -45,6 +45,10 @@
Changes through 1.9.9e did not credit all contributions;
it is not possible to add this information.
+20161105
+ + fix typo in man/terminfo.tail (Alain Williams).
+ + correct program-name in adacurses6-config.1 manual page.
+
20161029
+ add new function "unfocus_current_field" (Leon Winter)
Index: VERSION
--- ncurses-6.0-20161029+/VERSION 2016-10-29 19:16:10.000000000 +0000
+++ ncurses-6.0-20161105/VERSION 2016-11-05 16:39:30.000000000 +0000
@@ -1 +1 @@
-5:0:9 6.0 20161029
+5:0:9 6.0 20161105
Index: dist.mk
Prereq: 1.1130
--- ncurses-6.0-20161029+/dist.mk 2016-10-29 19:16:10.000000000 +0000
+++ ncurses-6.0-20161105/dist.mk 2016-11-05 16:39:30.000000000 +0000
@@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.1130 2016/10/29 19:16:10 tom Exp $
+# $Id: dist.mk,v 1.1131 2016/11/05 16:39:30 tom Exp $
# Makefile for creating ncurses distributions.
#
# This only needs to be used directly as a makefile by developers, but
@@ -37,7 +37,7 @@
# These define the major/minor/patch versions of ncurses.
NCURSES_MAJOR = 6
NCURSES_MINOR = 0
-NCURSES_PATCH = 20161029
+NCURSES_PATCH = 20161105
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
Index: man/MKada_config.in
Prereq: 1.8
--- ncurses-6.0-20161029+/man/MKada_config.in 2014-06-07 19:32:52.000000000 +0000
+++ ncurses-6.0-20161105/man/MKada_config.in 2016-11-05 21:08:21.000000000 +0000
@@ -1,5 +1,5 @@
.\"***************************************************************************
-.\" Copyright (c) 2010-2011,2014 Free Software Foundation, Inc. *
+.\" Copyright (c) 2010-2014,2016 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,12 +26,13 @@
.\" authorization. *
.\"***************************************************************************
.\"
-.\" $Id: MKada_config.in,v 1.8 2014/06/07 19:32:52 tom Exp $
+.\" $Id: MKada_config.in,v 1.10 2016/11/05 21:08:21 tom Exp $
+.ds C adacurses@USE_CFG_SUFFIX@\-config
.TH ADACURSES "1" "" "" "User Commands"
.SH NAME
-adacurses\-config \- helper script for AdaCurses libraries
+adacurses@USE_CFG_SUFFIX@\-config \- helper script for AdaCurses libraries
.SH SYNOPSIS
-.B adacurses\-config
+.B \*C
[\fIoptions\fR]
.SH DESCRIPTION
This is a shell script which simplifies configuring an application to use
@@ -49,9 +50,9 @@
to configure and build AdaCurses.
.TP
\fB\-\-help\fR
-prints a list of the \fBadacurses\-config\fP script's options.
+prints a list of the \fB\*C\fP script's options.
.PP
-If no options are given, \fBadacurses\-config\fP prints the combination
+If no options are given, \fB\*C\fP prints the combination
of
\fB\-\-cflags\fR and
\fB\-\-libs\fR
Index: man/terminfo.tail
Prereq: 1.73
--- ncurses-6.0-20161029+/man/terminfo.tail 2016-10-22 19:56:17.000000000 +0000
+++ ncurses-6.0-20161105/man/terminfo.tail 2016-11-05 21:15:43.000000000 +0000
@@ -1,4 +1,4 @@
-.\" $Id: terminfo.tail,v 1.73 2016/10/22 19:56:17 tom Exp $
+.\" $Id: terminfo.tail,v 1.74 2016/11/05 21:15:43 Alain.Williams Exp $
.\" Beginning of terminfo.tail file
.\" This file is part of ncurses.
.\" See "terminfo.head" for copyright.
@@ -648,7 +648,7 @@
\fBindn\fR, and \fBrin\fR will simulate destructive scrolling; their
documentation cautions you not to define \fBcsr\fR unless this is true.
This \fBcurses\fR implementation is more liberal and will do explicit erases
-after scrolling if \fBndstr\fR is defined.
+after scrolling if \fBndsrc\fR is defined.
.PP
If the terminal has the ability to define a window as part of
memory, which all commands affect,
Index: package/debian-mingw/changelog
--- ncurses-6.0-20161029+/package/debian-mingw/changelog 2016-10-29 19:16:10.000000000 +0000
+++ ncurses-6.0-20161105/package/debian-mingw/changelog 2016-11-05 16:39:30.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20161029) unstable; urgency=low
+ncurses6 (6.0+20161105) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 29 Oct 2016 15:16:10 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 05 Nov 2016 12:39:30 -0400
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian-mingw64/changelog
--- ncurses-6.0-20161029+/package/debian-mingw64/changelog 2016-10-29 19:16:10.000000000 +0000
+++ ncurses-6.0-20161105/package/debian-mingw64/changelog 2016-11-05 16:39:30.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20161029) unstable; urgency=low
+ncurses6 (6.0+20161105) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 29 Oct 2016 15:16:10 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 05 Nov 2016 12:39:30 -0400
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian/changelog
--- ncurses-6.0-20161029+/package/debian/changelog 2016-10-29 19:16:10.000000000 +0000
+++ ncurses-6.0-20161105/package/debian/changelog 2016-11-05 16:39:30.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20161029) unstable; urgency=low
+ncurses6 (6.0+20161105) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 29 Oct 2016 15:16:10 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 05 Nov 2016 12:39:30 -0400
ncurses6 (5.9-20120608) unstable; urgency=low
Index: package/mingw-ncurses.nsi
Prereq: 1.182
--- ncurses-6.0-20161029+/package/mingw-ncurses.nsi 2016-10-29 19:16:10.000000000 +0000
+++ ncurses-6.0-20161105/package/mingw-ncurses.nsi 2016-11-05 16:39:30.000000000 +0000
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.182 2016/10/29 19:16:10 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.183 2016/11/05 16:39:30 tom Exp $
; TODO add examples
; TODO bump ABI to 6
@@ -10,7 +10,7 @@
!define VERSION_MAJOR "6"
!define VERSION_MINOR "0"
!define VERSION_YYYY "2016"
-!define VERSION_MMDD "1029"
+!define VERSION_MMDD "1105"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"
Index: package/mingw-ncurses.spec
--- ncurses-6.0-20161029+/package/mingw-ncurses.spec 2016-10-29 19:16:10.000000000 +0000
+++ ncurses-6.0-20161105/package/mingw-ncurses.spec 2016-11-05 16:39:30.000000000 +0000
@@ -3,7 +3,7 @@
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 6.0
-Release: 20161029
+Release: 20161105
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncurses.spec
--- ncurses-6.0-20161029+/package/ncurses.spec 2016-10-29 19:16:10.000000000 +0000
+++ ncurses-6.0-20161105/package/ncurses.spec 2016-11-05 16:39:30.000000000 +0000
@@ -1,7 +1,7 @@
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 6.0
-Release: 20161029
+Release: 20161105
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz

1166
ncurses-6.0-20161112.patch Normal file
View File

File diff suppressed because it is too large Load Diff

1034
ncurses-6.0-20161119.patch Normal file
View File

File diff suppressed because it is too large Load Diff

1307
ncurses-6.0-20161126.patch Normal file
View File

File diff suppressed because it is too large Load Diff

1173
ncurses-6.0-20161203.patch Normal file
View File

File diff suppressed because it is too large Load Diff

14551
ncurses-6.0-20161210.patch Normal file
View File

File diff suppressed because it is too large Load Diff

445
ncurses-6.0-20161217.patch Normal file
View File

@ -0,0 +1,445 @@
# ncurses 6.0 - patch 20161217 - Thomas E. Dickey
#
# ------------------------------------------------------------------------------
#
# Ncurses 6.0 is at
# ftp.gnu.org:/pub/gnu
#
# Patches for ncurses 6.0 can be found at
# ftp://invisible-island.net/ncurses/6.0
# http://invisible-mirror.net/archives/ncurses/6.0
#
# ------------------------------------------------------------------------------
# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20161217.patch.gz
# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created Sun Dec 18 01:43:10 UTC 2016
# ------------------------------------------------------------------------------
# MANIFEST | 1
# NEWS | 9 +-
# VERSION | 2
# dist.mk | 4
# ncurses-6.0-20161217/test/tput-colorcube | 130 +++++++++++++++++++++++++++++
# ncurses/tinfo/lib_tputs.c | 4
# package/debian-mingw/changelog | 4
# package/debian-mingw64/changelog | 4
# package/debian/changelog | 4
# package/mingw-ncurses.nsi | 4
# package/mingw-ncurses.spec | 2
# package/ncurses.spec | 2
# test/tput-initc | 78 ++++++++++++++++-
# 13 files changed, 228 insertions(+), 20 deletions(-)
# ------------------------------------------------------------------------------
Index: MANIFEST
--- ncurses-6.0-20161210+/MANIFEST 2016-12-11 02:44:18.000000000 +0000
+++ ncurses-6.0-20161217/MANIFEST 2016-12-17 23:39:59.000000000 +0000
@@ -1174,6 +1174,7 @@
./test/testaddch.c
./test/testcurs.c
./test/testscanw.c
+./test/tput-colorcube
./test/tput-initc
./test/tracemunch
./test/view.c
Index: NEWS
Prereq: 1.2708
--- ncurses-6.0-20161210+/NEWS 2016-12-11 00:24:06.000000000 +0000
+++ ncurses-6.0-20161217/NEWS 2016-12-17 23:41:02.000000000 +0000
@@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.2708 2016/12/11 00:24:06 tom Exp $
+-- $Id: NEWS,v 1.2711 2016/12/17 23:41:02 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
@@ -45,6 +45,13 @@
Changes through 1.9.9e did not credit all contributions;
it is not possible to add this information.
+20161217
+ + add tput-colorcube demo script.
+ + add -r and -s options to tput-initc demo, to match usage in xterm.
+ + flush the standard output in _nc_flush for the case where SP is zero,
+ e.g., when called via putp. This fixes a scenario where "tput flash"
+ did not work after changes in 20130112.
+
20161210
+ add configure script option --disable-wattr-macros for use in cases
where one wants to use the same headers for ncurses5/ncurses6
Index: VERSION
--- ncurses-6.0-20161210+/VERSION 2016-12-10 12:47:46.000000000 +0000
+++ ncurses-6.0-20161217/VERSION 2016-12-17 16:05:02.000000000 +0000
@@ -1 +1 @@
-5:0:9 6.0 20161210
+5:0:9 6.0 20161217
Index: dist.mk
Prereq: 1.1136
--- ncurses-6.0-20161210+/dist.mk 2016-12-10 12:47:46.000000000 +0000
+++ ncurses-6.0-20161217/dist.mk 2016-12-17 16:05:02.000000000 +0000
@@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.1136 2016/12/10 12:47:46 tom Exp $
+# $Id: dist.mk,v 1.1137 2016/12/17 16:05:02 tom Exp $
# Makefile for creating ncurses distributions.
#
# This only needs to be used directly as a makefile by developers, but
@@ -37,7 +37,7 @@
# These define the major/minor/patch versions of ncurses.
NCURSES_MAJOR = 6
NCURSES_MINOR = 0
-NCURSES_PATCH = 20161210
+NCURSES_PATCH = 20161217
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
Index: ncurses/tinfo/lib_tputs.c
Prereq: 1.98
--- ncurses-6.0-20161210+/ncurses/tinfo/lib_tputs.c 2016-05-28 21:58:45.000000000 +0000
+++ ncurses-6.0-20161217/ncurses/tinfo/lib_tputs.c 2016-12-17 20:47:21.000000000 +0000
@@ -51,7 +51,7 @@
#include <termcap.h> /* ospeed */
#include <tic.h>
-MODULE_ID("$Id: lib_tputs.c,v 1.98 2016/05/28 21:58:45 tom Exp $")
+MODULE_ID("$Id: lib_tputs.c,v 1.99 2016/12/17 20:47:21 tom Exp $")
NCURSES_EXPORT_VAR(char) PC = 0; /* used by termcap library */
NCURSES_EXPORT_VAR(NCURSES_OSPEED) ospeed = 0; /* used by termcap library */
@@ -141,6 +141,8 @@
}
}
}
+ } else {
+ fflush(stdout);
}
}
Index: package/debian-mingw/changelog
--- ncurses-6.0-20161210+/package/debian-mingw/changelog 2016-12-10 12:47:46.000000000 +0000
+++ ncurses-6.0-20161217/package/debian-mingw/changelog 2016-12-17 16:05:02.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20161210) unstable; urgency=low
+ncurses6 (6.0+20161217) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 10 Dec 2016 07:47:46 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 17 Dec 2016 11:05:02 -0500
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian-mingw64/changelog
--- ncurses-6.0-20161210+/package/debian-mingw64/changelog 2016-12-10 12:47:46.000000000 +0000
+++ ncurses-6.0-20161217/package/debian-mingw64/changelog 2016-12-17 16:05:02.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20161210) unstable; urgency=low
+ncurses6 (6.0+20161217) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 10 Dec 2016 07:47:46 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 17 Dec 2016 11:05:02 -0500
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian/changelog
--- ncurses-6.0-20161210+/package/debian/changelog 2016-12-10 12:47:46.000000000 +0000
+++ ncurses-6.0-20161217/package/debian/changelog 2016-12-17 16:05:02.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20161210) unstable; urgency=low
+ncurses6 (6.0+20161217) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 10 Dec 2016 07:47:46 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 17 Dec 2016 11:05:02 -0500
ncurses6 (5.9-20120608) unstable; urgency=low
Index: package/mingw-ncurses.nsi
Prereq: 1.188
--- ncurses-6.0-20161210+/package/mingw-ncurses.nsi 2016-12-10 12:47:46.000000000 +0000
+++ ncurses-6.0-20161217/package/mingw-ncurses.nsi 2016-12-17 16:05:02.000000000 +0000
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.188 2016/12/10 12:47:46 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.189 2016/12/17 16:05:02 tom Exp $
; TODO add examples
; TODO bump ABI to 6
@@ -10,7 +10,7 @@
!define VERSION_MAJOR "6"
!define VERSION_MINOR "0"
!define VERSION_YYYY "2016"
-!define VERSION_MMDD "1210"
+!define VERSION_MMDD "1217"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"
Index: package/mingw-ncurses.spec
--- ncurses-6.0-20161210+/package/mingw-ncurses.spec 2016-12-10 12:47:46.000000000 +0000
+++ ncurses-6.0-20161217/package/mingw-ncurses.spec 2016-12-17 16:05:02.000000000 +0000
@@ -3,7 +3,7 @@
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 6.0
-Release: 20161210
+Release: 20161217
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncurses.spec
--- ncurses-6.0-20161210+/package/ncurses.spec 2016-12-10 12:47:46.000000000 +0000
+++ ncurses-6.0-20161217/package/ncurses.spec 2016-12-17 16:05:02.000000000 +0000
@@ -1,7 +1,7 @@
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 6.0
-Release: 20161210
+Release: 20161217
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: test/tput-colorcube
--- /dev/null 2016-12-17 11:28:23.787999705 +0000
+++ ncurses-6.0-20161217/test/tput-colorcube 2016-12-17 23:37:37.000000000 +0000
@@ -0,0 +1,130 @@
+#!/bin/sh
+##############################################################################
+# Copyright (c) 2016 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"), #
+# to deal in the Software without restriction, including without limitation #
+# the rights to use, copy, modify, merge, publish, distribute, distribute #
+# with modifications, sublicense, and/or sell copies of the Software, and to #
+# permit persons to whom the Software is furnished to do so, subject to the #
+# following conditions: #
+# #
+# The above copyright notice and this permission notice shall be included in #
+# all copies or substantial portions of the Software. #
+# #
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR #
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, #
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL #
+# THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER #
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING #
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER #
+# DEALINGS IN THE SOFTWARE. #
+# #
+# Except as contained in this notice, the name(s) of the above copyright #
+# holders shall not be used in advertising or otherwise to promote the sale, #
+# use or other dealings in this Software without prior written #
+# authorization. #
+##############################################################################
+# $Id: tput-colorcube,v 1.1 2016/12/17 23:37:37 tom Exp $
+# Use this script to print an xterm-style color cube, e.g., as done in
+# the xterm 88colors2.pl and 256colors2.pl scripts.
+
+failed() {
+ printf "?? $*\n" >&2
+ exit 1
+}
+
+newline() {
+ tput op
+ printf "\n"
+}
+
+if [ $# = 1 ]
+then
+ myterm=$1
+elif [ $# = 0 ]
+then
+ myterm=$TERM
+else
+ failed "expected one parameter or none"
+fi
+
+colors=$(tput -T $myterm colors 2>/dev/null)
+if [ ${colors:-0} -le 0 ]
+then
+ myterm=${myterm%%-color}
+ colors=$(tput -T $myterm colors 2>/dev/null)
+fi
+if [ ${colors:-0} -le 0 ]
+then
+ failed "terminal $myterm does not support color"
+fi
+
+printf "System colors:\n"
+
+color=0
+inrow=$colors
+to_do=$colors
+[ $colors -gt 256 ] && colors=256
+[ $inrow -gt 8 ] && inrow=8
+[ $to_do -gt 16 ] && to_do=16
+while [ $color -lt $to_do ]
+do
+ [ $color = $inrow ] && newline
+ tput setab $color
+ printf ' '
+ color=$(expr $color + 1)
+done
+newline
+
+[ $colors -le 16 ] && exit
+
+if [ $colors = 256 ]
+then
+ cube=6
+ ramp=232
+elif [ $colors -ge 88 ]
+then
+ cube=4
+ ramp=80
+else
+ exit
+fi
+
+printf "\n"
+printf "Color cube, ${cube}x${cube}x${cube}:\n"
+g=0
+cube2=$(expr $cube \* $cube)
+while [ $g -lt $cube ]
+do
+ r=0
+ while [ $r -lt $cube ]
+ do
+ b=0
+ while [ $b -lt $cube ]
+ do
+ color=$(expr 16 + \( $r \* $cube2 \) + \( $g \* $cube \) + $b)
+ tput setab $color
+ printf ' '
+ b=$(expr $b + 1)
+ done
+ tput op
+ printf ' '
+ r=$(expr $r + 1)
+ done
+ newline
+ g=$(expr $g + 1)
+done
+
+printf "\n"
+printf "Grayscale ramp:\n"
+color=$ramp
+while [ $color -lt $colors ]
+do
+ tput setab $color
+ printf ' '
+ color=$(expr $color + 1)
+done
+newline
+# vi:ts=4 sw=4
Index: test/tput-initc
Prereq: 1.1
--- ncurses-6.0-20161210+/test/tput-initc 2016-12-10 23:35:46.000000000 +0000
+++ ncurses-6.0-20161217/test/tput-initc 2016-12-17 22:35:05.000000000 +0000
@@ -26,7 +26,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: tput-initc,v 1.1 2016/12/10 23:35:46 tom Exp $
+# $Id: tput-initc,v 1.5 2016/12/17 22:35:05 tom Exp $
# Some of the ".dat" files in ncurses' test-directory give r/g/b numbers for
# default palettes of xterm and Linux console. This script reads the numbers
# and (assuming the same or compatible terminal) uses tput to (re)initialize
@@ -37,6 +37,40 @@
exit 1
}
+usage() {
+ cat >&2 <<-EOF
+ usage: $0 [-r] [-s] [palette-data]
+
+ Use this script with a palette data-file to (re)initialize colors with
+ tput. This script assumes arrangements for 16-, 88- and 256-colors
+ like the xterm 88colors2.pl and 256colors2.pl scripts.
+
+ Options:
+ -r reverse palette
+ -s reverse system colors (first 16 if more than 16 colors)
+EOF
+ exit 1
+}
+
+opt_r=no
+opt_s=no
+
+while getopts "rs" option "$@"
+do
+ case $option in
+ (r)
+ opt_r=yes
+ ;;
+ (s)
+ opt_s=yes
+ ;;
+ (*)
+ usage
+ ;;
+ esac
+done
+shift $(expr $OPTIND - 1)
+
if [ $# = 1 ]
then
file=$1
@@ -70,8 +104,20 @@
fi
cat $file |\
-awk -v myterm=$myterm '
-BEGIN { limit=1000; }
+awk -v opt_r=$opt_r \
+ -v opt_s=$opt_s \
+ -v colors=$colors \
+ -v myterm=$myterm '
+BEGIN {
+ limit = 1000;
+ range = -1;
+ cramp = -1;
+ if ( colors == 88 ) {
+ cramp = 80;
+ } else if ( colors = 256 ) {
+ cramp = 232;
+ }
+}
function scaled(n) {
return (n * 1000)/limit;
}
@@ -83,5 +129,27 @@
/^[0-9]+:/{
sub(":","",$1);
- printf "tput -T%s initc %d %d %d %d\n", myterm, $1,scaled($2),scaled($3),scaled($4);
-}' |sh -
+ item = $1 + 0;
+ if (range < item) {
+ range = item;
+ }
+ params[$1] = sprintf ("%d %d %d", scaled($2),scaled($3),scaled($4));
+}
+END {
+ for (n = 0; n <= range; ++n) {
+ m = n;
+ if ( opt_r == "yes" ) {
+ if ( colors <= 16 ) {
+ m = range - n;
+ } else if ( ( opt_s == "yes" ) && ( n < 16 ) ) {
+ m = 15 - n;
+ } else if ( n >= cramp ) {
+ m = cramp + colors - 1 - n;
+ } else {
+ m = 16 + cramp - 1 - n;
+ }
+ }
+ printf "tput -T%s initc %d %s\n", myterm, m, params[n];
+ }
+}
+' |sh -

1402
ncurses-6.0-20161224.patch Normal file
View File

File diff suppressed because it is too large Load Diff

16453
ncurses-6.0-20161231.patch Normal file
View File

File diff suppressed because it is too large Load Diff

6071
ncurses-6.0-20170107.patch Normal file
View File

File diff suppressed because it is too large Load Diff

959
ncurses-6.0-20170114.patch Normal file
View File

@ -0,0 +1,959 @@
# ncurses 6.0 - patch 20170114 - Thomas E. Dickey
#
# ------------------------------------------------------------------------------
#
# Ncurses 6.0 is at
# ftp.gnu.org:/pub/gnu
#
# Patches for ncurses 6.0 can be found at
# ftp://invisible-island.net/ncurses/6.0
# http://invisible-mirror.net/archives/ncurses/6.0
#
# ------------------------------------------------------------------------------
# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20170114.patch.gz
# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created Sun Jan 15 01:42:56 UTC 2017
# ------------------------------------------------------------------------------
# NEWS | 10 +++++++-
# VERSION | 2 -
# dist.mk | 4 +--
# doc/html/man/adacurses6-config.1.html | 2 -
# doc/html/man/captoinfo.1m.html | 2 -
# doc/html/man/clear.1.html | 2 -
# doc/html/man/curs_trace.3x.html | 27 +++++++++++++++++++++-
# doc/html/man/form.3x.html | 2 -
# doc/html/man/infocmp.1m.html | 14 +++++++----
# doc/html/man/infotocap.1m.html | 2 -
# doc/html/man/menu.3x.html | 2 -
# doc/html/man/ncurses.3x.html | 2 -
# doc/html/man/ncurses6-config.1.html | 2 -
# doc/html/man/panel.3x.html | 2 -
# doc/html/man/tabs.1.html | 2 -
# doc/html/man/terminfo.5.html | 2 -
# doc/html/man/tic.1m.html | 20 +++++++++-------
# doc/html/man/toe.1m.html | 19 +++++++++-------
# doc/html/man/tput.1.html | 8 ++----
# doc/html/man/tset.1.html | 38 ++++++++++++++++++++++----------
# man/curs_trace.3x | 21 ++++++++++++++++-
# man/infocmp.1m | 9 +++++--
# man/manhtml.aliases | 29 +++++++++++++++++++++++-
# man/tic.1m | 6 +++--
# man/toe.1m | 6 +++--
# man/tput.1 | 5 ----
# man/tset.1 | 30 +++++++++++++++++++++----
# ncurses/curses.priv.h | 3 +-
# ncurses/tinfo/lib_data.c | 3 +-
# ncurses/trace/lib_trace.c | 8 ++++--
# package/debian-mingw/changelog | 4 +--
# package/debian-mingw64/changelog | 4 +--
# package/debian/changelog | 4 +--
# package/mingw-ncurses.nsi | 4 +--
# package/mingw-ncurses.spec | 2 -
# package/ncurses.spec | 2 -
# 36 files changed, 217 insertions(+), 87 deletions(-)
# ------------------------------------------------------------------------------
Index: NEWS
Prereq: 1.2732
--- ncurses-6.0-20170107+/NEWS 2017-01-07 22:49:11.000000000 +0000
+++ ncurses-6.0-20170114/NEWS 2017-01-14 20:59:06.000000000 +0000
@@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.2732 2017/01/07 22:49:11 tom Exp $
+-- $Id: NEWS,v 1.2735 2017/01/14 20:59:06 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
@@ -45,6 +45,14 @@
Changes through 1.9.9e did not credit all contributions;
it is not possible to add this information.
+20170114
+ + improve discussion of early history of tset/reset programs.
+ + clarify in manual pages that the optional verbose option level is
+ available only when ncurses is configured for tracing.
+ + amend change from 20161231 to avoid writing traces to the standard
+ error after initializing the trace feature using the environment
+ variable.
+
20170107
+ amend changes for tput to reset tty modes to "sane" if the program
is run as "reset", like tset. Likewise, ensure that tset sends
Index: VERSION
--- ncurses-6.0-20170107+/VERSION 2017-01-07 15:27:12.000000000 +0000
+++ ncurses-6.0-20170114/VERSION 2017-01-14 15:30:30.000000000 +0000
@@ -1 +1 @@
-5:0:9 6.0 20170107
+5:0:9 6.0 20170114
Index: dist.mk
Prereq: 1.1141
--- ncurses-6.0-20170107+/dist.mk 2017-01-07 15:27:12.000000000 +0000
+++ ncurses-6.0-20170114/dist.mk 2017-01-14 15:30:30.000000000 +0000
@@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.1141 2017/01/07 15:27:12 tom Exp $
+# $Id: dist.mk,v 1.1142 2017/01/14 15:30:30 tom Exp $
# Makefile for creating ncurses distributions.
#
# This only needs to be used directly as a makefile by developers, but
@@ -37,7 +37,7 @@
# These define the major/minor/patch versions of ncurses.
NCURSES_MAJOR = 6
NCURSES_MINOR = 0
-NCURSES_PATCH = 20170107
+NCURSES_PATCH = 20170114
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
Index: doc/html/man/adacurses6-config.1.html
--- ncurses-6.0-20170107+/doc/html/man/adacurses6-config.1.html 2017-01-07 20:05:39.000000000 +0000
+++ ncurses-6.0-20170114/doc/html/man/adacurses6-config.1.html 2017-01-14 22:55:32.000000000 +0000
@@ -131,7 +131,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.0 (patch 20170107).
+ This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20170114).
Index: doc/html/man/captoinfo.1m.html
--- ncurses-6.0-20170107+/doc/html/man/captoinfo.1m.html 2017-01-07 20:05:39.000000000 +0000
+++ ncurses-6.0-20170114/doc/html/man/captoinfo.1m.html 2017-01-14 22:55:32.000000000 +0000
@@ -198,7 +198,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.0 (patch 20170107).
+ This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20170114).
</PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
Index: doc/html/man/clear.1.html
--- ncurses-6.0-20170107+/doc/html/man/clear.1.html 2017-01-07 20:05:39.000000000 +0000
+++ ncurses-6.0-20170114/doc/html/man/clear.1.html 2017-01-14 22:55:32.000000000 +0000
@@ -147,7 +147,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.0 (patch 20170107).
+ This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20170114).
Index: doc/html/man/curs_trace.3x.html
--- ncurses-6.0-20170107+/doc/html/man/curs_trace.3x.html 2017-01-07 20:43:27.000000000 +0000
+++ ncurses-6.0-20170114/doc/html/man/curs_trace.3x.html 2017-01-14 22:55:35.000000000 +0000
@@ -26,7 +26,7 @@
* sale, use or other dealings in this Software without prior written *
* authorization. *
****************************************************************************
- * @Id: curs_trace.3x,v 1.17 2017/01/07 18:45:42 tom Exp @
+ * @Id: curs_trace.3x,v 1.18 2017/01/14 19:46:40 tom Exp @
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
<HTML>
@@ -182,6 +182,30 @@
use_env, use_extended_names, use_tioctl
+</PRE><H3><a name="h3-Command-line-Utilities">Command-line Utilities</a></H3><PRE>
+ The command-line utilities such as <STRONG><A HREF="tic.1m.html">tic(1)</A></STRONG> provide a ver-
+ bose option which extends the set of messages written us-
+ ing the <STRONG>trace</STRONG> function. Both of these (<STRONG>-v</STRONG> and <STRONG>trace</STRONG>) use
+ the same variable (<STRONG>_nc_tracing</STRONG>), which determines the mes-
+ sages which are written.
+
+ Because the command-line utilities may call initialization
+ functions such as <STRONG>setupterm</STRONG>, <STRONG>tgetent</STRONG> or <STRONG>use_extend-</STRONG>
+ <STRONG>ed_names</STRONG>, some of their debugging output may be directed
+ to the <EM>trace</EM> file if the <STRONG>NCURSES_TRACE</STRONG> environment vari-
+ able is set:
+
+ <STRONG>o</STRONG> messages produced in the utility are written to the
+ standard error.
+
+ <STRONG>o</STRONG> messages produced by the underlying library are writ-
+ ten to <EM>trace</EM>.
+
+ If ncurses is built without tracing, none of the latter
+ are produced, and fewer diagnostics are provided by the
+ command-line utilities.
+
+
</PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
Routines which return a value are designed to be used as
parameters to the <STRONG>_tracef</STRONG> routine.
@@ -215,6 +239,7 @@
<li><a href="#h3-Functions">Functions</a></li>
<li><a href="#h3-Trace-Parameter">Trace Parameter</a></li>
<li><a href="#h3-Initialization">Initialization</a></li>
+<li><a href="#h3-Command-line-Utilities">Command-line Utilities</a></li>
</ul>
</li>
<li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
Index: doc/html/man/form.3x.html
--- ncurses-6.0-20170107+/doc/html/man/form.3x.html 2017-01-07 20:05:41.000000000 +0000
+++ ncurses-6.0-20170114/doc/html/man/form.3x.html 2017-01-14 22:55:35.000000000 +0000
@@ -239,7 +239,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.0 (patch 20170107).
+ This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20170114).
Index: doc/html/man/infocmp.1m.html
--- ncurses-6.0-20170107+/doc/html/man/infocmp.1m.html 2017-01-07 20:05:42.000000000 +0000
+++ ncurses-6.0-20170114/doc/html/man/infocmp.1m.html 2017-01-14 22:55:36.000000000 +0000
@@ -1,7 +1,7 @@
<!--
* t
****************************************************************************
- * Copyright (c) 1998-2015,2016 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2016,2017 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 @@
* sale, use or other dealings in this Software without prior written *
* authorization. *
****************************************************************************
- * @Id: infocmp.1m,v 1.59 2016/10/22 19:54:35 tom Exp @
+ * @Id: infocmp.1m,v 1.60 2017/01/14 19:55:27 tom Exp @
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
<HTML>
@@ -438,8 +438,12 @@
program, and exits.
<STRONG>-v</STRONG> <EM>n</EM> prints out tracing information on standard error as
- the program runs. Higher values of n induce greater
- verbosity.
+ the program runs.
+
+ The optional parameter <EM>n</EM> is a number from 1 to 10,
+ inclusive, indicating the desired level of detail of
+ information. If ncurses is built without tracing
+ support, the optional parameter is ignored.
<STRONG>-W</STRONG> By itself, the <STRONG>-w</STRONG> option will not force long strings
to be wrapped. Use the <STRONG>-W</STRONG> option to do this.
@@ -478,7 +482,7 @@
http://invisible-island.net/ncurses/tctest.html
- This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20170107).
+ This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20170114).
</PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
Index: doc/html/man/infotocap.1m.html
--- ncurses-6.0-20170107+/doc/html/man/infotocap.1m.html 2017-01-07 20:05:42.000000000 +0000
+++ ncurses-6.0-20170114/doc/html/man/infotocap.1m.html 2017-01-14 22:55:36.000000000 +0000
@@ -88,7 +88,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="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
- This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20170107).
+ This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20170114).
</PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
Index: doc/html/man/menu.3x.html
--- ncurses-6.0-20170107+/doc/html/man/menu.3x.html 2017-01-07 20:05:42.000000000 +0000
+++ ncurses-6.0-20170114/doc/html/man/menu.3x.html 2017-01-14 22:55:36.000000000 +0000
@@ -217,7 +217,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.0 (patch 20170107).
+ This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20170114).
Index: doc/html/man/ncurses.3x.html
--- ncurses-6.0-20170107+/doc/html/man/ncurses.3x.html 2017-01-07 20:43:29.000000000 +0000
+++ ncurses-6.0-20170114/doc/html/man/ncurses.3x.html 2017-01-14 22:55:37.000000000 +0000
@@ -60,7 +60,7 @@
sonable optimization. This implementation is "new curses"
(ncurses) and is the approved replacement for 4.4BSD clas-
sic curses, which has been discontinued. This describes
- <STRONG>ncurses</STRONG> version 6.0 (patch 20170107).
+ <STRONG>ncurses</STRONG> version 6.0 (patch 20170114).
The <STRONG>ncurses</STRONG> library emulates the curses library of System
V Release 4 UNIX, and XPG4 (X/Open Portability Guide)
Index: doc/html/man/ncurses6-config.1.html
--- ncurses-6.0-20170107+/doc/html/man/ncurses6-config.1.html 2017-01-07 20:05:43.000000000 +0000
+++ ncurses-6.0-20170114/doc/html/man/ncurses6-config.1.html 2017-01-14 22:55:37.000000000 +0000
@@ -114,7 +114,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.0 (patch 20170107).
+ This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20170114).
Index: doc/html/man/panel.3x.html
--- ncurses-6.0-20170107+/doc/html/man/panel.3x.html 2017-01-07 20:05:43.000000000 +0000
+++ ncurses-6.0-20170114/doc/html/man/panel.3x.html 2017-01-14 22:55:37.000000000 +0000
@@ -208,7 +208,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.0 (patch 20170107).
+ This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20170114).
</PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
Index: doc/html/man/tabs.1.html
--- ncurses-6.0-20170107+/doc/html/man/tabs.1.html 2017-01-07 20:05:43.000000000 +0000
+++ ncurses-6.0-20170114/doc/html/man/tabs.1.html 2017-01-14 22:55:37.000000000 +0000
@@ -170,7 +170,7 @@
</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
<STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <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.0 (patch 20170107).
+ This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20170114).
Index: doc/html/man/terminfo.5.html
--- ncurses-6.0-20170107+/doc/html/man/terminfo.5.html 2017-01-07 20:43:30.000000000 +0000
+++ ncurses-6.0-20170114/doc/html/man/terminfo.5.html 2017-01-14 22:55:37.000000000 +0000
@@ -75,7 +75,7 @@
nals by giving a set of capabilities which they have, by
specifying how to perform screen operations, and by speci-
fying padding requirements and initialization sequences.
- This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20170107).
+ This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20170114).
Entries in <EM>terminfo</EM> consist of a sequence of `,' separated
fields (embedded commas may be escaped with a backslash or
Index: doc/html/man/tic.1m.html
--- ncurses-6.0-20170107+/doc/html/man/tic.1m.html 2017-01-07 20:05:43.000000000 +0000
+++ ncurses-6.0-20170114/doc/html/man/tic.1m.html 2017-01-14 22:55:37.000000000 +0000
@@ -1,6 +1,6 @@
<!--
****************************************************************************
- * Copyright (c) 1998-2015,2016 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2016,2017 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 @@
* sale, use or other dealings in this Software without prior written *
* authorization. *
****************************************************************************
- * @Id: tic.1m,v 1.62 2016/10/01 17:14:50 tom Exp @
+ * @Id: tic.1m,v 1.63 2017/01/14 19:50:09 tom Exp @
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
<HTML>
@@ -277,12 +277,14 @@
program, and exits.
<STRONG>-v</STRONG><EM>n</EM> specifies that (verbose) output be written to stan-
- dard error trace information showing <STRONG>tic</STRONG>'s progress.
- The optional parameter <EM>n</EM> is a number from 1 to 10,
- inclusive, indicating the desired level of detail of
- information. If <EM>n</EM> is omitted, the default level is
- 1. If <EM>n</EM> is specified and greater than 1, the level
- of detail is increased.
+ dard error trace information showing <STRONG>tic</STRONG>'s progress.
+
+ The optional parameter <EM>n</EM> is a number from 1 to 10,
+ inclusive, indicating the desired level of detail of
+ information. If ncurses is built without tracing
+ support, the optional parameter is ignored. If <EM>n</EM> is
+ omitted, the default level is 1. If <EM>n</EM> is specified
+ and greater than 1, the level of detail is increased.
The debug flag levels are as follows:
@@ -401,7 +403,7 @@
<STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="captoinfo.1m.html">captoinfo(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>.
- This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20170107).
+ This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20170114).
</PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
Index: doc/html/man/toe.1m.html
--- ncurses-6.0-20170107+/doc/html/man/toe.1m.html 2017-01-07 20:05:43.000000000 +0000
+++ ncurses-6.0-20170114/doc/html/man/toe.1m.html 2017-01-14 22:55:37.000000000 +0000
@@ -1,6 +1,6 @@
<!--
****************************************************************************
- * Copyright (c) 1998-2011,2015 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2015,2017 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 @@
* sale, use or other dealings in this Software without prior written *
* authorization. *
****************************************************************************
- * @Id: toe.1m,v 1.27 2015/08/29 22:04:48 tom Exp @
+ * @Id: toe.1m,v 1.28 2017/01/14 19:55:36 tom Exp @
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
<HTML>
@@ -100,11 +100,14 @@
depend on it, followed by a newline.
<STRONG>-v</STRONG><EM>n</EM> specifies that (verbose) output be written to stan-
- dard error, showing <STRONG>toe</STRONG>'s progress. The optional
- parameter <EM>n</EM> is a number from 1 to 10, interpreted
- as for <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>.
+ dard error, showing <STRONG>toe</STRONG>'s progress.
- <STRONG>-V</STRONG> reports the version of ncurses which was used in
+ The optional parameter <EM>n</EM> is a number from 1 to 10,
+ interpreted as for <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>. If ncurses is built
+ without tracing support, the optional parameter is
+ ignored.
+
+ <STRONG>-V</STRONG> reports the version of ncurses which was used in
this program, and exits.
@@ -114,10 +117,10 @@
</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
- <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="captoinfo.1m.html">captoinfo(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="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>, <STRONG><A HREF="infotocap.1m.html">infotocap(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.0 (patch 20170107).
+ This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20170114).
Index: doc/html/man/tput.1.html
--- ncurses-6.0-20170107+/doc/html/man/tput.1.html 2017-01-07 23:09:13.000000000 +0000
+++ ncurses-6.0-20170114/doc/html/man/tput.1.html 2017-01-14 22:55:37.000000000 +0000
@@ -27,7 +27,7 @@
* sale, use or other dealings in this Software without prior written *
* authorization. *
****************************************************************************
- * @Id: tput.1,v 1.50 2017/01/07 23:03:28 tom Exp @
+ * @Id: tput.1,v 1.51 2017/01/14 20:49:40 tom Exp @
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
<HTML>
@@ -394,9 +394,7 @@
AT&amp;T System V provided a different <STRONG>tput</STRONG> command, whose
<STRONG>init</STRONG> and <STRONG>reset</STRONG> subcommands (more than half the program)
were incorporated from the <STRONG>reset</STRONG> feature of BSD <STRONG>tset</STRONG> writ-
- ten by Eric Allman. Later the corresponding source code
- for <EM>reset</EM> was removed from the BSD <STRONG>tset</STRONG> (in June 1993,
- released in 4.4BSD-Lite a year later).
+ ten by Eric Allman.
Keith Bostic replaced the BSD <STRONG>tput</STRONG> command in 1989 with a
new implementation based on the AT&amp;T System V program
@@ -500,7 +498,7 @@
<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="terminfo.5.html">terminfo(5)</A></STRONG>,
<STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>.
- This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20170107).
+ This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20170114).
Index: doc/html/man/tset.1.html
--- ncurses-6.0-20170107+/doc/html/man/tset.1.html 2017-01-07 23:09:13.000000000 +0000
+++ ncurses-6.0-20170114/doc/html/man/tset.1.html 2017-01-14 22:55:37.000000000 +0000
@@ -26,7 +26,7 @@
* sale, use or other dealings in this Software without prior written *
* authorization. *
****************************************************************************
- * @Id: tset.1,v 1.47 2017/01/07 22:59:51 tom Exp @
+ * @Id: tset.1,v 1.48 2017/01/14 20:55:07 tom Exp @
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
<HTML>
@@ -285,18 +285,34 @@
</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
- A <STRONG>reset</STRONG> command appeared in 2BSD (1979), written by Kurt
- Shoens.
+ A <STRONG>reset</STRONG> command appeared in 2BSD (April 1979), written by
+ Kurt Shoens. This program set the <EM>erase</EM> and <EM>kill</EM> charac-
+ ters to <STRONG>^H</STRONG> (backspace) and <STRONG>@</STRONG> respectively. Mark Horton
+ improved that in 3BSD (October 1979), adding <EM>intr</EM>, <EM>quit</EM>,
+ <EM>start</EM>/<EM>stop</EM> and <EM>eof</EM> characters as well as changing the pro-
+ gram to avoid modifying any user settings.
+
+ Later in 4.1BSD (December 1980), Mark Horton added a call
+ to the <STRONG>tset</STRONG> program using the <STRONG>-I</STRONG> and <STRONG>-Q</STRONG> options, i.e.,
+ using that to improve the terminal modes. With those
+ options, that version of <STRONG>reset</STRONG> did not use the termcap
+ database.
A separate <STRONG>tset</STRONG> command was provided in 2BSD by Eric All-
man. While the oldest published source (from 1979) pro-
- vides both programs, Allman's comments in the 2BSD source
- code indicate that he began work in October 1977, continu-
- ing development over the next few years.
-
- In September 1980, Eric Allman modified <STRONG>tset</STRONG> to provide a
- "reset" feature when the program was invoked as <STRONG>reset</STRONG>.
- This version appeared in 4.1cBSD, late in 1982.
+ vides both <STRONG>tset</STRONG> and <STRONG>reset</STRONG>, Allman's comments in the 2BSD
+ source code indicate that he began work in October 1977,
+ continuing development over the next few years.
+
+ In September 1980, Eric Allman modified <STRONG>tset</STRONG>, adding the
+ code from the existing "reset" feature when <STRONG>tset</STRONG> was
+ invoked as <STRONG>reset</STRONG>. Rather than simply copying the existing
+ program, in this merged version, <STRONG>tset</STRONG> used the termcap
+ database to do additional (re)initialization of the termi-
+ nal. This version appeared in 4.1cBSD, late in 1982.
+
+ Other developers (e.g., Keith Bostic and Jim Bloom) con-
+ tinued to modify <STRONG>tset</STRONG> until 4.4BSD was released in 1993.
The <STRONG>ncurses</STRONG> implementation was lightly adapted from the
4.4BSD sources for a terminfo environment by Eric S. Ray-
@@ -419,7 +435,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.0 (patch 20170107).
+ This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20170114).
Index: man/curs_trace.3x
Prereq: 1.17
--- ncurses-6.0-20170107+/man/curs_trace.3x 2017-01-07 18:45:42.000000000 +0000
+++ ncurses-6.0-20170114/man/curs_trace.3x 2017-01-14 19:46:40.000000000 +0000
@@ -26,7 +26,7 @@
.\" authorization. *
.\"***************************************************************************
.\"
-.\" $Id: curs_trace.3x,v 1.17 2017/01/07 18:45:42 tom Exp $
+.\" $Id: curs_trace.3x,v 1.18 2017/01/14 19:46:40 tom Exp $
.de bP
.IP \(bu 4
..
@@ -190,6 +190,25 @@
.hy
.ad
.RE
+.SS Command-line Utilities
+.PP
+The command-line utilities such as \fBtic\fP(1) provide a verbose option
+which extends the set of messages written using the \fBtrace\fP function.
+Both of these (\fB\-v\fP and \fBtrace\fP)
+use the same variable (\fB_nc_tracing\fP),
+which determines the messages which are written.
+.PP
+Because the command-line utilities may call initialization functions
+such as \fBsetupterm\fP, \fBtgetent\fP or \fBuse_extended_names\fP,
+some of their debugging output may be directed to the \fItrace\fP file
+if the \fBNCURSES_TRACE\fP environment variable is set:
+.bP
+messages produced in the utility are written to the standard error.
+.bP
+messages produced by the underlying library are written to \fItrace\fP.
+.PP
+If ncurses is built without tracing, none of the latter are produced,
+and fewer diagnostics are provided by the command-line utilities.
.SH RETURN VALUE
Routines which return a value are designed to be used as parameters
to the \fB_tracef\fR routine.
Index: man/infocmp.1m
Prereq: 1.59
--- ncurses-6.0-20170107+/man/infocmp.1m 2016-10-22 19:54:35.000000000 +0000
+++ ncurses-6.0-20170114/man/infocmp.1m 2017-01-14 19:55:27.000000000 +0000
@@ -1,6 +1,6 @@
'\" t
.\"***************************************************************************
-.\" Copyright (c) 1998-2015,2016 Free Software Foundation, Inc. *
+.\" Copyright (c) 1998-2016,2017 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: infocmp.1m,v 1.59 2016/10/22 19:54:35 tom Exp $
+.\" $Id: infocmp.1m,v 1.60 2017/01/14 19:55:27 tom Exp $
.TH @INFOCMP@ 1M ""
.ds n 5
.de bP
@@ -476,7 +476,10 @@
.TP 5
\fB\-v\fR \fIn\fR
prints out tracing information on standard error as the program runs.
-Higher values of n induce greater verbosity.
+.IP
+The optional parameter \fIn\fR is a number from 1 to 10, inclusive,
+indicating the desired level of detail of information.
+If ncurses is built without tracing support, the optional parameter is ignored.
.TP
\fB\-W\fR
By itself, the \fB\-w\fP option will not force long strings to be wrapped.
Index: man/manhtml.aliases
Prereq: 1.5
--- ncurses-6.0-20170107+/man/manhtml.aliases 2017-01-07 20:28:43.000000000 +0000
+++ ncurses-6.0-20170114/man/manhtml.aliases 2017-01-14 19:57:16.000000000 +0000
@@ -1,4 +1,31 @@
-# $Id: manhtml.aliases,v 1.5 2017/01/07 20:28:43 tom Exp $
+# $Id: manhtml.aliases,v 1.6 2017/01/14 19:57:16 tom Exp $
+#***************************************************************************
+# Copyright (c) 2013-2016,2017 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"), to deal in the Software without restriction, including *
+# without limitation the rights to use, copy, modify, merge, publish, *
+# distribute, distribute with modifications, sublicense, and/or sell *
+# copies of the Software, and to permit persons to whom the Software is *
+# furnished to do so, subject to the following conditions: *
+# *
+# The above copyright notice and this permission notice shall be included *
+# in all copies or substantial portions of the Software. *
+# *
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
+# IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
+# DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
+# OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
+# THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
+# *
+# Except as contained in this notice, the name(s) of the above copyright *
+# holders shall not be used in advertising or otherwise to promote the *
+# sale, use or other dealings in this Software without prior written *
+# authorization. *
+#***************************************************************************
# Items in this list will be linked to the corresponding manpages by man2html
addch(3X) curs_addch(3X)
delscreen(3X) curs_initscr(3X)
Index: man/tic.1m
Prereq: 1.62
--- ncurses-6.0-20170107+/man/tic.1m 2016-10-01 17:14:50.000000000 +0000
+++ ncurses-6.0-20170114/man/tic.1m 2017-01-14 19:50:09.000000000 +0000
@@ -1,5 +1,5 @@
.\"***************************************************************************
-.\" Copyright (c) 1998-2015,2016 Free Software Foundation, Inc. *
+.\" Copyright (c) 1998-2016,2017 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: tic.1m,v 1.62 2016/10/01 17:14:50 tom Exp $
+.\" $Id: tic.1m,v 1.63 2017/01/14 19:50:09 tom Exp $
.TH @TIC@ 1M ""
.ie \n(.g .ds `` \(lq
.el .ds `` ``
@@ -307,8 +307,10 @@
\fB\-v\fR\fIn\fR
specifies that (verbose) output be written to standard error trace
information showing \fB@TIC@\fR's progress.
+.IP
The optional parameter \fIn\fR is a number from 1 to 10, inclusive,
indicating the desired level of detail of information.
+If ncurses is built without tracing support, the optional parameter is ignored.
If \fIn\fR is omitted, the default level is 1.
If \fIn\fR is specified and greater than 1, the level of
detail is increased.
Index: man/toe.1m
Prereq: 1.27
--- ncurses-6.0-20170107+/man/toe.1m 2015-08-29 22:04:48.000000000 +0000
+++ ncurses-6.0-20170114/man/toe.1m 2017-01-14 19:55:36.000000000 +0000
@@ -1,5 +1,5 @@
.\"***************************************************************************
-.\" Copyright (c) 1998-2011,2015 Free Software Foundation, Inc. *
+.\" Copyright (c) 1998-2015,2017 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: toe.1m,v 1.27 2015/08/29 22:04:48 tom Exp $
+.\" $Id: toe.1m,v 1.28 2017/01/14 19:55:36 tom Exp $
.TH @TOE@ 1M ""
.ds n 5
.ds d @TERMINFO@
@@ -91,8 +91,10 @@
\fB\-v\fR\fIn\fR
specifies that (verbose) output be written to standard error,
showing \fB@TOE@\fR's progress.
+.IP
The optional parameter \fIn\fR is a number from 1 to 10,
interpreted as for \fB@TIC@\fR(1M).
+If ncurses is built without tracing support, the optional parameter is ignored.
.TP
\fB\-V\fR
reports the version of ncurses which was used in this program,
Index: man/tput.1
Prereq: 1.50
--- ncurses-6.0-20170107+/man/tput.1 2017-01-07 23:03:28.000000000 +0000
+++ ncurses-6.0-20170114/man/tput.1 2017-01-14 20:49:40.000000000 +0000
@@ -27,7 +27,7 @@
.\" authorization. *
.\"***************************************************************************
.\"
-.\" $Id: tput.1,v 1.50 2017/01/07 23:03:28 tom Exp $
+.\" $Id: tput.1,v 1.51 2017/01/14 20:49:40 tom Exp $
.TH @TPUT@ 1 ""
.ds d @TERMINFO@
.ds n 1
@@ -401,9 +401,6 @@
whose \fBinit\fP and \fBreset\fP subcommands
(more than half the program) were incorporated from
the \fBreset\fP feature of BSD \fBtset\fP written by Eric Allman.
-Later the corresponding source code for \fIreset\fP
-was removed from the BSD \fBtset\fP
-(in June 1993, released in 4.4BSD-Lite a year later).
.PP
Keith Bostic replaced the BSD \fBtput\fP command in 1989 with a new implementation
based on the AT&T System V program \fBtput\fP.
Index: man/tset.1
Prereq: 1.47
--- ncurses-6.0-20170107+/man/tset.1 2017-01-07 22:59:51.000000000 +0000
+++ ncurses-6.0-20170114/man/tset.1 2017-01-14 20:55:07.000000000 +0000
@@ -26,7 +26,7 @@
.\" authorization. *
.\"***************************************************************************
.\"
-.\" $Id: tset.1,v 1.47 2017/01/07 22:59:51 tom Exp $
+.\" $Id: tset.1,v 1.48 2017/01/14 20:55:07 tom Exp $
.TH @TSET@ 1 ""
.ie \n(.g .ds `` \(lq
.el .ds `` ``
@@ -274,18 +274,38 @@
any exclamation marks (\*(``!\*('').
.SH HISTORY
.PP
-A \fBreset\fP command appeared in 2BSD (1979), written by Kurt Shoens.
+A \fBreset\fP command appeared in 2BSD (April 1979), written by Kurt Shoens.
+This program set the \fIerase\fP and \fIkill\fP characters
+to \fB^H\fP (backspace) and \fB@\fP respectively.
+Mark Horton improved that in 3BSD (October 1979), adding
+\fIintr\fP, \fIquit\fP, \fIstart\fP/\fIstop\fP and \fIeof\fP characters
+as well as changing the program to avoid modifying any user settings.
+.PP
+Later in 4.1BSD (December 1980),
+Mark Horton added a call to the \fBtset\fP program
+using the \fB\-I\fP and \fB\-Q\fP options, i.e.,
+using that to improve the terminal modes.
+With those options,
+that version of \fBreset\fP did not use the termcap database.
.PP
A separate \fBtset\fP command was provided in 2BSD by Eric Allman.
-While the oldest published source (from 1979) provides both programs,
+While the oldest published source (from 1979)
+provides both \fBtset\fP and \fBreset\fP,
Allman's comments in the 2BSD source code indicate
that he began work in October 1977,
continuing development over the next few years.
.PP
-In September 1980, Eric Allman modified \fBtset\fP to provide a \*(lqreset\*(rq
-feature when the program was invoked as \fBreset\fP.
+In September 1980, Eric Allman modified \fBtset\fP,
+adding the code from the existing \*(lqreset\*(rq
+feature when \fBtset\fP was invoked as \fBreset\fP.
+Rather than simply copying the existing program,
+in this merged version, \fBtset\fP used the termcap database
+to do additional (re)initialization of the terminal.
This version appeared in 4.1cBSD, late in 1982.
.PP
+Other developers (e.g., Keith Bostic and Jim Bloom)
+continued to modify \fBtset\fP until 4.4BSD was released in 1993.
+.PP
The \fBncurses\fR implementation
was lightly adapted from the 4.4BSD sources for a terminfo environment by Eric
S. Raymond <esr@snark.thyrsus.com>.
Index: ncurses/curses.priv.h
Prereq: 1.557
--- ncurses-6.0-20170107+/ncurses/curses.priv.h 2017-01-07 19:45:37.000000000 +0000
+++ ncurses-6.0-20170114/ncurses/curses.priv.h 2017-01-14 17:52:49.000000000 +0000
@@ -34,7 +34,7 @@
****************************************************************************/
/*
- * $Id: curses.priv.h,v 1.557 2017/01/07 19:45:37 tom Exp $
+ * $Id: curses.priv.h,v 1.558 2017/01/14 17:52:49 tom Exp $
*
* curses.priv.h
*
@@ -901,6 +901,7 @@
#endif
#ifdef TRACE
+ bool trace_opened;
char trace_fname[PATH_MAX];
int trace_level;
FILE *trace_fp;
Index: ncurses/tinfo/lib_data.c
Prereq: 1.69
--- ncurses-6.0-20170107+/ncurses/tinfo/lib_data.c 2017-01-07 19:51:37.000000000 +0000
+++ ncurses-6.0-20170114/ncurses/tinfo/lib_data.c 2017-01-14 17:52:32.000000000 +0000
@@ -42,7 +42,7 @@
#include <curses.priv.h>
-MODULE_ID("$Id: lib_data.c,v 1.69 2017/01/07 19:51:37 tom Exp $")
+MODULE_ID("$Id: lib_data.c,v 1.70 2017/01/14 17:52:32 tom Exp $")
/*
* OS/2's native linker complains if we don't initialize public data when
@@ -168,6 +168,7 @@
#endif
#ifdef TRACE
+ FALSE, /* trace_opened */
CHARS_0s, /* trace_fname */
0, /* trace_level */
NULL, /* trace_fp */
Index: ncurses/trace/lib_trace.c
Prereq: 1.85
--- ncurses-6.0-20170107+/ncurses/trace/lib_trace.c 2016-12-31 13:50:06.000000000 +0000
+++ ncurses-6.0-20170114/ncurses/trace/lib_trace.c 2017-01-14 17:53:42.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2013,2016 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2016,2017 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 *
@@ -47,7 +47,7 @@
#include <ctype.h>
-MODULE_ID("$Id: lib_trace.c,v 1.85 2016/12/31 13:50:06 tom Exp $")
+MODULE_ID("$Id: lib_trace.c,v 1.86 2017/01/14 17:53:42 tom Exp $")
NCURSES_EXPORT_VAR(unsigned) _nc_tracing = 0; /* always define this */
@@ -87,6 +87,7 @@
#define MyFP _nc_globals.trace_fp
#define MyFD _nc_globals.trace_fd
+#define MyInit _nc_globals.trace_opened
#define MyPath _nc_globals.trace_fname
#define MyLevel _nc_globals.trace_level
#define MyNested _nc_globals.nested_tracef
@@ -95,6 +96,7 @@
trace(const unsigned int tracelevel)
{
if ((MyFP == 0) && tracelevel) {
+ MyInit = TRUE;
if (MyFD >= 0) {
MyFP = fdopen(MyFD, "wb");
} else {
@@ -160,7 +162,7 @@
#ifdef TRACE
/* verbose-trace in the command-line utilities relies on this */
- if (fp == 0 && _nc_tracing >= DEBUG_LEVEL(1))
+ if (fp == 0 && !MyInit && _nc_tracing >= DEBUG_LEVEL(1))
fp = stderr;
#endif
Index: package/debian-mingw/changelog
--- ncurses-6.0-20170107+/package/debian-mingw/changelog 2017-01-07 15:27:12.000000000 +0000
+++ ncurses-6.0-20170114/package/debian-mingw/changelog 2017-01-14 15:30:30.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20170107) unstable; urgency=low
+ncurses6 (6.0+20170114) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 07 Jan 2017 10:27:12 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 14 Jan 2017 10:30:30 -0500
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian-mingw64/changelog
--- ncurses-6.0-20170107+/package/debian-mingw64/changelog 2017-01-07 15:27:12.000000000 +0000
+++ ncurses-6.0-20170114/package/debian-mingw64/changelog 2017-01-14 15:30:30.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20170107) unstable; urgency=low
+ncurses6 (6.0+20170114) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 07 Jan 2017 10:27:12 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 14 Jan 2017 10:30:30 -0500
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian/changelog
--- ncurses-6.0-20170107+/package/debian/changelog 2017-01-07 15:27:12.000000000 +0000
+++ ncurses-6.0-20170114/package/debian/changelog 2017-01-14 15:30:30.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20170107) unstable; urgency=low
+ncurses6 (6.0+20170114) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 07 Jan 2017 10:27:12 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 14 Jan 2017 10:30:30 -0500
ncurses6 (5.9-20120608) unstable; urgency=low
Index: package/mingw-ncurses.nsi
Prereq: 1.192
--- ncurses-6.0-20170107+/package/mingw-ncurses.nsi 2017-01-07 15:27:12.000000000 +0000
+++ ncurses-6.0-20170114/package/mingw-ncurses.nsi 2017-01-14 15:30:30.000000000 +0000
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.192 2017/01/07 15:27:12 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.193 2017/01/14 15:30:30 tom Exp $
; TODO add examples
; TODO bump ABI to 6
@@ -10,7 +10,7 @@
!define VERSION_MAJOR "6"
!define VERSION_MINOR "0"
!define VERSION_YYYY "2017"
-!define VERSION_MMDD "0107"
+!define VERSION_MMDD "0114"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"
Index: package/mingw-ncurses.spec
--- ncurses-6.0-20170107+/package/mingw-ncurses.spec 2017-01-07 15:27:12.000000000 +0000
+++ ncurses-6.0-20170114/package/mingw-ncurses.spec 2017-01-14 15:30:30.000000000 +0000
@@ -3,7 +3,7 @@
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 6.0
-Release: 20170107
+Release: 20170114
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncurses.spec
--- ncurses-6.0-20170107+/package/ncurses.spec 2017-01-07 15:27:12.000000000 +0000
+++ ncurses-6.0-20170114/package/ncurses.spec 2017-01-14 15:30:30.000000000 +0000
@@ -1,7 +1,7 @@
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 6.0
-Release: 20170107
+Release: 20170114
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz

22698
ncurses-6.0-20151017.patch → ncurses-6.0-20170121.patch
View File

File diff suppressed because it is too large Load Diff

61
ncurses.spec
View File

@ -3,7 +3,7 @@
%define patchver %(echo %version | cut -d. -f 3) %define patchver %(echo %version | cut -d. -f 3)
%define tack_ver 1.07 %define tack_ver 1.07
Name: ncurses Name: ncurses
Version: 6.0.20160213 Version: 6.0.20170121
Release: 1mamba Release: 1mamba
Summary: A CRT screen handling and optimization package Summary: A CRT screen handling and optimization package
Group: System/Libraries Group: System/Libraries
@ -13,31 +13,26 @@ Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: http://www.gnu.org/directory/GNU/ncurses.html URL: http://www.gnu.org/directory/GNU/ncurses.html
Source0: http://ftp.gnu.org/pub/gnu/ncurses/ncurses-%{majver}.tar.gz Source0: http://ftp.gnu.org/pub/gnu/ncurses/ncurses-%{majver}.tar.gz
%if "%{?patchver}" != "" %if "%{?patchver}" != ""
#Source1: ftp://dickey.his.com/ncurses/5.9/patch-%{majver}-20150808.sh.gz Source1: ftp://dickey.his.com/ncurses/%{majver}/patch-%{majver}-20160910.sh.gz
Source2: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20150810.patch.gz Source2: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20160917.patch.gz
Source3: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20150815.patch.gz Source3: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20160924.patch.gz
Source4: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20150822.patch.gz Source4: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20161001.patch.gz
Source5: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20150905.patch.gz Source5: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20161008.patch.gz
Source6: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20150912.patch.gz Source6: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20161015.patch.gz
Source7: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20150919.patch.gz Source7: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20161022.patch.gz
Source8: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20150926.patch.gz Source8: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20161029.patch.gz
Source9: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20151010.patch.gz Source9: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20161105.patch.gz
Source10: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20151017.patch.gz Source10: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20161112.patch.gz
Source11: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20151024.patch.gz Source11: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20161119.patch.gz
Source12: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20151101.patch.gz Source12: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20161126.patch.gz
Source13: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20151107.patch.gz Source13: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20161203.patch.gz
Source14: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20151121.patch.gz Source14: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20161210.patch.gz
Source15: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20151128.patch.gz Source15: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20161217.patch.gz
Source16: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20151205.patch.gz Source16: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20161224.patch.gz
Source17: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20151212.patch.gz Source17: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20161231.patch.gz
Source18: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20151219.patch.gz Source18: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20170107.patch.gz
Source19: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20151226.patch.gz Source19: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20170114.patch.gz
Source20: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20160102.patch.gz Source20: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-%{patchver}.patch.gz
Source21: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20160116.patch.gz
Source22: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20160123.patch.gz
Source23: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20160130.patch.gz
Source24: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20160206.patch.gz
Source25: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-%{patchver}.patch.gz
%endif %endif
License: MIT License: MIT
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
@ -81,8 +76,7 @@ The header files and libraries for developing applications that use the ncurses
%setup -q -n %{name}-%{majver} %setup -q -n %{name}-%{majver}
%if "%{?patchver}" != "" %if "%{?patchver}" != ""
#gunzip -c %{SOURCE1} > update.sh gunzip -c %{SOURCE1} | bash
#sh ./update.sh
gunzip -c %{SOURCE2} | patch -p1 gunzip -c %{SOURCE2} | patch -p1
gunzip -c %{SOURCE3} | patch -p1 gunzip -c %{SOURCE3} | patch -p1
@ -103,11 +97,6 @@ gunzip -c %{SOURCE17} | patch -p1
gunzip -c %{SOURCE18} | patch -p1 gunzip -c %{SOURCE18} | patch -p1
gunzip -c %{SOURCE19} | patch -p1 gunzip -c %{SOURCE19} | patch -p1
gunzip -c %{SOURCE20} | patch -p1 gunzip -c %{SOURCE20} | patch -p1
gunzip -c %{SOURCE21} | patch -p1
gunzip -c %{SOURCE22} | patch -p1
gunzip -c %{SOURCE23} | patch -p1
gunzip -c %{SOURCE24} | patch -p1
gunzip -c %{SOURCE25} | patch -p1
%endif %endif
%build %build
@ -280,6 +269,12 @@ done
%defattr(-,root,root) %defattr(-,root,root)
%changelog %changelog
* Fri Jan 27 2017 Silvan Calarco <silvan.calarco@mambasoft.it> 6.0.20170121-1mamba
- update to 6.0.20170121
* Fri Jan 27 2017 Silvan Calarco <silvan.calarco@mambasoft.it> 6.0.20160910-1mamba
- update to 6.0.20160910
* Sat Feb 20 2016 Silvan Calarco <silvan.calarco@mambasoft.it> 6.0.20160213-1mamba * Sat Feb 20 2016 Silvan Calarco <silvan.calarco@mambasoft.it> 6.0.20160213-1mamba
- update to 6.0.20160213 - update to 6.0.20160213

BIN
patch-6.0-20160910.sh.gz Normal file
View File

Binary file not shown.