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

update to 6.2.20200328 [release 6.2.20200328-1mamba;Tue Mar 31 2020]

Browse Source
This commit is contained in:
Ercole 'ercolinux' Carpanetto 2024-01-06 07:33:58 +01:00
parent 733eaccac0
commit dc4d0e439f
45 changed files with 83814 additions and 147325 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1437
ncurses-6.1-20190615.patch
View File

File diff suppressed because it is too large Load Diff

8026
ncurses-6.1-20190623.patch
View File

File diff suppressed because it is too large Load Diff

17671
ncurses-6.1-20190630.patch
View File

File diff suppressed because it is too large Load Diff

309
ncurses-6.1-20190706.patch
View File

@ -1,309 +0,0 @@
# ncurses 6.1 - patch 20190706 - Thomas E. Dickey
#
# ------------------------------------------------------------------------------
#
# Ncurses 6.1 is at
# ftp.gnu.org:/pub/gnu
#
# Patches for ncurses 6.1 can be found at
# ftp://ftp.invisible-island.net/ncurses/6.1
# http://invisible-mirror.net/archives/ncurses/6.1
#
# ------------------------------------------------------------------------------
# ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20190706.patch.gz
# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created Sun Jul 7 00:14:47 UTC 2019
# ------------------------------------------------------------------------------
# NEWS | 6 ++
# VERSION | 2
# dist.mk | 4 -
# misc/terminfo.src | 77 +++++++++++++++++++++++++++++++++----
# 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
# package/ncursest.spec | 2
# 11 files changed, 89 insertions(+), 22 deletions(-)
# ------------------------------------------------------------------------------
Index: NEWS
Prereq: 1.3342
--- ncurses-6.1-20190630+/NEWS 2019-06-30 10:45:10.000000000 +0000
+++ ncurses-6.1-20190706/NEWS 2019-07-06 20:51:46.000000000 +0000
@@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3342 2019/06/30 10:45:10 tom Exp $
+-- $Id: NEWS,v 1.3344 2019/07/06 20:51:46 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.
+20190706
+ + add domterm -TD
+ + improve comments for recent changes, add alias xterm.js -TD
+
20190630
+ add --with-tic-path and --with-infocmp-path to work around problems
building fallback source using pre-6.0 tic/infocmp.
Index: VERSION
--- ncurses-6.1-20190630+/VERSION 2019-06-30 01:30:19.000000000 +0000
+++ ncurses-6.1-20190706/VERSION 2019-07-06 09:10:26.000000000 +0000
@@ -1 +1 @@
-5:0:10 6.1 20190630
+5:0:10 6.1 20190706
Index: dist.mk
Prereq: 1.1292
--- ncurses-6.1-20190630+/dist.mk 2019-06-30 01:30:19.000000000 +0000
+++ ncurses-6.1-20190706/dist.mk 2019-07-06 09:10:26.000000000 +0000
@@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.1292 2019/06/30 01:30:19 tom Exp $
+# $Id: dist.mk,v 1.1293 2019/07/06 09:10:26 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 = 1
-NCURSES_PATCH = 20190630
+NCURSES_PATCH = 20190706
# 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.1-20190630+/misc/terminfo.src 2019-06-30 20:05:21.000000000 +0000
+++ ncurses-6.1-20190706/misc/terminfo.src 2019-07-06 20:35:26.000000000 +0000
@@ -6,8 +6,8 @@
# Report bugs and new terminal descriptions to
# bug-ncurses@gnu.org
#
-# $Revision: 1.749 $
-# $Date: 2019/06/30 20:05:21 $
+# $Revision: 1.757 $
+# $Date: 2019/07/06 20:35: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
@@ -4225,6 +4225,8 @@
# Windows 10 1903
# Version 0.2.1715.0
+# https://github.com/microsoft/terminal
+#
# The task manager shows this as "OpenConsole.exe", which differs
# from the "Windows Command Processor" used for the command-prompt.
#
@@ -4247,9 +4249,9 @@
# - a few generic xterm features are supported (set window title), but
# others are missing (such as the mouse).
# - the cursor visible/invisible works in the PowerShell tab, not in "Legacy"
-# tack:
+# tack:
# - blink, dim, bold, invis, protect do not work
-# - bce works (but per vttest, with ED, EL, not BCE)
+# - bce works (but per vttest, with ED, EL, not ECH)
# - does not support keypad application mode
# - implements most of the xterm modified keys; sometimes modifiers are ignored
# or simply incorrect
@@ -4262,7 +4264,8 @@
use=xterm+pcfkeys, use=xterm-basic,
#### Visual Studio
-# Visual Studio Code 1.35.1
+# Visual Studio Code 1.35.1 uses xterm.js (see https://xtermjs.org/).
+# https://code.visualstudio.com/docs/editor/integrated-terminal
#
# This sets TERM to xterm-256color, which is a little more successful than
# Windows Terminal.
@@ -4289,11 +4292,11 @@
# - mouse mode is not reset by reset-sequence
# - supports italics and dim, but not cross-out or double-underline
# - color-palette cannot be changed
-vscode|Visual Studio Code terminal,
+vscode|xterm.js|Visual Studio Code terminal using xterm.js,
npc,
kcbt=\E[Z, rmkx=\E[?1l, smkx=\E[?1h, use=xterm+256setaf,
use=ecma+index, use=xterm+sm+1006, use=xterm+pcfkeys,
- use=xterm-basic, use=xterm-basic,
+ use=xterm-basic,
vscode-direct|Visual Studio Code with direct-colors,
use=xterm+indirect, use=vscode,
@@ -7012,6 +7015,62 @@
use=xterm+pce2, use=xterm+pcc2, use=ecma+italics,
use=xterm+alt1049,
+######## WEB CLIENTS
+
+#### DomTerm
+# https://domterm.org
+#
+# Quoting its webpage:
+# The domterm command runs a server that manages sessions (usually shell
+# processes). The user interface and terminal emulation is handled by a
+# JavaScript library that can run in a regular web browser or an embedded
+# browser such as Electron, using Web Sockets to talk to the server.
+#
+# it can connect to, and display in, a web browser, or as a standalone Qt
+# application. Either way, it displays in the current desktop session.
+#
+# Testing current code (2019/07/06) with Fedora 30:
+# tack
+# no flash
+# no beep
+# no dim
+# no blink
+# no invis
+# no italics
+# ok smxx/rmxx
+# bce screen shows diagonal lines...
+# kf6 sends nothing
+# kf11 toggles maximize
+# cursor-key application mode works
+# numeric keypad application does not work; keys always send face-codes
+# sends utf-8 for meta, like xterm
+# vttest
+# has problems with menu #1 (wrapping)
+# DA = vt200 with 132 columns, color
+# DA2 = 990, 100300 ("\E[>990;100300;0c")
+# no VT52, no double-size characters
+# vt220 ECH test works, SRM, DECSCA do not
+# S7C1T/S8C1t does not work
+# DECUDK does not work
+# CNL does not work; the other ECMA-48 cursor-movement tests work
+# REP sort-of works (does not match xterm)
+# SD/SU work, but not SL/SR
+# window reporting: works for size in chars/pixels, but not other tests
+# X10 mouse clicks work -- but return 4 rather than 1 for codes
+# any-event mouse mode acts like any-button mode
+# implements SGR mouse-mode
+# other:
+# does not implement initc
+# does accept either colons or semicolon in 38/48 SGR.
+domterm|DomTerm web client,
+ npc,
+ bel@, blink@, dim@, invis@, kcbt=\E[Z, ritm@, rmkx=\E[?1l,
+ sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|
+ %t;7%;m,
+ sitm@, smkx=\E[?1h, use=xterm+256setaf, use=ecma+index,
+ use=xterm+sm+1006, use=xterm+pcfkeys, use=xterm-basic,
+ use=xterm-basic,
+
######## UNIX VIRTUAL TERMINALS, VIRTUAL CONSOLES, AND TELNET CLIENTS
#
@@ -26282,4 +26341,8 @@
# + add vscode, vscode-direct -TD
# + use ecma+index in screen, st -TD
#
+# 2019-07-06
+# + add domterm -TD
+# + improve comments for recent changes, add alias xterm.js -TD
+#
######## SHANTIH! SHANTIH! SHANTIH!
Index: package/debian-mingw/changelog
--- ncurses-6.1-20190630+/package/debian-mingw/changelog 2019-06-30 01:30:19.000000000 +0000
+++ ncurses-6.1-20190706/package/debian-mingw/changelog 2019-07-06 09:10:26.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20190630) unstable; urgency=low
+ncurses6 (6.1+20190706) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 29 Jun 2019 21:29:49 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 06 Jul 2019 05:10:26 -0400
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian-mingw64/changelog
--- ncurses-6.1-20190630+/package/debian-mingw64/changelog 2019-06-30 01:30:19.000000000 +0000
+++ ncurses-6.1-20190706/package/debian-mingw64/changelog 2019-07-06 09:10:26.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20190630) unstable; urgency=low
+ncurses6 (6.1+20190706) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 29 Jun 2019 21:29:49 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 06 Jul 2019 05:10:26 -0400
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian/changelog
--- ncurses-6.1-20190630+/package/debian/changelog 2019-06-30 01:30:19.000000000 +0000
+++ ncurses-6.1-20190706/package/debian/changelog 2019-07-06 09:10:26.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20190630) unstable; urgency=low
+ncurses6 (6.1+20190706) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 29 Jun 2019 21:29:49 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 06 Jul 2019 05:10:26 -0400
ncurses6 (5.9-20120608) unstable; urgency=low
Index: package/mingw-ncurses.nsi
Prereq: 1.338
--- ncurses-6.1-20190630+/package/mingw-ncurses.nsi 2019-06-30 01:30:19.000000000 +0000
+++ ncurses-6.1-20190706/package/mingw-ncurses.nsi 2019-07-06 09:10:26.000000000 +0000
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.338 2019/06/30 01:30:19 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.339 2019/07/06 09:10:26 tom Exp $
; TODO add examples
; TODO bump ABI to 6
@@ -10,7 +10,7 @@
!define VERSION_MAJOR "6"
!define VERSION_MINOR "1"
!define VERSION_YYYY "2019"
-!define VERSION_MMDD "0630"
+!define VERSION_MMDD "0706"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"
Index: package/mingw-ncurses.spec
--- ncurses-6.1-20190630+/package/mingw-ncurses.spec 2019-06-30 18:34:07.000000000 +0000
+++ ncurses-6.1-20190706/package/mingw-ncurses.spec 2019-07-06 09:10:26.000000000 +0000
@@ -3,7 +3,7 @@
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 6.1
-Release: 20190630
+Release: 20190706
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncurses.spec
--- ncurses-6.1-20190630+/package/ncurses.spec 2019-06-30 01:30:19.000000000 +0000
+++ ncurses-6.1-20190706/package/ncurses.spec 2019-07-06 09:10:26.000000000 +0000
@@ -1,7 +1,7 @@
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 6.1
-Release: 20190630
+Release: 20190706
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncursest.spec
--- ncurses-6.1-20190630+/package/ncursest.spec 2019-06-30 01:30:19.000000000 +0000
+++ ncurses-6.1-20190706/package/ncursest.spec 2019-07-06 09:10:26.000000000 +0000
@@ -1,7 +1,7 @@
Summary: Curses library with POSIX thread support.
Name: ncursest6
Version: 6.1
-Release: 20190630
+Release: 20190706
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz

904
ncurses-6.1-20190713.patch
View File

@ -1,904 +0,0 @@
# ncurses 6.1 - patch 20190713 - Thomas E. Dickey
#
# ------------------------------------------------------------------------------
#
# Ncurses 6.1 is at
# ftp.gnu.org:/pub/gnu
#
# Patches for ncurses 6.1 can be found at
# ftp://ftp.invisible-island.net/ncurses/6.1
# http://invisible-mirror.net/archives/ncurses/6.1
#
# ------------------------------------------------------------------------------
# ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20190713.patch.gz
# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created Sun Jul 14 00:50:41 UTC 2019
# ------------------------------------------------------------------------------
# NEWS | 8 ++
# VERSION | 2
# dist.mk | 4 -
# doc/html/ada/funcs/T.htm | 2
# doc/html/ada/terminal_interface-curses-terminfo__adb.htm | 2
# 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_bkgd.3x.html | 10 ++-
# doc/html/man/curs_mouse.3x.html | 13 ++--
# 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/ncurses6-config.1.html | 2
# doc/html/man/panel.3x.html | 2
# doc/html/man/tabs.1.html | 2
# doc/html/man/term.7.html | 6 +-
# doc/html/man/terminfo.5.html | 39 +++++++------
# 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_bkgd.3x | 10 ++-
# man/curs_mouse.3x | 18 +++---
# man/term.7 | 6 +-
# man/terminfo.head | 6 +-
# man/terminfo.tail | 30 +++++-----
# 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
# package/ncursest.spec | 2
# progs/reset_cmd.c | 9 +--
# test/padview.c | 14 +++-
# 38 files changed, 132 insertions(+), 99 deletions(-)
# ------------------------------------------------------------------------------
Index: NEWS
Prereq: 1.3344
--- ncurses-6.1-20190706+/NEWS 2019-07-06 20:51:46.000000000 +0000
+++ ncurses-6.1-20190713/NEWS 2019-07-13 23:10:57.000000000 +0000
@@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3344 2019/07/06 20:51:46 tom Exp $
+-- $Id: NEWS,v 1.3347 2019/07/13 23:10:57 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.
+20190713
+ + change reset's behavior for margins to simply clear soft-margins if
+ possible, rather than clearing and then setting them according to the
+ terminal's width (suggested by Thomas Wolff).
+ + correct order of one wbkgd versus start_color call in test/padview.c
+
20190706
+ add domterm -TD
+ improve comments for recent changes, add alias xterm.js -TD
Index: VERSION
--- ncurses-6.1-20190706+/VERSION 2019-07-06 09:10:26.000000000 +0000
+++ ncurses-6.1-20190713/VERSION 2019-07-13 20:42:44.000000000 +0000
@@ -1 +1 @@
-5:0:10 6.1 20190706
+5:0:10 6.1 20190713
Index: dist.mk
Prereq: 1.1293
--- ncurses-6.1-20190706+/dist.mk 2019-07-06 09:10:26.000000000 +0000
+++ ncurses-6.1-20190713/dist.mk 2019-07-13 20:42:44.000000000 +0000
@@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.1293 2019/07/06 09:10:26 tom Exp $
+# $Id: dist.mk,v 1.1294 2019/07/13 20:42:44 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 = 1
-NCURSES_PATCH = 20190706
+NCURSES_PATCH = 20190713
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
Index: doc/html/ada/funcs/T.htm
--- ncurses-6.1-20190706+/doc/html/ada/funcs/T.htm 2019-06-15 23:31:13.000000000 +0000
+++ ncurses-6.1-20190713/doc/html/ada/funcs/T.htm 2019-07-13 23:50:38.000000000 +0000
@@ -20,8 +20,8 @@
<LI><A HREF="../terminal_interface-curses-termcap__adb.htm#ref_89_16" TARGET="main">tgetnum</A>
<LI><A HREF="../terminal_interface-curses-termcap__adb.htm#ref_108_16" TARGET="main">tgetstr - terminal_interface-curses-termcap.adb:108</A>
<LI><A HREF="../terminal_interface-curses-termcap__adb.htm#ref_129_16" TARGET="main">tgetstr - terminal_interface-curses-termcap.adb:129</A>
-<LI><A HREF="../terminal_interface-curses-termcap__ads.htm#ref_53_13" TARGET="main">TGoto</A>
<LI><A HREF="../terminal_interface-curses-termcap__adb.htm#ref_151_16" TARGET="main">tgoto</A>
+<LI><A HREF="../terminal_interface-curses-termcap__ads.htm#ref_53_13" TARGET="main">TGoto</A>
<LI><A HREF="../terminal_interface-curses-terminfo__adb.htm#ref_69_16" TARGET="main">tigetflag</A>
<LI><A HREF="../terminal_interface-curses-terminfo__adb.htm#ref_87_16" TARGET="main">tigetstr - terminal_interface-curses-terminfo.adb:87</A>
<LI><A HREF="../terminal_interface-curses-terminfo__adb.htm#ref_108_16" TARGET="main">tigetstr - terminal_interface-curses-terminfo.adb:108</A>
Index: doc/html/ada/terminal_interface-curses-terminfo__adb.htm
--- ncurses-6.1-20190706+/doc/html/ada/terminal_interface-curses-terminfo__adb.htm 2019-03-16 19:34:48.000000000 +0000
+++ ncurses-6.1-20190713/doc/html/ada/terminal_interface-curses-terminfo__adb.htm 2019-07-13 23:50:39.000000000 +0000
@@ -151,7 +151,7 @@
<b>end</b> <A HREF="terminal_interface-curses-terminfo__ads.htm#ref_68_13">Get_Number</A>;
<span class="comment"><EM>------------------------------------------------------------------------------</EM></span>
- <b>procedure</b> <span class="symbol"><A NAME="ref_137_14" HREF="terminal_interface-curses-terminfo__ads.htm#ref_76_14">Put_String</A></span> (<span class="symbol"><A NAME="ref_137_26" HREF="terminal_interface-curses-terminfo__ads.htm#ref_76_26">Str</A></span> : Terminfo_String;
+ <b>procedure</b> <span class="symbol"><A NAME="ref_137_14" HREF="terminal_interface-curses-terminfo__ads.htm#ref_76_14">Put_String</A></span> (<span class="symbol"><A NAME="ref_137_26" HREF="terminal_interface-curses-terminfo__ads.htm#ref_76_26">Str</A></span> : <A HREF="terminal_interface-curses-terminfo__ads.htm#ref_44_35">Terminfo_String</A>;
<span class="symbol"><A NAME="ref_138_26" HREF="terminal_interface-curses-terminfo__ads.htm#ref_77_26">affcnt</A></span> : Natural := 1;
<span class="symbol"><A NAME="ref_139_26" HREF="terminal_interface-curses-terminfo__ads.htm#ref_78_26">putc</A></span> : <A HREF="terminal_interface-curses-terminfo__ads.htm#ref_71_9">putctype</A> := <b>null</b>) <b>is</b>
<b>function</b> <span class="symbol"><A NAME="ref_140_16">tputs</A></span> (<span class="symbol"><A NAME="ref_140_23" HREF="terminal_interface-curses-terminfo__adb.htm#ref_140_16">str</A></span> : char_array;
Index: doc/html/man/adacurses6-config.1.html
--- ncurses-6.1-20190706+/doc/html/man/adacurses6-config.1.html 2019-06-23 21:16:02.000000000 +0000
+++ ncurses-6.1-20190713/doc/html/man/adacurses6-config.1.html 2019-07-13 23:50:33.000000000 +0000
@@ -125,7 +125,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.1 (patch 20190623).
+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190713).
Index: doc/html/man/captoinfo.1m.html
--- ncurses-6.1-20190706+/doc/html/man/captoinfo.1m.html 2019-06-23 21:16:02.000000000 +0000
+++ ncurses-6.1-20190713/doc/html/man/captoinfo.1m.html 2019-07-13 23:50:33.000000000 +0000
@@ -190,7 +190,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.1 (patch 20190623).
+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190713).
</PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
Index: doc/html/man/clear.1.html
--- ncurses-6.1-20190706+/doc/html/man/clear.1.html 2019-06-23 21:16:02.000000000 +0000
+++ ncurses-6.1-20190713/doc/html/man/clear.1.html 2019-07-13 23:50:33.000000000 +0000
@@ -148,7 +148,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.1 (patch 20190623).
+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190713).
Index: doc/html/man/curs_bkgd.3x.html
--- ncurses-6.1-20190706+/doc/html/man/curs_bkgd.3x.html 2019-03-16 19:34:43.000000000 +0000
+++ ncurses-6.1-20190713/doc/html/man/curs_bkgd.3x.html 2019-07-13 23:50:33.000000000 +0000
@@ -1,6 +1,6 @@
<!--
****************************************************************************
- * Copyright (c) 1998-2017,2018 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2018,2019 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: curs_bkgd.3x,v 1.28 2018/12/09 00:45:05 tom Exp @
+ * @Id: curs_bkgd.3x,v 1.29 2019/07/13 21:01:06 tom Exp @
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
<HTML>
@@ -121,6 +121,12 @@
rent background, and then adding attributes from the new back-
ground.
+ If the background's character value is zero, a space is assumed.
+
+ If the terminal does not support color, or if color has not been
+ started with <STRONG>start_color</STRONG>, the new background character's color
+ attribute will be ignored.
+
</PRE><H3><a name="h3-getbkgd">getbkgd</a></H3><PRE>
The <STRONG>getbkgd</STRONG> function returns the given window's current background
Index: doc/html/man/curs_mouse.3x.html
--- ncurses-6.1-20190706+/doc/html/man/curs_mouse.3x.html 2019-03-16 19:34:44.000000000 +0000
+++ ncurses-6.1-20190713/doc/html/man/curs_mouse.3x.html 2019-07-13 23:50:34.000000000 +0000
@@ -1,7 +1,7 @@
<!--
* t
****************************************************************************
- * Copyright (c) 1998-2017,2018 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2018,2019 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: curs_mouse.3x,v 1.50 2018/12/29 23:40:47 tom Exp @
+ * @Id: curs_mouse.3x,v 1.51 2019/07/13 23:45:12 tom Exp @
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
<HTML>
@@ -347,10 +347,11 @@
Because there are no standard terminal responses that would serve to
identify terminals which support the xterm mouse protocol, <STRONG>ncurses</STRONG> as-
- sumes that if your $TERM environment variable contains "xterm", or
- <STRONG>kmous</STRONG> is defined in the terminal description, then the terminal may
- send mouse events. The <STRONG>kmous</STRONG> capability is checked first, allowing the
- use of newer xterm mouse protocols.
+ sumes that if <STRONG>kmous</STRONG> is defined in the terminal description, or if the
+ terminal description's primary name or aliases contain the string
+ "xterm", then the terminal may send mouse events. The <STRONG>kmous</STRONG> capability
+ is checked first, allowing the use of newer xterm mouse protocols such
+ as xterm's private mode 1006.
</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
Index: doc/html/man/form.3x.html
--- ncurses-6.1-20190706+/doc/html/man/form.3x.html 2019-06-23 21:16:04.000000000 +0000
+++ ncurses-6.1-20190713/doc/html/man/form.3x.html 2019-07-13 23:50:35.000000000 +0000
@@ -246,7 +246,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.1 (patch 20190623).
+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190713).
Index: doc/html/man/infocmp.1m.html
--- ncurses-6.1-20190706+/doc/html/man/infocmp.1m.html 2019-06-23 21:16:04.000000000 +0000
+++ ncurses-6.1-20190713/doc/html/man/infocmp.1m.html 2019-07-13 23:50:36.000000000 +0000
@@ -481,7 +481,7 @@
https://invisible-island.net/ncurses/tctest.html
- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190623).
+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190713).
</PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
Index: doc/html/man/infotocap.1m.html
--- ncurses-6.1-20190706+/doc/html/man/infotocap.1m.html 2019-06-23 21:16:04.000000000 +0000
+++ ncurses-6.1-20190713/doc/html/man/infotocap.1m.html 2019-07-13 23:50:36.000000000 +0000
@@ -85,7 +85,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.1 (patch 20190623).
+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190713).
</PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
Index: doc/html/man/menu.3x.html
--- ncurses-6.1-20190706+/doc/html/man/menu.3x.html 2019-06-23 21:16:05.000000000 +0000
+++ ncurses-6.1-20190713/doc/html/man/menu.3x.html 2019-07-13 23:50:36.000000000 +0000
@@ -221,7 +221,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.1 (patch 20190623).
+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190713).
Index: doc/html/man/ncurses.3x.html
--- ncurses-6.1-20190706+/doc/html/man/ncurses.3x.html 2019-06-23 21:16:05.000000000 +0000
+++ ncurses-6.1-20190713/doc/html/man/ncurses.3x.html 2019-07-13 23:50:37.000000000 +0000
@@ -59,7 +59,7 @@
method of updating character screens with reasonable optimization.
This implementation is "new curses" (ncurses) and is the approved
replacement for 4.4BSD classic curses, which has been discontinued.
- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190623).
+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190713).
The <STRONG>ncurses</STRONG> library emulates the curses library of System V Release 4
UNIX, and XPG4 (X/Open Portability Guide) curses (also known as XSI
Index: doc/html/man/ncurses6-config.1.html
--- ncurses-6.1-20190706+/doc/html/man/ncurses6-config.1.html 2019-06-23 21:16:05.000000000 +0000
+++ ncurses-6.1-20190713/doc/html/man/ncurses6-config.1.html 2019-07-13 23:50:37.000000000 +0000
@@ -112,7 +112,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.1 (patch 20190623).
+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190713).
Index: doc/html/man/panel.3x.html
--- ncurses-6.1-20190706+/doc/html/man/panel.3x.html 2019-06-23 21:16:05.000000000 +0000
+++ ncurses-6.1-20190713/doc/html/man/panel.3x.html 2019-07-13 23:50:37.000000000 +0000
@@ -204,7 +204,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.1 (patch 20190623).
+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190713).
</PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
Index: doc/html/man/tabs.1.html
--- ncurses-6.1-20190706+/doc/html/man/tabs.1.html 2019-06-23 21:16:06.000000000 +0000
+++ ncurses-6.1-20190713/doc/html/man/tabs.1.html 2019-07-13 23:50:37.000000000 +0000
@@ -205,7 +205,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.1 (patch 20190623).
+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190713).
Index: doc/html/man/term.7.html
--- ncurses-6.1-20190706+/doc/html/man/term.7.html 2019-03-16 19:34:46.000000000 +0000
+++ ncurses-6.1-20190713/doc/html/man/term.7.html 2019-07-13 23:50:37.000000000 +0000
@@ -1,6 +1,6 @@
<!--
****************************************************************************
- * Copyright (c) 1998-2017,2018 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2018,2019 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: term.7,v 1.26 2018/07/28 22:19:56 tom Exp @
+ * @Id: term.7,v 1.27 2019/07/13 23:17:23 tom Exp @
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
<HTML>
@@ -177,7 +177,7 @@
-vb Use visible bell (flash) rather than beep.
- -w Wide; terminal is in 132 column mode.
+ -w Wide; terminal is in 132-column mode.
Conventionally, if your terminal type is a variant intended to specify
a line height, that suffix should go first. So, for a hypothetical
Index: doc/html/man/terminfo.5.html
--- ncurses-6.1-20190706+/doc/html/man/terminfo.5.html 2019-06-23 21:16:06.000000000 +0000
+++ ncurses-6.1-20190713/doc/html/man/terminfo.5.html 2019-07-13 23:50:37.000000000 +0000
@@ -5,7 +5,7 @@
* Note: this must be run through tbl before nroff.
* The magic cookie on the first line triggers this under some man programs.
****************************************************************************
- * Copyright (c) 1998-2017,2018 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2018,2019 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 *
@@ -31,9 +31,9 @@
* sale, use or other dealings in this Software without prior written *
* authorization. *
****************************************************************************
- * @Id: terminfo.head,v 1.35 2018/07/28 22:29:09 tom Exp @
+ * @Id: terminfo.head,v 1.36 2019/07/13 23:17:33 tom Exp @
* Head of terminfo man page ends here
- * @Id: terminfo.tail,v 1.93 2019/06/01 22:32:15 tom Exp @
+ * @Id: terminfo.tail,v 1.95 2019/07/13 23:29:04 tom Exp @
* Beginning of terminfo.tail file
* This file is part of ncurses.
* See "terminfo.head" for copyright.
@@ -74,7 +74,7 @@
<EM>Terminfo</EM> describes terminals by giving a set of capabilities which they
have, by specifying how to perform screen operations, and by specifying
padding requirements and initialization sequences. This describes
- <STRONG>ncurses</STRONG> version 6.1 (patch 20190623).
+ <STRONG>ncurses</STRONG> version 6.1 (patch 20190713).
</PRE><H3><a name="h3-Terminfo-Entry-Syntax">Terminfo Entry Syntax</a></H3><PRE>
@@ -124,7 +124,7 @@
ing up the terminal should have a root name, thus "hp2621". This name
should not contain hyphens. Modes that the hardware can be in, or user
preferences, should be indicated by appending a hyphen and a mode suf-
- fix. Thus, a vt100 in 132 column mode would be vt100-w. The following
+ fix. Thus, a vt100 in 132-column mode would be vt100-w. The following
suffixes should be used where possible:
<STRONG>Suffix</STRONG> <STRONG>Meaning</STRONG> <STRONG>Example</STRONG>
@@ -1902,10 +1902,14 @@
run the program
<STRONG>iprog</STRONG>
- output <STRONG>is1</STRONG> <STRONG>is2</STRONG>
+ output
+ <STRONG>is1</STRONG> and
+ <STRONG>is2</STRONG>
set the margins using
- <STRONG>mgc</STRONG>, <STRONG>smgl</STRONG> and <STRONG>smgr</STRONG>
+ <STRONG>mgc</STRONG> or
+ <STRONG>smglp</STRONG> and <STRONG>smgrp</STRONG> or
+ <STRONG>smgl</STRONG> and <STRONG>smgr</STRONG>
set tabs using
<STRONG>tbc</STRONG> and <STRONG>hts</STRONG>
@@ -1913,8 +1917,8 @@
print the file
<STRONG>if</STRONG>
- and finally
- output <STRONG>is3</STRONG>.
+ and finally output
+ <STRONG>is3</STRONG>.
Most initialization is done with <STRONG>is2</STRONG>. Special terminal modes can be
set up without duplicating strings by putting the common sequences in
@@ -1922,14 +1926,14 @@
A set of sequences that does a harder reset from a totally unknown
state can be given as <STRONG>rs1</STRONG>, <STRONG>rs2</STRONG>, <STRONG>rf</STRONG> and <STRONG>rs3</STRONG>, analogous to <STRONG>is1</STRONG> <STRONG>,</STRONG> <STRONG>is2</STRONG> <STRONG>,</STRONG> <STRONG>if</STRONG>
- and <STRONG>is3</STRONG> respectively. These strings are output by the <STRONG>reset</STRONG> program
- (an alias of <STRONG>tset</STRONG>), which is used when the terminal gets into a wedged
- state. Commands are normally placed in <STRONG>rs1</STRONG>, <STRONG>rs2</STRONG> <STRONG>rs3</STRONG> and <STRONG>rf</STRONG> only if
- they produce annoying effects on the screen and are not necessary when
- logging in. For example, the command to set the vt100 into 80-column
- mode would normally be part of <STRONG>is2</STRONG>, but it causes an annoying glitch of
- the screen and is not normally needed since the terminal is usually
- already in 80 column mode.
+ and <STRONG>is3</STRONG> respectively. These strings are output by <EM>reset</EM> option of
+ <STRONG>tput</STRONG>, or by the <STRONG>reset</STRONG> program (an alias of <STRONG>tset</STRONG>), which is used when
+ the terminal gets into a wedged state. Commands are normally placed in
+ <STRONG>rs1</STRONG>, <STRONG>rs2</STRONG> <STRONG>rs3</STRONG> and <STRONG>rf</STRONG> only if they produce annoying effects on the screen
+ and are not necessary when logging in. For example, the command to set
+ the vt100 into 80-column mode would normally be part of <STRONG>is2</STRONG>, but it
+ causes an annoying glitch of the screen and is not normally needed
+ since the terminal is usually already in 80-column mode.
The <STRONG>reset</STRONG> program writes strings including <STRONG>iprog</STRONG>, etc., in the same
order as the <EM>init</EM> program, using <STRONG>rs1</STRONG>, etc., instead of <STRONG>is1</STRONG>, etc. If
@@ -2146,7 +2150,6 @@
green <STRONG>COLOR_GREEN</STRONG> 2 0,max,0
yellow <STRONG>COLOR_YELLOW</STRONG> 3 max,max,0
blue <STRONG>COLOR_BLUE</STRONG> 4 0,0,max
-
magenta <STRONG>COLOR_MAGENTA</STRONG> 5 max,0,max
cyan <STRONG>COLOR_CYAN</STRONG> 6 0,max,max
white <STRONG>COLOR_WHITE</STRONG> 7 max,max,max
Index: doc/html/man/tic.1m.html
--- ncurses-6.1-20190706+/doc/html/man/tic.1m.html 2019-06-23 21:16:06.000000000 +0000
+++ ncurses-6.1-20190713/doc/html/man/tic.1m.html 2019-07-13 23:50:37.000000000 +0000
@@ -365,7 +365,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>. <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>.
- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190623).
+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190713).
</PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
Index: doc/html/man/toe.1m.html
--- ncurses-6.1-20190706+/doc/html/man/toe.1m.html 2019-06-23 21:16:06.000000000 +0000
+++ ncurses-6.1-20190713/doc/html/man/toe.1m.html 2019-07-13 23:50:37.000000000 +0000
@@ -113,7 +113,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>ter-</STRONG>
<STRONG><A HREF="terminfo.5.html">minfo(5)</A></STRONG>.
- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190623).
+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190713).
Index: doc/html/man/tput.1.html
--- ncurses-6.1-20190706+/doc/html/man/tput.1.html 2019-06-23 21:16:06.000000000 +0000
+++ ncurses-6.1-20190713/doc/html/man/tput.1.html 2019-07-13 23:50:37.000000000 +0000
@@ -522,7 +522,7 @@
</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
<STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>, <STRONG>stty(1)</STRONG>, <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>, <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="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.1 (patch 20190623).
+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190713).
Index: doc/html/man/tset.1.html
--- ncurses-6.1-20190706+/doc/html/man/tset.1.html 2019-06-23 21:16:06.000000000 +0000
+++ ncurses-6.1-20190713/doc/html/man/tset.1.html 2019-07-13 23:50:37.000000000 +0000
@@ -389,7 +389,7 @@
<STRONG>csh(1)</STRONG>, <STRONG>sh(1)</STRONG>, <STRONG>stty(1)</STRONG>, <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>, <STRONG>tty(4)</STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>,
<STRONG>ttys(5)</STRONG>, <STRONG>environ(7)</STRONG>
- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190623).
+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190713).
Index: man/curs_bkgd.3x
Prereq: 1.28
--- ncurses-6.1-20190706+/man/curs_bkgd.3x 2018-12-09 00:45:05.000000000 +0000
+++ ncurses-6.1-20190713/man/curs_bkgd.3x 2019-07-13 21:01:06.000000000 +0000
@@ -1,5 +1,5 @@
.\"***************************************************************************
-.\" Copyright (c) 1998-2017,2018 Free Software Foundation, Inc. *
+.\" Copyright (c) 1998-2018,2019 Free Software Foundation, Inc. *
.\" *
.\" Permission is hereby granted, free of charge, to any person obtaining a *
.\" copy of this software and associated documentation files (the *
@@ -26,7 +26,7 @@
.\" authorization. *
.\"***************************************************************************
.\"
-.\" $Id: curs_bkgd.3x,v 1.28 2018/12/09 00:45:05 tom Exp $
+.\" $Id: curs_bkgd.3x,v 1.29 2019/07/13 21:01:06 tom Exp $
.de bP
.ie n .IP \(bu 4
.el .IP \(bu 2
@@ -112,6 +112,12 @@
the library updates only the non-color attributes,
first removing those which may have come from the current background,
and then adding attributes from the new background.
+.PP
+If the background's character value is zero, a space is assumed.
+.PP
+If the terminal does not support color,
+or if color has not been started with \fBstart_color\fP,
+the new background character's color attribute will be ignored.
.SS getbkgd
.PP
The \fBgetbkgd\fR function returns the given window's current background
Index: man/curs_mouse.3x
Prereq: 1.50
--- ncurses-6.1-20190706+/man/curs_mouse.3x 2018-12-29 23:40:47.000000000 +0000
+++ ncurses-6.1-20190713/man/curs_mouse.3x 2019-07-13 23:45:12.000000000 +0000
@@ -1,6 +1,6 @@
'\" t
.\"***************************************************************************
-.\" Copyright (c) 1998-2017,2018 Free Software Foundation, Inc. *
+.\" Copyright (c) 1998-2018,2019 Free Software Foundation, Inc. *
.\" *
.\" Permission is hereby granted, free of charge, to any person obtaining a *
.\" copy of this software and associated documentation files (the *
@@ -27,7 +27,7 @@
.\" authorization. *
.\"***************************************************************************
.\"
-.\" $Id: curs_mouse.3x,v 1.50 2018/12/29 23:40:47 tom Exp $
+.\" $Id: curs_mouse.3x,v 1.51 2019/07/13 23:45:12 tom Exp $
.ie \n(.g .ds `` \(lq
.el .ds `` ``
.ie \n(.g .ds '' \(rq
@@ -394,7 +394,7 @@
.PP
Mouse events under xterm will not be detected correctly in a window with
its keypad bit off, since they are interpreted as a variety of function key.
-Your terminfo description should have \fBkmous\fR set to "\\E[M"
+Your terminfo description should have \fBkmous\fR set to \*(``\\E[M\*(''
(the beginning of the response from xterm for mouse clicks).
Other values for \fBkmous\fR are permitted,
but under the same assumption,
@@ -402,11 +402,13 @@
.PP
Because there are no standard terminal responses that would serve to identify
terminals which support the xterm mouse protocol, \fBncurses\fR assumes that
-if your $TERM environment variable contains \*(``xterm\*('',
-or \fBkmous\fR is defined in
-the terminal description, then the terminal may send mouse events.
-The \fBkmous\fP capability is checked first, allowing the
-use of newer xterm mouse protocols.
+if \fBkmous\fR is defined in the terminal description,
+or if the terminal description's primary name or aliases
+contain the string \*(``xterm\*('',
+then the terminal may send mouse events.
+The \fBkmous\fP capability is checked first,
+allowing the use of newer xterm mouse protocols
+such as xterm's private mode 1006.
.SH SEE ALSO
\fBcurses\fR(3X),
\fBcurs_kernel\fR(3X),
Index: man/term.7
Prereq: 1.26
--- ncurses-6.1-20190706+/man/term.7 2018-07-28 22:19:56.000000000 +0000
+++ ncurses-6.1-20190713/man/term.7 2019-07-13 23:17:23.000000000 +0000
@@ -1,5 +1,5 @@
.\"***************************************************************************
-.\" Copyright (c) 1998-2017,2018 Free Software Foundation, Inc. *
+.\" Copyright (c) 1998-2018,2019 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: term.7,v 1.26 2018/07/28 22:19:56 tom Exp $
+.\" $Id: term.7,v 1.27 2019/07/13 23:17:23 tom Exp $
.TH term 7
.ie \n(.g .ds `` \(lq
.el .ds `` ``
@@ -190,7 +190,7 @@
Use visible bell (flash) rather than beep.
.TP 5
\-w
-Wide; terminal is in 132 column mode.
+Wide; terminal is in 132-column mode.
.PP
Conventionally, if your terminal type is a variant intended to specify a
line height, that suffix should go first.
Index: man/terminfo.head
Prereq: 1.35
--- ncurses-6.1-20190706+/man/terminfo.head 2018-07-28 22:29:09.000000000 +0000
+++ ncurses-6.1-20190713/man/terminfo.head 2019-07-13 23:17:33.000000000 +0000
@@ -1,5 +1,5 @@
.\"***************************************************************************
-.\" Copyright (c) 1998-2017,2018 Free Software Foundation, Inc. *
+.\" Copyright (c) 1998-2018,2019 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: terminfo.head,v 1.35 2018/07/28 22:29:09 tom Exp $
+.\" $Id: terminfo.head,v 1.36 2019/07/13 23:17:33 tom Exp $
.TH terminfo 5 "" "" "File Formats"
.ds n 5
.ds d @TERMINFO@
@@ -124,7 +124,7 @@
This name should not contain hyphens.
Modes that the hardware can be in, or user preferences, should
be indicated by appending a hyphen and a mode suffix.
-Thus, a vt100 in 132 column mode would be vt100\-w.
+Thus, a vt100 in 132-column mode would be vt100\-w.
The following suffixes should be used where possible:
.PP
.TS
Index: man/terminfo.tail
Prereq: 1.93
--- ncurses-6.1-20190706+/man/terminfo.tail 2019-06-01 22:32:15.000000000 +0000
+++ ncurses-6.1-20190713/man/terminfo.tail 2019-07-13 23:29:04.000000000 +0000
@@ -1,4 +1,4 @@
-.\" $Id: terminfo.tail,v 1.93 2019/06/01 22:32:15 tom Exp $
+.\" $Id: terminfo.tail,v 1.95 2019/07/13 23:29:04 tom Exp $
.\" Beginning of terminfo.tail file
.\" This file is part of ncurses.
.\" See "terminfo.head" for copyright.
@@ -1141,14 +1141,17 @@
.B iprog
.TP
output
-.B is1
-.B is2
+.br
+\fBis1\fP and
+.br
+\fBis2\fP
.TP
set the margins using
-.BR mgc ,
-.B smgl
-and
-.B smgr
+\fBmgc\fP or
+.br
+\fBsmglp\fP and \fBsmgrp\fP or
+.br
+\fBsmgl\fP and \fBsmgr\fP
.TP
set tabs using
.B tbc
@@ -1156,11 +1159,10 @@
.B hts
.TP
print the file
-.B if
+\fBif\fP
.TP
-and finally
-output
-.BR is3 .
+and finally output
+\fBis3\fP.
.RE
.PP
Most initialization is done with
@@ -1187,7 +1189,9 @@
and
.B is3
respectively.
-These strings are output by the \fB@RESET@\fP program
+These strings are output
+by \fIreset\fP option of \fB@TPUT@\fP,
+or by the \fB@RESET@\fP program
(an alias of \fB@TSET@\fP),
which is used when the terminal gets into a wedged state.
Commands are normally placed in
@@ -1202,7 +1206,7 @@
normally be part of
.BR is2 ,
but it causes an annoying glitch of the screen and is not normally
-needed since the terminal is usually already in 80 column mode.
+needed since the terminal is usually already in 80-column mode.
.PP
The \fB@RESET@\fP program writes strings including
.BR iprog ,
Index: package/debian-mingw/changelog
--- ncurses-6.1-20190706+/package/debian-mingw/changelog 2019-07-06 09:10:26.000000000 +0000
+++ ncurses-6.1-20190713/package/debian-mingw/changelog 2019-07-13 20:42:44.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20190706) unstable; urgency=low
+ncurses6 (6.1+20190713) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 06 Jul 2019 05:10:26 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 13 Jul 2019 16:42:44 -0400
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian-mingw64/changelog
--- ncurses-6.1-20190706+/package/debian-mingw64/changelog 2019-07-06 09:10:26.000000000 +0000
+++ ncurses-6.1-20190713/package/debian-mingw64/changelog 2019-07-13 20:42:44.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20190706) unstable; urgency=low
+ncurses6 (6.1+20190713) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 06 Jul 2019 05:10:26 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 13 Jul 2019 16:42:44 -0400
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian/changelog
--- ncurses-6.1-20190706+/package/debian/changelog 2019-07-06 09:10:26.000000000 +0000
+++ ncurses-6.1-20190713/package/debian/changelog 2019-07-13 20:42:44.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20190706) unstable; urgency=low
+ncurses6 (6.1+20190713) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 06 Jul 2019 05:10:26 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 13 Jul 2019 16:42:44 -0400
ncurses6 (5.9-20120608) unstable; urgency=low
Index: package/mingw-ncurses.nsi
Prereq: 1.339
--- ncurses-6.1-20190706+/package/mingw-ncurses.nsi 2019-07-06 09:10:26.000000000 +0000
+++ ncurses-6.1-20190713/package/mingw-ncurses.nsi 2019-07-13 20:42:44.000000000 +0000
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.339 2019/07/06 09:10:26 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.340 2019/07/13 20:42:44 tom Exp $
; TODO add examples
; TODO bump ABI to 6
@@ -10,7 +10,7 @@
!define VERSION_MAJOR "6"
!define VERSION_MINOR "1"
!define VERSION_YYYY "2019"
-!define VERSION_MMDD "0706"
+!define VERSION_MMDD "0713"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"
Index: package/mingw-ncurses.spec
--- ncurses-6.1-20190706+/package/mingw-ncurses.spec 2019-07-06 09:10:26.000000000 +0000
+++ ncurses-6.1-20190713/package/mingw-ncurses.spec 2019-07-13 20:42:44.000000000 +0000
@@ -3,7 +3,7 @@
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 6.1
-Release: 20190706
+Release: 20190713
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncurses.spec
--- ncurses-6.1-20190706+/package/ncurses.spec 2019-07-06 09:10:26.000000000 +0000
+++ ncurses-6.1-20190713/package/ncurses.spec 2019-07-13 20:42:44.000000000 +0000
@@ -1,7 +1,7 @@
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 6.1
-Release: 20190706
+Release: 20190713
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncursest.spec
--- ncurses-6.1-20190706+/package/ncursest.spec 2019-07-06 09:10:26.000000000 +0000
+++ ncurses-6.1-20190713/package/ncursest.spec 2019-07-13 20:42:44.000000000 +0000
@@ -1,7 +1,7 @@
Summary: Curses library with POSIX thread support.
Name: ncursest6
Version: 6.1
-Release: 20190706
+Release: 20190713
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: progs/reset_cmd.c
Prereq: 1.17
--- ncurses-6.1-20190706+/progs/reset_cmd.c 2019-05-25 22:36:53.000000000 +0000
+++ ncurses-6.1-20190713/progs/reset_cmd.c 2019-07-13 21:35:13.000000000 +0000
@@ -52,7 +52,7 @@
#include <sys/ptem.h>
#endif
-MODULE_ID("$Id: reset_cmd.c,v 1.17 2019/05/25 22:36:53 tom Exp $")
+MODULE_ID("$Id: reset_cmd.c,v 1.18 2019/07/13 21:35:13 tom Exp $")
/*
* SCO defines TIOCGSIZE and the corresponding struct. Other systems (SunOS,
@@ -495,6 +495,9 @@
? reset_2string
: init_2string);
+ if (VALID_STRING(clear_margins)) {
+ need_flush |= sent_string(clear_margins);
+ } else
#if defined(set_lr_margin)
if (VALID_STRING(set_lr_margin)) {
need_flush |= sent_string(TPARM_2(set_lr_margin, 0,
@@ -509,10 +512,8 @@
columns - 1));
} else
#endif
- if (VALID_STRING(clear_margins)
- && VALID_STRING(set_left_margin)
+ if (VALID_STRING(set_left_margin)
&& VALID_STRING(set_right_margin)) {
- need_flush |= sent_string(clear_margins);
need_flush |= to_left_margin();
need_flush |= sent_string(set_left_margin);
if (VALID_STRING(parm_right_cursor)) {
Index: test/padview.c
Prereq: 1.13
--- ncurses-6.1-20190706+/test/padview.c 2019-01-21 19:47:07.000000000 +0000
+++ ncurses-6.1-20190713/test/padview.c 2019-07-13 20:41:47.000000000 +0000
@@ -28,7 +28,7 @@
/*
* clone of view.c, using pads
*
- * $Id: padview.c,v 1.13 2019/01/21 19:47:07 tom Exp $
+ * $Id: padview.c,v 1.14 2019/07/13 20:41:47 tom Exp $
*/
#include <test.priv.h>
@@ -191,7 +191,7 @@
failed("cannot allocate pad workspace");
if (try_color) {
wattrset(my_pad, COLOR_PAIR(my_pair));
- wbkgd(my_pad, (chtype) COLOR_PAIR(my_pair));
+ wbkgd(my_pad, (chtype) (' ' | COLOR_PAIR(my_pair)));
}
/*
@@ -347,18 +347,22 @@
nodelay(stdscr, TRUE);
idlok(stdscr, TRUE); /* allow use of insert/delete line */
- my_pad = read_file(fname = argv[optind]);
-
if (try_color) {
if (has_colors()) {
start_color();
init_pair(my_pair, COLOR_WHITE, COLOR_BLUE);
- bkgd((chtype) COLOR_PAIR(my_pair));
+ bkgd((chtype) (' ' | COLOR_PAIR(my_pair)));
} else {
try_color = FALSE;
}
}
+ /*
+ * Do this after starting color, otherwise the pad's background will be
+ * uncolored after the ncurses 6.1.20181208 fixes.
+ */
+ my_pad = read_file(fname = argv[optind]);
+
my_row = 0;
while (!done) {
int n, c;

1437
ncurses-6.1-20190720.patch
View File

File diff suppressed because it is too large Load Diff

4133
ncurses-6.1-20190727.patch
View File

File diff suppressed because it is too large Load Diff

1319
ncurses-6.1-20190728.patch
View File

File diff suppressed because it is too large Load Diff

657
ncurses-6.1-20190803.patch
View File

@ -1,657 +0,0 @@
# ncurses 6.1 - patch 20190803 - Thomas E. Dickey
#
# ------------------------------------------------------------------------------
#
# Ncurses 6.1 is at
# ftp.gnu.org:/pub/gnu
#
# Patches for ncurses 6.1 can be found at
# ftp://ftp.invisible-island.net/ncurses/6.1
# http://invisible-mirror.net/archives/ncurses/6.1
#
# ------------------------------------------------------------------------------
# ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20190803.patch.gz
# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created Sun Aug 4 00:24:33 UTC 2019
# ------------------------------------------------------------------------------
# NEWS | 13 ++-
# VERSION | 2
# dist.mk | 4
# misc/terminfo.src | 155 +++++++++++++++++++++----------------
# ncurses/base/lib_scroll.c | 14 +--
# ncurses/tinfo/parse_entry.c | 7 +
# 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
# package/ncursest.spec | 2
# 13 files changed, 130 insertions(+), 87 deletions(-)
# ------------------------------------------------------------------------------
Index: NEWS
Prereq: 1.3356
--- ncurses-6.1-20190728+/NEWS 2019-07-28 18:49:10.000000000 +0000
+++ ncurses-6.1-20190803/NEWS 2019-08-03 22:31:47.000000000 +0000
@@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3356 2019/07/28 18:49:10 tom Exp $
+-- $Id: NEWS,v 1.3359 2019/08/03 22:31:47 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
@@ -45,6 +45,17 @@
Changes through 1.9.9e did not credit all contributions;
it is not possible to add this information.
+20190803
+ + improve loop limits in _nc_scroll_window() to handle a case where
+ the scrolled data is a pad which is taller than the window (patch
+ by Rob King).
+ + amend the change to screen, because tmux relies upon that entry
+ and does not support that feature (Debian #933572) -TD
+ + updated ms-terminal entry & notes -TD
+ + updated kitty entry & notes -TD
+ + updated alacritty+common entry & notes -TD
+ + use xterm+sl-twm for consistency -TD
+
20190728
+ fix a few more coverity warnings.
+ more documentation updates based on tctest.
Index: VERSION
--- ncurses-6.1-20190728+/VERSION 2019-07-28 10:39:10.000000000 +0000
+++ ncurses-6.1-20190803/VERSION 2019-08-03 13:57:42.000000000 +0000
@@ -1 +1 @@
-5:0:10 6.1 20190728
+5:0:10 6.1 20190803
Index: dist.mk
Prereq: 1.1298
--- ncurses-6.1-20190728+/dist.mk 2019-07-28 10:39:10.000000000 +0000
+++ ncurses-6.1-20190803/dist.mk 2019-08-03 13:57:42.000000000 +0000
@@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.1298 2019/07/28 10:39:10 tom Exp $
+# $Id: dist.mk,v 1.1299 2019/08/03 13:57: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 = 1
-NCURSES_PATCH = 20190728
+NCURSES_PATCH = 20190803
# 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.1-20190728+/misc/terminfo.src 2019-07-06 20:35:26.000000000 +0000
+++ ncurses-6.1-20190803/misc/terminfo.src 2019-08-03 21:42:15.000000000 +0000
@@ -6,8 +6,8 @@
# Report bugs and new terminal descriptions to
# bug-ncurses@gnu.org
#
-# $Revision: 1.757 $
-# $Date: 2019/07/06 20:35:26 $
+# $Revision: 1.763 $
+# $Date: 2019/08/03 21:42:15 $
#
# 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
@@ -4223,8 +4223,9 @@
ms-vt-utf8|vt-utf8|UTF-8 flavor of vt100+,
use=ms-vt100+,
+# Windows Terminal (Preview)
# Windows 10 1903
-# Version 0.2.1715.0
+# Version 0.2.1831.0
# https://github.com/microsoft/terminal
#
# The task manager shows this as "OpenConsole.exe", which differs
@@ -4239,10 +4240,12 @@
# fail in vttest, which does not pay attention to TERM.
# vttest:
# - menu 1 (tests for cursor movement) misbehaves like command-prompt
+# - primary DA says this is a vanilla VT100
# - does not flush response to primary DA, leaving a ^M on the end when
-# The PowerShell tab is used. Both the "Legacy" tab and the command-prompt
+# the PowerShell tab is used. Both the "Legacy" tab and the command-prompt
# work properly in this test.
-# - in the generic VT100 tests, there are problems with character sets.
+# - in the generic VT100 tests, there are problems with character sets
+# (diamond shows as a double-width character, DEL as two replacement-chars).
# - outside of the generic VT100 tests, the program does poorly because most
# of the features are missing.
# - ECH does not work properly
@@ -4257,11 +4260,14 @@
# or simply incorrect
# - sends escape+key rather than implementing meta mode
# other:
-# - color palette cannot be altered
+# - color palette can be altered, but OSC 104 for resetting does not work
+# - crashed with a script used for testing NRCS.
+# - does not recognize either xterm+direct or xterm+indirect escapes.
ms-terminal|Windows10 terminal,
npc,
rmkx=\E[?1l, rmm@, smkx=\E[?1h, smm@, use=xterm+256setaf,
- use=xterm+pcfkeys, use=xterm-basic,
+ use=xterm+pcfkeys, use=ansi+rep, use=ecma+index,
+ use=xterm-basic,
#### Visual Studio
# Visual Studio Code 1.35.1 uses xterm.js (see https://xtermjs.org/).
@@ -6847,6 +6853,7 @@
#### Alacritty
# https://github.com/jwilm/alacritty
+# Version 0.3.3 (2019/08/03)
# Version 0.2.1 (2018/10/03)
# Project started in 2016/02, uses Rust and OpenGL, and in contrast to (most X
# terminal programs) is not designed to run with a remote server.
@@ -6854,21 +6861,24 @@
# Packaged in Arch Linux -
# vttest:
# initial screensize 24x80
-# does not switch between 80/132 columns
-# passes wrapping test
-# identifies as a vt100
+# no DECCOLM (does not switch between 80/132 columns)
+# otherwise, passes wrapping test
+# no DECSCNM
+# identifies as a vt102
# passes bce test
# vt220:
-# fails ECH, leaving text on right margin
+# ECH works (0.2.1 left text on right margin)
# no SRM, DECSCA
# vt320:
# fails DECXCPR
# does not implement any of the DECRQM/DECRPM controls
# does not implement any of the DECRQSS controls
# vt420:
+# no DECLRMM
# no DECBI, DECFI
# other:
-# fails REP, SL, SR
+# fails CHT, otherwise ECMA-48 cursor movement ok
+# fails ERM/SPA, SL, SR, passes REP, SD, SU
# xterm:
# no X10 mouse
# has normal and highlight mouse
@@ -6876,9 +6886,9 @@
# cursor-position wrong after alternate-screen
# none of the dtterm controls work
# tack:
-# bell and flash do not work (perhaps Parallels problem)
-# italics works; crossed-out does not
-# function-keys work up to kf36; window manager interferes with remainder
+# bell and flash do not work
+# italics and crossed-out work (latter did not work in 0.2.1)
+# function-keys work up to kf36; those using two modifiers do not work
#
# The program sources include "alacritty" and "alacritty-direct", which are
# copied from "xterm-256color" and "xterm-direct" (but using semicolon for
@@ -6891,18 +6901,19 @@
use=xterm+indirect, use=alacritty+common,
# removed ech, since it fails vttest -TD
-# removed ecma+strikeout, not implemented -TD
+# added ecma+strikeout in 0.3.3 -TD
+# added xterm+sl-twm in 0.3.3 -TD
alacritty+common|base fragment for alacritty,
npc,
- ech@, kb2=\EOE, kbs=^H, kcbt=\E[Z, kent=\EOM, Se=\E[0 q,
+ ech@, kb2=\EOE, kbs=^?, kcbt=\E[Z, kent=\EOM, Se=\E[0 q,
use=ecma+index, use=xterm-basic, use=xterm+app,
use=ansi+rep, use=xterm+sm+1006, use=xterm+tmux,
- use=ecma+italics, use=xterm+pce2, use=xterm+pcc2,
- use=xterm+pcf2,
+ use=ecma+strikeout, use=xterm+sl-twm, use=ecma+italics,
+ use=xterm+pce2, use=xterm+pcc2, use=xterm+pcf2,
#### Kitty
# https://github.com/kovidgoyal/kitty
-# Version 0.12.3
+# Version 0.13.3
# Project started in 2016/10 (see alacritty), but is a Python script rather
# than Rust, using OpenGL. The same caveats regarding remote connections
# apply. This is not an X terminal, though (like alacritty), it copies
@@ -6959,8 +6970,10 @@
# no mouse-highlight tracking
# no DEC locator
# dtterm - only supports report-size chars/pixels
+# recognizes tcap-query
# tack:
# flash doesn't work
+# italics do not work
# bce should be set (but see vttest)
#* developer's terminfo stopped at kf25, but the program continues,
# copying xterm for the rest of the control+fkey sequence
@@ -6971,6 +6984,7 @@
# act like xterm for the editing/cursor-keys, e.g., alt+shift. While
# the implementation is incomplete, the building-blocks are consistent
# with what has been implemented -TD
+# DECKPAM does not work -TD
#* ka1, ka3, kc1, kc3 were bogus (removed)
#* meta sends escape (removed kmm) -TD
#* cvvis does not make cursor "more visible" -TD
@@ -6988,8 +7002,8 @@
csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
- dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M,
- ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
+ dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, dl=\E[%p1%dM,
+ dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
flash=\E[?5h$<100/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG,
ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L,
ind=\n, kbs=^?, kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB,
@@ -7007,13 +7021,13 @@
knp=\E[6~, kpp=\E[5~, kri=\E[1;2A, op=\E[39;49m, rc=\E8,
rev=\E[7m, ri=\EM, rmacs=\E(B, rmam=\E[?7l, rmir=\E[4l,
rmkx=\E[?1l, rmso=\E[27m, rmul=\E[24m, rs1=\Ec, sc=\E7,
- sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|
- %t;7%;;m,
+ sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;
+ %?%p1%p3%|%t;7%;m,
sgr0=\E(B\E[m, smacs=\E(0, smam=\E[?7h, smir=\E[4h,
smkx=\E[?1h, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
vpa=\E[%i%p1%dd, use=ecma+index, use=xterm+sl-twm,
- use=xterm+pce2, use=xterm+pcc2, use=ecma+italics,
- use=xterm+alt1049,
+ use=ecma+strikeout, use=xterm+pce2, use=xterm+pcc2,
+ use=ecma+italics, use=xterm+alt1049,
######## WEB CLIENTS
@@ -7221,6 +7235,12 @@
# the other capabilities will confuse screen. Curses applications which use
# sgr are not impacted (because that usually resets all capabilities before
# setting any), but termcap applications do not use sgr -TD
+#
+# The "screen" entry should use ecma+index rather than just indn, but tmux
+# defaults to using "screen". For background, screen supported ecma+index
+# since 1994 (i.e., screen 3.0.5), stating that it was an obscure code used by
+# the (Siemens Nixdorf) 97801 terminal. It was not shown in the termcap or
+# terminfo entries (which list about 60% of the control sequences).
screen|VT 100/ANSI X3.64 virtual terminal,
OTbs, OTpt, am, km, mir, msgr, xenl, G0,
colors#8, cols#80, it#8, lines#24, ncv@, pairs#64, U8#1,
@@ -7235,27 +7255,27 @@
dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K,
enacs=\E(B\E)0, flash=\Eg, home=\E[H, hpa=\E[%i%p1%dG,
ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L,
- ind=\n, is2=\E)0, kbs=^H, kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB,
- kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3~, kend=\E[4~, kf1=\EOP,
- kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR,
- kf4=\EOS, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~,
- kf9=\E[20~, khome=\E[1~, kich1=\E[2~, kmous=\E[M,
- knp=\E[6~, kpp=\E[5~, nel=\EE, rc=\E8, rev=\E[7m, ri=\EM,
- rmacs=^O, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[23m,
- rmul=\E[24m, rs2=\Ec\E[?1000l\E[?25h, sc=\E7,
+ ind=\n, indn=\E[%p1%dS, is2=\E)0, kbs=^H, kcbt=\E[Z,
+ kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+ kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~,
+ kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
+ kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
+ khome=\E[1~, kich1=\E[2~, kmous=\E[M, knp=\E[6~, kpp=\E[5~,
+ nel=\EE, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O, rmir=\E[4l,
+ rmkx=\E[?1l\E>, rmso=\E[23m, rmul=\E[24m,
+ rs2=\Ec\E[?1000l\E[?25h, sc=\E7,
sgr=\E[0%?%p6%t;1%;%?%p1%t;3%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;
5%;%?%p5%t;2%;m%?%p9%t\016%e\017%;,
sgr0=\E[m\017, smacs=^N, smir=\E[4h, smkx=\E[?1h\E=,
smso=\E[3m, smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd,
- E0=\E(B, S0=\E(%p1%c, use=ecma+index, use=xterm+alt1049,
- use=ecma+color,
+ E0=\E(B, S0=\E(%p1%c, use=xterm+alt1049, use=ecma+color,
# The bce and status-line entries are from screen 3.9.13 (and require some
# changes to .screenrc).
screen-bce|VT 100/ANSI X3.64 virtual terminal with bce,
bce,
- ech@, use=screen,
+ ech@, use=screen4,
screen-s|VT 100/ANSI X3.64 virtual terminal with hardstatus line,
- dsl=\E_\E\\, fsl=\E\\, tsl=\E_, use=screen,
+ dsl=\E_\E\\, fsl=\E\\, tsl=\E_, use=screen4,
# ======================================================================
# Entries for GNU Screen with 16 colors.
@@ -7266,7 +7286,7 @@
# do all support 16 color palette.
screen-16color|GNU Screen with 16 colors,
- use=ibm+16color, use=screen,
+ use=ibm+16color, use=screen4,
screen-16color-s|GNU Screen with 16 colors and status line,
use=ibm+16color, use=screen-s,
@@ -7281,7 +7301,7 @@
# Entries for GNU Screen 4.02 with --enable-colors256.
screen-256color|GNU Screen with 256 colors,
- use=xterm+256setaf, use=screen,
+ use=xterm+256setaf, use=screen4,
screen-256color-s|GNU Screen with 256 colors and status line,
use=xterm+256setaf, use=screen-s,
@@ -7367,14 +7387,14 @@
acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260i
\316j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u
\264v\301w\302x\263y\363z\362{\343|\330}\234~\376,
- use=screen+fkeys, use=xterm+x11mouse, use=screen,
+ use=screen+fkeys, use=xterm+x11mouse, use=screen4,
# Other terminals
screen.rxvt|screen in rxvt,
bw, XT,
cvvis@, flash@, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC,
kcuu1=\EOA, use=screen+fkeys, use=vt100+enq,
use=rxvt+pcfkeys, use=xterm+x11mouse, use=vt220+keypad,
- use=screen,
+ use=screen4,
screen.Eterm|screen in Eterm,
use=xterm+x11mouse, use=screen+fkeys, use=Eterm,
screen.mrxvt|screen in mrxvt,
@@ -7392,7 +7412,7 @@
screen.linux|screen in linux console,
bw,
kbs=^?, kcbt@, use=xterm+x11mouse, use=screen+fkeys,
- use=screen,
+ use=screen4,
screen.mlterm|screen in mlterm,
use=xterm+x11mouse, use=screen+fkeys, use=mlterm,
screen.putty|screen in putty,
@@ -7434,7 +7454,7 @@
ech@, use=screen.linux,
screen-w|VT 100/ANSI X3.64 virtual terminal with 132 cols,
- cols#132, use=screen,
+ cols#132, use=screen4,
screen2|old VT 100/ANSI X3.64 virtual terminal,
cols#80, it#8, lines#24,
@@ -7470,7 +7490,7 @@
# was last updated in 2009 to include 256-color support. The most recent
# release is 4.6.2 (October 2017).
screen4|VT 100/ANSI X3.64 virtual terminal,
- use=screen,
+ use=ecma+index, use=screen,
# As of March 2019, screen 5.0 has not been released.
#
@@ -7488,7 +7508,7 @@
rmso=\E[27m,
sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?
%p5%t;2%;m%?%p9%t\016%e\017%;,
- smso=\E[7m, use=ecma+italics, use=screen,
+ smso=\E[7m, use=ecma+italics, use=screen4,
#### Tmux
@@ -20670,7 +20690,7 @@
yzz||}}~~,
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=xterm+x11mouse, use=screen,
+ use=xterm+x11mouse, use=screen4,
screen.minitel1b|Screen specific for minitel1b,
kclr=\E[2J, kdl1=\E[M, kf13=^Y{1, kf14=^Y{2, kf15=^Y{3,
@@ -20798,7 +20818,7 @@
\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
\n\n\n\n\n\n\n\n\n\n,
- use=xterm+x11mouse, use=screen,
+ use=xterm+x11mouse, use=screen4,
screen.linux-m1b|Linux m1b specific for screen,
colors@, pairs@,
@@ -20813,30 +20833,29 @@
putty-m1|Putty Minitel 1 "like" Couleurs,
hs,
- dim@, dsl=\E]2;\007, fsl=^G, kf1=\E[11~, kf2=\E[12~,
- kf3=\E[13~, kf4=\E[14~, kf5=\E[15~,
- rmcup=\E[2J\E[?47l\E8, rmul=\E[24m, smcup=\E7\E[?47h,
- smul=\E[4m, tsl=\E]2;, .E3=\E[300S, .WS=\E[8;%d;%dt,
- Z0=\E[?3h, Z1=\E[?3l, use=ecma+index, use=linux-m1,
+ dim@, kf1=\E[11~, kf2=\E[12~, kf3=\E[13~, kf4=\E[14~,
+ kf5=\E[15~, rmcup=\E[2J\E[?47l\E8, rmul=\E[24m,
+ smcup=\E7\E[?47h, smul=\E[4m, .E3=\E[300S,
+ .WS=\E[8;%d;%dt, Z0=\E[?3h, Z1=\E[?3l, use=xterm+sl-twm,
+ use=ecma+index, use=linux-m1,
putty-m1b|Putty Minitel 1B "like" Monochrome (Gris/Blanc/Noir),
hs,
- dim@, dsl=\E]2;\007, fsl=^G, kf1=\E[11~, kf2=\E[12~,
- kf3=\E[13~, kf4=\E[14~, kf5=\E[15~,
- rmcup=\E[2J\E[?47l\E8, rmul=\E[24m, smcup=\E7\E[?47h,
- smul=\E[4m, tsl=\E]2;, .E3=\E[300S, .WS=\E[8;%d;%dt,
- Z0=\E[?3h, Z1=\E[?3l, use=ecma+index, use=linux-m1b,
+ dim@, kf1=\E[11~, kf2=\E[12~, kf3=\E[13~, kf4=\E[14~,
+ kf5=\E[15~, rmcup=\E[2J\E[?47l\E8, rmul=\E[24m,
+ smcup=\E7\E[?47h, smul=\E[4m, .E3=\E[300S,
+ .WS=\E[8;%d;%dt, Z0=\E[?3h, Z1=\E[?3l, use=xterm+sl-twm,
+ use=ecma+index, use=linux-m1b,
putty-m2|Putty Minitel 2 "like" Couleurs (Vert/Blanc/Noir),
hs,
acsc=``aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{
{||}}~~,
- dim@, dsl=\E]2;\007, fsl=^G, kf1=\E[11~, kf2=\E[12~,
- kf3=\E[13~, kf4=\E[14~, kf5=\E[15~,
- rmcup=\E[2J\E[?47l\E8, rmul=\E[24m, smcup=\E7\E[?47h,
- smul=\E[4m, tsl=\E]2;, .E3=\E[300S, .WS=\E[8;%d;%dt,
- Z0=\E[?3h, Z1=\E[?3l, use=ecma+index, use=linux-m2,
-
+ dim@, kf1=\E[11~, kf2=\E[12~, kf3=\E[13~, kf4=\E[14~,
+ kf5=\E[15~, rmcup=\E[2J\E[?47l\E8, rmul=\E[24m,
+ smcup=\E7\E[?47h, smul=\E[4m, .E3=\E[300S,
+ .WS=\E[8;%d;%dt, Z0=\E[?3h, Z1=\E[?3l, use=xterm+sl-twm,
+ use=ecma+index, use=linux-m2,
screen.putty-m1|Putty m1 specific for screen,
dim@, rmul=\E[24m, smul=\E[4m, E3@, use=screen.linux-m1,
@@ -26345,4 +26364,12 @@
# + add domterm -TD
# + improve comments for recent changes, add alias xterm.js -TD
#
+# 2019-08-03
+# + amend the change to screen, because tmux relies upon that entry
+# and does not support that feature (Debian #933572) -TD
+# + updated ms-terminal entry & notes -TD
+# + updated kitty entry & notes -TD
+# + updated alacritty+common entry & notes -TD
+# + use xterm+sl-twm for consistency -TD
+#
######## SHANTIH! SHANTIH! SHANTIH!
Index: ncurses/base/lib_scroll.c
Prereq: 1.29
--- ncurses-6.1-20190728+/ncurses/base/lib_scroll.c 2011-10-22 16:34:50.000000000 +0000
+++ ncurses-6.1-20190803/ncurses/base/lib_scroll.c 2019-08-03 22:27:55.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2011,2019 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 @@
#include <curses.priv.h>
-MODULE_ID("$Id: lib_scroll.c,v 1.29 2011/10/22 16:34:50 tom Exp $")
+MODULE_ID("$Id: lib_scroll.c,v 1.31 2019/08/03 22:27:55 tom Exp $")
NCURSES_EXPORT(void)
_nc_scroll_window(WINDOW *win,
@@ -77,11 +77,13 @@
* setup cost. So there is no point in trying to be excessively
* clever -- esr.
*/
+#define BottomLimit(n) ((n) >= 0 && (n) >= top)
+#define TopLimit(n) ((n) <= win->_maxy && (n) <= bottom)
/* shift n lines downwards */
if (n < 0) {
limit = top - n;
- for (line = bottom; line >= limit && line >= 0; line--) {
+ for (line = bottom; line >= limit && BottomLimit(line); line--) {
TR(TRACE_MOVE, ("...copying %d to %d", line + n, line));
memcpy(win->_line[line].text,
win->_line[line + n].text,
@@ -89,7 +91,7 @@
if_USE_SCROLL_HINTS(win->_line[line].oldindex =
win->_line[line + n].oldindex);
}
- for (line = top; line < limit && line <= win->_maxy; line++) {
+ for (line = top; line < limit && TopLimit(line); line++) {
TR(TRACE_MOVE, ("...filling %d", line));
for (j = 0; j <= win->_maxx; j++)
win->_line[line].text[j] = blank;
@@ -100,14 +102,14 @@
/* shift n lines upwards */
if (n > 0) {
limit = bottom - n;
- for (line = top; line <= limit && line <= win->_maxy; line++) {
+ for (line = top; line <= limit && TopLimit(line); line++) {
memcpy(win->_line[line].text,
win->_line[line + n].text,
to_copy);
if_USE_SCROLL_HINTS(win->_line[line].oldindex =
win->_line[line + n].oldindex);
}
- for (line = bottom; line > limit && line >= 0; line--) {
+ for (line = bottom; line > limit && BottomLimit(line); line--) {
for (j = 0; j <= win->_maxx; j++)
win->_line[line].text[j] = blank;
if_USE_SCROLL_HINTS(win->_line[line].oldindex = _NEWINDEX);
Index: ncurses/tinfo/parse_entry.c
Prereq: 1.96
--- ncurses-6.1-20190728+/ncurses/tinfo/parse_entry.c 2019-03-16 23:31:40.000000000 +0000
+++ ncurses-6.1-20190803/ncurses/tinfo/parse_entry.c 2019-08-03 23:10:38.000000000 +0000
@@ -47,7 +47,7 @@
#include <ctype.h>
#include <tic.h>
-MODULE_ID("$Id: parse_entry.c,v 1.96 2019/03/16 23:31:40 tom Exp $")
+MODULE_ID("$Id: parse_entry.c,v 1.97 2019/08/03 23:10:38 tom Exp $")
#ifdef LINT
static short const parametrized[] =
@@ -530,9 +530,12 @@
break;
case NUMBER:
+#if !NCURSES_EXT_NUMBERS
if (_nc_curr_token.tk_valnumber > MAX_NUMBER) {
entryp->tterm.Numbers[entry_ptr->nte_index] = MAX_NUMBER;
- } else {
+ } else
+#endif
+ {
entryp->tterm.Numbers[entry_ptr->nte_index] =
(NCURSES_INT2) _nc_curr_token.tk_valnumber;
}
Index: package/debian-mingw/changelog
--- ncurses-6.1-20190728+/package/debian-mingw/changelog 2019-07-28 10:39:10.000000000 +0000
+++ ncurses-6.1-20190803/package/debian-mingw/changelog 2019-08-03 13:57:42.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20190728) unstable; urgency=low
+ncurses6 (6.1+20190803) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sun, 28 Jul 2019 06:39:10 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 03 Aug 2019 09:57:42 -0400
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian-mingw64/changelog
--- ncurses-6.1-20190728+/package/debian-mingw64/changelog 2019-07-28 10:39:10.000000000 +0000
+++ ncurses-6.1-20190803/package/debian-mingw64/changelog 2019-08-03 13:57:42.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20190728) unstable; urgency=low
+ncurses6 (6.1+20190803) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sun, 28 Jul 2019 06:39:10 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 03 Aug 2019 09:57:42 -0400
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian/changelog
--- ncurses-6.1-20190728+/package/debian/changelog 2019-07-28 10:39:10.000000000 +0000
+++ ncurses-6.1-20190803/package/debian/changelog 2019-08-03 13:57:42.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20190728) unstable; urgency=low
+ncurses6 (6.1+20190803) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sun, 28 Jul 2019 06:39:10 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 03 Aug 2019 09:57:42 -0400
ncurses6 (5.9-20120608) unstable; urgency=low
Index: package/mingw-ncurses.nsi
Prereq: 1.344
--- ncurses-6.1-20190728+/package/mingw-ncurses.nsi 2019-07-28 10:39:10.000000000 +0000
+++ ncurses-6.1-20190803/package/mingw-ncurses.nsi 2019-08-03 13:57:42.000000000 +0000
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.344 2019/07/28 10:39:10 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.345 2019/08/03 13:57:42 tom Exp $
; TODO add examples
; TODO bump ABI to 6
@@ -10,7 +10,7 @@
!define VERSION_MAJOR "6"
!define VERSION_MINOR "1"
!define VERSION_YYYY "2019"
-!define VERSION_MMDD "0728"
+!define VERSION_MMDD "0803"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"
Index: package/mingw-ncurses.spec
--- ncurses-6.1-20190728+/package/mingw-ncurses.spec 2019-07-28 10:39:10.000000000 +0000
+++ ncurses-6.1-20190803/package/mingw-ncurses.spec 2019-08-03 13:57:42.000000000 +0000
@@ -3,7 +3,7 @@
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 6.1
-Release: 20190728
+Release: 20190803
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncurses.spec
--- ncurses-6.1-20190728+/package/ncurses.spec 2019-07-28 10:39:10.000000000 +0000
+++ ncurses-6.1-20190803/package/ncurses.spec 2019-08-03 13:57:42.000000000 +0000
@@ -1,7 +1,7 @@
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 6.1
-Release: 20190728
+Release: 20190803
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncursest.spec
--- ncurses-6.1-20190728+/package/ncursest.spec 2019-07-28 10:39:10.000000000 +0000
+++ ncurses-6.1-20190803/package/ncursest.spec 2019-08-03 13:57:42.000000000 +0000
@@ -1,7 +1,7 @@
Summary: Curses library with POSIX thread support.
Name: ncursest6
Version: 6.1
-Release: 20190728
+Release: 20190803
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz

413
ncurses-6.1-20190810.patch
View File

@ -1,413 +0,0 @@
# ncurses 6.1 - patch 20190810 - Thomas E. Dickey
#
# ------------------------------------------------------------------------------
#
# Ncurses 6.1 is at
# ftp.gnu.org:/pub/gnu
#
# Patches for ncurses 6.1 can be found at
# ftp://ftp.invisible-island.net/ncurses/6.1
# http://invisible-mirror.net/archives/ncurses/6.1
#
# ------------------------------------------------------------------------------
# ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20190810.patch.gz
# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created Sat Aug 10 23:58:30 UTC 2019
# ------------------------------------------------------------------------------
# NEWS | 5 +++-
# VERSION | 2 -
# dist.mk | 4 +--
# ncurses/base/lib_mouse.c | 4 +--
# ncurses/tinfo/lib_setup.c | 33 +++++++++++++++++---------------
# ncurses/tinfo/tinfo_driver.c | 38 ++++++++++++++++++++++---------------
# 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 -
# package/ncursest.spec | 2 -
# test/demo_menus.c | 5 +++-
# test/ncurses.c | 12 +++++++++--
# 15 files changed, 75 insertions(+), 50 deletions(-)
# ------------------------------------------------------------------------------
Index: NEWS
Prereq: 1.3359
--- ncurses-6.1-20190803+/NEWS 2019-08-03 22:31:47.000000000 +0000
+++ ncurses-6.1-20190810/NEWS 2019-08-10 19:05:52.000000000 +0000
@@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3359 2019/08/03 22:31:47 tom Exp $
+-- $Id: NEWS,v 1.3361 2019/08/10 19:05:52 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.
+20190810
+ + fix a few more coverity warnings.
+
20190803
+ improve loop limits in _nc_scroll_window() to handle a case where
the scrolled data is a pad which is taller than the window (patch
Index: VERSION
--- ncurses-6.1-20190803+/VERSION 2019-08-03 13:57:42.000000000 +0000
+++ ncurses-6.1-20190810/VERSION 2019-08-10 12:52:53.000000000 +0000
@@ -1 +1 @@
-5:0:10 6.1 20190803
+5:0:10 6.1 20190810
Index: dist.mk
Prereq: 1.1299
--- ncurses-6.1-20190803+/dist.mk 2019-08-03 13:57:42.000000000 +0000
+++ ncurses-6.1-20190810/dist.mk 2019-08-10 12:52:53.000000000 +0000
@@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.1299 2019/08/03 13:57:42 tom Exp $
+# $Id: dist.mk,v 1.1300 2019/08/10 12:52:53 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 = 1
-NCURSES_PATCH = 20190803
+NCURSES_PATCH = 20190810
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
Index: ncurses/base/lib_mouse.c
Prereq: 1.182
--- ncurses-6.1-20190803+/ncurses/base/lib_mouse.c 2019-07-20 20:42:43.000000000 +0000
+++ ncurses-6.1-20190810/ncurses/base/lib_mouse.c 2019-08-10 17:11:50.000000000 +0000
@@ -84,7 +84,7 @@
#define CUR SP_TERMTYPE
#endif
-MODULE_ID("$Id: lib_mouse.c,v 1.182 2019/07/20 20:42:43 tom Exp $")
+MODULE_ID("$Id: lib_mouse.c,v 1.183 2019/08/10 17:11:50 tom Exp $")
#include <tic.h>
@@ -438,7 +438,7 @@
#if USE_WEAK_SYMBOLS
/* Danger Robinson: do not use dlopen for libgpm if already loaded */
- if ((Gpm_Wgetch)) {
+ if ((Gpm_Wgetch) != 0) {
if (!sp->_mouse_gpm_loaded) {
T(("GPM library was already dlopen'd, not by us"));
}
Index: ncurses/tinfo/lib_setup.c
Prereq: 1.202
--- ncurses-6.1-20190803+/ncurses/tinfo/lib_setup.c 2019-07-28 19:33:40.000000000 +0000
+++ ncurses-6.1-20190810/ncurses/tinfo/lib_setup.c 2019-08-10 17:08:00.000000000 +0000
@@ -48,7 +48,7 @@
#include <locale.h>
#endif
-MODULE_ID("$Id: lib_setup.c,v 1.202 2019/07/28 19:33:40 tom Exp $")
+MODULE_ID("$Id: lib_setup.c,v 1.204 2019/08/10 17:08:00 tom Exp $")
/****************************************************************************
*
@@ -446,23 +446,24 @@
int old_cols = columns;
#endif
- TINFO_GET_SIZE(sp, sp->_term, &new_lines, &new_cols);
-
- /*
- * See is_term_resized() and resizeterm().
- * We're doing it this way because those functions belong to the upper
- * ncurses library, while this resides in the lower terminfo library.
- */
- if (sp != 0 && sp->_resize != 0) {
- if ((new_lines != old_lines) || (new_cols != old_cols)) {
- sp->_resize(NCURSES_SP_ARGx new_lines, new_cols);
- } else if (sp->_sig_winch && (sp->_ungetch != 0)) {
- sp->_ungetch(SP_PARM, KEY_RESIZE); /* so application can know this */
+ if (sp != 0) {
+ TINFO_GET_SIZE(sp, sp->_term, &new_lines, &new_cols);
+ /*
+ * See is_term_resized() and resizeterm().
+ * We're doing it this way because those functions belong to the upper
+ * ncurses library, while this resides in the lower terminfo library.
+ */
+ if (sp->_resize != 0) {
+ if ((new_lines != old_lines) || (new_cols != old_cols)) {
+ sp->_resize(NCURSES_SP_ARGx new_lines, new_cols);
+ } else if (sp->_sig_winch && (sp->_ungetch != 0)) {
+ sp->_ungetch(SP_PARM, KEY_RESIZE); /* so application can know this */
+ }
+ sp->_sig_winch = FALSE;
}
- sp->_sig_winch = FALSE;
}
}
-#endif
+#endif /* USE_SIZECHANGE */
/****************************************************************************
*
@@ -776,6 +777,8 @@
} else if (status == TGETENT_NO) {
ret_error1(status, "unknown terminal type.\n",
myname, free(myname));
+ } else {
+ ret_error0(status, "unexpected return-code\n");
}
}
#if NCURSES_EXT_NUMBERS
Index: ncurses/tinfo/tinfo_driver.c
Prereq: 1.64
--- ncurses-6.1-20190803+/ncurses/tinfo/tinfo_driver.c 2019-07-28 18:43:09.000000000 +0000
+++ ncurses-6.1-20190810/ncurses/tinfo/tinfo_driver.c 2019-08-10 18:36:08.000000000 +0000
@@ -51,7 +51,7 @@
# endif
#endif
-MODULE_ID("$Id: tinfo_driver.c,v 1.64 2019/07/28 18:43:09 tom Exp $")
+MODULE_ID("$Id: tinfo_driver.c,v 1.66 2019/08/10 18:36:08 tom Exp $")
/*
* SCO defines TIOCGSIZE and the corresponding struct. Other systems (SunOS,
@@ -188,6 +188,8 @@
} else if (status == TGETENT_NO) {
ret_error1(status, "unknown terminal type.\n",
tname, NO_COPY);
+ } else {
+ ret_error0(status, "unexpected return-code\n");
}
}
result = TRUE;
@@ -1340,23 +1342,29 @@
unsigned ch = (unsigned) c;
if (flag) {
while ((s = _nc_expand_try(sp->_key_ok,
- ch, &count, (size_t) 0)) != 0
- && _nc_remove_key(&(sp->_key_ok), ch)) {
- code = _nc_add_to_try(&(sp->_keytry), s, ch);
- free(s);
- count = 0;
- if (code != OK)
- break;
+ ch, &count, (size_t) 0)) != 0) {
+ if (_nc_remove_key(&(sp->_key_ok), ch)) {
+ code = _nc_add_to_try(&(sp->_keytry), s, ch);
+ free(s);
+ count = 0;
+ if (code != OK)
+ break;
+ } else {
+ free(s);
+ }
}
} else {
while ((s = _nc_expand_try(sp->_keytry,
- ch, &count, (size_t) 0)) != 0
- && _nc_remove_key(&(sp->_keytry), ch)) {
- code = _nc_add_to_try(&(sp->_key_ok), s, ch);
- free(s);
- count = 0;
- if (code != OK)
- break;
+ ch, &count, (size_t) 0)) != 0) {
+ if (_nc_remove_key(&(sp->_keytry), ch)) {
+ code = _nc_add_to_try(&(sp->_key_ok), s, ch);
+ free(s);
+ count = 0;
+ if (code != OK)
+ break;
+ } else {
+ free(s);
+ }
}
}
}
Index: package/debian-mingw/changelog
--- ncurses-6.1-20190803+/package/debian-mingw/changelog 2019-08-03 13:57:42.000000000 +0000
+++ ncurses-6.1-20190810/package/debian-mingw/changelog 2019-08-10 12:52:53.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20190803) unstable; urgency=low
+ncurses6 (6.1+20190810) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 03 Aug 2019 09:57:42 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 10 Aug 2019 08:52:53 -0400
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian-mingw64/changelog
--- ncurses-6.1-20190803+/package/debian-mingw64/changelog 2019-08-03 13:57:42.000000000 +0000
+++ ncurses-6.1-20190810/package/debian-mingw64/changelog 2019-08-10 12:52:53.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20190803) unstable; urgency=low
+ncurses6 (6.1+20190810) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 03 Aug 2019 09:57:42 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 10 Aug 2019 08:52:53 -0400
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian/changelog
--- ncurses-6.1-20190803+/package/debian/changelog 2019-08-03 13:57:42.000000000 +0000
+++ ncurses-6.1-20190810/package/debian/changelog 2019-08-10 12:52:53.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20190803) unstable; urgency=low
+ncurses6 (6.1+20190810) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 03 Aug 2019 09:57:42 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 10 Aug 2019 08:52:53 -0400
ncurses6 (5.9-20120608) unstable; urgency=low
Index: package/mingw-ncurses.nsi
Prereq: 1.345
--- ncurses-6.1-20190803+/package/mingw-ncurses.nsi 2019-08-03 13:57:42.000000000 +0000
+++ ncurses-6.1-20190810/package/mingw-ncurses.nsi 2019-08-10 12:52:53.000000000 +0000
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.345 2019/08/03 13:57:42 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.346 2019/08/10 12:52:53 tom Exp $
; TODO add examples
; TODO bump ABI to 6
@@ -10,7 +10,7 @@
!define VERSION_MAJOR "6"
!define VERSION_MINOR "1"
!define VERSION_YYYY "2019"
-!define VERSION_MMDD "0803"
+!define VERSION_MMDD "0810"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"
Index: package/mingw-ncurses.spec
--- ncurses-6.1-20190803+/package/mingw-ncurses.spec 2019-08-03 13:57:42.000000000 +0000
+++ ncurses-6.1-20190810/package/mingw-ncurses.spec 2019-08-10 12:52:53.000000000 +0000
@@ -3,7 +3,7 @@
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 6.1
-Release: 20190803
+Release: 20190810
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncurses.spec
--- ncurses-6.1-20190803+/package/ncurses.spec 2019-08-03 13:57:42.000000000 +0000
+++ ncurses-6.1-20190810/package/ncurses.spec 2019-08-10 12:52:53.000000000 +0000
@@ -1,7 +1,7 @@
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 6.1
-Release: 20190803
+Release: 20190810
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncursest.spec
--- ncurses-6.1-20190803+/package/ncursest.spec 2019-08-03 13:57:42.000000000 +0000
+++ ncurses-6.1-20190810/package/ncursest.spec 2019-08-10 12:52:53.000000000 +0000
@@ -1,7 +1,7 @@
Summary: Curses library with POSIX thread support.
Name: ncursest6
Version: 6.1
-Release: 20190803
+Release: 20190810
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: test/demo_menus.c
Prereq: 1.66
--- ncurses-6.1-20190803+/test/demo_menus.c 2019-04-06 20:42:48.000000000 +0000
+++ ncurses-6.1-20190810/test/demo_menus.c 2019-08-10 19:25:27.000000000 +0000
@@ -26,7 +26,7 @@
* authorization. *
****************************************************************************/
/*
- * $Id: demo_menus.c,v 1.66 2019/04/06 20:42:48 tom Exp $
+ * $Id: demo_menus.c,v 1.67 2019/08/10 19:25:27 tom Exp $
*
* Demonstrate a variety of functions from the menu library.
* Thomas Dickey - 2005/4/9
@@ -110,6 +110,8 @@
static bool loaded_file = FALSE;
static char empty[1];
+
+#ifdef TRACE
static void failed(const char *s) GCC_NORETURN;
static void
@@ -119,6 +121,7 @@
endwin();
ExitProgram(EXIT_FAILURE);
}
+#endif
/* Common function to allow ^T to toggle trace-mode in the middle of a test
* so that trace-files can be made smaller.
Index: test/ncurses.c
Prereq: 1.515
--- ncurses-6.1-20190803+/test/ncurses.c 2019-04-20 20:34:11.000000000 +0000
+++ ncurses-6.1-20190810/test/ncurses.c 2019-08-10 19:38: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.515 2019/04/20 20:34:11 tom Exp $
+$Id: ncurses.c,v 1.516 2019/08/10 19:38:41 tom Exp $
***************************************************************************/
@@ -7876,11 +7876,15 @@
{
int c;
int my_e_param = 1;
+#ifdef NCURSES_VERSION_PATCH
#if HAVE_USE_DEFAULT_COLORS
int default_fg = COLOR_WHITE;
int default_bg = COLOR_BLACK;
- bool assumed_colors = FALSE;
bool default_colors = FALSE;
+#if HAVE_ASSUME_DEFAULT_COLORS
+ bool assumed_colors = FALSE;
+#endif
+#endif
#endif
bool monochrome = FALSE;
#if HAVE_COLOR_CONTENT
@@ -7892,7 +7896,9 @@
while ((c = getopt(argc, argv, "a:dEe:fhmp:s:Tt:x")) != -1) {
switch (c) {
+#ifdef NCURSES_VERSION_PATCH
#if HAVE_USE_DEFAULT_COLORS
+#if HAVE_ASSUME_DEFAULT_COLORS
case 'a':
assumed_colors = TRUE;
switch (sscanf(optarg, "%d,%d", &default_fg, &default_bg)) {
@@ -7904,10 +7910,12 @@
break;
}
break;
+#endif
case 'd':
default_colors = TRUE;
break;
#endif
+#endif
#if HAVE_USE_ENV
case 'E':
use_env(FALSE);

960
ncurses-6.1-20190817.patch
View File

@ -1,960 +0,0 @@
# ncurses 6.1 - patch 20190817 - Thomas E. Dickey
#
# ------------------------------------------------------------------------------
#
# Ncurses 6.1 is at
# ftp.gnu.org:/pub/gnu
#
# Patches for ncurses 6.1 can be found at
# ftp://ftp.invisible-island.net/ncurses/6.1
# http://invisible-mirror.net/archives/ncurses/6.1
#
# ------------------------------------------------------------------------------
# ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20190817.patch.gz
# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created Sun Aug 18 00:33:55 UTC 2019
# ------------------------------------------------------------------------------
# NEWS | 7 ++++++-
# VERSION | 2 +-
# dist.mk | 4 ++--
# ncurses/base/lib_bkgd.c | 24 ++++++++++++++++++------
# 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 +-
# package/ncursest.spec | 2 +-
# test/blue.c | 20 ++++++++++----------
# test/bs.c | 31 +++++++++++++++++--------------
# test/cardfile.c | 28 ++++++++++++++++------------
# test/chgat.c | 7 ++++---
# test/clip_printw.c | 9 +++++----
# test/color_content.c | 4 ++--
# test/color_set.c | 7 ++++---
# test/demo_altkeys.c | 16 +++++++++-------
# test/demo_defkey.c | 17 +++++++++--------
# test/demo_forms.c | 19 +++++++++++--------
# test/demo_menus.c | 10 ++++------
# test/test_sgr.c | 4 ++--
# 23 files changed, 131 insertions(+), 100 deletions(-)
# ------------------------------------------------------------------------------
Index: NEWS
Prereq: 1.3361
--- ncurses-6.1-20190810+/NEWS 2019-08-10 19:05:52.000000000 +0000
+++ ncurses-6.1-20190817/NEWS 2019-08-17 21:47:27.000000000 +0000
@@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3361 2019/08/10 19:05:52 tom Exp $
+-- $Id: NEWS,v 1.3364 2019/08/17 21:47:27 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.
+20190817
+ + amend 20181208 changes for wbkgd() and wbkgrnd(), fixing a few
+ details where it still differed from SVr4.
+ + fix some cppcheck warnings, mostly style, in ncurses test-programs.
+
20190810
+ fix a few more coverity warnings.
Index: VERSION
--- ncurses-6.1-20190810+/VERSION 2019-08-10 12:52:53.000000000 +0000
+++ ncurses-6.1-20190817/VERSION 2019-08-17 13:26:39.000000000 +0000
@@ -1 +1 @@
-5:0:10 6.1 20190810
+5:0:10 6.1 20190817
Index: dist.mk
Prereq: 1.1300
--- ncurses-6.1-20190810+/dist.mk 2019-08-10 12:52:53.000000000 +0000
+++ ncurses-6.1-20190817/dist.mk 2019-08-17 13:26:39.000000000 +0000
@@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.1300 2019/08/10 12:52:53 tom Exp $
+# $Id: dist.mk,v 1.1301 2019/08/17 13:26:39 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 = 1
-NCURSES_PATCH = 20190810
+NCURSES_PATCH = 20190817
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
Index: ncurses/base/lib_bkgd.c
Prereq: 1.52
--- ncurses-6.1-20190810+/ncurses/base/lib_bkgd.c 2018-12-09 00:09:17.000000000 +0000
+++ ncurses-6.1-20190817/ncurses/base/lib_bkgd.c 2019-08-17 20:59:41.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2016,2018 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2018,2019 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 *
@@ -36,7 +36,7 @@
#include <curses.priv.h>
-MODULE_ID("$Id: lib_bkgd.c,v 1.52 2018/12/09 00:09:17 tom Exp $")
+MODULE_ID("$Id: lib_bkgd.c,v 1.53 2019/08/17 20:59:41 tom Exp $")
/*
* Set the window's background information.
@@ -145,6 +145,11 @@
memset(&old_bkgd, 0, sizeof(old_bkgd));
(void) wgetbkgrnd(win, &old_bkgd);
+ if (!memcmp(&old_bkgd, &new_bkgd, sizeof(new_bkgd))) {
+ T(("...unchanged"));
+ returnCode(OK);
+ }
+
old_char = old_bkgd;
RemAttr(old_char, ~A_CHARTEXT);
old_attr = AttrOf(old_bkgd);
@@ -153,6 +158,8 @@
if (!(old_attr & A_COLOR)) {
old_pair = 0;
}
+ T(("... old background char %s, attr %s, pair %d",
+ _tracechar(CharOf(old_char)), _traceattr(old_attr), old_pair));
new_char = new_bkgd;
RemAttr(new_char, ~A_CHARTEXT);
@@ -163,15 +170,20 @@
if (!Charable(new_bkgd)) {
new_char = old_char;
}
+ if (!(new_attr & A_COLOR)) {
+ new_pair = 0;
+ }
+ T(("... new background char %s, attr %s, pair %d",
+ _tracechar(CharOf(new_char)), _traceattr(new_attr), new_pair));
(void) wbkgrndset(win, CHREF(new_bkgd));
/* SVr4 updates color pair if old/new match, otherwise just attrs */
if ((new_pair != 0) && (new_pair == old_pair)) {
- SetAttr(win->_nc_bkgd, new_attr);
- SetPair(win->_nc_bkgd, new_pair);
+ WINDOW_ATTRS(win) = new_attr;
+ SET_WINDOW_PAIR(win, new_pair);
} else {
- SetAttr(win->_nc_bkgd, new_attr);
+ WINDOW_ATTRS(win) = new_attr;
}
for (y = 0; y <= win->_maxy; y++) {
@@ -195,7 +207,7 @@
| (new_attr & ALL_BUT_COLOR));
}
} else {
- SetAttr(*cp, new_attr);
+ SetAttr(*cp, (tmp_attr & ~old_attr) | new_attr);
SetPair(*cp, new_pair);
}
}
Index: package/debian-mingw/changelog
--- ncurses-6.1-20190810+/package/debian-mingw/changelog 2019-08-10 12:52:53.000000000 +0000
+++ ncurses-6.1-20190817/package/debian-mingw/changelog 2019-08-17 13:26:39.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20190810) unstable; urgency=low
+ncurses6 (6.1+20190817) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 10 Aug 2019 08:52:53 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 17 Aug 2019 09:26:39 -0400
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian-mingw64/changelog
--- ncurses-6.1-20190810+/package/debian-mingw64/changelog 2019-08-10 12:52:53.000000000 +0000
+++ ncurses-6.1-20190817/package/debian-mingw64/changelog 2019-08-17 13:26:39.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20190810) unstable; urgency=low
+ncurses6 (6.1+20190817) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 10 Aug 2019 08:52:53 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 17 Aug 2019 09:26:39 -0400
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian/changelog
--- ncurses-6.1-20190810+/package/debian/changelog 2019-08-10 12:52:53.000000000 +0000
+++ ncurses-6.1-20190817/package/debian/changelog 2019-08-17 13:26:39.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20190810) unstable; urgency=low
+ncurses6 (6.1+20190817) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 10 Aug 2019 08:52:53 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 17 Aug 2019 09:26:39 -0400
ncurses6 (5.9-20120608) unstable; urgency=low
Index: package/mingw-ncurses.nsi
Prereq: 1.346
--- ncurses-6.1-20190810+/package/mingw-ncurses.nsi 2019-08-10 12:52:53.000000000 +0000
+++ ncurses-6.1-20190817/package/mingw-ncurses.nsi 2019-08-17 13:26:39.000000000 +0000
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.346 2019/08/10 12:52:53 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.347 2019/08/17 13:26:39 tom Exp $
; TODO add examples
; TODO bump ABI to 6
@@ -10,7 +10,7 @@
!define VERSION_MAJOR "6"
!define VERSION_MINOR "1"
!define VERSION_YYYY "2019"
-!define VERSION_MMDD "0810"
+!define VERSION_MMDD "0817"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"
Index: package/mingw-ncurses.spec
--- ncurses-6.1-20190810+/package/mingw-ncurses.spec 2019-08-10 12:52:53.000000000 +0000
+++ ncurses-6.1-20190817/package/mingw-ncurses.spec 2019-08-17 13:26:39.000000000 +0000
@@ -3,7 +3,7 @@
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 6.1
-Release: 20190810
+Release: 20190817
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncurses.spec
--- ncurses-6.1-20190810+/package/ncurses.spec 2019-08-10 12:52:53.000000000 +0000
+++ ncurses-6.1-20190817/package/ncurses.spec 2019-08-17 13:26:39.000000000 +0000
@@ -1,7 +1,7 @@
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 6.1
-Release: 20190810
+Release: 20190817
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncursest.spec
--- ncurses-6.1-20190810+/package/ncursest.spec 2019-08-10 12:52:53.000000000 +0000
+++ ncurses-6.1-20190817/package/ncursest.spec 2019-08-17 13:26:39.000000000 +0000
@@ -1,7 +1,7 @@
Summary: Curses library with POSIX thread support.
Name: ncursest6
Version: 6.1
-Release: 20190810
+Release: 20190817
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: test/blue.c
Prereq: 1.51
--- ncurses-6.1-20190810+/test/blue.c 2017-09-30 17:43:18.000000000 +0000
+++ ncurses-6.1-20190817/test/blue.c 2019-08-17 21:49:19.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2016,2017 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2017,2019 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 *
@@ -36,7 +36,7 @@
*****************************************************************************/
/*
- * $Id: blue.c,v 1.51 2017/09/30 17:43:18 tom Exp $
+ * $Id: blue.c,v 1.52 2019/08/17 21:49:19 tom Exp $
*/
#include <test.priv.h>
@@ -153,14 +153,14 @@
static void
shuffle(int size)
{
- int i, j, numswaps, swapnum, temp;
+ int numswaps, swapnum;
numswaps = size * 10; /* an arbitrary figure */
for (swapnum = 0; swapnum < numswaps; swapnum++) {
- i = rand() % size;
- j = rand() % size;
- temp = deck[i];
+ int i = rand() % size;
+ int j = rand() % size;
+ int temp = deck[i];
deck[i] = deck[j];
deck[j] = temp;
}
@@ -169,11 +169,11 @@
static void
deal_cards(void)
{
- int ptr, card = 0, value, csuit, crank, suit, aces[4];
+ int card = 0, value, csuit, crank, suit, aces[4];
memset(aces, 0, sizeof(aces));
for (suit = HEARTS; suit <= CLUBS; suit++) {
- ptr = freeptr[suit];
+ int ptr = freeptr[suit];
grid[ptr++] = NOCARD; /* 1st card space is blank */
while ((ptr % GRID_WIDTH) != 0) {
value = deck[card++];
@@ -388,10 +388,10 @@
static int
collect_discards(void)
{
- int row, col, cardno = 0, finish, gridno;
+ int row, col, cardno = 0, gridno;
for (row = HEARTS; row <= CLUBS; row++) {
- finish = 0;
+ int finish = 0;
for (col = 1; col < GRID_WIDTH; col++) {
gridno = row * GRID_WIDTH + col;
Index: test/bs.c
Prereq: 1.73
--- ncurses-6.1-20190810+/test/bs.c 2018-05-12 15:07:51.000000000 +0000
+++ ncurses-6.1-20190817/test/bs.c 2019-08-17 21:49:19.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2017,2018 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2018,2019 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 @@
* v2.0 featuring strict ANSI/POSIX conformance, November 1993.
* v2.1 with ncurses mouse support, September 1995
*
- * $Id: bs.c,v 1.73 2018/05/12 15:07:51 tom Exp $
+ * $Id: bs.c,v 1.74 2019/08/17 21:49:19 tom Exp $
*/
#include <test.priv.h>
@@ -548,14 +548,15 @@
static int
getcoord(int atcpu)
{
- int ny, nx, c;
-
if (atcpu)
cgoto(cury, curx);
else
pgoto(cury, curx);
(void) refresh();
+
for (;;) {
+ int ny, nx, c;
+
if (atcpu) {
MvPrintw(CYBASE + BDEPTH + 1, CXBASE + 11, "(%d, %c)",
curx, 'A' + cury);
@@ -731,10 +732,9 @@
awinna(void)
{
int i, j;
- ship_t *ss;
for (i = 0; i < 2; ++i) {
- ss = (i) ? cpuship : plyship;
+ ship_t *ss = (i) ? cpuship : plyship;
for (j = 0; j < SHIPTYPES; ++j, ++ss)
if (ss->length > ss->hits)
break;
@@ -761,9 +761,11 @@
if (++ss->hits < ss->length) /* still afloat? */
return ((ship_t *) NULL);
else { /* sunk! */
- int i, j;
+ int i;
+
+ if (!closepack) {
+ int j;
- if (!closepack)
for (j = -1; j <= 1; j++) {
int bx = ss->x + j * xincr[(ss->dir + 2) % dir_MAX];
int by = ss->y + j * yincr[(ss->dir + 2) % dir_MAX];
@@ -792,6 +794,7 @@
}
}
}
+ }
for (i = 0; i < ss->length; ++i) {
int x1 = ss->x + i * xincr[ss->dir];
@@ -884,12 +887,12 @@
static int
sgetc(const char *s)
{
- const char *s1;
- int ch;
-
(void) refresh();
+
for (;;) {
- ch = getch();
+ int ch = getch();
+ const char *s1;
+
if (islower(ch))
ch = toupper(ch);
if (is_QUIT(ch))
@@ -1161,9 +1164,9 @@
static void
do_options(int c, char *op[])
{
- register int i;
-
if (c > 1) {
+ int i;
+
for (i = 1; i < c; i++) {
switch (op[i][0]) {
default:
Index: test/cardfile.c
Prereq: 1.45
--- ncurses-6.1-20190810+/test/cardfile.c 2017-10-19 21:14:25.000000000 +0000
+++ ncurses-6.1-20190817/test/cardfile.c 2019-08-17 21:49:40.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1999-2016,2017 Free Software Foundation, Inc. *
+ * Copyright (c) 1999-2017,2019 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: cardfile.c,v 1.45 2017/10/19 21:14:25 tom Exp $
+ * $Id: cardfile.c,v 1.46 2019/08/17 21:49:40 tom Exp $
*
* File format: text beginning in column 1 is a title; other text is content.
*/
@@ -125,10 +125,12 @@
static void
add_content(CARD * card, const char *content)
{
- size_t total, offset;
+ size_t total;
content = skip(content);
if ((total = strlen(content)) != 0) {
+ size_t offset;
+
if (card->content != 0 && (offset = strlen(card->content)) != 0) {
total += 1 + offset;
card->content = typeRealloc(char, total + 1, card->content);
@@ -173,10 +175,11 @@
read_data(char *fname)
{
FILE *fp;
- CARD *card = 0;
- char buffer[BUFSIZ];
if ((fp = fopen(fname, "r")) != 0) {
+ CARD *card = 0;
+ char buffer[BUFSIZ];
+
while (fgets(buffer, sizeof(buffer), fp)) {
trim(buffer);
if (isspace(UChar(*buffer))) {
@@ -197,15 +200,17 @@
write_data(const char *fname)
{
FILE *fp;
- CARD *p = 0;
- int n;
if (!strcmp(fname, default_name))
fname = "cardfile.out";
if ((fp = fopen(fname, "w")) != 0) {
+ CARD *p = 0;
+
for (p = all_cards; p != 0; p = p->link) {
FIELD **f = form_fields(p->form);
+ int n;
+
for (n = 0; f[n] != 0; n++) {
char *s = field_buffer(f[n], 0);
if (s != 0
@@ -365,7 +370,7 @@
#if (defined(KEY_RESIZE) && HAVE_WRESIZE) || NO_LEAKS
static void
-free_form_fields(FIELD ** f)
+free_form_fields(FIELD **f)
{
int n;
@@ -391,7 +396,6 @@
int form_high;
int y;
int x;
- int ch = ERR;
int finished = FALSE;
show_legend();
@@ -432,6 +436,8 @@
order_cards(top_card, visible_cards);
while (!finished) {
+ int ch = ERR;
+
update_panels();
doupdate();
@@ -522,13 +528,11 @@
}
#if NO_LEAKS
while (all_cards != 0) {
- FIELD **f;
-
p = all_cards;
all_cards = all_cards->link;
if (isVisible(p)) {
- f = form_fields(p->form);
+ FIELD **f = form_fields(p->form);
unpost_form(p->form); /* ...so we can free it */
free_form(p->form); /* this also disconnects the fields */
Index: test/chgat.c
Prereq: 1.17
--- ncurses-6.1-20190810+/test/chgat.c 2017-09-28 23:04:14.000000000 +0000
+++ ncurses-6.1-20190817/test/chgat.c 2019-08-17 21:49:19.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 2006-2012,2017 Free Software Foundation, Inc. *
+ * Copyright (c) 2006-2017,2019 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: chgat.c,v 1.17 2017/09/28 23:04:14 tom Exp $
+ * $Id: chgat.c,v 1.18 2019/08/17 21:49:19 tom Exp $
*
* test-driver for chgat/wchgat/mvchgat/mvwchgat
*/
@@ -75,10 +75,11 @@
};
/* *INDENT-ON* */
- static bool first = TRUE;
const char *result = 0;
if (has_colors()) {
+ static bool first = TRUE;
+
if (first) {
size_t n;
Index: test/clip_printw.c
Prereq: 1.15
--- ncurses-6.1-20190810+/test/clip_printw.c 2017-09-28 23:07:23.000000000 +0000
+++ ncurses-6.1-20190817/test/clip_printw.c 2019-08-17 21:49:40.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 2008-2016,2017 Free Software Foundation, Inc. *
+ * Copyright (c) 2008-2017,2019 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: clip_printw.c,v 1.15 2017/09/28 23:07:23 tom Exp $
+ * $Id: clip_printw.c,v 1.16 2019/08/17 21:49:40 tom Exp $
*
* demonstrate how to use printw without wrapping.
*/
@@ -56,7 +56,7 @@
} STATUS;
static int
-clip_wprintw(WINDOW *win, NCURSES_CONST char *fmt,...)
+clip_wprintw(WINDOW *win, NCURSES_CONST char *fmt, ...)
{
int y0, x0, y1, x1, width;
WINDOW *sub;
@@ -103,10 +103,11 @@
};
/* *INDENT-ON* */
- static bool first = TRUE;
const char *result = 0;
if (has_colors()) {
+ static bool first = TRUE;
+
if (first) {
unsigned n;
Index: test/color_content.c
Prereq: 1.10
--- ncurses-6.1-20190810+/test/color_content.c 2019-01-21 01:05:44.000000000 +0000
+++ ncurses-6.1-20190817/test/color_content.c 2019-08-17 21:29:13.000000000 +0000
@@ -26,7 +26,7 @@
* authorization. *
****************************************************************************/
/*
- * $Id: color_content.c,v 1.10 2019/01/21 01:05:44 tom Exp $
+ * $Id: color_content.c,v 1.11 2019/08/17 21:29:13 tom Exp $
*/
#define NEED_TIME_H
@@ -251,7 +251,6 @@
main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
{
int i;
- int repeat;
while ((i = getopt(argc, argv, "f:il:npr:sx")) != -1) {
switch (i) {
@@ -305,6 +304,7 @@
}
}
} else {
+ int repeat;
for (repeat = 0; repeat < r_opt; ++repeat) {
run_test();
Index: test/color_set.c
Prereq: 1.8
--- ncurses-6.1-20190810+/test/color_set.c 2014-02-01 22:10:42.000000000 +0000
+++ ncurses-6.1-20190817/test/color_set.c 2019-08-17 21:49:19.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 2003-2012,2014 Free Software Foundation, Inc. *
+ * Copyright (c) 2003-2014,2019 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: color_set.c,v 1.8 2014/02/01 22:10:42 tom Exp $
+ * $Id: color_set.c,v 1.9 2019/08/17 21:49:19 tom Exp $
*/
#include <test.priv.h>
@@ -39,13 +39,14 @@
main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
{
NCURSES_COLOR_T f, b;
- int i;
initscr();
cbreak();
noecho();
if (has_colors()) {
+ int i;
+
start_color();
(void) pair_content(0, &f, &b);
Index: test/demo_altkeys.c
Prereq: 1.12
--- ncurses-6.1-20190810+/test/demo_altkeys.c 2018-12-29 17:52:53.000000000 +0000
+++ ncurses-6.1-20190817/test/demo_altkeys.c 2019-08-17 21:49:40.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 2005-2017,2018 Free Software Foundation, Inc. *
+ * Copyright (c) 2005-2018,2019 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: demo_altkeys.c,v 1.12 2018/12/29 17:52:53 tom Exp $
+ * $Id: demo_altkeys.c,v 1.13 2019/08/17 21:49:40 tom Exp $
*
* Demonstrate the define_key() function.
* Thomas Dickey - 2005/10/22
@@ -47,11 +47,12 @@
log_last_line(WINDOW *win)
{
FILE *fp;
- int y, x, n;
- char temp[256];
if ((fp = fopen(MY_LOGFILE, "a")) != 0) {
+ char temp[256];
+ int y, x, n;
int need = sizeof(temp) - 1;
+
if (need > COLS)
need = COLS;
getyx(win, y, x);
@@ -75,8 +76,7 @@
int n;
int ch;
#if HAVE_GETTIMEOFDAY
- int secs, msecs;
- struct timeval current, previous;
+ struct timeval previous;
#endif
unlink(MY_LOGFILE);
@@ -119,8 +119,10 @@
while ((ch = getch()) != ERR) {
bool escaped = (ch >= MY_KEYS);
const char *name = keyname(escaped ? (ch - MY_KEYS) : ch);
-
#if HAVE_GETTIMEOFDAY
+ int secs, msecs;
+ struct timeval current;
+
gettimeofday(&current, 0);
secs = (int) (current.tv_sec - previous.tv_sec);
msecs = (int) ((current.tv_usec - previous.tv_usec) / 1000);
Index: test/demo_defkey.c
Prereq: 1.28
--- ncurses-6.1-20190810+/test/demo_defkey.c 2018-02-12 09:57:31.000000000 +0000
+++ ncurses-6.1-20190817/test/demo_defkey.c 2019-08-17 21:49:19.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 2002-2017,2018 Free Software Foundation, Inc. *
+ * Copyright (c) 2002-2018,2019 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: demo_defkey.c,v 1.28 2018/02/12 09:57:31 tom Exp $
+ * $Id: demo_defkey.c,v 1.29 2019/08/17 21:49:19 tom Exp $
*
* Demonstrate the define_key() function.
* Thomas Dickey - 2002/11/23
@@ -45,10 +45,10 @@
log_last_line(WINDOW *win)
{
FILE *fp;
- int y, x, n;
- char temp[256];
if ((fp = fopen(MY_LOGFILE, "a")) != 0) {
+ char temp[256];
+ int y, x, n;
int need = sizeof(temp) - 1;
if (need > COLS)
need = COLS;
@@ -98,11 +98,12 @@
visible(const char *string)
{
char *result = 0;
- size_t need = 1;
- int pass;
- int n;
if (string != 0 && *string != '\0') {
+ int pass;
+ int n;
+ size_t need = 1;
+
for (pass = 0; pass < 2; ++pass) {
for (n = 0; string[n] != '\0'; ++n) {
char temp[80];
@@ -185,7 +186,6 @@
if (value != 0) {
const char *prefix = 0;
- char temp[BUFSIZ];
if (!(strncmp) (value, "\033[", (size_t) 2)) {
prefix = "\033O";
@@ -193,6 +193,7 @@
prefix = "\033[";
}
if (prefix != 0) {
+ char temp[BUFSIZ];
_nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp))
"%s%s", prefix, value + 2);
really_define_key(win, temp, code);
Index: test/demo_forms.c
Prereq: 1.55
--- ncurses-6.1-20190810+/test/demo_forms.c 2018-07-14 23:26:02.000000000 +0000
+++ ncurses-6.1-20190817/test/demo_forms.c 2019-08-17 21:49:19.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 2003-2017,2018 Free Software Foundation, Inc. *
+ * Copyright (c) 2003-2018,2019 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: demo_forms.c,v 1.55 2018/07/14 23:26:02 tom Exp $
+ * $Id: demo_forms.c,v 1.56 2019/08/17 21:49:19 tom Exp $
*
* Demonstrate a variety of functions from the form library.
* Thomas Dickey - 2003/4/26
@@ -338,9 +338,6 @@
show_current_field(WINDOW *win, FORM *form)
{
FIELD *field;
- FIELDTYPE *type;
- char *buffer;
- int nbuf;
int field_rows, field_cols, field_max;
int currow, curcol;
@@ -355,7 +352,11 @@
if (data_behind(form))
waddstr(win, " behind");
waddch(win, '\n');
+
if ((field = current_field(form)) != 0) {
+ FIELDTYPE *type;
+ int nbuf;
+
wprintw(win, "Page %d%s, Field %d/%d%s:",
form_page(form),
new_page(field) ? "*" : "",
@@ -411,6 +412,7 @@
waddstr(win, "\n");
for (nbuf = 0; nbuf <= 2; ++nbuf) {
+ char *buffer;
if ((buffer = field_buffer(field, nbuf)) != 0) {
wprintw(win, "buffer %d:", nbuf);
(void) wattrset(win, A_REVERSE);
@@ -430,13 +432,11 @@
static void
demo_forms(void)
{
- WINDOW *w;
FORM *form;
FIELD *f[100]; /* will memset to zero */
- int finished = 0, c;
+ int c;
unsigned n = 0;
int pg;
- WINDOW *also;
const char *fname;
static const char *my_enum[] =
{"first", "second", "third", 0};
@@ -544,6 +544,9 @@
f[n] = (FIELD *) 0;
if ((form = new_form(f)) != 0) {
+ WINDOW *w;
+ WINDOW *also;
+ int finished = 0;
display_form(form);
Index: test/demo_menus.c
Prereq: 1.67
--- ncurses-6.1-20190810+/test/demo_menus.c 2019-08-10 19:25:27.000000000 +0000
+++ ncurses-6.1-20190817/test/demo_menus.c 2019-08-17 21:45:32.000000000 +0000
@@ -26,7 +26,7 @@
* authorization. *
****************************************************************************/
/*
- * $Id: demo_menus.c,v 1.67 2019/08/10 19:25:27 tom Exp $
+ * $Id: demo_menus.c,v 1.68 2019/08/17 21:45:32 tom Exp $
*
* Demonstrate a variety of functions from the menu library.
* Thomas Dickey - 2005/4/9
@@ -309,12 +309,11 @@
static void
menu_destroy(MENU * m)
{
- int count;
-
Trace(("menu_destroy %p", (void *) m));
if (m != 0) {
ITEM **items = menu_items(m);
const char *blob = 0;
+ int count;
count = item_count(m);
Trace(("menu_destroy %p count %d", (void *) m, count));
@@ -429,7 +428,6 @@
&& (sb.st_mode & S_IFMT) == S_IFREG
&& sb.st_size != 0) {
size_t size = (size_t) sb.st_size;
- unsigned j, k;
char *blob = typeMalloc(char, size + 1);
MENU_DATA *list = typeCalloc(MENU_DATA, size + 1);
@@ -442,6 +440,7 @@
if (fp != 0) {
if (fread(blob, sizeof(char), size, fp) == size) {
bool mark = TRUE;
+ unsigned j, k;
for (j = k = 0; j < size; ++j) {
if (mark) {
list[k++].name = blob + j;
@@ -609,7 +608,6 @@
/* interactively set the trace level */
{
ITEM **ip;
- unsigned newtrace;
int result;
for (ip = menu_items(mpTrace); *ip; ip++) {
@@ -625,7 +623,7 @@
if (result == E_OK) {
if (update_trace_menu(mpTrace) || cmd == REQ_TOGGLE_ITEM) {
- newtrace = 0;
+ unsigned newtrace = 0;
for (ip = menu_items(mpTrace); *ip; ip++) {
if (item_value(*ip)) {
MENU_DATA *td = (MENU_DATA *) item_userptr(*ip);
Index: test/test_sgr.c
Prereq: 1.13
--- ncurses-6.1-20190810+/test/test_sgr.c 2019-07-28 18:13:39.000000000 +0000
+++ ncurses-6.1-20190817/test/test_sgr.c 2019-08-17 21:36:44.000000000 +0000
@@ -29,7 +29,7 @@
/*
* Author: Thomas E. Dickey
*
- * $Id: test_sgr.c,v 1.13 2019/07/28 18:13:39 tom Exp $
+ * $Id: test_sgr.c,v 1.14 2019/08/17 21:36:44 tom Exp $
*
* A simple demo of the sgr/sgr0 terminal capabilities.
*/
@@ -147,7 +147,7 @@
static char params[] = "SURBDBIPA";
unsigned n;
- printf("%4d ", bits);
+ printf("%4u ", bits);
bits &= ~ignore;
for (n = 0; n < MAXPAR; ++n) {
putchar((int) ((bits & (unsigned) (1 << n)) ? params[n] : '-'));

1843
ncurses-6.1-20190824.patch
View File

File diff suppressed because it is too large Load Diff

6115
ncurses-6.1-20190831.patch
View File

File diff suppressed because it is too large Load Diff

37005
ncurses-6.1-20190907.patch
View File

File diff suppressed because it is too large Load Diff

406
ncurses-6.1-20190914.patch
View File

@ -1,406 +0,0 @@
# ncurses 6.1 - patch 20190914 - Thomas E. Dickey
#
# ------------------------------------------------------------------------------
#
# Ncurses 6.1 is at
# ftp.gnu.org:/pub/gnu
#
# Patches for ncurses 6.1 can be found at
# ftp://ftp.invisible-island.net/ncurses/6.1
# http://invisible-mirror.net/archives/ncurses/6.1
#
# ------------------------------------------------------------------------------
# ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20190914.patch.gz
# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created Sun Sep 15 01:08:42 UTC 2019
# ------------------------------------------------------------------------------
# Ada95/configure | 29 +++++++++++++++--------------
# Ada95/configure.in | 5 +++--
# Ada95/package/AdaCurses.spec | 22 ++++++++++++++++------
# NEWS | 5 ++++-
# 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 +-
# package/ncursest.spec | 2 +-
# 13 files changed, 52 insertions(+), 37 deletions(-)
# ------------------------------------------------------------------------------
Index: Ada95/configure
--- ncurses-6.1-20190907+/Ada95/configure 2019-09-07 23:37:18.000000000 +0000
+++ ncurses-6.1-20190914/Ada95/configure 2019-09-14 19:53:04.000000000 +0000
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 1.72 .
+# From configure.in Revision: 1.73 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by Autoconf 2.52.20190901.
#
@@ -16564,7 +16564,7 @@
ADAGEN_LDFLAGS='$(NATIVE_LDFLAGS)'
fi
-ac_config_files="$ac_config_files $SUB_MAKEFILES doc/adacurses${DFT_ARG_SUFFIX}-config.1:doc/MKada_config.in Makefile"
+ac_config_files="$ac_config_files $SUB_MAKEFILES src/library.gpr:src/library.gpr.in doc/adacurses${DFT_ARG_SUFFIX}-config.1:doc/MKada_config.in Makefile"
ac_config_commands="$ac_config_commands default"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -16907,11 +16907,12 @@
case "$ac_config_target" in
# Handling of arguments.
"$SUB_MAKEFILES" ) CONFIG_FILES="$CONFIG_FILES $SUB_MAKEFILES" ;;
+ "src/library.gpr" ) CONFIG_FILES="$CONFIG_FILES src/library.gpr:src/library.gpr.in" ;;
"doc/adacurses${DFT_ARG_SUFFIX}-config.1" ) CONFIG_FILES="$CONFIG_FILES doc/adacurses${DFT_ARG_SUFFIX}-config.1:doc/MKada_config.in" ;;
"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:16914: error: invalid argument: $ac_config_target" >&5
+ *) { { echo "$as_me:16915: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
{ (exit 1); exit 1; }; };;
esac
@@ -17264,7 +17265,7 @@
esac
if test x"$ac_file" != x-; then
- { echo "$as_me:17267: creating $ac_file" >&5
+ { echo "$as_me:17268: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
rm -f "$ac_file"
fi
@@ -17282,7 +17283,7 @@
-) echo $tmp/stdin ;;
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
- test -f "$f" || { { echo "$as_me:17285: error: cannot find input file: $f" >&5
+ test -f "$f" || { { echo "$as_me:17286: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
echo $f;;
@@ -17295,7 +17296,7 @@
echo $srcdir/$f
else
# /dev/null tree
- { { echo "$as_me:17298: error: cannot find input file: $f" >&5
+ { { echo "$as_me:17299: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
fi;;
@@ -17311,7 +17312,7 @@
if test -n "$ac_seen"; then
ac_used=`grep '@datarootdir@' $ac_item`
if test -z "$ac_used"; then
- { echo "$as_me:17314: WARNING: datarootdir was used implicitly but not set:
+ { echo "$as_me:17315: 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;}
@@ -17320,7 +17321,7 @@
fi
ac_seen=`grep '${datarootdir}' $ac_item`
if test -n "$ac_seen"; then
- { echo "$as_me:17323: WARNING: datarootdir was used explicitly but not set:
+ { echo "$as_me:17324: 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;}
@@ -17357,7 +17358,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:17360: WARNING: Variable $ac_name is used but was not set:
+ { echo "$as_me:17361: 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;}
@@ -17368,7 +17369,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:17371: WARNING: Some variables may not be substituted:
+ { echo "$as_me:17372: WARNING: Some variables may not be substituted:
$ac_seen" >&5
echo "$as_me: WARNING: Some variables may not be substituted:
$ac_seen" >&2;}
@@ -17417,7 +17418,7 @@
* ) ac_file_in=$ac_file.in ;;
esac
- test x"$ac_file" != x- && { echo "$as_me:17420: creating $ac_file" >&5
+ test x"$ac_file" != x- && { echo "$as_me:17421: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
# First look for the input files in the build tree, otherwise in the
@@ -17428,7 +17429,7 @@
-) echo $tmp/stdin ;;
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
- test -f "$f" || { { echo "$as_me:17431: error: cannot find input file: $f" >&5
+ test -f "$f" || { { echo "$as_me:17432: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
echo $f;;
@@ -17441,7 +17442,7 @@
echo $srcdir/$f
else
# /dev/null tree
- { { echo "$as_me:17444: error: cannot find input file: $f" >&5
+ { { echo "$as_me:17445: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
fi;;
@@ -17499,7 +17500,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:17502: $ac_file is unchanged" >&5
+ { echo "$as_me:17503: $ac_file is unchanged" >&5
echo "$as_me: $ac_file is unchanged" >&6;}
else
ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
Index: Ada95/configure.in
Prereq: 1.72
--- ncurses-6.1-20190907+/Ada95/configure.in 2019-09-07 22:50:06.000000000 +0000
+++ ncurses-6.1-20190914/Ada95/configure.in 2019-09-14 19:33:07.000000000 +0000
@@ -28,14 +28,14 @@
dnl
dnl Author: Thomas E. Dickey
dnl
-dnl $Id: configure.in,v 1.72 2019/09/07 22:50:06 tom Exp $
+dnl $Id: configure.in,v 1.73 2019/09/14 19:33:07 tom Exp $
dnl Process this file with autoconf to produce a configure script.
dnl
dnl See https://invisible-island.net/autoconf/ for additional information.
dnl
dnl ---------------------------------------------------------------------------
AC_PREREQ(2.52.20030208)
-AC_REVISION($Revision: 1.72 $)
+AC_REVISION($Revision: 1.73 $)
AC_INIT(gen/gen.c)
AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
@@ -609,6 +609,7 @@
AC_OUTPUT( \
$SUB_MAKEFILES \
+ src/library.gpr:src/library.gpr.in \
doc/adacurses${DFT_ARG_SUFFIX}-config.1:doc/MKada_config.in \
Makefile,[
if test -z "$USE_OLD_MAKERULES" ; then
Index: Ada95/package/AdaCurses.spec
Prereq: 1.19
--- ncurses-6.1-20190907+/Ada95/package/AdaCurses.spec 2019-09-08 01:00:18.000000000 +0000
+++ ncurses-6.1-20190914/Ada95/package/AdaCurses.spec 2019-09-15 00:07:32.000000000 +0000
@@ -2,7 +2,7 @@
%define AppProgram AdaCurses
%define AppVersion MAJOR.MINOR
%define AppRelease YYYYMMDD
-# $Id: AdaCurses.spec,v 1.19 2019/09/08 01:00:18 tom Exp $
+# $Id: AdaCurses.spec,v 1.24 2019/09/15 00:07:32 tom Exp $
Name: %{AppProgram}
Version: %{AppVersion}
Release: %{AppRelease}
@@ -22,9 +22,13 @@
%define debug_package %{nil}
+%define need_filter %(if grep -E -i '(mageia|red hat|fedora)' /etc/issue >/dev/null; then echo 1; elif test -f /etc/fedora-release; then echo 1; else echo 0; fi)
+
+%if %{need_filter} == 1
# http://fedoraproject.org/wiki/EPEL:Packaging_Autoprovides_and_Requires_Filtering
%filter_from_requires /lib%{AppProgram}.so.1/d
%filter_setup
+%endif
%setup -q -n %{AppProgram}-%{AppRelease}
@@ -52,12 +56,12 @@
%install
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
( cd samples &&
make install.examples \
- DESTDIR=$RPM_BUILD_ROOT \
- BINDIR=$RPM_BUILD_ROOT%{_bindir}/%{AppProgram}
+ DESTDIR=$RPM_BUILD_ROOT \
+ BINDIR=$RPM_BUILD_ROOT%{_bindir}/%{AppProgram}
)
%clean
@@ -67,14 +71,20 @@
%defattr(-,root,root)
%{_bindir}/adacurses*-config
%{_bindir}/%{AppProgram}/*
-%{ada_libdir}/lib%{AppProgram}.*
+%{ada_libdir}/
+%if %{need_filter} == 1
+%{_libdir}/lib%{AppProgram}.*
+%endif
%{_mandir}/man1/adacurses*-config.1*
%{_datadir}/%{AppProgram}/*
-%{ada_include}/terminal_interface*
+%{ada_include}/
%changelog
# each patch should add its ChangeLog entries here
+* Sat Sep 14 2019 Thomas Dickey
+- build-fixes for Fedora29, OpenSUSE
+
* Sat Sep 07 2019 Thomas Dickey
- use AppProgram to replace "AdaCurses" globally
- amend install-paths to work with Fedora30
Index: NEWS
Prereq: 1.3371
--- ncurses-6.1-20190907+/NEWS 2019-09-07 22:41:16.000000000 +0000
+++ ncurses-6.1-20190914/NEWS 2019-09-14 23:18:21.000000000 +0000
@@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3371 2019/09/07 22:41:16 tom Exp $
+-- $Id: NEWS,v 1.3373 2019/09/14 23:18:21 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.
+20190914
+ + build-fixes for Ada95 configure-script and corresponding test package
+
20190907
+ add --with-ada-libname option and modify Ada95 configuration to
allow renaming the "AdaCurses" library (prompted by proposed changes
Index: VERSION
--- ncurses-6.1-20190907+/VERSION 2019-09-07 15:19:35.000000000 +0000
+++ ncurses-6.1-20190914/VERSION 2019-09-14 13:43:52.000000000 +0000
@@ -1 +1 @@
-5:0:10 6.1 20190907
+5:0:10 6.1 20190914
Index: dist.mk
Prereq: 1.1304
--- ncurses-6.1-20190907+/dist.mk 2019-09-07 15:19:35.000000000 +0000
+++ ncurses-6.1-20190914/dist.mk 2019-09-14 13:43:52.000000000 +0000
@@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.1304 2019/09/07 15:19:35 tom Exp $
+# $Id: dist.mk,v 1.1305 2019/09/14 13:43:52 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 = 1
-NCURSES_PATCH = 20190907
+NCURSES_PATCH = 20190914
# 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.1-20190907+/package/debian-mingw/changelog 2019-09-07 15:19:35.000000000 +0000
+++ ncurses-6.1-20190914/package/debian-mingw/changelog 2019-09-14 13:43:52.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20190907) unstable; urgency=low
+ncurses6 (6.1+20190914) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 07 Sep 2019 11:19:35 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 14 Sep 2019 09:43:52 -0400
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian-mingw64/changelog
--- ncurses-6.1-20190907+/package/debian-mingw64/changelog 2019-09-07 15:19:35.000000000 +0000
+++ ncurses-6.1-20190914/package/debian-mingw64/changelog 2019-09-14 13:43:52.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20190907) unstable; urgency=low
+ncurses6 (6.1+20190914) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 07 Sep 2019 11:19:35 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 14 Sep 2019 09:43:52 -0400
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian/changelog
--- ncurses-6.1-20190907+/package/debian/changelog 2019-09-07 15:19:35.000000000 +0000
+++ ncurses-6.1-20190914/package/debian/changelog 2019-09-14 13:43:52.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20190907) unstable; urgency=low
+ncurses6 (6.1+20190914) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 07 Sep 2019 11:19:35 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 14 Sep 2019 09:43:52 -0400
ncurses6 (5.9-20120608) unstable; urgency=low
Index: package/mingw-ncurses.nsi
Prereq: 1.350
--- ncurses-6.1-20190907+/package/mingw-ncurses.nsi 2019-09-07 15:19:35.000000000 +0000
+++ ncurses-6.1-20190914/package/mingw-ncurses.nsi 2019-09-14 13:43:52.000000000 +0000
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.350 2019/09/07 15:19:35 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.351 2019/09/14 13:43:52 tom Exp $
; TODO add examples
; TODO bump ABI to 6
@@ -10,7 +10,7 @@
!define VERSION_MAJOR "6"
!define VERSION_MINOR "1"
!define VERSION_YYYY "2019"
-!define VERSION_MMDD "0907"
+!define VERSION_MMDD "0914"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"
Index: package/mingw-ncurses.spec
--- ncurses-6.1-20190907+/package/mingw-ncurses.spec 2019-09-07 15:19:35.000000000 +0000
+++ ncurses-6.1-20190914/package/mingw-ncurses.spec 2019-09-14 13:43:52.000000000 +0000
@@ -3,7 +3,7 @@
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 6.1
-Release: 20190907
+Release: 20190914
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncurses.spec
--- ncurses-6.1-20190907+/package/ncurses.spec 2019-09-07 15:19:35.000000000 +0000
+++ ncurses-6.1-20190914/package/ncurses.spec 2019-09-14 13:43:52.000000000 +0000
@@ -1,7 +1,7 @@
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 6.1
-Release: 20190907
+Release: 20190914
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncursest.spec
--- ncurses-6.1-20190907+/package/ncursest.spec 2019-09-07 15:19:35.000000000 +0000
+++ ncurses-6.1-20190914/package/ncursest.spec 2019-09-14 13:43:52.000000000 +0000
@@ -1,7 +1,7 @@
Summary: Curses library with POSIX thread support.
Name: ncursest6
Version: 6.1
-Release: 20190907
+Release: 20190914
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz

2677
ncurses-6.1-20190921.patch
View File

File diff suppressed because it is too large Load Diff

922
ncurses-6.1-20190928.patch
View File

@ -1,922 +0,0 @@
# ncurses 6.1 - patch 20190928 - Thomas E. Dickey
#
# ------------------------------------------------------------------------------
#
# Ncurses 6.1 is at
# ftp.gnu.org:/pub/gnu
#
# Patches for ncurses 6.1 can be found at
# ftp://ftp.invisible-island.net/ncurses/6.1
# http://invisible-mirror.net/archives/ncurses/6.1
#
# ------------------------------------------------------------------------------
# ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20190928.patch.gz
# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created Sat Sep 28 15:09:31 UTC 2019
# ------------------------------------------------------------------------------
# NEWS | 10 ++
# VERSION | 2
# aclocal.m4 | 72 ++++++++++++++++++++
# configure | 106 +++++++++++++++++++++++++----
# configure.in | 7 +
# dist.mk | 4 -
# misc/gen-pkgconfig.in | 39 +++++------
# misc/ncurses-config.in | 131 +++++++++++++++++++++++++++++--------
# misc/terminfo.src | 11 +--
# 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
# package/ncursest.spec | 2
# test/ncurses.c | 10 +-
# 17 files changed, 325 insertions(+), 89 deletions(-)
# ------------------------------------------------------------------------------
Index: NEWS
Prereq: 1.3376
--- ncurses-6.1-20190921+/NEWS 2019-09-21 23:47:04.000000000 +0000
+++ ncurses-6.1-20190928/NEWS 2019-09-28 12:57:39.000000000 +0000
@@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3376 2019/09/21 23:47:04 tom Exp $
+-- $Id: NEWS,v 1.3380 2019/09/28 12:57:39 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.
+20190928
+ + amend the ncurse*-config and pc-files to take into account the rpath
+ hack which differed between those files.
+ + improve -L option filtering in ncurses*-config
+ + improve recovery from error when reading command-character in
+ test/ncurses.c, showing the relevant error message and not exiting on
+ EINTR (cf: 20180922)
+
20190921
+ add a note in resizeterm manpage about top-level windows which touch
the screen's borders.
Index: VERSION
--- ncurses-6.1-20190921+/VERSION 2019-09-21 14:56:20.000000000 +0000
+++ ncurses-6.1-20190928/VERSION 2019-09-27 18:43:59.000000000 +0000
@@ -1 +1 @@
-5:0:10 6.1 20190921
+5:0:10 6.1 20190928
Index: aclocal.m4
Prereq: 1.883
--- ncurses-6.1-20190921+/aclocal.m4 2019-09-21 22:11:35.000000000 +0000
+++ ncurses-6.1-20190928/aclocal.m4 2019-09-27 21:08:36.000000000 +0000
@@ -28,7 +28,7 @@
dnl
dnl Author: Thomas E. Dickey 1995-on
dnl
-dnl $Id: aclocal.m4,v 1.883 2019/09/21 22:11:35 tom Exp $
+dnl $Id: aclocal.m4,v 1.884 2019/09/27 21:08:36 tom Exp $
dnl Macros used in NCURSES auto-configuration script.
dnl
dnl These macros are maintained separately from NCURSES. The copyright on
@@ -3850,6 +3850,76 @@
fi
])dnl
dnl ---------------------------------------------------------------------------
+dnl CF_LD_SEARCHPATH version: 2 updated: 2019/09/26 20:34:14
+dnl ----------------
+dnl Try to obtain the linker's search-path, for use in scripts.
+dnl
+dnl Ignore LD_LIBRARY_PATH, etc.
+AC_DEFUN([CF_LD_SEARCHPATH],[
+AC_CACHE_CHECK(for linker search path,cf_cv_ld_searchpath,[
+
+if test "$cross_compiling" != yes ; then
+
+# GNU binutils' ld does not involve permissions which may stop ldconfig.
+cf_pathlist=`ld --verbose 2>/dev/null | grep SEARCH_DIR | sed -e 's,SEARCH_DIR[[("=]][[("=]]*,,g' -e 's/"[[)]];//gp' | sort -u`
+
+# The -NX options tell newer versions of Linux ldconfig to not attempt to
+# update the cache, which makes it run faster.
+test -z "$cf_pathlist" && \
+ cf_pathlist=`ldconfig -NX -v 2>/dev/null | sed -e '/^[[ ]]/d' -e 's/:$//' | sort -u`
+
+test -z "$cf_pathlist" &&
+ cf_pathlist=`ldconfig -v 2>/dev/null | sed -n -e '/^[[ ]]/d' -e 's/:$//p' | sort -u`
+
+# This works with OpenBSD 6.5, which lists only filenames
+test -z "$cf_pathlist" &&
+ cf_pathlist=`ldconfig -v 2>/dev/null | sed -n -e 's,^Adding \(.*\)/.*[$],\1,p' | sort -u`
+
+if test -z "$cf_pathlist"
+then
+ # dyld default path with MacOS
+ if test -f /usr/bin/otool && test "x`uname -s`" = xDarwin
+ then
+ # do this to bypass check
+ cf_cv_ld_searchpath='$HOME/lib'
+ cf_pathlist="/usr/local/lib /lib /usr/lib"
+ fi
+fi
+
+if test -z "$cf_pathlist"
+then
+ # Solaris is hardcoded
+ if test -d /opt/SUNWspro/lib
+ then
+ cf_pathlist="/opt/SUNWspro/lib /usr/ccs/lib /usr/lib"
+ elif test -d /usr/ccs/lib
+ then
+ cf_pathlist="/usr/ccs/lib /usr/lib"
+ fi
+fi
+
+fi
+
+# If nothing else, assume it is conventional
+test -z "$cf_pathlist" && cf_pathlist="/usr/lib /lib"
+
+# Finally, check that this is only directories
+for cf_path in [$]0 $cf_pathlist
+do
+ if test -d "$cf_path"; then
+ test -n "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath="${cf_cv_ld_searchpath} "
+ cf_cv_ld_searchpath="${cf_cv_ld_searchpath}${cf_path}"
+ fi
+done
+
+# Ensure that it is nonempty
+test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
+])
+
+LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'`
+AC_SUBST(LD_SEARCHPATH)
+])dnl
+dnl ---------------------------------------------------------------------------
dnl CF_LIBRARY_PATH version: 10 updated: 2015/04/15 19:08:48
dnl ---------------
dnl Construct a search-list of directories for a nonstandard library-file
Index: configure
--- ncurses-6.1-20190921+/configure 2019-09-21 19:49:24.000000000 +0000
+++ ncurses-6.1-20190928/configure 2019-09-27 22:50:51.000000000 +0000
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 1.689 .
+# From configure.in Revision: 1.690 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by Autoconf 2.52.20190901.
#
@@ -26022,6 +26022,77 @@
CHECK_BUILD=
fi
+# This is used for the *-config script and *.pc data files.
+
+echo "$as_me:26027: checking for linker search path" >&5
+echo $ECHO_N "checking for linker search path... $ECHO_C" >&6
+if test "${cf_cv_ld_searchpath+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+if test "$cross_compiling" != yes ; then
+
+# GNU binutils' ld does not involve permissions which may stop ldconfig.
+cf_pathlist=`ld --verbose 2>/dev/null | grep SEARCH_DIR | sed -e 's,SEARCH_DIR[("=][("=]*,,g' -e 's/"[)];//gp' | sort -u`
+
+# The -NX options tell newer versions of Linux ldconfig to not attempt to
+# update the cache, which makes it run faster.
+test -z "$cf_pathlist" && \
+ cf_pathlist=`ldconfig -NX -v 2>/dev/null | sed -e '/^[ ]/d' -e 's/:$//' | sort -u`
+
+test -z "$cf_pathlist" &&
+ cf_pathlist=`ldconfig -v 2>/dev/null | sed -n -e '/^[ ]/d' -e 's/:$//p' | sort -u`
+
+# This works with OpenBSD 6.5, which lists only filenames
+test -z "$cf_pathlist" &&
+ cf_pathlist=`ldconfig -v 2>/dev/null | sed -n -e 's,^Adding \(.*\)/.*$,\1,p' | sort -u`
+
+if test -z "$cf_pathlist"
+then
+ # dyld default path with MacOS
+ if test -f /usr/bin/otool && test "x`uname -s`" = xDarwin
+ then
+ # do this to bypass check
+ cf_cv_ld_searchpath='$HOME/lib'
+ cf_pathlist="/usr/local/lib /lib /usr/lib"
+ fi
+fi
+
+if test -z "$cf_pathlist"
+then
+ # Solaris is hardcoded
+ if test -d /opt/SUNWspro/lib
+ then
+ cf_pathlist="/opt/SUNWspro/lib /usr/ccs/lib /usr/lib"
+ elif test -d /usr/ccs/lib
+ then
+ cf_pathlist="/usr/ccs/lib /usr/lib"
+ fi
+fi
+
+fi
+
+# If nothing else, assume it is conventional
+test -z "$cf_pathlist" && cf_pathlist="/usr/lib /lib"
+
+# Finally, check that this is only directories
+for cf_path in $0 $cf_pathlist
+do
+ if test -d "$cf_path"; then
+ test -n "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath="${cf_cv_ld_searchpath} "
+ cf_cv_ld_searchpath="${cf_cv_ld_searchpath}${cf_path}"
+ fi
+done
+
+# Ensure that it is nonempty
+test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
+
+fi
+echo "$as_me:26091: result: $cf_cv_ld_searchpath" >&5
+echo "${ECHO_T}$cf_cv_ld_searchpath" >&6
+
+LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'`
+
cat >>confdefs.h <<\EOF
#define HAVE_CURSES_DATA_BOOLNAMES 1
EOF
@@ -26107,7 +26178,7 @@
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:26110: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:26181: creating $CONFIG_STATUS" >&5
echo "$as_me: creating $CONFIG_STATUS" >&6;}
cat >$CONFIG_STATUS <<_ACEOF
#! $SHELL
@@ -26283,7 +26354,7 @@
echo "$ac_cs_version"; exit 0 ;;
--he | --h)
# Conflict between --help and --header
- { { echo "$as_me:26286: error: ambiguous option: $1
+ { { echo "$as_me:26357: 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;}
@@ -26302,7 +26373,7 @@
ac_need_defaults=false;;
# This is an error.
- -*) { { echo "$as_me:26305: error: unrecognized option: $1
+ -*) { { echo "$as_me:26376: 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;}
@@ -26421,7 +26492,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:26424: error: invalid argument: $ac_config_target" >&5
+ *) { { echo "$as_me:26495: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
{ (exit 1); exit 1; }; };;
esac
@@ -26784,6 +26855,7 @@
s,@ADAGEN_LDFLAGS@,$ADAGEN_LDFLAGS,;t t
s,@CHECK_BUILD@,$CHECK_BUILD,;t t
s,@PRIVATE_LIBS@,$PRIVATE_LIBS,;t t
+s,@LD_SEARCHPATH@,$LD_SEARCHPATH,;t t
CEOF
EOF
@@ -26916,7 +26988,7 @@
esac
if test x"$ac_file" != x-; then
- { echo "$as_me:26919: creating $ac_file" >&5
+ { echo "$as_me:26991: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
rm -f "$ac_file"
fi
@@ -26934,7 +27006,7 @@
-) echo $tmp/stdin ;;
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
- test -f "$f" || { { echo "$as_me:26937: error: cannot find input file: $f" >&5
+ test -f "$f" || { { echo "$as_me:27009: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
echo $f;;
@@ -26947,7 +27019,7 @@
echo $srcdir/$f
else
# /dev/null tree
- { { echo "$as_me:26950: error: cannot find input file: $f" >&5
+ { { echo "$as_me:27022: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
fi;;
@@ -26963,7 +27035,7 @@
if test -n "$ac_seen"; then
ac_used=`grep '@datarootdir@' $ac_item`
if test -z "$ac_used"; then
- { echo "$as_me:26966: WARNING: datarootdir was used implicitly but not set:
+ { echo "$as_me:27038: 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;}
@@ -26972,7 +27044,7 @@
fi
ac_seen=`grep '${datarootdir}' $ac_item`
if test -n "$ac_seen"; then
- { echo "$as_me:26975: WARNING: datarootdir was used explicitly but not set:
+ { echo "$as_me:27047: 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;}
@@ -27009,7 +27081,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:27012: WARNING: Variable $ac_name is used but was not set:
+ { echo "$as_me:27084: 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;}
@@ -27020,7 +27092,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:27023: WARNING: Some variables may not be substituted:
+ { echo "$as_me:27095: WARNING: Some variables may not be substituted:
$ac_seen" >&5
echo "$as_me: WARNING: Some variables may not be substituted:
$ac_seen" >&2;}
@@ -27069,7 +27141,7 @@
* ) ac_file_in=$ac_file.in ;;
esac
- test x"$ac_file" != x- && { echo "$as_me:27072: creating $ac_file" >&5
+ test x"$ac_file" != x- && { echo "$as_me:27144: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
# First look for the input files in the build tree, otherwise in the
@@ -27080,7 +27152,7 @@
-) echo $tmp/stdin ;;
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
- test -f "$f" || { { echo "$as_me:27083: error: cannot find input file: $f" >&5
+ test -f "$f" || { { echo "$as_me:27155: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
echo $f;;
@@ -27093,7 +27165,7 @@
echo $srcdir/$f
else
# /dev/null tree
- { { echo "$as_me:27096: error: cannot find input file: $f" >&5
+ { { echo "$as_me:27168: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
fi;;
@@ -27151,7 +27223,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:27154: $ac_file is unchanged" >&5
+ { echo "$as_me:27226: $ac_file is unchanged" >&5
echo "$as_me: $ac_file is unchanged" >&6;}
else
ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -27496,7 +27568,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}:27499: testing overriding CXX_MODEL to SHARED ..." 1>&5
+echo "${as_me:-configure}:27571: testing overriding CXX_MODEL to SHARED ..." 1>&5
with_shared_cxx=yes
;;
Index: configure.in
Prereq: 1.689
--- ncurses-6.1-20190921+/configure.in 2019-09-07 20:06:52.000000000 +0000
+++ ncurses-6.1-20190928/configure.in 2019-09-27 21:12:34.000000000 +0000
@@ -28,14 +28,14 @@
dnl
dnl Author: Thomas E. Dickey 1995-on
dnl
-dnl $Id: configure.in,v 1.689 2019/09/07 20:06:52 tom Exp $
+dnl $Id: configure.in,v 1.690 2019/09/27 21:12:34 tom Exp $
dnl Process this file with autoconf to produce a configure script.
dnl
dnl See https://invisible-island.net/autoconf/ for additional information.
dnl
dnl ---------------------------------------------------------------------------
AC_PREREQ(2.52.20170501)
-AC_REVISION($Revision: 1.689 $)
+AC_REVISION($Revision: 1.690 $)
AC_INIT(ncurses/base/lib_initscr.c)
AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
@@ -2391,6 +2391,9 @@
AC_SUBST(CHECK_BUILD)
AC_SUBST(PRIVATE_LIBS)
+# This is used for the *-config script and *.pc data files.
+CF_LD_SEARCHPATH
+
AC_DEFINE(HAVE_CURSES_DATA_BOOLNAMES,1,[definition needed for in-tree build of tack])
AC_OUTPUT( \
Index: dist.mk
Prereq: 1.1306
--- ncurses-6.1-20190921+/dist.mk 2019-09-21 14:56:20.000000000 +0000
+++ ncurses-6.1-20190928/dist.mk 2019-09-27 18:43:59.000000000 +0000
@@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.1306 2019/09/21 14:56:20 tom Exp $
+# $Id: dist.mk,v 1.1307 2019/09/27 18:43:59 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 = 1
-NCURSES_PATCH = 20190921
+NCURSES_PATCH = 20190928
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
Index: misc/gen-pkgconfig.in
Prereq: 1.34
--- ncurses-6.1-20190921+/misc/gen-pkgconfig.in 2018-06-09 22:21:33.000000000 +0000
+++ ncurses-6.1-20190928/misc/gen-pkgconfig.in 2019-09-28 12:53:53.000000000 +0000
@@ -1,7 +1,7 @@
#!@SHELL@
-# $Id: gen-pkgconfig.in,v 1.34 2018/06/09 22:21:33 tom Exp $
+# $Id: gen-pkgconfig.in,v 1.36 2019/09/28 12:53:53 tom Exp $
##############################################################################
-# Copyright (c) 2009-2015,2018 Free Software Foundation, Inc. #
+# Copyright (c) 2009-2018,2019 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"), #
@@ -46,6 +46,7 @@
DFT_DEP_SUFFIX=@DFT_DEP_SUFFIX@
TINFO_ARG_SUFFIX=@TINFO_ARG_SUFFIX@
CXX_LIB_SUFFIX=@CXX_LIB_SUFFIX@
+RPATH_LIST=@RPATH_LIST@
PRIVATE_LIBS="@PRIVATE_LIBS@"
suffix=@PC_MODULE_SUFFIX@
@@ -66,10 +67,10 @@
FORM_LIBRARY="${FORM_NAME}@USE_ARG_SUFFIX@"
CFLAGS="@PKG_CFLAGS@"
-if test "$includedir" != "/usr/include" ; then
+if [ "$includedir" != "/usr/include" ]; then
includetop=`echo "$includedir" | sed -e 's,/include/[^/]*$,/include,'`
- test "$includetop" = "/usr/include" && includetop="$includedir"
- if test "x$includetop" != "x$includedir"
+ [ "$includetop" = "/usr/include" ] && includetop="$includedir"
+ if [ "x$includetop" != "x$includedir" ]
then
CFLAGS="$CFLAGS -I${includetop}"
fi
@@ -77,10 +78,10 @@
fi
LDFLAGS=
-if test "$libdir" != "/usr/lib" ; then
+if [ "$libdir" != "/usr/lib" ]; then
LDFLAGS="$LDFLAGS -L\${libdir}"
fi
-if test "x@EXTRA_LDFLAGS@" != "x" ; then
+if [ "x@EXTRA_LDFLAGS@" != "x" ]; then
LDFLAGS="$LDFLAGS @EXTRA_LDFLAGS@"
fi
@@ -88,8 +89,8 @@
# functions or curses variables (which also reside in tinfo) can be linked
# using the -lncurses option.
NEED_TINFO=no
-if test "x@TINFO_LIBS@" != "x" && \
- test "x$TINFO_ARG_SUFFIX" != "x$MAIN_LIBRARY"
+if [ "x@TINFO_LIBS@" != "x" ] && \
+ [ "x$TINFO_ARG_SUFFIX" != "x$MAIN_LIBRARY" ]
then
NEED_TINFO=yes
fi
@@ -102,10 +103,10 @@
desc="ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@"
reqs=
- if test $name = $MAIN_LIBRARY ; then
+ if [ $name = $MAIN_LIBRARY ]; then
desc="$desc library"
- test $NEED_TINFO = yes && LIBS="$LIBS -l$TINFO_ARG_SUFFIX"
- elif test $name = $SUB_LIBRARY ; then
+ [ $NEED_TINFO = yes ] && LIBS="$LIBS -l$TINFO_ARG_SUFFIX"
+ elif [ $name = $SUB_LIBRARY ]; then
desc="$desc terminal interface library"
elif expr $name : ".*${CXX_NAME}.*" >/dev/null ; then
reqs="$PANEL_LIBRARY${suffix}, $MENU_LIBRARY${suffix}, $FORM_LIBRARY${suffix}, $MAIN_LIBRARY${suffix}"
@@ -115,15 +116,15 @@
desc="$desc add-on library"
fi
- if test $name != $SUB_LIBRARY && \
- test $SUB_LIBRARY != $MAIN_LIBRARY && \
- test $name != $TINFO_NAME && \
- test $NEED_TINFO != yes ; then
- test -n "$reqs" && reqs="$reqs, "
+ if [ $name != $SUB_LIBRARY ] && \
+ [ $SUB_LIBRARY != $MAIN_LIBRARY ] && \
+ [ $name != $TINFO_NAME ] && \
+ [ $NEED_TINFO != yes ] ; then
+ [ -n "$reqs" ] && reqs="$reqs, "
reqs="${reqs}${SUB_LIBRARY}${suffix}"
fi
- if test $name = $MAIN_LIBRARY
+ if [ $name = $MAIN_LIBRARY ]
then
main_libs="$PRIVATE_LIBS"
else
@@ -154,4 +155,4 @@
EOF
done
-# vile:shmode
+# vile:shmode ts=4 sw=4
Index: misc/ncurses-config.in
Prereq: 1.37
--- ncurses-6.1-20190921+/misc/ncurses-config.in 2018-06-09 22:29:01.000000000 +0000
+++ ncurses-6.1-20190928/misc/ncurses-config.in 2019-09-28 12:54:17.000000000 +0000
@@ -1,7 +1,7 @@
#!@SHELL@
-# $Id: ncurses-config.in,v 1.37 2018/06/09 22:29:01 tom Exp $
+# $Id: ncurses-config.in,v 1.39 2019/09/28 12:54:17 tom Exp $
##############################################################################
-# Copyright (c) 2006-2017,2018 Free Software Foundation, Inc. #
+# Copyright (c) 2006-2018,2019 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"), #
@@ -54,7 +54,7 @@
# Ensure that RPATH_LIST contains only absolute pathnames, if it is nonempty.
# We cannot filter it out within the build-process since the variable is used
# in some special cases of installation using a relative path.
-if test -n "$RPATH_LIST"
+if [ -n "$RPATH_LIST" ]
then
save_IFS="$IFS"
IFS='@PATH_SEPARATOR@'
@@ -65,7 +65,7 @@
./*|../*|*/..|*/../*)
;;
*)
- test -n "$filtered" && filtered="${filtered}@PATH_SEPARATOR@"
+ [ -n "$filtered" ] && filtered="${filtered}@PATH_SEPARATOR@"
filtered="${filtered}${item}"
;;
esac
@@ -78,7 +78,7 @@
# with --disable-overwrite, we installed into a subdirectory, but transformed
# the headers to include like this:
# <ncurses@LIB_SUFFIX@/curses.h>
-if test x@WITH_OVERWRITE@ = xno ; then
+if [ x@WITH_OVERWRITE@ = xno ]; then
case $includedir in
$prefix/include/ncurses@LIB_SUFFIX@@EXTRA_SUFFIX@)
includedir=`echo "$includedir" | sed -e 's,/[^/]*$,,'`
@@ -86,9 +86,50 @@
esac
fi
-test $# = 0 && exec @SHELL@ $0 --error
+LIBS="@LIBS@ @PRIVATE_LIBS@"
+if [ "@TINFO_NAME@" = "@LIB_NAME@" ]; then
+ LIBS="-l${THIS} $LIBS"
+else
+ LIBS="-l${THIS} -l${TINFO_LIB} $LIBS"
+fi
+
+# Ignore -L options which do not correspond to an actual directory, or which
+# are standard library directories (i.e., the linker is supposed to search
+# those directories).
+#
+# There is no portable way to find the list of standard library directories.
+# Require a POSIX shell anyway, to keep this simple.
+lib_flags=
+for opt in -L$libdir @LDFLAGS@ @EXTRA_LDFLAGS@ $LIBS
+do
+ case $opt in
+ -L*)
+ [ -d ${opt##-L} ] || continue
+ case ${opt##-L} in
+ @LD_SEARCHPATH@) # skip standard libdir
+ continue
+ ;;
+ *)
+ found=no
+ for check in $lib_flags
+ do
+ if [ "x$check" = "x$opt" ]
+ then
+ found=yes
+ break
+ fi
+ done
+ [ $found = yes ] && continue
+ ;;
+ esac
+ ;;
+ esac
+ lib_flags="$lib_flags $opt"
+done
-while test $# -gt 0; do
+[ $# = 0 ] && exec @SHELL@ $0 --error
+
+while [ $# -gt 0 ]; do
case "$1" in
# basic configuration
--prefix)
@@ -100,10 +141,10 @@
# compile/link
--cflags)
INCS="@PKG_CFLAGS@"
- if test "x@WITH_OVERWRITE@" = xno ; then
+ if [ "x@WITH_OVERWRITE@" = xno ]; then
INCS="$INCS -I${includesubdir}"
fi
- if test "${includedir}" != /usr/include ; then
+ if [ "${includedir}" != /usr/include ]; then
INCS="$INCS -I${includedir}"
fi
sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
@@ -111,22 +152,54 @@
ENDECHO
;;
--libs)
- if test "$libdir" = /usr/lib
- then
- LIBDIR=
- else
- LIBDIR=-L$libdir
- fi
- LIBS="@LIBS@ @PRIVATE_LIBS@"
- if test @TINFO_NAME@ = @LIB_NAME@ ; then
- sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
- $LIBDIR @EXTRA_LDFLAGS@ -l${THIS} $LIBS
-ENDECHO
- else
- sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
- $LIBDIR @EXTRA_LDFLAGS@ -l${THIS} -l${TINFO_LIB} $LIBS
-ENDECHO
- fi
+ OPTS=
+ for opt in $lib_flags
+ do
+ [ -n "$OPTS" ] && OPTS="$OPTS "
+ OPTS="${OPTS}${opt}"
+ done
+ printf "%s\n" "$OPTS"
+ ;;
+ --libs-only-L)
+ OPTS=
+ for opt in $lib_flags
+ do
+ case "x$opt" in
+ x-L*)
+ [ -n "$OPTS" ] && OPTS="$OPTS "
+ OPTS="${OPTS}${opt}"
+ ;;
+ esac
+ done
+ printf "%s\n" "$OPTS"
+ ;;
+ --libs-only-l)
+ OPTS=
+ for opt in $lib_flags
+ do
+ case "x$opt" in
+ x-l*)
+ [ -n "$OPTS" ] && OPTS="$OPTS "
+ OPTS="${OPTS}${opt}"
+ ;;
+ esac
+ done
+ printf "%s\n" "$OPTS"
+ ;;
+ --libs-only-other)
+ OPTS=
+ for opt in $lib_flags
+ do
+ case "x$opt" in
+ x-[lL]*)
+ ;;
+ *)
+ [ -n "$OPTS" ] && OPTS="$OPTS "
+ OPTS="${OPTS}${opt}"
+ ;;
+ esac
+ done
+ printf "%s\n" "$OPTS"
;;
# identification
--version)
@@ -147,9 +220,9 @@
;;
--includedir)
INCS=
- if test "x@WITH_OVERWRITE@" = xno ; then
+ if [ "x@WITH_OVERWRITE@" = xno ]; then
INCS="${includesubdir}"
- elif test "${includedir}" != /usr/include ; then
+ elif [ "${includedir}" != /usr/include ]; then
INCS="${includedir}"
fi
echo $INCS
@@ -181,6 +254,10 @@
--cflags echos the C compiler flags needed to compile with ${THIS}
--libs echos the libraries needed to link with ${THIS}
+ --libs-only-L echos -L linker options (search path) for ${THIS}
+ --libs-only-l echos -l linker options (libraries) for ${THIS}
+ --libs-only-other echos linker options other than -L/-l
+
--version echos the release+patchdate version of ${THIS}
--abi-version echos the ABI version of ${THIS}
--mouse-version echos the mouse-interface version of ${THIS}
Index: misc/terminfo.src
--- ncurses-6.1-20190921+/misc/terminfo.src 2019-08-03 21:42:15.000000000 +0000
+++ ncurses-6.1-20190928/misc/terminfo.src 2019-09-22 18:48:45.000000000 +0000
@@ -6,8 +6,8 @@
# Report bugs and new terminal descriptions to
# bug-ncurses@gnu.org
#
-# $Revision: 1.763 $
-# $Date: 2019/08/03 21:42:15 $
+# $Revision: 1.765 $
+# $Date: 2019/09/22 18:48:45 $
#
# 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
@@ -3292,7 +3292,7 @@
# tracked under rdar://problem/7365108 and rdar://problem/7365134
# in Apple's bug reporter.
#
-# In OS X 10.7 (Leopard) the TERM which can be set in the preferences dialog
+# In OS X 10.5 (Leopard) the TERM which can be set in the preferences dialog
# defaults to xterm-color. Alternative selections are ansi, dtterm, rxvt,
# vt52, vt100, vt102 and xterm.
nsterm-16color|AppKit Terminal.app v240.2+ with Mac OS X version 10.5,
@@ -3364,7 +3364,7 @@
# This is tested with OS X 10.8 (Mountain Lion), 2012/08/11
# TERM_PROGRAM_VERSION=309
-# Earlier reports state that these differences also apply to OS X 10.7 (Leopard),
+# Earlier reports state that these differences also apply to OS X 10.7 (Lion),
# TERM_PROGRAM_VERSION=303
nsterm-build309|Terminal.app in OS X 10.8,
use=xterm+256setaf, use=nsterm-bce,
@@ -26372,4 +26372,7 @@
# + updated alacritty+common entry & notes -TD
# + use xterm+sl-twm for consistency -TD
#
+# 2019-09-22
+# + correct a comment -TD
+#
######## SHANTIH! SHANTIH! SHANTIH!
Index: package/debian-mingw/changelog
--- ncurses-6.1-20190921+/package/debian-mingw/changelog 2019-09-21 14:56:20.000000000 +0000
+++ ncurses-6.1-20190928/package/debian-mingw/changelog 2019-09-27 18:43:59.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20190921) unstable; urgency=low
+ncurses6 (6.1+20190928) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 21 Sep 2019 10:56:20 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sun, 22 Sep 2019 14:43:59 -0400
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian-mingw64/changelog
--- ncurses-6.1-20190921+/package/debian-mingw64/changelog 2019-09-21 14:56:20.000000000 +0000
+++ ncurses-6.1-20190928/package/debian-mingw64/changelog 2019-09-27 18:43:59.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20190921) unstable; urgency=low
+ncurses6 (6.1+20190928) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 21 Sep 2019 10:56:20 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sun, 22 Sep 2019 14:43:59 -0400
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian/changelog
--- ncurses-6.1-20190921+/package/debian/changelog 2019-09-21 14:56:20.000000000 +0000
+++ ncurses-6.1-20190928/package/debian/changelog 2019-09-27 18:43:59.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20190921) unstable; urgency=low
+ncurses6 (6.1+20190928) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 21 Sep 2019 10:56:20 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sun, 22 Sep 2019 14:43:59 -0400
ncurses6 (5.9-20120608) unstable; urgency=low
Index: package/mingw-ncurses.nsi
Prereq: 1.352
--- ncurses-6.1-20190921+/package/mingw-ncurses.nsi 2019-09-21 14:56:20.000000000 +0000
+++ ncurses-6.1-20190928/package/mingw-ncurses.nsi 2019-09-27 18:43:59.000000000 +0000
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.352 2019/09/21 14:56:20 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.353 2019/09/27 18:43:59 tom Exp $
; TODO add examples
; TODO bump ABI to 6
@@ -10,7 +10,7 @@
!define VERSION_MAJOR "6"
!define VERSION_MINOR "1"
!define VERSION_YYYY "2019"
-!define VERSION_MMDD "0921"
+!define VERSION_MMDD "0928"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"
Index: package/mingw-ncurses.spec
--- ncurses-6.1-20190921+/package/mingw-ncurses.spec 2019-09-21 14:56:20.000000000 +0000
+++ ncurses-6.1-20190928/package/mingw-ncurses.spec 2019-09-27 18:43:59.000000000 +0000
@@ -3,7 +3,7 @@
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 6.1
-Release: 20190921
+Release: 20190928
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncurses.spec
--- ncurses-6.1-20190921+/package/ncurses.spec 2019-09-21 14:56:20.000000000 +0000
+++ ncurses-6.1-20190928/package/ncurses.spec 2019-09-27 18:43:59.000000000 +0000
@@ -1,7 +1,7 @@
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 6.1
-Release: 20190921
+Release: 20190928
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncursest.spec
--- ncurses-6.1-20190921+/package/ncursest.spec 2019-09-21 14:56:20.000000000 +0000
+++ ncurses-6.1-20190928/package/ncursest.spec 2019-09-27 18:43:59.000000000 +0000
@@ -1,7 +1,7 @@
Summary: Curses library with POSIX thread support.
Name: ncursest6
Version: 6.1
-Release: 20190921
+Release: 20190928
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: test/ncurses.c
Prereq: 1.518
--- ncurses-6.1-20190921+/test/ncurses.c 2019-08-31 23:22:40.000000000 +0000
+++ ncurses-6.1-20190928/test/ncurses.c 2019-09-22 19:12:40.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.518 2019/08/31 23:22:40 tom Exp $
+$Id: ncurses.c,v 1.519 2019/09/22 19:12:40 tom Exp $
***************************************************************************/
@@ -7815,11 +7815,13 @@
for (;;) {
char ch = '\0';
if (read(fileno(stdin), &ch, (size_t) 1) <= 0) {
- if (command == 0)
- command = 'q';
- if (errno == EINTR) {
+ int save_err = errno;
+ perror("\nOOPS");
+ if (save_err == EINTR) {
clearerr(stdin);
continue;
+ } else if (command == 0) {
+ command = 'q';
}
break;
} else if (command == 0 && !isspace(UChar(ch))) {

231
ncurses-6.1-20191005.patch
View File

@ -1,231 +0,0 @@
# ncurses 6.1 - patch 20191005 - Thomas E. Dickey
#
# ------------------------------------------------------------------------------
#
# Ncurses 6.1 is at
# ftp.gnu.org:/pub/gnu
#
# Patches for ncurses 6.1 can be found at
# ftp://ftp.invisible-island.net/ncurses/6.1
# http://invisible-mirror.net/archives/ncurses/6.1
#
# ------------------------------------------------------------------------------
# ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20191005.patch.gz
# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created Sun Oct 6 00:58:27 UTC 2019
# ------------------------------------------------------------------------------
# NEWS | 6 +++++-
# VERSION | 2 +-
# dist.mk | 4 ++--
# misc/gen-pkgconfig.in | 5 +++--
# misc/ncurses-config.in | 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 +-
# package/ncursest.spec | 2 +-
# 12 files changed, 24 insertions(+), 19 deletions(-)
# ------------------------------------------------------------------------------
Index: NEWS
Prereq: 1.3380
--- ncurses-6.1-20190928+/NEWS 2019-09-28 12:57:39.000000000 +0000
+++ ncurses-6.1-20191005/NEWS 2019-10-05 22:53:18.000000000 +0000
@@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3380 2019/09/28 12:57:39 tom Exp $
+-- $Id: NEWS,v 1.3382 2019/10/05 22:53:18 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.
+20191005
+ + modify the ncurse*-config and pc-files to more closely match for the
+ -I and -l options.
+
20190928
+ amend the ncurse*-config and pc-files to take into account the rpath
hack which differed between those files.
Index: VERSION
--- ncurses-6.1-20190928+/VERSION 2019-09-27 18:43:59.000000000 +0000
+++ ncurses-6.1-20191005/VERSION 2019-10-05 14:44:23.000000000 +0000
@@ -1 +1 @@
-5:0:10 6.1 20190928
+5:0:10 6.1 20191005
Index: dist.mk
Prereq: 1.1307
--- ncurses-6.1-20190928+/dist.mk 2019-09-27 18:43:59.000000000 +0000
+++ ncurses-6.1-20191005/dist.mk 2019-10-05 14:44:23.000000000 +0000
@@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.1307 2019/09/27 18:43:59 tom Exp $
+# $Id: dist.mk,v 1.1308 2019/10/05 14:44: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 = 1
-NCURSES_PATCH = 20190928
+NCURSES_PATCH = 20191005
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
Index: misc/gen-pkgconfig.in
Prereq: 1.36
--- ncurses-6.1-20190928+/misc/gen-pkgconfig.in 2019-09-28 12:53:53.000000000 +0000
+++ ncurses-6.1-20191005/misc/gen-pkgconfig.in 2019-10-05 22:25:47.000000000 +0000
@@ -1,5 +1,5 @@
#!@SHELL@
-# $Id: gen-pkgconfig.in,v 1.36 2019/09/28 12:53:53 tom Exp $
+# $Id: gen-pkgconfig.in,v 1.38 2019/10/05 22:25:47 tom Exp $
##############################################################################
# Copyright (c) 2009-2018,2019 Free Software Foundation, Inc. #
# #
@@ -70,11 +70,11 @@
if [ "$includedir" != "/usr/include" ]; then
includetop=`echo "$includedir" | sed -e 's,/include/[^/]*$,/include,'`
[ "$includetop" = "/usr/include" ] && includetop="$includedir"
+ CFLAGS="$CFLAGS -I\${includedir}"
if [ "x$includetop" != "x$includedir" ]
then
CFLAGS="$CFLAGS -I${includetop}"
fi
- CFLAGS="$CFLAGS -I\${includedir}"
fi
LDFLAGS=
@@ -106,6 +106,7 @@
if [ $name = $MAIN_LIBRARY ]; then
desc="$desc library"
[ $NEED_TINFO = yes ] && LIBS="$LIBS -l$TINFO_ARG_SUFFIX"
+ [ -n "@LIBS@" ] && LIBS="$LIBS @LIBS@"
elif [ $name = $SUB_LIBRARY ]; then
desc="$desc terminal interface library"
elif expr $name : ".*${CXX_NAME}.*" >/dev/null ; then
Index: misc/ncurses-config.in
Prereq: 1.39
--- ncurses-6.1-20190928+/misc/ncurses-config.in 2019-09-28 12:54:17.000000000 +0000
+++ ncurses-6.1-20191005/misc/ncurses-config.in 2019-10-05 22:24:20.000000000 +0000
@@ -1,5 +1,5 @@
#!@SHELL@
-# $Id: ncurses-config.in,v 1.39 2019/09/28 12:54:17 tom Exp $
+# $Id: ncurses-config.in,v 1.40 2019/10/05 22:24:20 tom Exp $
##############################################################################
# Copyright (c) 2006-2018,2019 Free Software Foundation, Inc. #
# #
@@ -86,7 +86,7 @@
esac
fi
-LIBS="@LIBS@ @PRIVATE_LIBS@"
+LIBS="@LIBS@"
if [ "@TINFO_NAME@" = "@LIB_NAME@" ]; then
LIBS="-l${THIS} $LIBS"
else
Index: package/debian-mingw/changelog
--- ncurses-6.1-20190928+/package/debian-mingw/changelog 2019-09-27 18:43:59.000000000 +0000
+++ ncurses-6.1-20191005/package/debian-mingw/changelog 2019-10-05 14:44:23.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20190928) unstable; urgency=low
+ncurses6 (6.1+20191005) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sun, 22 Sep 2019 14:43:59 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 05 Oct 2019 10:44:23 -0400
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian-mingw64/changelog
--- ncurses-6.1-20190928+/package/debian-mingw64/changelog 2019-09-27 18:43:59.000000000 +0000
+++ ncurses-6.1-20191005/package/debian-mingw64/changelog 2019-10-05 14:44:23.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20190928) unstable; urgency=low
+ncurses6 (6.1+20191005) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sun, 22 Sep 2019 14:43:59 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 05 Oct 2019 10:44:23 -0400
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian/changelog
--- ncurses-6.1-20190928+/package/debian/changelog 2019-09-27 18:43:59.000000000 +0000
+++ ncurses-6.1-20191005/package/debian/changelog 2019-10-05 14:44:23.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20190928) unstable; urgency=low
+ncurses6 (6.1+20191005) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sun, 22 Sep 2019 14:43:59 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 05 Oct 2019 10:44:23 -0400
ncurses6 (5.9-20120608) unstable; urgency=low
Index: package/mingw-ncurses.nsi
Prereq: 1.353
--- ncurses-6.1-20190928+/package/mingw-ncurses.nsi 2019-09-27 18:43:59.000000000 +0000
+++ ncurses-6.1-20191005/package/mingw-ncurses.nsi 2019-10-05 14:44:23.000000000 +0000
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.353 2019/09/27 18:43:59 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.354 2019/10/05 14:44:23 tom Exp $
; TODO add examples
; TODO bump ABI to 6
@@ -10,7 +10,7 @@
!define VERSION_MAJOR "6"
!define VERSION_MINOR "1"
!define VERSION_YYYY "2019"
-!define VERSION_MMDD "0928"
+!define VERSION_MMDD "1005"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"
Index: package/mingw-ncurses.spec
--- ncurses-6.1-20190928+/package/mingw-ncurses.spec 2019-09-27 18:43:59.000000000 +0000
+++ ncurses-6.1-20191005/package/mingw-ncurses.spec 2019-10-05 14:44:23.000000000 +0000
@@ -3,7 +3,7 @@
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 6.1
-Release: 20190928
+Release: 20191005
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncurses.spec
--- ncurses-6.1-20190928+/package/ncurses.spec 2019-09-27 18:43:59.000000000 +0000
+++ ncurses-6.1-20191005/package/ncurses.spec 2019-10-05 14:44:23.000000000 +0000
@@ -1,7 +1,7 @@
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 6.1
-Release: 20190928
+Release: 20191005
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncursest.spec
--- ncurses-6.1-20190928+/package/ncursest.spec 2019-09-27 18:43:59.000000000 +0000
+++ ncurses-6.1-20191005/package/ncursest.spec 2019-10-05 14:44:23.000000000 +0000
@@ -1,7 +1,7 @@
Summary: Curses library with POSIX thread support.
Name: ncursest6
Version: 6.1
-Release: 20190928
+Release: 20191005
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz

1359
ncurses-6.1-20191012.patch
View File

File diff suppressed because it is too large Load Diff

304
ncurses-6.1-20191015.patch
View File

@ -1,304 +0,0 @@
# ncurses 6.1 - patch 20191015 - Thomas E. Dickey
#
# ------------------------------------------------------------------------------
#
# Ncurses 6.1 is at
# ftp.gnu.org:/pub/gnu
#
# Patches for ncurses 6.1 can be found at
# ftp://ftp.invisible-island.net/ncurses/6.1
# http://invisible-mirror.net/archives/ncurses/6.1
#
# ------------------------------------------------------------------------------
# ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20191015.patch.gz
# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created Wed Oct 16 00:42:21 UTC 2019
# ------------------------------------------------------------------------------
# NEWS | 10 +++++++++-
# VERSION | 2 +-
# dist.mk | 4 ++--
# ncurses/tinfo/captoinfo.c | 34 ++++++++++++++++++++--------------
# 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 +-
# package/ncursest.spec | 2 +-
# progs/tic.c | 5 +++--
# 12 files changed, 46 insertions(+), 31 deletions(-)
# ------------------------------------------------------------------------------
Index: NEWS
Prereq: 1.3389
--- ncurses-6.1-20191012+/NEWS 2019-10-12 21:17:50.000000000 +0000
+++ ncurses-6.1-20191015/NEWS 2019-10-16 00:04:31.000000000 +0000
@@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3389 2019/10/12 21:17:50 tom Exp $
+-- $Id: NEWS,v 1.3393 2019/10/16 00:04:31 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.
+20191015
+ + improve buffer-checks in captoinfo.c, for some cases when the
+ input string is shorter than expected.
+ > fix two errata in tic (report/testcases by Hongxu Chen):
+ + check for missing character after backslash in write_it
+ + check for missing characters after "%>" when converting from termcap
+ syntax (cf: 980530).
+
20191012
+ amend recent changes to ncurses*-config and pc-files to filter out
Debian linker-flags (report by Sven Joachim, cf: 20150516).
Index: VERSION
--- ncurses-6.1-20191012+/VERSION 2019-10-12 15:30:55.000000000 +0000
+++ ncurses-6.1-20191015/VERSION 2019-10-15 21:46:57.000000000 +0000
@@ -1 +1 @@
-5:0:10 6.1 20191012
+5:0:10 6.1 20191015
Index: dist.mk
Prereq: 1.1309
--- ncurses-6.1-20191012+/dist.mk 2019-10-12 15:30:55.000000000 +0000
+++ ncurses-6.1-20191015/dist.mk 2019-10-15 21:46:57.000000000 +0000
@@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.1309 2019/10/12 15:30:55 tom Exp $
+# $Id: dist.mk,v 1.1310 2019/10/15 21:46:57 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 = 1
-NCURSES_PATCH = 20191012
+NCURSES_PATCH = 20191015
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
Index: ncurses/tinfo/captoinfo.c
Prereq: 1.96
--- ncurses-6.1-20191012+/ncurses/tinfo/captoinfo.c 2018-05-12 16:46:55.000000000 +0000
+++ ncurses-6.1-20191015/ncurses/tinfo/captoinfo.c 2019-10-15 23:13:35.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2017,2018 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2018,2019 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 *
@@ -97,7 +97,7 @@
#include <ctype.h>
#include <tic.h>
-MODULE_ID("$Id: captoinfo.c,v 1.96 2018/05/12 16:46:55 tom Exp $")
+MODULE_ID("$Id: captoinfo.c,v 1.97 2019/10/15 23:13:35 tom Exp $")
#if 0
#define DEBUG_THIS(p) DEBUG(9, p)
@@ -210,7 +210,7 @@
break;
default:
c = UChar(*sp);
- len = 2;
+ len = (c != '\0') ? 2 : 1;
break;
}
break;
@@ -224,13 +224,13 @@
break;
default:
c = UChar(*sp);
- len = 1;
+ len = (c != '\0') ? 1 : 0;
}
if (isgraph(c) && c != ',' && c != '\'' && c != '\\' && c != ':') {
dp = save_string(dp, "%\'");
dp = save_char(dp, c);
dp = save_char(dp, '\'');
- } else {
+ } else if (c != '\0') {
dp = save_string(dp, "%{");
if (c > 99)
dp = save_char(dp, c / 100 + '0');
@@ -313,7 +313,7 @@
if (s == 0)
s = "";
if (parameterized >= 0 && isdigit(UChar(*s)))
- for (capstart = s;; s++)
+ for (capstart = s; *s != '\0'; s++)
if (!(isdigit(UChar(*s)) || *s == '*' || *s == '.'))
break;
@@ -360,13 +360,18 @@
dp = save_string(dp, "%{2}%*%-");
break;
case '>':
- getparm(param, 2);
/* %?%{x}%>%t%{y}%+%; */
- dp = save_string(dp, "%?");
- s += cvtchar(s);
- dp = save_string(dp, "%>%t");
- s += cvtchar(s);
- dp = save_string(dp, "%+%;");
+ if (s[0] && s[1]) {
+ getparm(param, 2);
+ dp = save_string(dp, "%?");
+ s += cvtchar(s);
+ dp = save_string(dp, "%>%t");
+ s += cvtchar(s);
+ dp = save_string(dp, "%+%;");
+ } else {
+ _nc_warning("expected two characters after %%>");
+ dp = save_string(dp, "%>");
+ }
break;
case 'a':
if ((*s == '=' || *s == '+' || *s == '-'
@@ -492,7 +497,8 @@
}
break;
default:
- dp = save_char(dp, *s++);
+ if (*s != '\0')
+ dp = save_char(dp, *s++);
break;
}
}
@@ -503,7 +509,7 @@
*/
if (capstart) {
dp = save_string(dp, "$<");
- for (s = capstart;; s++)
+ for (s = capstart; *s != '\0'; s++)
if (isdigit(UChar(*s)) || *s == '*' || *s == '.')
dp = save_char(dp, *s);
else
Index: package/debian-mingw/changelog
--- ncurses-6.1-20191012+/package/debian-mingw/changelog 2019-10-12 15:30:55.000000000 +0000
+++ ncurses-6.1-20191015/package/debian-mingw/changelog 2019-10-15 21:46:57.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20191012) unstable; urgency=low
+ncurses6 (6.1+20191015) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Fri, 11 Oct 2019 19:37:45 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Tue, 15 Oct 2019 17:46:57 -0400
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian-mingw64/changelog
--- ncurses-6.1-20191012+/package/debian-mingw64/changelog 2019-10-12 15:30:55.000000000 +0000
+++ ncurses-6.1-20191015/package/debian-mingw64/changelog 2019-10-15 21:46:57.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20191012) unstable; urgency=low
+ncurses6 (6.1+20191015) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Fri, 11 Oct 2019 19:37:45 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Tue, 15 Oct 2019 17:46:57 -0400
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian/changelog
--- ncurses-6.1-20191012+/package/debian/changelog 2019-10-12 15:30:55.000000000 +0000
+++ ncurses-6.1-20191015/package/debian/changelog 2019-10-15 21:46:57.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20191012) unstable; urgency=low
+ncurses6 (6.1+20191015) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Fri, 11 Oct 2019 19:37:45 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Tue, 15 Oct 2019 17:46:57 -0400
ncurses6 (5.9-20120608) unstable; urgency=low
Index: package/mingw-ncurses.nsi
Prereq: 1.355
--- ncurses-6.1-20191012+/package/mingw-ncurses.nsi 2019-10-12 15:30:55.000000000 +0000
+++ ncurses-6.1-20191015/package/mingw-ncurses.nsi 2019-10-15 21:46:57.000000000 +0000
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.355 2019/10/12 15:30:55 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.356 2019/10/15 21:46:57 tom Exp $
; TODO add examples
; TODO bump ABI to 6
@@ -10,7 +10,7 @@
!define VERSION_MAJOR "6"
!define VERSION_MINOR "1"
!define VERSION_YYYY "2019"
-!define VERSION_MMDD "1012"
+!define VERSION_MMDD "1015"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"
Index: package/mingw-ncurses.spec
--- ncurses-6.1-20191012+/package/mingw-ncurses.spec 2019-10-12 15:30:55.000000000 +0000
+++ ncurses-6.1-20191015/package/mingw-ncurses.spec 2019-10-15 21:46:57.000000000 +0000
@@ -3,7 +3,7 @@
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 6.1
-Release: 20191012
+Release: 20191015
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncurses.spec
--- ncurses-6.1-20191012+/package/ncurses.spec 2019-10-12 15:30:55.000000000 +0000
+++ ncurses-6.1-20191015/package/ncurses.spec 2019-10-15 21:46:57.000000000 +0000
@@ -1,7 +1,7 @@
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 6.1
-Release: 20191012
+Release: 20191015
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncursest.spec
--- ncurses-6.1-20191012+/package/ncursest.spec 2019-10-12 15:30:55.000000000 +0000
+++ ncurses-6.1-20191015/package/ncursest.spec 2019-10-15 21:46:57.000000000 +0000
@@ -1,7 +1,7 @@
Summary: Curses library with POSIX thread support.
Name: ncursest6
Version: 6.1
-Release: 20191012
+Release: 20191015
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: progs/tic.c
Prereq: 1.278
--- ncurses-6.1-20191012+/progs/tic.c 2019-07-27 22:44:21.000000000 +0000
+++ ncurses-6.1-20191015/progs/tic.c 2019-10-15 22:18:29.000000000 +0000
@@ -48,7 +48,7 @@
#include <parametrized.h>
#include <transform.h>
-MODULE_ID("$Id: tic.c,v 1.278 2019/07/27 22:44:21 tom Exp $")
+MODULE_ID("$Id: tic.c,v 1.279 2019/10/15 22:18:29 tom Exp $")
#define STDIN_NAME "<stdin>"
@@ -218,7 +218,8 @@
while ((ch = *t++) != 0) {
*d++ = (char) ch;
if (ch == '\\') {
- *d++ = *t++;
+ if ((*d++ = *t++) == '\0')
+ break;
} else if ((ch == '%')
&& (*t == L_BRACE)) {
char *v = 0;

256
ncurses-6.1-20191019.patch
View File

@ -1,256 +0,0 @@
# ncurses 6.1 - patch 20191019 - Thomas E. Dickey
#
# ------------------------------------------------------------------------------
#
# Ncurses 6.1 is at
# ftp.gnu.org:/pub/gnu
#
# Patches for ncurses 6.1 can be found at
# ftp://ftp.invisible-island.net/ncurses/6.1
# http://invisible-mirror.net/archives/ncurses/6.1
#
# ------------------------------------------------------------------------------
# ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20191019.patch.gz
# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created Sun Oct 20 01:10:33 UTC 2019
# ------------------------------------------------------------------------------
# NEWS | 9 ++++++++-
# VERSION | 2 +-
# dist.mk | 4 ++--
# ncurses/tinfo/comp_parse.c | 6 +++---
# ncurses/tinfo/make_hash.c | 7 ++-----
# 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 +-
# package/ncursest.spec | 2 +-
# 12 files changed, 27 insertions(+), 23 deletions(-)
# ------------------------------------------------------------------------------
Index: NEWS
Prereq: 1.3393
--- ncurses-6.1-20191015+/NEWS 2019-10-16 00:04:31.000000000 +0000
+++ ncurses-6.1-20191019/NEWS 2019-10-19 21:16:45.000000000 +0000
@@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3393 2019/10/16 00:04:31 tom Exp $
+-- $Id: NEWS,v 1.3396 2019/10/19 21:16:45 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.
+20191019
+ + modify make_hash to not require --disable-leaks, to simplify building
+ with address-sanitizer.
+ + modify tic to exit if it cannot remove a conflicting name, because
+ treating that as a partial success can cause an infinite loop in
+ use-resolution (report/testcase by Hongxu Chen, cf: 20111001).
+
20191015
+ improve buffer-checks in captoinfo.c, for some cases when the
input string is shorter than expected.
Index: VERSION
--- ncurses-6.1-20191015+/VERSION 2019-10-15 21:46:57.000000000 +0000
+++ ncurses-6.1-20191019/VERSION 2019-10-19 12:47:53.000000000 +0000
@@ -1 +1 @@
-5:0:10 6.1 20191015
+5:0:10 6.1 20191019
Index: dist.mk
Prereq: 1.1310
--- ncurses-6.1-20191015+/dist.mk 2019-10-15 21:46:57.000000000 +0000
+++ ncurses-6.1-20191019/dist.mk 2019-10-19 12:47:53.000000000 +0000
@@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.1310 2019/10/15 21:46:57 tom Exp $
+# $Id: dist.mk,v 1.1311 2019/10/19 12:47:53 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 = 1
-NCURSES_PATCH = 20191015
+NCURSES_PATCH = 20191019
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
Index: ncurses/tinfo/comp_parse.c
Prereq: 1.106
--- ncurses-6.1-20191015+/ncurses/tinfo/comp_parse.c 2018-05-26 14:16:46.000000000 +0000
+++ ncurses-6.1-20191019/ncurses/tinfo/comp_parse.c 2019-10-19 20:47:43.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2017,2018 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2018,2019 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 <tic.h>
-MODULE_ID("$Id: comp_parse.c,v 1.106 2018/05/26 14:16:46 tom Exp $")
+MODULE_ID("$Id: comp_parse.c,v 1.107 2019/10/19 20:47:43 tom Exp $")
static void sanity_check2(TERMTYPE2 *, bool);
NCURSES_IMPEXP void NCURSES_API(*_nc_check_termtype2) (TERMTYPE2 *, bool) = sanity_check2;
@@ -180,11 +180,11 @@
++qend;
while ((*qstart++ = *qend++) != '\0') ;
fprintf(stderr, "...now\t%s\n", p2);
+ removed = TRUE;
} else {
fprintf(stderr, "Cannot remove alias '%.*s'\n",
(int) (qend - qstart), qstart);
}
- removed = TRUE;
break;
}
}
Index: ncurses/tinfo/make_hash.c
Prereq: 1.28
--- ncurses-6.1-20191015+/ncurses/tinfo/make_hash.c 2019-07-27 23:06:54.000000000 +0000
+++ ncurses-6.1-20191019/ncurses/tinfo/make_hash.c 2019-10-19 21:02:19.000000000 +0000
@@ -43,7 +43,7 @@
#include <ctype.h>
-MODULE_ID("$Id: make_hash.c,v 1.28 2019/07/27 23:06:54 tom Exp $")
+MODULE_ID("$Id: make_hash.c,v 1.29 2019/10/19 21:02:19 tom Exp $")
/*
* _nc_make_hash_table()
@@ -164,13 +164,11 @@
int col = 0;
-#if NO_LEAKS
if (buffer == 0) {
free(list);
list = 0;
return 0;
}
-#endif
if (*buffer != '#') {
if (list == 0) {
@@ -433,12 +431,11 @@
}
free(hash_table);
-#if NO_LEAKS
for (n = 0; (n < tablesize); ++n) {
free((void *) name_table[n].ute_name);
}
free(name_table);
parse_columns(0);
-#endif
+
return EXIT_SUCCESS;
}
Index: package/debian-mingw/changelog
--- ncurses-6.1-20191015+/package/debian-mingw/changelog 2019-10-15 21:46:57.000000000 +0000
+++ ncurses-6.1-20191019/package/debian-mingw/changelog 2019-10-19 12:47:53.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20191015) unstable; urgency=low
+ncurses6 (6.1+20191019) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Tue, 15 Oct 2019 17:46:57 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 19 Oct 2019 08:47:53 -0400
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian-mingw64/changelog
--- ncurses-6.1-20191015+/package/debian-mingw64/changelog 2019-10-15 21:46:57.000000000 +0000
+++ ncurses-6.1-20191019/package/debian-mingw64/changelog 2019-10-19 12:47:53.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20191015) unstable; urgency=low
+ncurses6 (6.1+20191019) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Tue, 15 Oct 2019 17:46:57 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 19 Oct 2019 08:47:53 -0400
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian/changelog
--- ncurses-6.1-20191015+/package/debian/changelog 2019-10-15 21:46:57.000000000 +0000
+++ ncurses-6.1-20191019/package/debian/changelog 2019-10-19 12:47:53.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20191015) unstable; urgency=low
+ncurses6 (6.1+20191019) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Tue, 15 Oct 2019 17:46:57 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 19 Oct 2019 08:47:53 -0400
ncurses6 (5.9-20120608) unstable; urgency=low
Index: package/mingw-ncurses.nsi
Prereq: 1.356
--- ncurses-6.1-20191015+/package/mingw-ncurses.nsi 2019-10-15 21:46:57.000000000 +0000
+++ ncurses-6.1-20191019/package/mingw-ncurses.nsi 2019-10-19 12:47:53.000000000 +0000
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.356 2019/10/15 21:46:57 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.357 2019/10/19 12:47:53 tom Exp $
; TODO add examples
; TODO bump ABI to 6
@@ -10,7 +10,7 @@
!define VERSION_MAJOR "6"
!define VERSION_MINOR "1"
!define VERSION_YYYY "2019"
-!define VERSION_MMDD "1015"
+!define VERSION_MMDD "1019"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"
Index: package/mingw-ncurses.spec
--- ncurses-6.1-20191015+/package/mingw-ncurses.spec 2019-10-15 21:46:57.000000000 +0000
+++ ncurses-6.1-20191019/package/mingw-ncurses.spec 2019-10-19 12:47:53.000000000 +0000
@@ -3,7 +3,7 @@
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 6.1
-Release: 20191015
+Release: 20191019
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncurses.spec
--- ncurses-6.1-20191015+/package/ncurses.spec 2019-10-15 21:46:57.000000000 +0000
+++ ncurses-6.1-20191019/package/ncurses.spec 2019-10-19 12:47:53.000000000 +0000
@@ -1,7 +1,7 @@
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 6.1
-Release: 20191015
+Release: 20191019
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncursest.spec
--- ncurses-6.1-20191015+/package/ncursest.spec 2019-10-15 21:46:57.000000000 +0000
+++ ncurses-6.1-20191019/package/ncursest.spec 2019-10-19 12:47:53.000000000 +0000
@@ -1,7 +1,7 @@
Summary: Curses library with POSIX thread support.
Name: ncursest6
Version: 6.1
-Release: 20191015
+Release: 20191019
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz

740
ncurses-6.1-20191026.patch
View File

@ -1,740 +0,0 @@
# ncurses 6.1 - patch 20191026 - Thomas E. Dickey
#
# ------------------------------------------------------------------------------
#
# Ncurses 6.1 is at
# ftp.gnu.org:/pub/gnu
#
# Patches for ncurses 6.1 can be found at
# ftp://ftp.invisible-island.net/ncurses/6.1
# http://invisible-mirror.net/archives/ncurses/6.1
#
# ------------------------------------------------------------------------------
# ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20191026.patch.gz
# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created Sun Oct 27 01:34:14 UTC 2019
# ------------------------------------------------------------------------------
# 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_add_wch.3x.html | 103 +++++++++++++++++---------------
# 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/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 | 2
# doc/html/man/toe.1m.html | 2
# doc/html/man/tput.1.html | 2
# doc/html/man/tset.1.html | 2
# man/curs_add_wch.3x | 56 ++++++++++-------
# misc/terminfo.src | 16 ++++
# ncurses/tinfo/lib_tgoto.c | 13 +++-
# 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
# package/ncursest.spec | 2
# 30 files changed, 152 insertions(+), 106 deletions(-)
# ------------------------------------------------------------------------------
Index: NEWS
Prereq: 1.3396
--- ncurses-6.1-20191019+/NEWS 2019-10-19 21:16:45.000000000 +0000
+++ ncurses-6.1-20191026/NEWS 2019-10-27 00:10:51.000000000 +0000
@@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3396 2019/10/19 21:16:45 tom Exp $
+-- $Id: NEWS,v 1.3399 2019/10/27 00:10:51 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.
+20191026
+ + add a note in man/curs_add_wch.3x about Unicode terminology for the
+ line-drawing characters (report by Nick Black).
+ + improve comment in lib_tgoto.c regarding the use of \200 where a
+ \0 would be intended by the caller (report by "64 bit", cf: 20000923).
+ + modify linux-16color to accommodate Linux console driver change in
+ early 2018 (report by Dino Petrucci).
+
20191019
+ modify make_hash to not require --disable-leaks, to simplify building
with address-sanitizer.
Index: VERSION
--- ncurses-6.1-20191019+/VERSION 2019-10-19 12:47:53.000000000 +0000
+++ ncurses-6.1-20191026/VERSION 2019-10-26 08:56:47.000000000 +0000
@@ -1 +1 @@
-5:0:10 6.1 20191019
+5:0:10 6.1 20191026
Index: dist.mk
Prereq: 1.1311
--- ncurses-6.1-20191019+/dist.mk 2019-10-19 12:47:53.000000000 +0000
+++ ncurses-6.1-20191026/dist.mk 2019-10-26 08:56:47.000000000 +0000
@@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.1311 2019/10/19 12:47:53 tom Exp $
+# $Id: dist.mk,v 1.1312 2019/10/26 08:56:47 tom Exp $
# Makefile for creating ncurses distributions.
#
# This only needs to be used directly as a makefile by developers, but
@@ -37,7 +37,7 @@
# These define the major/minor/patch versions of ncurses.
NCURSES_MAJOR = 6
NCURSES_MINOR = 1
-NCURSES_PATCH = 20191019
+NCURSES_PATCH = 20191026
# 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.1-20191019+/doc/html/man/adacurses6-config.1.html 2019-10-12 21:32:36.000000000 +0000
+++ ncurses-6.1-20191026/doc/html/man/adacurses6-config.1.html 2019-10-27 00:15:46.000000000 +0000
@@ -125,7 +125,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.1 (patch 20191012).
+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191026).
Index: doc/html/man/captoinfo.1m.html
--- ncurses-6.1-20191019+/doc/html/man/captoinfo.1m.html 2019-10-12 21:32:36.000000000 +0000
+++ ncurses-6.1-20191026/doc/html/man/captoinfo.1m.html 2019-10-27 00:15:46.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.1 (patch 20191012).
+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191026).
</PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
Index: doc/html/man/clear.1.html
--- ncurses-6.1-20191019+/doc/html/man/clear.1.html 2019-10-12 21:32:36.000000000 +0000
+++ ncurses-6.1-20191026/doc/html/man/clear.1.html 2019-10-27 00:15:46.000000000 +0000
@@ -148,7 +148,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.1 (patch 20191012).
+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191026).
Index: doc/html/man/curs_add_wch.3x.html
--- ncurses-6.1-20191019+/doc/html/man/curs_add_wch.3x.html 2019-03-16 19:34:43.000000000 +0000
+++ ncurses-6.1-20191026/doc/html/man/curs_add_wch.3x.html 2019-10-27 00:15:46.000000000 +0000
@@ -1,6 +1,6 @@
<!--
****************************************************************************
- * Copyright (c) 2001-2015,2017 Free Software Foundation, Inc. *
+ * Copyright (c) 2001-2017,2019 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: curs_add_wch.3x,v 1.24 2017/11/18 23:47:37 tom Exp @
+ * @Id: curs_add_wch.3x,v 1.25 2019/10/27 00:07:13 tom Exp @
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
<HTML>
@@ -138,7 +138,24 @@
WACS_VLINE 0x2502 | x vertical line
The wide-character configuration of ncurses also defines symbols for
- double-lines:
+ thick lines (<STRONG>acsc</STRONG> "J" to "V"):
+
+ <STRONG>ACS</STRONG> <STRONG>Unicode</STRONG> <STRONG>ASCII</STRONG> <STRONG>acsc</STRONG> <STRONG>Glyph</STRONG>
+ <STRONG>Name</STRONG> <STRONG>Default</STRONG> <STRONG>Default</STRONG> <STRONG>char</STRONG> <STRONG>Name</STRONG>
+ -----------------------------------------------------------------------
+ WACS_T_BTEE 0x253b + V thick tee pointing up
+ WACS_T_HLINE 0x2501 - Q thick horizontal line
+ WACS_T_LLCORNER 0x2517 + M thick lower left corner
+ WACS_T_LRCORNER 0x251b + J thick lower right corner
+ WACS_T_LTEE 0x252b + T thick tee pointing right
+ WACS_T_PLUS 0x254b + N thick large plus
+ WACS_T_RTEE 0x2523 + U thick tee pointing left
+ WACS_T_TTEE 0x2533 + W thick tee pointing down
+ WACS_T_ULCORNER 0x250f + L thick upper left corner
+ WACS_T_URCORNER 0x2513 + K thick upper right corner
+ WACS_T_VLINE 0x2503 | X thick vertical line
+
+ and for double-lines (<STRONG>acsc</STRONG> "A" to "I"):
<STRONG>ACS</STRONG> <STRONG>Unicode</STRONG> <STRONG>ASCII</STRONG> <STRONG>acsc</STRONG> <STRONG>Glyph</STRONG>
<STRONG>Name</STRONG> <STRONG>Default</STRONG> <STRONG>Default</STRONG> <STRONG>char</STRONG> <STRONG>Name</STRONG>
@@ -155,28 +172,22 @@
WACS_D_URCORNER 0x2557 + B double upper right corner
WACS_D_VLINE 0x2551 | Y double vertical line
- and for thick lines:
+ Unicode's descriptions for these characters differs slightly from
+ ncurses, by introducing the term "light" (along with less important
+ details). Here are its descriptions for the normal, thick, and double
+ horizontal lines:
- <STRONG>ACS</STRONG> <STRONG>Unicode</STRONG> <STRONG>ASCII</STRONG> <STRONG>acsc</STRONG> <STRONG>Glyph</STRONG>
- <STRONG>Name</STRONG> <STRONG>Default</STRONG> <STRONG>Default</STRONG> <STRONG>char</STRONG> <STRONG>Name</STRONG>
- -----------------------------------------------------------------------
- WACS_T_BTEE 0x253b + V thick tee pointing up
- WACS_T_HLINE 0x2501 - Q thick horizontal line
- WACS_T_LLCORNER 0x2517 + M thick lower left corner
- WACS_T_LRCORNER 0x251b + J thick lower right corner
- WACS_T_LTEE 0x252b + T thick tee pointing right
- WACS_T_PLUS 0x254b + N thick large plus
- WACS_T_RTEE 0x2523 + U thick tee pointing left
- WACS_T_TTEE 0x2533 + W thick tee pointing down
- WACS_T_ULCORNER 0x250f + L thick upper left corner
- WACS_T_URCORNER 0x2513 + K thick upper right corner
- WACS_T_VLINE 0x2503 | X thick vertical line
+ <STRONG>o</STRONG> U+2500 BOX DRAWINGS LIGHT HORIZONTAL
+
+ <STRONG>o</STRONG> U+2501 BOX DRAWINGS HEAVY HORIZONTAL
+
+ <STRONG>o</STRONG> U+2550 BOX DRAWINGS DOUBLE HORIZONTAL
</PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
All routines return the integer <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> on success.
- Functions with a "mv" prefix first perform a cursor movement using
+ Functions with a "mv" prefix first perform a cursor movement using
<STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
the window pointer is null.
@@ -186,71 +197,71 @@
</PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
- All of these functions are described in the XSI Curses standard, Issue
- 4. The defaults specified for line-drawing characters apply in the
+ All of these functions are described in the XSI Curses standard, Issue
+ 4. The defaults specified for line-drawing characters apply in the
POSIX locale.
- X/Open Curses makes it clear that the WACS_ symbols should be defined
+ X/Open Curses makes it clear that the WACS_ symbols should be defined
as a pointer to <STRONG>cchar_t</STRONG> data, e.g., in the discussion of <STRONG>border_set</STRONG>. A
few implementations are problematic:
<STRONG>o</STRONG> NetBSD curses defines the symbols as a <STRONG>wchar_t</STRONG> within a <STRONG>cchar_t</STRONG>.
<STRONG>o</STRONG> HPUX curses equates some of the <EM>ACS</EM><STRONG>_</STRONG> symbols to the analogous <EM>WACS</EM><STRONG>_</STRONG>
- symbols as if the <EM>ACS</EM><STRONG>_</STRONG> symbols were wide characters. The misde-
- fined symbols are the arrows and other symbols which are not used
+ symbols as if the <EM>ACS</EM><STRONG>_</STRONG> symbols were wide characters. The misde-
+ fined symbols are the arrows and other symbols which are not used
for line-drawing.
X/Open Curses does not define symbols for thick- or double-lines. SVr4
- curses implementations defined their line-drawing symbols in terms of
- intermediate symbols. This implementation extends those symbols, pro-
+ curses implementations defined their line-drawing symbols in terms of
+ intermediate symbols. This implementation extends those symbols, pro-
viding new definitions which are not in the SVr4 implementations.
- Not all Unicode-capable terminals provide support for VT100-style
+ Not all Unicode-capable terminals provide support for VT100-style
alternate character sets (i.e., the <STRONG>acsc</STRONG> capability), with their corre-
- sponding line-drawing characters. X/Open Curses did not address the
- aspect of integrating Unicode with line-drawing characters. Existing
- implementations of Unix curses (AIX, HPUX, Solaris) use only the <STRONG>acsc</STRONG>
- character-mapping to provide this feature. As a result, those imple-
- mentations can only use single-byte line-drawing characters. Ncurses
- 5.3 (2002) provided a table of Unicode values to solve these problems.
+ sponding line-drawing characters. X/Open Curses did not address the
+ aspect of integrating Unicode with line-drawing characters. Existing
+ implementations of Unix curses (AIX, HPUX, Solaris) use only the <STRONG>acsc</STRONG>
+ character-mapping to provide this feature. As a result, those imple-
+ mentations can only use single-byte line-drawing characters. Ncurses
+ 5.3 (2002) provided a table of Unicode values to solve these problems.
NetBSD curses incorporated that table in 2010.
In this implementation, the Unicode values are used instead of the ter-
- minal description's <STRONG>acsc</STRONG> mapping as discussed in <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> for the
- environment variable <STRONG>NCURSES_NO_UTF8_ACS</STRONG>. In contrast, for the same
+ minal description's <STRONG>acsc</STRONG> mapping as discussed in <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> for the
+ environment variable <STRONG>NCURSES_NO_UTF8_ACS</STRONG>. In contrast, for the same
cases, the line-drawing characters described in <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG> will use
only the ASCII default values.
- Having Unicode available does not solve all of the problems with line-
+ Having Unicode available does not solve all of the problems with line-
drawing for curses:
- <STRONG>o</STRONG> The closest Unicode equivalents to the VT100 graphics <EM>S1</EM>, <EM>S3</EM>, <EM>S7</EM>
- and <EM>S9</EM> frequently are not displayed at the regular intervals which
+ <STRONG>o</STRONG> The closest Unicode equivalents to the VT100 graphics <EM>S1</EM>, <EM>S3</EM>, <EM>S7</EM>
+ and <EM>S9</EM> frequently are not displayed at the regular intervals which
the terminal used.
- <STRONG>o</STRONG> The <EM>lantern</EM> is a special case. It originated with the AT&amp;T 4410
- terminal in the early 1980s. There is no accessible documentation
+ <STRONG>o</STRONG> The <EM>lantern</EM> is a special case. It originated with the AT&amp;T 4410
+ terminal in the early 1980s. There is no accessible documentation
depicting the lantern symbol on the AT&amp;T terminal.
Lacking documentation, most readers assume that a <EM>storm</EM> <EM>lantern</EM> was
intended. But there are several possibilities, all with problems.
- Unicode 6.0 (2010) does provide two lantern symbols: U+1F383 and
- U+1F3EE. Those were not available in 2002, and are irrelevant
- since they lie outside the BMP and as a result are not generally
+ Unicode 6.0 (2010) does provide two lantern symbols: U+1F383 and
+ U+1F3EE. Those were not available in 2002, and are irrelevant
+ since they lie outside the BMP and as a result are not generally
available in terminals. They are not storm lanterns, in any case.
Most <EM>storm</EM> <EM>lanterns</EM> have a tapering glass chimney (to guard against
tipping); some have a wire grid protecting the chimney.
- For the tapering appearance, U+2603 was adequate. In use on a
+ For the tapering appearance, U+2603 was adequate. In use on a
terminal, no one can tell what the image represents. Unicode calls
it a snowman.
- Others have suggested these alternatives: S U+00A7 (section mark),
+ Others have suggested these alternatives: S U+00A7 (section mark),
<STRONG>O</STRONG> U+0398 (theta), <STRONG>O</STRONG> U+03A6 (phi), d U+03B4 (delta), U+2327 (x in a
- rectangle), U+256C (forms double vertical and horizontal), and
+ rectangle), U+256C (forms double vertical and horizontal), and
U+2612 (ballot box with x).
Index: doc/html/man/form.3x.html
--- ncurses-6.1-20191019+/doc/html/man/form.3x.html 2019-10-12 21:32:38.000000000 +0000
+++ ncurses-6.1-20191026/doc/html/man/form.3x.html 2019-10-27 00:15:49.000000000 +0000
@@ -246,7 +246,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.1 (patch 20191012).
+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191026).
Index: doc/html/man/infocmp.1m.html
--- ncurses-6.1-20191019+/doc/html/man/infocmp.1m.html 2019-10-12 21:32:39.000000000 +0000
+++ ncurses-6.1-20191026/doc/html/man/infocmp.1m.html 2019-10-27 00:15:50.000000000 +0000
@@ -512,7 +512,7 @@
https://invisible-island.net/ncurses/tctest.html
- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191012).
+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191026).
</PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
Index: doc/html/man/infotocap.1m.html
--- ncurses-6.1-20191019+/doc/html/man/infotocap.1m.html 2019-10-12 21:32:39.000000000 +0000
+++ ncurses-6.1-20191026/doc/html/man/infotocap.1m.html 2019-10-27 00:15:50.000000000 +0000
@@ -90,7 +90,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.1 (patch 20191012).
+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191026).
</PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
Index: doc/html/man/menu.3x.html
--- ncurses-6.1-20191019+/doc/html/man/menu.3x.html 2019-10-12 21:32:39.000000000 +0000
+++ ncurses-6.1-20191026/doc/html/man/menu.3x.html 2019-10-27 00:15:50.000000000 +0000
@@ -221,7 +221,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.1 (patch 20191012).
+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191026).
Index: doc/html/man/ncurses.3x.html
--- ncurses-6.1-20191019+/doc/html/man/ncurses.3x.html 2019-10-12 21:32:40.000000000 +0000
+++ ncurses-6.1-20191026/doc/html/man/ncurses.3x.html 2019-10-27 00:15:51.000000000 +0000
@@ -59,7 +59,7 @@
method of updating character screens with reasonable optimization.
This implementation is "new curses" (ncurses) and is the approved
replacement for 4.4BSD classic curses, which has been discontinued.
- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191012).
+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191026).
The <STRONG>ncurses</STRONG> library emulates the curses library of System V Release 4
UNIX, and XPG4 (X/Open Portability Guide) curses (also known as XSI
Index: doc/html/man/ncurses6-config.1.html
--- ncurses-6.1-20191019+/doc/html/man/ncurses6-config.1.html 2019-10-12 21:32:40.000000000 +0000
+++ ncurses-6.1-20191026/doc/html/man/ncurses6-config.1.html 2019-10-27 00:15:51.000000000 +0000
@@ -112,7 +112,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.1 (patch 20191012).
+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191026).
Index: doc/html/man/panel.3x.html
--- ncurses-6.1-20191019+/doc/html/man/panel.3x.html 2019-10-12 21:32:40.000000000 +0000
+++ ncurses-6.1-20191026/doc/html/man/panel.3x.html 2019-10-27 00:15:51.000000000 +0000
@@ -204,7 +204,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.1 (patch 20191012).
+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191026).
</PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
Index: doc/html/man/tabs.1.html
--- ncurses-6.1-20191019+/doc/html/man/tabs.1.html 2019-10-12 21:32:40.000000000 +0000
+++ ncurses-6.1-20191026/doc/html/man/tabs.1.html 2019-10-27 00:15:51.000000000 +0000
@@ -205,7 +205,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.1 (patch 20191012).
+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191026).
Index: doc/html/man/terminfo.5.html
--- ncurses-6.1-20191019+/doc/html/man/terminfo.5.html 2019-10-12 21:32:41.000000000 +0000
+++ ncurses-6.1-20191026/doc/html/man/terminfo.5.html 2019-10-27 00:15:51.000000000 +0000
@@ -103,7 +103,7 @@
have, by specifying how to perform screen operations, and by specifying
padding requirements and initialization sequences.
- This manual describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191012).
+ This manual describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191026).
</PRE><H3><a name="h3-Terminfo-Entry-Syntax">Terminfo Entry Syntax</a></H3><PRE>
Index: doc/html/man/tic.1m.html
--- ncurses-6.1-20191019+/doc/html/man/tic.1m.html 2019-10-12 21:32:41.000000000 +0000
+++ ncurses-6.1-20191026/doc/html/man/tic.1m.html 2019-10-27 00:15:51.000000000 +0000
@@ -460,7 +460,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>. <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>.
- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191012).
+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191026).
</PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
Index: doc/html/man/toe.1m.html
--- ncurses-6.1-20191019+/doc/html/man/toe.1m.html 2019-10-12 21:32:41.000000000 +0000
+++ ncurses-6.1-20191026/doc/html/man/toe.1m.html 2019-10-27 00:15:51.000000000 +0000
@@ -170,7 +170,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>ter-</STRONG>
<STRONG><A HREF="terminfo.5.html">minfo(5)</A></STRONG>.
- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191012).
+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191026).
Index: doc/html/man/tput.1.html
--- ncurses-6.1-20191019+/doc/html/man/tput.1.html 2019-10-12 21:32:41.000000000 +0000
+++ ncurses-6.1-20191026/doc/html/man/tput.1.html 2019-10-27 00:15:51.000000000 +0000
@@ -522,7 +522,7 @@
</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
<STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>, <STRONG>stty(1)</STRONG>, <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>, <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="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.1 (patch 20191012).
+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191026).
Index: doc/html/man/tset.1.html
--- ncurses-6.1-20191019+/doc/html/man/tset.1.html 2019-10-12 21:32:41.000000000 +0000
+++ ncurses-6.1-20191026/doc/html/man/tset.1.html 2019-10-27 00:15:51.000000000 +0000
@@ -389,7 +389,7 @@
<STRONG>csh(1)</STRONG>, <STRONG>sh(1)</STRONG>, <STRONG>stty(1)</STRONG>, <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>, <STRONG>tty(4)</STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>,
<STRONG>ttys(5)</STRONG>, <STRONG>environ(7)</STRONG>
- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191012).
+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191026).
Index: man/curs_add_wch.3x
Prereq: 1.24
--- ncurses-6.1-20191019+/man/curs_add_wch.3x 2017-11-18 23:47:37.000000000 +0000
+++ ncurses-6.1-20191026/man/curs_add_wch.3x 2019-10-27 00:07:13.000000000 +0000
@@ -1,5 +1,5 @@
.\"***************************************************************************
-.\" Copyright (c) 2001-2015,2017 Free Software Foundation, Inc. *
+.\" Copyright (c) 2001-2017,2019 Free Software Foundation, Inc. *
.\" *
.\" Permission is hereby granted, free of charge, to any person obtaining a *
.\" copy of this software and associated documentation files (the *
@@ -26,7 +26,7 @@
.\" authorization. *
.\"***************************************************************************
.\"
-.\" $Id: curs_add_wch.3x,v 1.24 2017/11/18 23:47:37 tom Exp $
+.\" $Id: curs_add_wch.3x,v 1.25 2019/10/27 00:07:13 tom Exp $
.TH curs_add_wch 3X ""
.ie \n(.g .ds `` \(lq
.el .ds `` ``
@@ -155,7 +155,28 @@
.TE
.PP
The wide-character configuration of ncurses also defines symbols
-for double-lines:
+for thick lines (\fBacsc\fP \*(``J\*('' to \*(``V\*(''):
+.TS
+l l l l l
+l l l l l
+_ _ _ _ _
+lw(1.5i) lw5 lw5 lw5 lw20.
+\fBACS\fR \fBUnicode\fP \fBASCII\fR \fBacsc\fP \fBGlyph\fR
+\fBName\fR \fBDefault\fP \fBDefault\fR \fBchar\fP \fBName\fR
+WACS_T_BTEE 0x253b + V thick tee pointing up
+WACS_T_HLINE 0x2501 - Q thick horizontal line
+WACS_T_LLCORNER 0x2517 + M thick lower left corner
+WACS_T_LRCORNER 0x251b + J thick lower right corner
+WACS_T_LTEE 0x252b + T thick tee pointing right
+WACS_T_PLUS 0x254b + N thick large plus
+WACS_T_RTEE 0x2523 + U thick tee pointing left
+WACS_T_TTEE 0x2533 + W thick tee pointing down
+WACS_T_ULCORNER 0x250f + L thick upper left corner
+WACS_T_URCORNER 0x2513 + K thick upper right corner
+WACS_T_VLINE 0x2503 | X thick vertical line
+.TE
+.PP
+and for double-lines (\fBacsc\fP \*(``A\*('' to \*(``I\*(''):
.PP
.TS
l l l l l
@@ -177,26 +198,15 @@
WACS_D_VLINE 0x2551 | Y double vertical line
.TE
.PP
-and for thick lines:
-.TS
-l l l l l
-l l l l l
-_ _ _ _ _
-lw(1.5i) lw5 lw5 lw5 lw20.
-\fBACS\fR \fBUnicode\fP \fBASCII\fR \fBacsc\fP \fBGlyph\fR
-\fBName\fR \fBDefault\fP \fBDefault\fR \fBchar\fP \fBName\fR
-WACS_T_BTEE 0x253b + V thick tee pointing up
-WACS_T_HLINE 0x2501 - Q thick horizontal line
-WACS_T_LLCORNER 0x2517 + M thick lower left corner
-WACS_T_LRCORNER 0x251b + J thick lower right corner
-WACS_T_LTEE 0x252b + T thick tee pointing right
-WACS_T_PLUS 0x254b + N thick large plus
-WACS_T_RTEE 0x2523 + U thick tee pointing left
-WACS_T_TTEE 0x2533 + W thick tee pointing down
-WACS_T_ULCORNER 0x250f + L thick upper left corner
-WACS_T_URCORNER 0x2513 + K thick upper right corner
-WACS_T_VLINE 0x2503 | X thick vertical line
-.TE
+Unicode's descriptions for these characters differs slightly from ncurses,
+by introducing the term \*(``light\*('' (along with less important details).
+Here are its descriptions for the normal, thick, and double horizontal lines:
+.bP
+U+2500 BOX DRAWINGS LIGHT HORIZONTAL
+.bP
+U+2501 BOX DRAWINGS HEAVY HORIZONTAL
+.bP
+U+2550 BOX DRAWINGS DOUBLE HORIZONTAL
.SH RETURN VALUE
.PP
All routines return the integer \fBERR\fR upon failure and \fBOK\fR on success.
Index: misc/terminfo.src
--- ncurses-6.1-20191019+/misc/terminfo.src 2019-09-22 18:48:45.000000000 +0000
+++ ncurses-6.1-20191026/misc/terminfo.src 2019-10-26 17:00:56.000000000 +0000
@@ -6,8 +6,8 @@
# Report bugs and new terminal descriptions to
# bug-ncurses@gnu.org
#
-# $Revision: 1.765 $
-# $Date: 2019/09/22 18:48:45 $
+# $Revision: 1.766 $
+# $Date: 2019/10/26 17:00:56 $
#
# 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
@@ -1126,10 +1126,16 @@
# console font but bright background colors turn into dim ones when
# you use a 512-character console font. This uses bold for bright
# foreground colors and blink for bright background colors.
+#
+# Interestingly, the original version of this entry in 2009 used a documented
+# (but nonstandard) SGR 21, which was supported in the Linux console since 1992
+# as an equivalent for SGR 22. Long after (early 2018), someone modified the
+# console driver to make it ignore SGR 21 because the ECMA-48 standard
+# suggested a different use for that particular code.
linux-16color|linux console with 16 colors,
colors#16, ncv#42, pairs#0x100,
setab=\E[4%p1%{8}%m%d%?%p1%{7}%>%t;5%e;25%;m,
- setaf=\E[3%p1%{8}%m%d%?%p1%{7}%>%t;1%e;21%;m,
+ setaf=\E[3%p1%{8}%m%d%?%p1%{7}%>%t;1%e;22%;m,
use=linux,
# bterm (bogl 0.1.18)
@@ -26375,4 +26381,8 @@
# 2019-09-22
# + correct a comment -TD
#
+# 2019-10-26
+# + modify linux-16color to accommodate Linux console driver change in
+# early 2018 (report by Dino Petrucci).
+#
######## SHANTIH! SHANTIH! SHANTIH!
Index: ncurses/tinfo/lib_tgoto.c
Prereq: 1.17
--- ncurses-6.1-20191019+/ncurses/tinfo/lib_tgoto.c 2018-04-07 21:11:48.000000000 +0000
+++ ncurses-6.1-20191026/ncurses/tinfo/lib_tgoto.c 2019-10-26 22:43:48.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 2000-2012,2018 Free Software Foundation, Inc. *
+ * Copyright (c) 2000-2018,2019 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 <termcap.h>
-MODULE_ID("$Id: lib_tgoto.c,v 1.17 2018/04/07 21:11:48 tom Exp $")
+MODULE_ID("$Id: lib_tgoto.c,v 1.18 2019/10/26 22:43:48 tom Exp $")
#if !PURE_TERMINFO
static bool
@@ -125,7 +125,14 @@
*value += 1;
need_BC = TRUE;
} else {
- *value = 0200; /* tputs will treat this as \0 */
+ /* tputs will pretend this is \0, which will almost
+ * always work since ANSI-compatible terminals ignore
+ * the character. ECMA-48 does not document a C1
+ * control for this value. A few (obsolete) terminals
+ * can use this value in special cases, such as cursor
+ * addressing using single-byte coordinates.
+ */
+ *value = 0200;
}
}
result[used++] = (char) *value++;
Index: package/debian-mingw/changelog
--- ncurses-6.1-20191019+/package/debian-mingw/changelog 2019-10-19 12:47:53.000000000 +0000
+++ ncurses-6.1-20191026/package/debian-mingw/changelog 2019-10-26 08:56:47.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20191019) unstable; urgency=low
+ncurses6 (6.1+20191026) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 19 Oct 2019 08:47:53 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 26 Oct 2019 04:56:47 -0400
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian-mingw64/changelog
--- ncurses-6.1-20191019+/package/debian-mingw64/changelog 2019-10-19 12:47:53.000000000 +0000
+++ ncurses-6.1-20191026/package/debian-mingw64/changelog 2019-10-26 08:56:47.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20191019) unstable; urgency=low
+ncurses6 (6.1+20191026) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 19 Oct 2019 08:47:53 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 26 Oct 2019 04:56:47 -0400
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian/changelog
--- ncurses-6.1-20191019+/package/debian/changelog 2019-10-19 12:47:53.000000000 +0000
+++ ncurses-6.1-20191026/package/debian/changelog 2019-10-26 08:56:47.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20191019) unstable; urgency=low
+ncurses6 (6.1+20191026) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 19 Oct 2019 08:47:53 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 26 Oct 2019 04:56:47 -0400
ncurses6 (5.9-20120608) unstable; urgency=low
Index: package/mingw-ncurses.nsi
Prereq: 1.357
--- ncurses-6.1-20191019+/package/mingw-ncurses.nsi 2019-10-19 12:47:53.000000000 +0000
+++ ncurses-6.1-20191026/package/mingw-ncurses.nsi 2019-10-26 08:56:47.000000000 +0000
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.357 2019/10/19 12:47:53 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.358 2019/10/26 08:56:47 tom Exp $
; TODO add examples
; TODO bump ABI to 6
@@ -10,7 +10,7 @@
!define VERSION_MAJOR "6"
!define VERSION_MINOR "1"
!define VERSION_YYYY "2019"
-!define VERSION_MMDD "1019"
+!define VERSION_MMDD "1026"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"
Index: package/mingw-ncurses.spec
--- ncurses-6.1-20191019+/package/mingw-ncurses.spec 2019-10-19 12:47:53.000000000 +0000
+++ ncurses-6.1-20191026/package/mingw-ncurses.spec 2019-10-26 08:56:47.000000000 +0000
@@ -3,7 +3,7 @@
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 6.1
-Release: 20191019
+Release: 20191026
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncurses.spec
--- ncurses-6.1-20191019+/package/ncurses.spec 2019-10-19 12:47:53.000000000 +0000
+++ ncurses-6.1-20191026/package/ncurses.spec 2019-10-26 08:56:47.000000000 +0000
@@ -1,7 +1,7 @@
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 6.1
-Release: 20191019
+Release: 20191026
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncursest.spec
--- ncurses-6.1-20191019+/package/ncursest.spec 2019-10-19 12:47:53.000000000 +0000
+++ ncurses-6.1-20191026/package/ncursest.spec 2019-10-26 08:56:47.000000000 +0000
@@ -1,7 +1,7 @@
Summary: Curses library with POSIX thread support.
Name: ncursest6
Version: 6.1
-Release: 20191019
+Release: 20191026
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz

3052
ncurses-6.1-20191102.patch
View File

File diff suppressed because it is too large Load Diff

482
ncurses-6.1-20191109.patch
View File

@ -1,482 +0,0 @@
# ncurses 6.1 - patch 20191109 - Thomas E. Dickey
#
# ------------------------------------------------------------------------------
#
# Ncurses 6.1 is at
# ftp.gnu.org:/pub/gnu
#
# Patches for ncurses 6.1 can be found at
# ftp://ftp.invisible-island.net/ncurses/6.1
# http://invisible-mirror.net/archives/ncurses/6.1
#
# ------------------------------------------------------------------------------
# ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20191109.patch.gz
# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created Sun Nov 10 00:43:22 UTC 2019
# ------------------------------------------------------------------------------
# NEWS | 11 +++
# VERSION | 2
# dist.mk | 4 -
# misc/terminfo.src | 115 ++++++++++++++++++++++---------------
# 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
# package/ncursest.spec | 2
# progs/tic.c | 5 -
# 12 files changed, 96 insertions(+), 63 deletions(-)
# ------------------------------------------------------------------------------
Index: NEWS
Prereq: 1.3401
--- ncurses-6.1-20191102+/NEWS 2019-11-03 00:12:08.000000000 +0000
+++ ncurses-6.1-20191109/NEWS 2019-11-10 00:18:59.000000000 +0000
@@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3401 2019/11/03 00:12:08 tom Exp $
+-- $Id: NEWS,v 1.3404 2019/11/10 00:18:59 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.
+20191109
+ + add warning-check in tic for terminals with parm_dch vs parm_ich.
+ + drop ich1 from rxvt-basic, Eterm and mlterm to improve compatibility
+ with old non-curses programs -TD
+ + reviewed st 0.8.2, updated some details -TD
+ + use ansi+rep several places -TD
+ + corrected tic's check for ich1 (report by Sebastian J. Bronner,
+ cf: 20020901).
+
20191102
+ check parameter of set_escdelay, return ERR if negative.
+ check parameter of set_tabsize, return ERR if not greater than zero
Index: VERSION
--- ncurses-6.1-20191102+/VERSION 2019-11-02 09:43:29.000000000 +0000
+++ ncurses-6.1-20191109/VERSION 2019-11-06 09:37:05.000000000 +0000
@@ -1 +1 @@
-5:0:10 6.1 20191102
+5:0:10 6.1 20191109
Index: dist.mk
Prereq: 1.1313
--- ncurses-6.1-20191102+/dist.mk 2019-11-02 09:43:29.000000000 +0000
+++ ncurses-6.1-20191109/dist.mk 2019-11-06 09:37:05.000000000 +0000
@@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.1313 2019/11/02 09:43:29 tom Exp $
+# $Id: dist.mk,v 1.1314 2019/11/06 09:37: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 = 1
-NCURSES_PATCH = 20191102
+NCURSES_PATCH = 20191109
# 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.1-20191102+/misc/terminfo.src 2019-11-02 16:55:15.000000000 +0000
+++ ncurses-6.1-20191109/misc/terminfo.src 2019-11-09 23:52:28.000000000 +0000
@@ -6,8 +6,8 @@
# Report bugs and new terminal descriptions to
# bug-ncurses@gnu.org
#
-# $Revision: 1.767 $
-# $Date: 2019/11/02 16:55:15 $
+# $Revision: 1.773 $
+# $Date: 2019/11/09 23:52:28 $
#
# 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
@@ -1404,9 +1404,8 @@
kopt=\ENk, kpp=\E[V, kref=\ENl, kres=\ENp, krfr=\ENg,
kri=\E[b, krpl=\ENr, krst=\ENj, ksav=\ENq, kslt=\E[T,
ktbc=\ENd, kund=\ENu, ll=\E[99H, nel=\EE, op=\E[39;49m,
- rep=%p1%c\E[%p2%{1}%-%db, rev=\E[7m, ri=\E[T, rmacs=^O,
- rmam=\E[?7l, rmso=\E[27m, rmul=\E[24m,
- rs1=\017\E[?7h\E[0;39;49m$<2>\E>\E[?1l,
+ rev=\E[7m, ri=\E[T, rmacs=^O, rmam=\E[?7l, rmso=\E[27m,
+ rmul=\E[24m, rs1=\017\E[?7h\E[0;39;49m$<2>\E>\E[?1l,
rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}
%=%t3%e%p1%d%;m,
@@ -1416,7 +1415,8 @@
%|%t;7%;%?%p7%t;9%;m%?%p9%t\016%e\017%;,
sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smso=\E[7m,
smul=\E[4m, tbc=\E[3g,
- tsl=\E7\E1;24r\E[?6l\E[25;%i%p1%dH, use=ecma+index,
+ tsl=\E7\E1;24r\E[?6l\E[25;%i%p1%dH, use=ansi+rep,
+ use=ecma+index,
#
qansi|QNX ansi with console writes,
daisy, xhpa, use=qansi-g,
@@ -5881,7 +5881,7 @@
dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M,
ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, enacs=,
home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@,
- ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\n,
+ il=\E[%p1%dL, il1=\E[L, ind=\n,
is2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>, kbs=^?,
kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
kdch1=\E[3~, kend=\EOF, kent=\EOM, kfnd=\E[1~, khome=\EOH,
@@ -5950,8 +5950,8 @@
cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K,
enacs=\E(B\E)0, flash=\E[?5h$<100/>\E[?5l, home=\E[H,
- ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL,
- il1=\E[L, ind=\n, is1=\E[?47l\E=\E[?1l,
+ ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L,
+ ind=\n, is1=\E[?47l\E=\E[?1l,
is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, kbs=^H,
kcbt=\E[Z, kmous=\E[M, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O,
rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=\E>, rmso=\E[27m,
@@ -6202,8 +6202,7 @@
dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M,
ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E)0,
home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@,
- ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\n,
- is1=\E[?47l\E>\E[?1l,
+ il=\E[%p1%dL, il1=\E[L, ind=\n, is1=\E[?47l\E>\E[?1l,
is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, kNXT@,
kPRV@, ka1=\E[7~, ka3=\E[5~, kb2=\EOu, kbeg=\EOu, kbs=^H,
kc1=\E[8~, kc3=\E[6~, kent=\EOM, khlp=\E[28~, kmous=\E[M,
@@ -6508,7 +6507,29 @@
# st.suckless.org
st|stterm| simpleterm,
- use=st-0.7,
+ use=st-0.8,
+
+# Reviewed 0.8.2:
+# In tack,
+# there is some problem turning off line-drawing
+# shift+control function-keys do nothing; shift+control cursor keys work
+# the padding tests make the terminal non-functional.
+# In vttest,
+# SD/SU work
+# SL/SR/REP do not work
+# ECMA-48 cursor movement works, e.g., CHA, CBT, etc.
+#
+# This entry discards the ccc/initc capabilities from st-0.7 because they
+# belong in st-256color.
+st-0.8|simpleterm 0.7,
+ dim=\E[2m, kcbt@, kent@, oc=\E]104\007,
+ sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|
+ %t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p7%t;8%;m,
+ Ms=\E]52;%p1%s;%p2%s\007, kDN3=\E[1;3B, kDN5=\E[1;5B,
+ kLFT3=\E[1;3D, kLFT5=\E[1;5D, kNXT3=\E[6;3~,
+ kNXT5=\E[6;5~, kPRV3=\E[5;3~, kPRV5=\E[5;5~,
+ kRIT3=\E[1;3C, kRIT5=\E[1;5C, kUP3=\E[1;3A, kUP5=\E[1;5A,
+ use=ecma+strikeout, use=st-0.6,
# Reviewed 0.7:
# dim is intermittent, sometimes works, sometimes does not
@@ -6660,14 +6681,15 @@
use=ecma+index,
st-16color|stterm-16color|simpleterm with 16-colors,
use=ibm+16color, use=st,
-# 256 colors "works", but when running xterm's test-scripts, some garbage is
-# shown in the titlebar.
+# Tested with st 0.8.2
+# The issue with the titlebar is fixed, though st is very slow.
+# In st 0.7, 256 colors "works", but when running xterm's test-scripts, some
+# garbage is shown in the titlebar.
#
# terminal wants to use TERM=stterm-256color, but that is longer than 14
# characters, making the choice nonportable.
st-256color|stterm-256color|simpleterm with 256 colors,
- ccc@,
- initc@, oc@, use=xterm+256color, use=st,
+ use=xterm+256color, use=st,
#### TERMINATOR
# https://github.com/software-jessies-org/jessies/wiki/Terminator
@@ -13307,16 +13329,15 @@
kf2=\EOV, kf3=\EOu, kf4=\ENj, kf5=\ENe, kf6=\ENf, kf7=\ENh,
kf8=\E[H, kf9=\EOc, kind=\E[S, kri=\E[T, ll=\E#2, mc0=\E[0i,
mc4=\E[?8i, mc5=\E[?4i, mgc=\E\:, nel=\EE,
- pln=\E[%p1%dp%p2%:-16s, rc=\E8,
- rep=%p1%c\E[%p2%{1}%-%db, rev=\E[7m, ri=\EM, rmacs=^O,
- rmir=\E[4l, rmkx=\E[19;0|, rmln=\E<, rmso=\E[m, rmul=\E[m,
- rmxon=\E[29;1|, rs2=\E[5;0|, sc=\E7,
+ pln=\E[%p1%dp%p2%:-16s, rc=\E8, rev=\E[7m, ri=\EM,
+ rmacs=^O, rmir=\E[4l, rmkx=\E[19;0|, rmln=\E<, rmso=\E[m,
+ rmul=\E[m, rmxon=\E[29;1|, rs2=\E[5;0|, sc=\E7,
sgr=\E[0%?%p5%p6%|%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1%|%p6
%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
sgr0=\E[m\017, smacs=^N, smgl=\E4, smgr=\E5, smir=\E[4h,
smkx=\E[19;1|, smln=\E?, smso=\E[7m, smul=\E[4m,
smxon=\E[29;0|, tbc=\E[3g, vpa=\E[%p1%{1}%+%dd,
- use=ecma+index,
+ use=ansi+rep, use=ecma+index,
# (att500: I merged this with the att513 entry, att500 just used att513 -- esr)
att500|att513|AT&T 513 using page mode,
@@ -13357,8 +13378,7 @@
pfloc=\E[%p1%d;%p2%l%d;2;0p\s\s\sF%p1%d\s\s\s\s\s\s\s\s\s\s
\s%p2%s,
pfx=\E[%p1%d;%p2%l%d;1;0p F%p1%d %p2%s,
- pln=\E[%p1%dp%p2%:-16s, rc=\E8,
- rep=%p1%c\E[%p2%{1}%-%db, rev=\E[7m, ri=\EM,
+ pln=\E[%p1%dp%p2%:-16s, rc=\E8, rev=\E[7m, ri=\EM,
rin=\E[%p1%dF, rmacs=^O, rmir=\E[4l,
rmkx=\E[19;0|\E[21;1|\212, rmln=\E<, rmso=\E[m,
rmul=\E[m,
@@ -13369,7 +13389,7 @@
%|%p6%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
sgr0=\E[m\017, smacs=^N, smir=\E[4h,
smkx=\E[19;1|\E[21;4|\Eent, smln=\E?, smso=\E[7m,
- smul=\E[4m, tbc=\E[3g, vpa=\E[%p1%{1}%+%dd,
+ smul=\E[4m, tbc=\E[3g, vpa=\E[%p1%{1}%+%dd, use=ansi+rep,
# 01-07-88
# printer must be set to EMUL ANSI to accept ESC codes
@@ -13803,15 +13823,15 @@
mc0=\E[i, mc4=\E[?4i, mc5=\E[?5i, nel=\EE,
pfx=\E[%p1%d;%p2%l%02dq%?%p1%{9}%<%t\s\s\sF%p1%1d\s\s\s\s\s
\s\s\s\s\s\s%;%p2%s,
- pln=\E[%p1%d;0;0;0q%p2%:-16.16s, rc=\E8,
- rep=%p1%c\E[%p2%{1}%-%db, rev=\E[7m, ri=\EM, rmacs=^O,
- rmir=\E[4l, rmln=\E[2p, rmso=\E[27m, rmul=\E[24m,
- rmxon=\E[53;3|, rs1=\Ec\E[?3;5l\E[56;0|, sc=\E7,
+ pln=\E[%p1%d;0;0;0q%p2%:-16.16s, rc=\E8, rev=\E[7m,
+ ri=\EM, rmacs=^O, rmir=\E[4l, rmln=\E[2p, rmso=\E[27m,
+ rmul=\E[24m, rmxon=\E[53;3|, rs1=\Ec\E[?3;5l\E[56;0|,
+ sc=\E7,
sgr=\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1
%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
sgr0=\E[m\017, smacs=^N, smir=\E[4h, smln=\E[p, smso=\E[7m,
smul=\E[4m, smxon=\E[53;0|, tbc=\E[3g,
- tsl=\E7\E[99;%i%p1%dx,
+ tsl=\E7\E[99;%i%p1%dx, use=ansi+rep,
# This entry was modified 3/13/90 by JWE.
# fixes include additions of <enacs>, correcting <rep>, and modification
@@ -13858,15 +13878,15 @@
pfx=\E[%?%p1%{25}%<%t%p1%e%p1%{24}%-%;%d;%p2%l%02d%?%p1%{25}
%<%tq\s\s\sSYS\s\s\s\s\sF%p1%:-2d\s\s%e;0;3q%;%p2%s,
pfxl=\E[%p1%d;%p2%l%02d;0;0q%p3%:-16.16s%p2%s,
- pln=\E[%p1%d;0;0;0q%p2%:-16.16s, rc=\E8,
- rep=%p1%c\E[%p2%{1}%-%db, rev=\E[7m, ri=\EM, rmacs=^O,
- rmam=\E[?7l, rmir=\E[4l, rmln=\E[?13h, rmso=\E[27m,
- rmul=\E[24m, rmxon=\E[?21l, rs2=\Ec\E[?3l, sc=\E7,
+ pln=\E[%p1%d;0;0;0q%p2%:-16.16s, rc=\E8, rev=\E[7m,
+ ri=\EM, rmacs=^O, rmam=\E[?7l, rmir=\E[4l, rmln=\E[?13h,
+ rmso=\E[27m, rmul=\E[24m, rmxon=\E[?21l, rs2=\Ec\E[?3l,
+ sc=\E7,
sgr=\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1
%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smir=\E[4h,
smln=\E[?13l, smso=\E[7m, smul=\E[4m, smxon=\E[?21h,
- swidm=\E#6, tsl=\E7\E[;%i%p1%dx,
+ swidm=\E#6, tsl=\E7\E[;%i%p1%dx, use=ansi+rep,
att730-41|730MTG-41|AT&T 730-41 windowing terminal Version,
lines#41, use=att730,
att730-24|730MTG-24|AT&T 730-24 windowing terminal Version,
@@ -14340,8 +14360,7 @@
kf21=\EOU, kf22=\EOV, kf23=\EOW, kf24=\EOX, kf3=\EOC,
kf4=\EOD, kf5=\EOE, kf6=\EOF, kf7=\EOG, kf8=\EOH, kf9=\EOI,
khome=\E[H, kich1=\E[@, kil1=\E[L, krmir=\E6, mc0=\E[0i,
- mc4=^C, mc5=\E[v, mc5p=\E[%p1%dv, rc=\E8,
- rep=%p1%c\E[%p2%{1}%-%db, rev=\E[7m,
+ mc4=^C, mc5=\E[v, mc5p=\E[%p1%dv, rc=\E8, rev=\E[7m,
rmkx=\EP`>y~[[J`8xy~[[A`4xy~[[D`6xy~[[C`2xy~[[B\E
\\,
rmm=\E[>52l, rmso=\E[m, rmul=\E[m, sc=\E7,
@@ -14351,7 +14370,7 @@
smkx=\EP`>z~[[J`8xz~[[A`4xz~[[D`6xz~[[C`2xz~[[B\E
\\,
smm=\E[>52h, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
- vpa=\E[%p1%{1}%+%dd,
+ vpa=\E[%p1%{1}%+%dd, use=ansi+rep,
aaa+rv|ann arbor ambassador in reverse video,
blink=\E[5;7m, bold=\E[1;7m, invis=\E[7;8m,
@@ -15455,17 +15474,16 @@
kf4=\EOS, khome=\E[H, kich1=\E\001\r, kil1=\E\003\r,
ll=\E[24H, mc0=\E[0i, mc4=\E[4i, mc5=\E[5i,
pfloc=\E[%p1%d;0u#%p2%s#, pfx=\E[%p1%d;1u#%p2%s#,
- prot=\E[99m, rc=\E8, rep=%p1%c\E[%p2%{1}%-%db, rev=\E[7m,
- ri=\EM$<4>, rmacs=\016$<1>, rmcup=\E[w\E2\r\n,
- rmir=\E[4l, rmkx=\E[!z\E[0;2u, rmso=\E[7!{, rmul=\E[4!{,
- sc=\E7,
+ prot=\E[99m, rc=\E8, rev=\E[7m, ri=\EM$<4>, rmacs=\016$<1>,
+ rmcup=\E[w\E2\r\n, rmir=\E[4l, rmkx=\E[!z\E[0;2u,
+ rmso=\E[7!{, rmul=\E[4!{, sc=\E7,
sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;
%;%?%p7%t8;%;%?%p8%t99;%;m%?%p5%t\E[1!{%;%?%p9%t\017%e
\016%;$<1>,
sgr0=\E[m\016$<1>, smacs=\017$<1>,
smcup=\E[=4l\E[1;24w\E2\r, smir=\E[4h,
smkx=\E[1!z\E[0;3u, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
- vpa=\E[%p1%{1}%+%dd,
+ vpa=\E[%p1%{1}%+%dd, use=ansi+rep,
avt-rv-ns|concept avt in reverse video mode/no status line,
flash=\E[=205l$<200>\E[=205h, is1=\E[=103l\E[=205h,
use=avt-ns,
@@ -19546,13 +19564,12 @@
dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, hpa=\E[%p1%{1}%+%dG,
ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL,
il1=\E[L, ind=\n, invis=\E[8m, kbs=^H, kcub1=\E[D,
- kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, khome=\E[H,
- rep=%p1%c\E[%p2%{1}%-%db, rev=\E[7m, rmam=\E[?7l,
- rmso=\E[m, rmul=\E[m,
+ kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, khome=\E[H, rev=\E[7m,
+ rmam=\E[?7l, rmso=\E[m, rmul=\E[m,
sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;
%;%?%p7%t8;%;m,
sgr0=\E[m, smam=\E[?7h, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
- vpa=\E[%p1%{1}%+%dd,
+ vpa=\E[%p1%{1}%+%dd, use=ansi+rep,
# The tek4125 emulates a vt100 incorrectly - the scrolling region
# command is ignored. The following entry replaces <csr> with the needed
# <il>, <il>, and <smir>; removes some cursor pad commands that the tek4125
@@ -26397,4 +26414,10 @@
# 2019-11-02
# + add "xterm-mono" to help packagers (report by Sven Joachim) -TD
#
+# 2019-11-09
+# + drop ich1 from rxvt-basic, Eterm and mlterm to improve compatibility
+# with old non-curses programs -TD
+# + reviewed st 0.8.2, updated some details -TD
+# + use ansi+rep several places -TD
+#
######## SHANTIH! SHANTIH! SHANTIH!
Index: package/debian-mingw/changelog
--- ncurses-6.1-20191102+/package/debian-mingw/changelog 2019-11-02 09:43:29.000000000 +0000
+++ ncurses-6.1-20191109/package/debian-mingw/changelog 2019-11-06 09:37:05.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20191102) unstable; urgency=low
+ncurses6 (6.1+20191109) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 02 Nov 2019 05:43:29 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Wed, 06 Nov 2019 04:37:04 -0500
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian-mingw64/changelog
--- ncurses-6.1-20191102+/package/debian-mingw64/changelog 2019-11-02 09:43:29.000000000 +0000
+++ ncurses-6.1-20191109/package/debian-mingw64/changelog 2019-11-06 09:37:05.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20191102) unstable; urgency=low
+ncurses6 (6.1+20191109) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 02 Nov 2019 05:43:29 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Wed, 06 Nov 2019 04:37:05 -0500
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian/changelog
--- ncurses-6.1-20191102+/package/debian/changelog 2019-11-02 09:43:29.000000000 +0000
+++ ncurses-6.1-20191109/package/debian/changelog 2019-11-06 09:37:05.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20191102) unstable; urgency=low
+ncurses6 (6.1+20191109) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 02 Nov 2019 05:43:29 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Wed, 06 Nov 2019 04:37:04 -0500
ncurses6 (5.9-20120608) unstable; urgency=low
Index: package/mingw-ncurses.nsi
Prereq: 1.359
--- ncurses-6.1-20191102+/package/mingw-ncurses.nsi 2019-11-02 09:43:29.000000000 +0000
+++ ncurses-6.1-20191109/package/mingw-ncurses.nsi 2019-11-06 09:37:05.000000000 +0000
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.359 2019/11/02 09:43:29 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.360 2019/11/06 09:37:05 tom Exp $
; TODO add examples
; TODO bump ABI to 6
@@ -10,7 +10,7 @@
!define VERSION_MAJOR "6"
!define VERSION_MINOR "1"
!define VERSION_YYYY "2019"
-!define VERSION_MMDD "1102"
+!define VERSION_MMDD "1109"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"
Index: package/mingw-ncurses.spec
--- ncurses-6.1-20191102+/package/mingw-ncurses.spec 2019-11-02 09:43:29.000000000 +0000
+++ ncurses-6.1-20191109/package/mingw-ncurses.spec 2019-11-06 09:37:05.000000000 +0000
@@ -3,7 +3,7 @@
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 6.1
-Release: 20191102
+Release: 20191109
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncurses.spec
--- ncurses-6.1-20191102+/package/ncurses.spec 2019-11-02 09:43:29.000000000 +0000
+++ ncurses-6.1-20191109/package/ncurses.spec 2019-11-06 09:37:05.000000000 +0000
@@ -1,7 +1,7 @@
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 6.1
-Release: 20191102
+Release: 20191109
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncursest.spec
--- ncurses-6.1-20191102+/package/ncursest.spec 2019-11-02 09:43:29.000000000 +0000
+++ ncurses-6.1-20191109/package/ncursest.spec 2019-11-06 09:37:05.000000000 +0000
@@ -1,7 +1,7 @@
Summary: Curses library with POSIX thread support.
Name: ncursest6
Version: 6.1
-Release: 20191102
+Release: 20191109
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: progs/tic.c
Prereq: 1.279
--- ncurses-6.1-20191102+/progs/tic.c 2019-10-15 22:18:29.000000000 +0000
+++ ncurses-6.1-20191109/progs/tic.c 2019-11-09 18:51:36.000000000 +0000
@@ -48,7 +48,7 @@
#include <parametrized.h>
#include <transform.h>
-MODULE_ID("$Id: tic.c,v 1.279 2019/10/15 22:18:29 tom Exp $")
+MODULE_ID("$Id: tic.c,v 1.281 2019/11/09 18:51:36 tom Exp $")
#define STDIN_NAME "<stdin>"
@@ -2939,6 +2939,7 @@
* These are probably both or none.
*/
PAIRED(parm_index, parm_rindex);
+ PAIRED(parm_ich, parm_dch);
/*
* These may be mismatched because the terminal description relies on
@@ -3055,7 +3056,7 @@
* ncurses handles it.
*/
if ((PRESENT(enter_insert_mode) || PRESENT(exit_insert_mode))
- && PRESENT(parm_ich)) {
+ && PRESENT(insert_character)) {
_nc_warning("non-curses applications may be confused by ich1 with smir/rmir");
}

260
ncurses-6.1-20191116.patch
View File

@ -1,260 +0,0 @@
# ncurses 6.1 - patch 20191116 - Thomas E. Dickey
#
# ------------------------------------------------------------------------------
#
# Ncurses 6.1 is at
# ftp.gnu.org:/pub/gnu
#
# Patches for ncurses 6.1 can be found at
# ftp://ftp.invisible-island.net/ncurses/6.1
# http://invisible-mirror.net/archives/ncurses/6.1
#
# ------------------------------------------------------------------------------
# ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20191116.patch.gz
# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created Sun Nov 17 01:23:05 UTC 2019
# ------------------------------------------------------------------------------
# NEWS | 10 +++++++++-
# VERSION | 2 +-
# configure | 4 ++--
# configure.in | 6 +++---
# dist.mk | 4 ++--
# ncurses/Makefile.in | 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 +-
# package/ncursest.spec | 2 +-
# 13 files changed, 33 insertions(+), 25 deletions(-)
# ------------------------------------------------------------------------------
Index: NEWS
Prereq: 1.3404
--- ncurses-6.1-20191109+/NEWS 2019-11-10 00:18:59.000000000 +0000
+++ ncurses-6.1-20191116/NEWS 2019-11-16 20:48:27.000000000 +0000
@@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3404 2019/11/10 00:18:59 tom Exp $
+-- $Id: NEWS,v 1.3407 2019/11/16 20:48:27 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.
+20191116
+ + modify ncurses/Makefile.in to fix a case where Debian/testing changes
+ to the ld --as-needed configuration broke ncurses-examples test
+ packages.
+ + drop library-dependency on psapi for MinGW port, since win_driver.c
+ defines PSAPI_VERSION to 2, making it use GetProcessImageFileName
+ from kernel32.dll (prompted by patch by Simon Sobish, cf: 20140503).
+
20191109
+ add warning-check in tic for terminals with parm_dch vs parm_ich.
+ drop ich1 from rxvt-basic, Eterm and mlterm to improve compatibility
Index: VERSION
--- ncurses-6.1-20191109+/VERSION 2019-11-06 09:37:05.000000000 +0000
+++ ncurses-6.1-20191116/VERSION 2019-11-16 15:09:15.000000000 +0000
@@ -1 +1 @@
-5:0:10 6.1 20191109
+5:0:10 6.1 20191116
Index: configure
--- ncurses-6.1-20191109+/configure 2019-11-02 20:33:48.000000000 +0000
+++ ncurses-6.1-20191116/configure 2019-11-16 15:59:28.000000000 +0000
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 1.690 .
+# From configure.in Revision: 1.691 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by Autoconf 2.52.20190901.
#
@@ -17119,7 +17119,7 @@
case $cf_cv_system_name in
(*mingw32*|*mingw64*)
CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
- LIBS=" -lpsapi $LIBS"
+ # Note: WINVER may be a problem with Windows 10
;;
(*)
echo "$as_me:17125: checking for gettimeofday" >&5
Index: configure.in
Prereq: 1.690
--- ncurses-6.1-20191109+/configure.in 2019-09-27 21:12:34.000000000 +0000
+++ ncurses-6.1-20191116/configure.in 2019-11-16 15:54:47.000000000 +0000
@@ -28,14 +28,14 @@
dnl
dnl Author: Thomas E. Dickey 1995-on
dnl
-dnl $Id: configure.in,v 1.690 2019/09/27 21:12:34 tom Exp $
+dnl $Id: configure.in,v 1.691 2019/11/16 15:54:47 tom Exp $
dnl Process this file with autoconf to produce a configure script.
dnl
dnl See https://invisible-island.net/autoconf/ for additional information.
dnl
dnl ---------------------------------------------------------------------------
AC_PREREQ(2.52.20170501)
-AC_REVISION($Revision: 1.690 $)
+AC_REVISION($Revision: 1.691 $)
AC_INIT(ncurses/base/lib_initscr.c)
AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
@@ -1616,7 +1616,7 @@
case $cf_cv_system_name in
(*mingw32*|*mingw64*)
CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
- LIBS=" -lpsapi $LIBS"
+ # Note: WINVER may be a problem with Windows 10
;;
(*)
AC_CHECK_FUNC(gettimeofday,
Index: dist.mk
Prereq: 1.1314
--- ncurses-6.1-20191109+/dist.mk 2019-11-06 09:37:05.000000000 +0000
+++ ncurses-6.1-20191116/dist.mk 2019-11-16 15:09:15.000000000 +0000
@@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.1314 2019/11/06 09:37:05 tom Exp $
+# $Id: dist.mk,v 1.1315 2019/11/16 15:09:15 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 = 1
-NCURSES_PATCH = 20191109
+NCURSES_PATCH = 20191116
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
Index: ncurses/Makefile.in
Prereq: 1.163
--- ncurses-6.1-20191109+/ncurses/Makefile.in 2019-06-30 14:57:27.000000000 +0000
+++ ncurses-6.1-20191116/ncurses/Makefile.in 2019-11-16 20:42:40.000000000 +0000
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.163 2019/06/30 14:57:27 tom Exp $
+# $Id: Makefile.in,v 1.164 2019/11/16 20:42:40 tom Exp $
##############################################################################
# Copyright (c) 1998-2018,2019 Free Software Foundation, Inc. #
# #
@@ -126,12 +126,12 @@
CFLAGS_DEFAULT = $(CFLAGS_@DFT_UPR_MODEL@)
LINK = $(LIBTOOL)
-LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@
+LDFLAGS = @LDFLAGS@ @LD_MODEL@
SHLIB_DIRS = -L../lib
-SHLIB_LIST = $(SHLIB_DIRS) @SHLIB_LIST@
-TINFO_LIST = $(SHLIB_DIRS) @TINFO_LIST@
-TICS_LIST = $(SHLIB_DIRS) @TICS_LIST@
+SHLIB_LIST = $(SHLIB_DIRS) @SHLIB_LIST@ @LIBS@
+TINFO_LIST = $(SHLIB_DIRS) @TINFO_LIST@ @LIBS@
+TICS_LIST = $(SHLIB_DIRS) @TICS_LIST@ @LIBS@
RPATH_LIST = @RPATH_LIST@
RESULTING_SYMS = @RESULTING_SYMS@
Index: package/debian-mingw/changelog
--- ncurses-6.1-20191109+/package/debian-mingw/changelog 2019-11-06 09:37:05.000000000 +0000
+++ ncurses-6.1-20191116/package/debian-mingw/changelog 2019-11-16 15:09:15.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20191109) unstable; urgency=low
+ncurses6 (6.1+20191116) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Wed, 06 Nov 2019 04:37:04 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 16 Nov 2019 10:09:15 -0500
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian-mingw64/changelog
--- ncurses-6.1-20191109+/package/debian-mingw64/changelog 2019-11-06 09:37:05.000000000 +0000
+++ ncurses-6.1-20191116/package/debian-mingw64/changelog 2019-11-16 15:09:15.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20191109) unstable; urgency=low
+ncurses6 (6.1+20191116) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Wed, 06 Nov 2019 04:37:05 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 16 Nov 2019 10:09:15 -0500
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian/changelog
--- ncurses-6.1-20191109+/package/debian/changelog 2019-11-06 09:37:05.000000000 +0000
+++ ncurses-6.1-20191116/package/debian/changelog 2019-11-16 15:09:15.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20191109) unstable; urgency=low
+ncurses6 (6.1+20191116) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Wed, 06 Nov 2019 04:37:04 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 16 Nov 2019 10:09:15 -0500
ncurses6 (5.9-20120608) unstable; urgency=low
Index: package/mingw-ncurses.nsi
Prereq: 1.360
--- ncurses-6.1-20191109+/package/mingw-ncurses.nsi 2019-11-06 09:37:05.000000000 +0000
+++ ncurses-6.1-20191116/package/mingw-ncurses.nsi 2019-11-16 15:09:15.000000000 +0000
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.360 2019/11/06 09:37:05 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.361 2019/11/16 15:09:15 tom Exp $
; TODO add examples
; TODO bump ABI to 6
@@ -10,7 +10,7 @@
!define VERSION_MAJOR "6"
!define VERSION_MINOR "1"
!define VERSION_YYYY "2019"
-!define VERSION_MMDD "1109"
+!define VERSION_MMDD "1116"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"
Index: package/mingw-ncurses.spec
--- ncurses-6.1-20191109+/package/mingw-ncurses.spec 2019-11-06 09:37:05.000000000 +0000
+++ ncurses-6.1-20191116/package/mingw-ncurses.spec 2019-11-16 15:09:15.000000000 +0000
@@ -3,7 +3,7 @@
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 6.1
-Release: 20191109
+Release: 20191116
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncurses.spec
--- ncurses-6.1-20191109+/package/ncurses.spec 2019-11-06 09:37:05.000000000 +0000
+++ ncurses-6.1-20191116/package/ncurses.spec 2019-11-16 15:09:15.000000000 +0000
@@ -1,7 +1,7 @@
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 6.1
-Release: 20191109
+Release: 20191116
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncursest.spec
--- ncurses-6.1-20191109+/package/ncursest.spec 2019-11-06 09:37:05.000000000 +0000
+++ ncurses-6.1-20191116/package/ncursest.spec 2019-11-16 15:09:15.000000000 +0000
@@ -1,7 +1,7 @@
Summary: Curses library with POSIX thread support.
Name: ncursest6
Version: 6.1
-Release: 20191109
+Release: 20191116
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz

387
ncurses-6.1-20191123.patch
View File

@ -1,387 +0,0 @@
# ncurses 6.1 - patch 20191123 - Thomas E. Dickey
#
# ------------------------------------------------------------------------------
#
# Ncurses 6.1 is at
# ftp.gnu.org:/pub/gnu
#
# Patches for ncurses 6.1 can be found at
# ftp://ftp.invisible-island.net/ncurses/6.1
# http://invisible-mirror.net/archives/ncurses/6.1
#
# ------------------------------------------------------------------------------
# ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20191123.patch.gz
# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created Sun Nov 24 02:39:05 UTC 2019
# ------------------------------------------------------------------------------
# Ada95/package/AdaCurses-doc.spec | 12 ++++++++++--
# Ada95/package/AdaCurses.spec | 12 ++++++++++--
# NEWS | 6 +++++-
# 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 | 6 +++---
# package/ncurses.spec | 12 ++++++++++--
# package/ncursest.spec | 12 ++++++++++--
# test/package/mingw-ncurses-examples.spec | 12 ++++++++++--
# test/package/ncurses-examples.spec | 12 ++++++++++--
# 14 files changed, 79 insertions(+), 27 deletions(-)
# ------------------------------------------------------------------------------
Index: Ada95/package/AdaCurses-doc.spec
Prereq: 1.6
--- ncurses-6.1-20191116+/Ada95/package/AdaCurses-doc.spec 2019-09-07 20:37:52.000000000 +0000
+++ ncurses-6.1-20191123/Ada95/package/AdaCurses-doc.spec 2019-11-23 21:15:53.000000000 +0000
@@ -3,7 +3,7 @@
%define AppVersion MAJOR.MINOR
%define AppRelease YYYYMMDD
%define AppPackage %{AppProgram}-doc
-# $Id: AdaCurses-doc.spec,v 1.6 2019/09/07 20:37:52 tom Exp $
+# $Id: AdaCurses-doc.spec,v 1.7 2019/11/23 21:15:53 tom Exp $
Name: %{AppPackage}
Version: %{AppVersion}
Release: %{AppRelease}
@@ -37,7 +37,12 @@
(cd doc && make install.html DESTDIR=$RPM_BUILD_ROOT )
%clean
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+if rm -rf $RPM_BUILD_ROOT; then
+ echo OK
+else
+ find $RPM_BUILD_ROOT -type f | grep -F -v /.nfs && exit 1
+fi
+exit 0
%files
%defattr(-,root,root)
@@ -46,6 +51,9 @@
%changelog
# each patch should add its ChangeLog entries here
+* Sat Nov 16 2019 Thomas Dickey
+- modify clean-rule to work around Fedora NFS bugs.
+
* Sat Sep 07 2019 Thomas Dickey
- use AppProgram to replace "AdaCurses" globally
Index: Ada95/package/AdaCurses.spec
Prereq: 1.24
--- ncurses-6.1-20191116+/Ada95/package/AdaCurses.spec 2019-09-15 00:07:32.000000000 +0000
+++ ncurses-6.1-20191123/Ada95/package/AdaCurses.spec 2019-11-23 21:15:31.000000000 +0000
@@ -2,7 +2,7 @@
%define AppProgram AdaCurses
%define AppVersion MAJOR.MINOR
%define AppRelease YYYYMMDD
-# $Id: AdaCurses.spec,v 1.24 2019/09/15 00:07:32 tom Exp $
+# $Id: AdaCurses.spec,v 1.25 2019/11/23 21:15:31 tom Exp $
Name: %{AppProgram}
Version: %{AppVersion}
Release: %{AppRelease}
@@ -65,7 +65,12 @@
)
%clean
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+if rm -rf $RPM_BUILD_ROOT; then
+ echo OK
+else
+ find $RPM_BUILD_ROOT -type f | grep -F -v /.nfs && exit 1
+fi
+exit 0
%files
%defattr(-,root,root)
@@ -82,6 +87,9 @@
%changelog
# each patch should add its ChangeLog entries here
+* Sat Nov 16 2019 Thomas Dickey
+- modify clean-rule to work around Fedora NFS bugs.
+
* Sat Sep 14 2019 Thomas Dickey
- build-fixes for Fedora29, OpenSUSE
Index: NEWS
Prereq: 1.3407
--- ncurses-6.1-20191116+/NEWS 2019-11-16 20:48:27.000000000 +0000
+++ ncurses-6.1-20191123/NEWS 2019-11-24 01:55:57.000000000 +0000
@@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3407 2019/11/16 20:48:27 tom Exp $
+-- $Id: NEWS,v 1.3410 2019/11/24 01:55:57 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.
+20191123
+ + fix typo for MinGW rpm test-package.
+ + workaround in rpm specs for NFS problems in Fedora 31.
+
20191116
+ modify ncurses/Makefile.in to fix a case where Debian/testing changes
to the ld --as-needed configuration broke ncurses-examples test
Index: VERSION
--- ncurses-6.1-20191116+/VERSION 2019-11-16 15:09:15.000000000 +0000
+++ ncurses-6.1-20191123/VERSION 2019-11-23 15:45:17.000000000 +0000
@@ -1 +1 @@
-5:0:10 6.1 20191116
+5:0:10 6.1 20191123
Index: dist.mk
Prereq: 1.1315
--- ncurses-6.1-20191116+/dist.mk 2019-11-16 15:09:15.000000000 +0000
+++ ncurses-6.1-20191123/dist.mk 2019-11-23 15:45:17.000000000 +0000
@@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.1315 2019/11/16 15:09:15 tom Exp $
+# $Id: dist.mk,v 1.1316 2019/11/23 15:45:17 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 = 1
-NCURSES_PATCH = 20191116
+NCURSES_PATCH = 20191123
# 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.1-20191116+/package/debian-mingw/changelog 2019-11-16 15:09:15.000000000 +0000
+++ ncurses-6.1-20191123/package/debian-mingw/changelog 2019-11-23 15:45:17.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20191116) unstable; urgency=low
+ncurses6 (6.1+20191123) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 16 Nov 2019 10:09:15 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 23 Nov 2019 10:45:17 -0500
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian-mingw64/changelog
--- ncurses-6.1-20191116+/package/debian-mingw64/changelog 2019-11-16 15:09:15.000000000 +0000
+++ ncurses-6.1-20191123/package/debian-mingw64/changelog 2019-11-23 15:45:17.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20191116) unstable; urgency=low
+ncurses6 (6.1+20191123) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 16 Nov 2019 10:09:15 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 23 Nov 2019 10:45:17 -0500
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian/changelog
--- ncurses-6.1-20191116+/package/debian/changelog 2019-11-16 15:09:15.000000000 +0000
+++ ncurses-6.1-20191123/package/debian/changelog 2019-11-23 15:45:17.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20191116) unstable; urgency=low
+ncurses6 (6.1+20191123) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 16 Nov 2019 10:09:15 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 23 Nov 2019 10:45:17 -0500
ncurses6 (5.9-20120608) unstable; urgency=low
Index: package/mingw-ncurses.nsi
Prereq: 1.361
--- ncurses-6.1-20191116+/package/mingw-ncurses.nsi 2019-11-16 15:09:15.000000000 +0000
+++ ncurses-6.1-20191123/package/mingw-ncurses.nsi 2019-11-23 15:45:17.000000000 +0000
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.361 2019/11/16 15:09:15 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.362 2019/11/23 15:45:17 tom Exp $
; TODO add examples
; TODO bump ABI to 6
@@ -10,7 +10,7 @@
!define VERSION_MAJOR "6"
!define VERSION_MINOR "1"
!define VERSION_YYYY "2019"
-!define VERSION_MMDD "1116"
+!define VERSION_MMDD "1123"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"
Index: package/mingw-ncurses.spec
--- ncurses-6.1-20191116+/package/mingw-ncurses.spec 2019-11-16 15:09:15.000000000 +0000
+++ ncurses-6.1-20191123/package/mingw-ncurses.spec 2019-11-24 01:54:24.000000000 +0000
@@ -3,7 +3,7 @@
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 6.1
-Release: 20191116
+Release: 20191123
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
@@ -68,8 +68,8 @@
--with-cxx-shared \\\
--with-develop \\\
--with-fallbacks=unknown,xterm \\\
- --with-tic-path=/usr/bin/tic${MY_ABI} \\\
- --with-infocmp-path=/usr/bin/infocmp${MY_ABI} \\\
+ --with-tic-path=/usr/bin/tic%{MY_ABI} \\\
+ --with-infocmp-path=/usr/bin/infocmp%{MY_ABI} \\\
--with-install-prefix=$RPM_BUILD_ROOT \\\
--with-pc-suffix=%{MY_ABI} \\\
--with-pcre2 \\\
Index: package/ncurses.spec
--- ncurses-6.1-20191116+/package/ncurses.spec 2019-11-16 15:09:15.000000000 +0000
+++ ncurses-6.1-20191123/package/ncurses.spec 2019-11-23 21:14:34.000000000 +0000
@@ -1,7 +1,7 @@
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 6.1
-Release: 20191116
+Release: 20191123
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
@@ -114,7 +114,12 @@
( cd test && make ncurses LOCAL_LIBDIR=%{_libdir} && mv ncurses $RPM_BUILD_ROOT/%{_bindir}/ncurses%{MY_ABI} )
%clean
-rm -rf $RPM_BUILD_ROOT
+if rm -rf $RPM_BUILD_ROOT; then
+ echo OK
+else
+ find $RPM_BUILD_ROOT -type f | grep -F -v /.nfs && exit 1
+fi
+exit 0
%files
%defattr(-,root,root,-)
@@ -124,6 +129,9 @@
%changelog
+* Sat Nov 16 2019 Thomas Dickey
+- modify clean-rule to work around Fedora NFS bugs.
+
* Sat Aug 25 2018 Thomas E. Dickey
- split spec-file into ncurses6 and ncursest6 to work around toolset breakage
in Fedora 28
Index: package/ncursest.spec
--- ncurses-6.1-20191116+/package/ncursest.spec 2019-11-16 15:09:15.000000000 +0000
+++ ncurses-6.1-20191123/package/ncursest.spec 2019-11-23 21:14:52.000000000 +0000
@@ -1,7 +1,7 @@
Summary: Curses library with POSIX thread support.
Name: ncursest6
Version: 6.1
-Release: 20191116
+Release: 20191123
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
@@ -118,7 +118,12 @@
( cd test && make ncurses LOCAL_LIBDIR=%{_libdir} && mv ncurses $RPM_BUILD_ROOT/%{_bindir}/ncursest%{MY_ABI} )
%clean
-rm -rf $RPM_BUILD_ROOT
+if rm -rf $RPM_BUILD_ROOT; then
+ echo OK
+else
+ find $RPM_BUILD_ROOT -type f | grep -F -v /.nfs && exit 1
+fi
+exit 0
%files
%defattr(-,root,root,-)
@@ -128,6 +133,9 @@
%changelog
+* Sat Nov 16 2019 Thomas Dickey
+- modify clean-rule to work around Fedora NFS bugs.
+
* Sat Aug 25 2018 Thomas E. Dickey
- split spec-file into ncurses6 and ncursest6 to work around toolset breakage
in Fedora 28
Index: test/package/mingw-ncurses-examples.spec
Prereq: 1.8
--- ncurses-6.1-20191116+/test/package/mingw-ncurses-examples.spec 2019-01-27 00:22:16.000000000 +0000
+++ ncurses-6.1-20191123/test/package/mingw-ncurses-examples.spec 2019-11-23 21:13:52.000000000 +0000
@@ -4,7 +4,7 @@
%global AppProgram ncurses-examples
%global AppVersion MAJOR.MINOR
%global AppRelease YYYYMMDD
-# $Id: mingw-ncurses-examples.spec,v 1.8 2019/01/27 00:22:16 tom Exp $
+# $Id: mingw-ncurses-examples.spec,v 1.9 2019/11/23 21:13:52 tom Exp $
Name: mingw32-ncurses6-examples
Version: %{AppVersion}
Release: %{AppRelease}
@@ -97,7 +97,12 @@
popd
%clean
-rm -rf $RPM_BUILD_ROOT
+if rm -rf $RPM_BUILD_ROOT; then
+ echo OK
+else
+ find $RPM_BUILD_ROOT -type f | grep -F -v /.nfs && exit 1
+fi
+exit 0
%defattr(-,root,root,-)
@@ -111,5 +116,8 @@
%changelog
+* Sat Nov 16 2019 Thomas Dickey
+- modify clean-rule to work around Fedora NFS bugs.
+
* Sat Oct 19 2013 Thomas E. Dickey
- initial version
Index: test/package/ncurses-examples.spec
Prereq: 1.14
--- ncurses-6.1-20191116+/test/package/ncurses-examples.spec 2019-02-03 01:17:27.000000000 +0000
+++ ncurses-6.1-20191123/test/package/ncurses-examples.spec 2019-11-23 21:11:34.000000000 +0000
@@ -3,7 +3,7 @@
%global AltProgram ncursest-examples
%global AppVersion MAJOR.MINOR
%global AppRelease YYYYMMDD
-# $Id: ncurses-examples.spec,v 1.14 2019/02/03 01:17:27 tom Exp $
+# $Id: ncurses-examples.spec,v 1.16 2019/11/23 21:11:34 tom Exp $
Name: %{AppProgram}
Version: %{AppVersion}
Release: %{AppRelease}
@@ -86,7 +86,12 @@
popd
%clean
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+if rm -rf $RPM_BUILD_ROOT; then
+ echo OK
+else
+ find $RPM_BUILD_ROOT -type f | grep -F -v /.nfs && exit 1
+fi
+exit 0
%files -n %{AppProgram}
%defattr(-,root,root)
@@ -101,6 +106,9 @@
%changelog
# each patch should add its ChangeLog entries here
+* Sat Nov 16 2019 Thomas Dickey
+- modify clean-rule to work around Fedora NFS bugs.
+
* Sat Nov 11 2017 Thomas Dickey
- add example data-files
- use rpm built-in "configure"

3764
ncurses-6.1-20191130.patch
View File

File diff suppressed because it is too large Load Diff

1686
ncurses-6.1-20191207.patch
View File

File diff suppressed because it is too large Load Diff

1901
ncurses-6.1-20191214.patch
View File

File diff suppressed because it is too large Load Diff

733
ncurses-6.1-20191221.patch
View File

@ -1,733 +0,0 @@
# ncurses 6.1 - patch 20191221 - Thomas E. Dickey
#
# ------------------------------------------------------------------------------
#
# Ncurses 6.1 is at
# ftp.gnu.org:/pub/gnu
#
# Patches for ncurses 6.1 can be found at
# ftp://ftp.invisible-island.net/ncurses/6.1
# http://invisible-mirror.net/archives/ncurses/6.1
#
# ------------------------------------------------------------------------------
# ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20191221.patch.gz
# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created Sun Dec 22 03:20:49 UTC 2019
# ------------------------------------------------------------------------------
# Ada95/samples/Makefile.in | 5
# NEWS | 12 +
# VERSION | 2
# dist.mk | 4
# include/MKterm.h.awk.in | 6
# ncurses/base/keyok.c | 5
# ncurses/base/lib_color.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
# package/ncursest.spec | 2
# test/tracemunch | 400 ++++++++++++++++++++++++++++++++++---
# 15 files changed, 412 insertions(+), 48 deletions(-)
# ------------------------------------------------------------------------------
Index: Ada95/samples/Makefile.in
Prereq: 1.56
--- ncurses-6.1-20191214+/Ada95/samples/Makefile.in 2019-09-08 00:01:38.000000000 +0000
+++ ncurses-6.1-20191221/Ada95/samples/Makefile.in 2019-12-22 01:09:19.000000000 +0000
@@ -28,7 +28,7 @@
#
# Author: Juergen Pfeifer, 1996
#
-# $Id: Makefile.in,v 1.56 2019/09/08 00:01:38 tom Exp $
+# $Id: Makefile.in,v 1.57 2019/12/22 01:09:19 tom Exp $
#
.SUFFIXES:
@@ -82,6 +82,7 @@
LIBDIR = $(DESTDIR)$(libdir)
MY_DATADIR = $(DATADIR)/@ADA_LIBNAME@
+THIS_DATADIR = $(datadir)/@ADA_LIBNAME@
################################################################################
ada_srcdir = ../src
@@ -165,4 +166,4 @@
$(THISLIB)-explanation.adb : $(srcdir)/$(THISLIB)-explanation.adb_p
rm -f $@
- $(ADAPREP) -DTHIS_DATADIR=\"$(DATADIR)\" @GNATPREP_OPTS@ $(srcdir)/$(THISLIB)-explanation.adb_p $@
+ $(ADAPREP) -DTHIS_DATADIR=\"$(THIS_DATADIR)/\" @GNATPREP_OPTS@ $(srcdir)/$(THISLIB)-explanation.adb_p $@
Index: NEWS
Prereq: 1.3416
--- ncurses-6.1-20191214+/NEWS 2019-12-14 21:26:03.000000000 +0000
+++ ncurses-6.1-20191221/NEWS 2019-12-21 22:43:54.000000000 +0000
@@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3416 2019/12/14 21:26:03 tom Exp $
+-- $Id: NEWS,v 1.3420 2019/12/21 22:43:54 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
@@ -45,6 +45,16 @@
Changes through 1.9.9e did not credit all contributions;
it is not possible to add this information.
+20191221
+ + correct pathname used in Ada95 sample programs for explain.txt, to
+ work with test-packages.
+ + improve tracemunch:
+ + keep track of TERMINAL* values
+ + if tracing was first turned on after initialization, attempt to
+ show distinct screen, window and terminal names anyway.
+ + ensure that GCC_NORETURN is defined in term.h, because the prototype
+ for exit_terminfo() uses it (report by Werner Fink).
+
20191214
+ add exit_curses() and exit_terminfo() to replace internal symbols for
leak-checking.
Index: VERSION
--- ncurses-6.1-20191214+/VERSION 2019-12-14 17:50:13.000000000 +0000
+++ ncurses-6.1-20191221/VERSION 2019-12-21 11:16:12.000000000 +0000
@@ -1 +1 @@
-5:0:10 6.1 20191214
+5:0:10 6.1 20191221
Index: dist.mk
Prereq: 1.1319
--- ncurses-6.1-20191214+/dist.mk 2019-12-14 17:50:13.000000000 +0000
+++ ncurses-6.1-20191221/dist.mk 2019-12-21 11:16:12.000000000 +0000
@@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.1319 2019/12/14 17:50:13 tom Exp $
+# $Id: dist.mk,v 1.1320 2019/12/21 11:16: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 = 1
-NCURSES_PATCH = 20191214
+NCURSES_PATCH = 20191221
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
Index: include/MKterm.h.awk.in
Prereq: 1.72
--- ncurses-6.1-20191214+/include/MKterm.h.awk.in 2019-12-14 22:31:32.000000000 +0000
+++ ncurses-6.1-20191221/include/MKterm.h.awk.in 2019-12-21 18:29:09.000000000 +0000
@@ -59,7 +59,7 @@
print "/* and: Thomas E. Dickey 1995-on */"
print "/****************************************************************************/"
print ""
- print "/* $Id: MKterm.h.awk.in,v 1.72 2019/12/14 22:31:32 tom Exp $ */"
+ print "/* $Id: MKterm.h.awk.in,v 1.73 2019/12/21 18:29:09 tom Exp $ */"
print ""
print "/*"
print "** term.h -- Definition of struct term"
@@ -147,6 +147,10 @@
print "#define SET_TTY(fd, buf) stty(fd, buf)"
print "#endif"
print ""
+ print "#ifndef GCC_NORETURN"
+ print "#define GCC_NORETURN /* nothing */"
+ print "#endif"
+ print ""
print "#define NAMESIZE 256"
print ""
print "/* The cast works because TERMTYPE is the first data in TERMINAL */"
Index: ncurses/base/keyok.c
Prereq: 1.14
--- ncurses-6.1-20191214+/ncurses/base/keyok.c 2014-03-08 20:32:59.000000000 +0000
+++ ncurses-6.1-20191221/ncurses/base/keyok.c 2019-12-21 22:40:32.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2012,2014 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2014,2019 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 *
@@ -33,7 +33,7 @@
#include <curses.priv.h>
-MODULE_ID("$Id: keyok.c,v 1.14 2014/03/08 20:32:59 tom Exp $")
+MODULE_ID("$Id: keyok.c,v 1.15 2019/12/21 22:40:32 tom Exp $")
/*
* Enable (or disable) ncurses' interpretation of a keycode by adding (or
@@ -55,7 +55,6 @@
#ifdef USE_TERM_DRIVER
code = CallDriver_2(sp, td_kyOk, c, flag);
#else
- T((T_CALLED("keyok(%d,%d)"), c, flag));
if (c >= 0) {
int count = 0;
char *s;
Index: ncurses/base/lib_color.c
Prereq: 1.140
--- ncurses-6.1-20191214+/ncurses/base/lib_color.c 2019-01-21 01:55:18.000000000 +0000
+++ ncurses-6.1-20191221/ncurses/base/lib_color.c 2019-12-22 00:57:53.000000000 +0000
@@ -48,7 +48,7 @@
#define CUR SP_TERMTYPE
#endif
-MODULE_ID("$Id: lib_color.c,v 1.140 2019/01/21 01:55:18 tom Exp $")
+MODULE_ID("$Id: lib_color.c,v 1.142 2019/12/22 00:57:53 tom Exp $")
#ifdef USE_TERM_DRIVER
#define CanChange InfoOf(SP_PARM).canchange
@@ -803,7 +803,7 @@
int code = FALSE;
(void) SP_PARM;
- T((T_CALLED("has_colors()")));
+ T((T_CALLED("has_colors(%p)"), (void *) SP_PARM));
if (HasTerminal(SP_PARM)) {
#ifdef USE_TERM_DRIVER
code = HasColor;
Index: package/debian-mingw/changelog
--- ncurses-6.1-20191214+/package/debian-mingw/changelog 2019-12-14 17:50:13.000000000 +0000
+++ ncurses-6.1-20191221/package/debian-mingw/changelog 2019-12-21 11:16:12.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20191214) unstable; urgency=low
+ncurses6 (6.1+20191221) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 14 Dec 2019 12:50:13 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 21 Dec 2019 06:16:12 -0500
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian-mingw64/changelog
--- ncurses-6.1-20191214+/package/debian-mingw64/changelog 2019-12-14 17:50:13.000000000 +0000
+++ ncurses-6.1-20191221/package/debian-mingw64/changelog 2019-12-21 11:16:12.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20191214) unstable; urgency=low
+ncurses6 (6.1+20191221) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 14 Dec 2019 12:50:13 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 21 Dec 2019 06:16:12 -0500
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian/changelog
--- ncurses-6.1-20191214+/package/debian/changelog 2019-12-14 17:50:13.000000000 +0000
+++ ncurses-6.1-20191221/package/debian/changelog 2019-12-21 11:16:12.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20191214) unstable; urgency=low
+ncurses6 (6.1+20191221) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 14 Dec 2019 12:50:13 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 21 Dec 2019 06:16:12 -0500
ncurses6 (5.9-20120608) unstable; urgency=low
Index: package/mingw-ncurses.nsi
Prereq: 1.365
--- ncurses-6.1-20191214+/package/mingw-ncurses.nsi 2019-12-14 17:50:13.000000000 +0000
+++ ncurses-6.1-20191221/package/mingw-ncurses.nsi 2019-12-21 11:16:12.000000000 +0000
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.365 2019/12/14 17:50:13 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.366 2019/12/21 11:16:12 tom Exp $
; TODO add examples
; TODO bump ABI to 6
@@ -10,7 +10,7 @@
!define VERSION_MAJOR "6"
!define VERSION_MINOR "1"
!define VERSION_YYYY "2019"
-!define VERSION_MMDD "1214"
+!define VERSION_MMDD "1221"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"
Index: package/mingw-ncurses.spec
--- ncurses-6.1-20191214+/package/mingw-ncurses.spec 2019-12-14 17:50:13.000000000 +0000
+++ ncurses-6.1-20191221/package/mingw-ncurses.spec 2019-12-21 11:16:12.000000000 +0000
@@ -3,7 +3,7 @@
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 6.1
-Release: 20191214
+Release: 20191221
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncurses.spec
--- ncurses-6.1-20191214+/package/ncurses.spec 2019-12-14 17:50:13.000000000 +0000
+++ ncurses-6.1-20191221/package/ncurses.spec 2019-12-21 11:16:12.000000000 +0000
@@ -1,7 +1,7 @@
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 6.1
-Release: 20191214
+Release: 20191221
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncursest.spec
--- ncurses-6.1-20191214+/package/ncursest.spec 2019-12-14 17:50:13.000000000 +0000
+++ ncurses-6.1-20191221/package/ncursest.spec 2019-12-21 11:16:12.000000000 +0000
@@ -1,7 +1,7 @@
Summary: Curses library with POSIX thread support.
Name: ncursest6
Version: 6.1
-Release: 20191214
+Release: 20191221
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: test/tracemunch
Prereq: 1.24
--- ncurses-6.1-20191214+/test/tracemunch 2018-12-29 22:20:06.000000000 +0000
+++ ncurses-6.1-20191221/test/tracemunch 2019-12-21 22:33:35.000000000 +0000
@@ -1,7 +1,7 @@
#!/usr/bin/env perl
-# $Id: tracemunch,v 1.24 2018/12/29 22:20:06 tom Exp $
+# $Id: tracemunch,v 1.26 2019/12/21 22:33:35 tom Exp $
##############################################################################
-# Copyright (c) 1998-2017,2018 Free Software Foundation, Inc. #
+# Copyright (c) 1998-2018,2019 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"), #
@@ -42,8 +42,305 @@
our $waddnstr =
'waddnstr\(0x([[:xdigit:]]+),"([^\"]+)",[0-9]+\) called \{A_NORMAL\}';
+# If the trace is complete, we can infer addresses using the return value from
+# newwin, etc. But if it is incomplete, we can still check for special cases
+# such as SCREEN* and WINDOW* parameters. In this table, the type for the
+# first parameter is encoded, relying upon an ncurses programming convention:
+# 1 = SCREEN*
+# 2 = WINDOW*
+# 4 = TERMINAL*
+our %known_p1 = qw(
+ TransformLine 1
+ _nc_freewin 2
+ _nc_initscr 1
+ _nc_makenew 1
+ _nc_mingw_console_read 1
+ _nc_reset_colors 1
+ _nc_scroll_optimize 1
+ _nc_tinfo 1
+ _nc_tinfo_mvcur 1
+ _nc_wgetch 2
+ adjust_window 2
+ assume_default_colors 1
+ attr_get 2
+ baudrate 1
+ beep 1
+ border_set 2
+ box 2
+ box_set 2
+ can_change_color 1
+ cbreak 1
+ clearok 2
+ color_content 1
+ copywin 2
+ curs_set 1
+ decrease_size 1
+ def_prog_mode 1
+ def_shell_mode 1
+ define_key 1
+ del_curterm 1
+ delay_output 1
+ delscreen 1
+ delwin 2
+ derwin 2
+ doupdate 1
+ dupwin 2
+ echo 1
+ endwin 1
+ erasechar 1
+ filter 1
+ flash 1
+ flushinp 1
+ getattrs 2
+ getbegx 2
+ getbegy 2
+ getbkgd 2
+ getcurx 2
+ getcury 2
+ getmaxx 2
+ getmaxy 2
+ getmouse 1
+ getparx 2
+ getpary 2
+ halfdelay 1
+ has_ic 1
+ has_il 1
+ has_key 1
+ idcok 2
+ idlok 2
+ immedok 2
+ increase_size 1
+ init_color 1
+ init_pair 1
+ intrflush 1
+ is_cleared 2
+ is_idcok 2
+ is_idlok 2
+ is_immedok 2
+ is_keypad 2
+ is_leaveok 2
+ is_linetouched 2
+ is_nodelay 2
+ is_notimeout 2
+ is_pad 2
+ is_scrollok 2
+ is_subwin 2
+ is_syncok 2
+ is_term_resized 1
+ is_wintouched 2
+ key_defined 1
+ keybound 1
+ keyok 1
+ keypad 2
+ killchar 1
+ leaveok 2
+ longname 1
+ meta 2
+ mouseinterval 1
+ mousemask 1
+ mvcur 1
+ mvderwin 2
+ mvwadd_wch 2
+ mvwadd_wchnstr 2
+ mvwadd_wchstr 2
+ mvwaddch 2
+ mvwaddchnstr 2
+ mvwaddchstr 2
+ mvwaddnstr 2
+ mvwaddnwstr 2
+ mvwaddstr 2
+ mvwaddwstr 2
+ mvwchgat 2
+ mvwdelch 2
+ mvwget_wch 2
+ mvwget_wstr 2
+ mvwgetch 2
+ mvwgetn_wstr 2
+ mvwgetnstr 2
+ mvwgetstr 2
+ mvwhline 2
+ mvwhline_set 2
+ mvwin 2
+ mvwin_wch 2
+ mvwin_wchnstr 2
+ mvwin_wchstr 2
+ mvwinch 2
+ mvwinchnstr 2
+ mvwinchstr 2
+ mvwins_nwstr 2
+ mvwins_wch 2
+ mvwins_wstr 2
+ mvwinsch 2
+ mvwinsnstr 2
+ mvwinsstr 2
+ mvwinstr 2
+ mvwinwstr 2
+ mvwvline 2
+ mvwvline_set 2
+ newpad 1
+ newterm 1
+ newwin 1
+ nl 1
+ nocbreak 1
+ nodelay 2
+ noecho 1
+ nofilter 1
+ nonl 1
+ noqiflush 1
+ noraw 1
+ notimeout 2
+ overlap 2
+ overlay 2
+ overwrite 2
+ pair_content 1
+ pecho_wchar 2
+ pechochar 2
+ pnoutrefresh 2
+ putwin 2
+ qiflush 1
+ raw 1
+ redrawwin 2
+ reset_prog_mode 1
+ reset_shell_mode 1
+ resetty 1
+ resize_term 1
+ resizeterm 1
+ restartterm 1
+ ripoffline 1
+ savetty 1
+ scr_init 1
+ scr_restore 1
+ scr_set 1
+ scroll 2
+ scrollok 2
+ set_curterm 4
+ set_term 1
+ slk_attr 1
+ slk_attr_set 1
+ slk_attroff 1
+ slk_attron 1
+ slk_attrset 1
+ slk_clear 1
+ slk_color 1
+ slk_init 1
+ slk_label 1
+ slk_noutrefresh 1
+ slk_refresh 1
+ slk_restore 1
+ slk_set 1
+ slk_touch 1
+ start_color 1
+ subwin 2
+ syncok 2
+ termattrs 1
+ termname 1
+ tgetflag 1
+ tgetnum 1
+ tigetflag 1
+ tigetnum 1
+ tigetstr 1
+ tinfo 1
+ touchline 2
+ touchwin 2
+ typeahead 1
+ unget_wch 1
+ ungetch 1
+ ungetmouse 1
+ untouchwin 2
+ use_default_colors 1
+ use_env 1
+ use_legacy_coding 1
+ use_screen 1
+ use_tioctl 1
+ use_window 2
+ vidattr 1
+ vidputs 1
+ vw_printw 2
+ vwprintw 2
+ wadd_wch 2
+ wadd_wchnstr 2
+ wadd_wchstr 2
+ waddch 2
+ waddchnstr 2
+ waddchstr 2
+ waddnstr 2
+ waddnwstr 2
+ waddstr 2
+ waddwstr 2
+ wattr_get 2
+ wattr_off 2
+ wattr_on 2
+ wattr_set 2
+ wattroff 2
+ wattron 2
+ wattrset 2
+ wbkgd 2
+ wbkgdset 2
+ wborder 2
+ wborder_set 2
+ wchgat 2
+ wclear 2
+ wclrtobot 2
+ wclrtoeol 2
+ wcolor_set 2
+ wcursyncup 2
+ wdelch 2
+ wdeleteln 2
+ wechochar 2
+ wenclose 2
+ werase 2
+ wget_wch 2
+ wget_wstr 2
+ wgetbkgrnd 2
+ wgetch 2
+ wgetch_events 2
+ wgetdelay 2
+ wgetn_wstr 2
+ wgetnstr 2
+ wgetparent 2
+ wgetscrreg 2
+ wgetstr 2
+ whline 2
+ whline_set 2
+ win_wch 2
+ win_wchnstr 2
+ win_wchstr 2
+ winch 2
+ winchnstr 2
+ winchstr 2
+ winnstr 2
+ winnwstr 2
+ wins_nwstr 2
+ wins_wch 2
+ wins_wstr 2
+ winsch 2
+ winsdelln 2
+ winsertln 2
+ winsnstr 2
+ winsstr 2
+ winstr 2
+ winwstr 2
+ wmouse_trafo 2
+ wmove 2
+ wnoutrefresh 2
+ wprintw 2
+ wredrawln 2
+ wrefresh 2
+ wresize 2
+ wscrl 2
+ wsetscrreg 2
+ wstandend 2
+ wstandout 2
+ wsyncdown 2
+ wsyncup 2
+ wtimeout 2
+ wtouchln 2
+ wvline 2
+);
+
our $scr_nums = 0;
our $thr_nums = 0;
+our $trm_nums = 0;
our $try_nums = 0;
our $win_nums = 0;
our $curscr = "";
@@ -51,40 +348,90 @@
our $stdscr = "";
our %scr_addr;
our %thr_addr;
+our %trm_addr;
our %try_addr;
our %win_addr;
-sub transaddr {
+sub has_addr($) {
+ my $value = shift;
+ my $result = 0;
+ $result = 1 if ( $value =~ /\b0x[[:xdigit:]]+\b/i );
+ return $result;
+}
+
+sub transaddr($) {
+ my $arg = shift;
my $n;
- my $arg = $_[0];
$arg =~ s/\b$curscr\b/curscr/g if ($curscr);
$arg =~ s/\b$newscr\b/newscr/g if ($newscr);
$arg =~ s/\b$stdscr\b/stdscr/g if ($stdscr);
- foreach my $addr ( keys %scr_addr ) {
- $n = $scr_addr{$addr};
- $arg =~ s/\b$addr\b/screen$n/g if ( defined $n );
- }
- foreach my $addr ( keys %thr_addr ) {
- $n = $thr_addr{$addr};
- $arg =~ s/\b$addr\b/thread$n/g if ( defined $n );
- }
- foreach my $addr ( keys %try_addr ) {
- $n = $try_addr{$addr};
- $arg =~ s/\b$addr\b/tries_$n/g if ( defined $n );
- }
- foreach my $addr ( keys %win_addr ) {
- $n = $win_addr{$addr};
- $arg =~ s/\b$addr\b/window$n/g if ( defined $n );
+ if ( &has_addr($arg) ) {
+ foreach my $addr ( keys %scr_addr ) {
+ $n = $scr_addr{$addr};
+ $arg =~ s/\b$addr\b/screen$n/g if ( defined $n );
+ }
+ }
+ if ( &has_addr($arg) ) {
+ foreach my $addr ( keys %thr_addr ) {
+ $n = $thr_addr{$addr};
+ $arg =~ s/\b$addr\b/thread$n/g if ( defined $n );
+ }
+ }
+ if ( &has_addr($arg) ) {
+ foreach my $addr ( keys %trm_addr ) {
+ $n = $trm_addr{$addr};
+ $arg =~ s/\b$addr\b/terminal$n/g if ( defined $n );
+ }
}
- if ( $arg =~ /add_wch\((window\d+,)?0x[[:xdigit:]]+\)/i ) {
- $arg =~ s/(0x[[:xdigit:]]+)[)]/\&wch)/i;
+ if ( &has_addr($arg) ) {
+ foreach my $addr ( keys %try_addr ) {
+ $n = $try_addr{$addr};
+ $arg =~ s/\b$addr\b/tries_$n/g if ( defined $n );
+ }
}
- elsif ( $arg =~ /color_content\((screen\d+,)?\d+(,0x[[:xdigit:]]+){3}/i ) {
- $arg =~ s/(,0x[[:xdigit:]]+){3}[)]/,\&r,\&g,\&b)/i;
+ if ( &has_addr($arg) ) {
+ foreach my $addr ( keys %win_addr ) {
+ $n = $win_addr{$addr};
+ $arg =~ s/\b$addr\b/window$n/g if ( defined $n );
+ }
}
- elsif ( $arg =~ /pair_content\((screen\d+,)?\d+(,0x[[:xdigit:]]+){2}/i ) {
- $arg =~ s/(,0x[[:xdigit:]]+){2}[)]/,\&fg,\&bg)/i;
+ if ( &has_addr($arg) ) {
+ if ( $arg =~ /add_wch\((window\d+,)?0x[[:xdigit:]]+\)/i ) {
+ $arg =~ s/(0x[[:xdigit:]]+)[)]/\&wch)/i;
+ }
+ elsif (
+ $arg =~ /color_content\((screen\d+,)?\d+(,0x[[:xdigit:]]+){3}/i )
+ {
+ $arg =~ s/(,0x[[:xdigit:]]+){3}[)]/,\&r,\&g,\&b)/i;
+ }
+ elsif ( $arg =~ /pair_content\((screen\d+,)?\d+(,0x[[:xdigit:]]+){2}/i )
+ {
+ $arg =~ s/(,0x[[:xdigit:]]+){2}[)]/,\&fg,\&bg)/i;
+ }
+ }
+ if ( &has_addr($arg) and $arg =~ /called\s+\{/ ) {
+ my $func = $arg;
+ chomp $func;
+ $func =~ s/^.*called\s+\{([[:alnum:]_]+)\(.*$/$1/;
+ if ( defined $known_p1{$func} ) {
+ my $addr = $arg;
+ my $type = $known_p1{$func};
+ chomp $addr;
+ $addr =~ s/^[^(]+\((0x[[:xdigit:]]+).*/$1/i;
+ if ( $type == 1 ) {
+ $scr_addr{$addr} = ++$scr_nums;
+ $arg = &transaddr($arg);
+ }
+ elsif ( $type == 2 ) {
+ $win_addr{$addr} = ++$win_nums;
+ $arg = &transaddr($arg);
+ }
+ elsif ( $type == 4 ) {
+ $trm_addr{$addr} = ++$trm_nums;
+ $arg = &transaddr($arg);
+ }
+ }
}
return $arg;
@@ -132,6 +479,9 @@
}
$awaiting = "";
}
+ elsif ( $_ =~ /^(\+ )*called \{set_curterm\((0x[[:xdigit:]]+)\)/ ) {
+ $trm_addr{$2} = ++$trm_nums unless defined $trm_addr{$2};
+ }
elsif ( $_ =~ /^(\+ )*called \{_nc_add_to_try\((0x[[:xdigit:]]+),/ )
{
$try_addr{$2} = ++$try_nums unless defined $try_addr{$2};

360
ncurses-6.1-20191228.patch
View File

@ -1,360 +0,0 @@
# ncurses 6.1 - patch 20191228 - Thomas E. Dickey
#
# ------------------------------------------------------------------------------
#
# Ncurses 6.1 is at
# ftp.gnu.org:/pub/gnu
#
# Patches for ncurses 6.1 can be found at
# ftp://ftp.invisible-island.net/ncurses/6.1
# http://invisible-mirror.net/archives/ncurses/6.1
#
# ------------------------------------------------------------------------------
# ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20191228.patch.gz
# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created Sun Dec 29 02:31:23 UTC 2019
# ------------------------------------------------------------------------------
# NEWS | 10 +++++++++-
# VERSION | 2 +-
# dist.mk | 4 ++--
# misc/gen-pkgconfig.in | 10 +++++++---
# misc/ncurses-config.in | 5 ++++-
# 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 | 22 +++++++++++++++-------
# package/ncursest.spec | 23 +++++++++++++++--------
# 12 files changed, 62 insertions(+), 32 deletions(-)
# ------------------------------------------------------------------------------
Index: NEWS
Prereq: 1.3420
--- ncurses-6.1-20191221+/NEWS 2019-12-21 22:43:54.000000000 +0000
+++ ncurses-6.1-20191228/NEWS 2019-12-25 23:16:49.000000000 +0000
@@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3420 2019/12/21 22:43:54 tom Exp $
+-- $Id: NEWS,v 1.3422 2019/12/25 23:16:49 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.
+20191228
+ + in gen-pkgconfig.in, move the RPATH_LIST and PRIVATE_LIBS assignments
+ past the various prefix/libdir assignments, to allow for using those
+ symbols, e.g., as done via CF_SHARED_OPTS.
+ + improve ncurses*-config and pc-files by filtering out linker-specs.
+ + modify test-package to more closely match Fedora's configuration
+ for PIE/PIC feature and debug-packages.
+
20191221
+ correct pathname used in Ada95 sample programs for explain.txt, to
work with test-packages.
Index: VERSION
--- ncurses-6.1-20191221+/VERSION 2019-12-21 11:16:12.000000000 +0000
+++ ncurses-6.1-20191228/VERSION 2019-12-28 15:45:41.000000000 +0000
@@ -1 +1 @@
-5:0:10 6.1 20191221
+5:0:10 6.1 20191228
Index: dist.mk
Prereq: 1.1320
--- ncurses-6.1-20191221+/dist.mk 2019-12-21 11:16:12.000000000 +0000
+++ ncurses-6.1-20191228/dist.mk 2019-12-28 15:45:41.000000000 +0000
@@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.1320 2019/12/21 11:16:12 tom Exp $
+# $Id: dist.mk,v 1.1321 2019/12/28 15:45:41 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 = 1
-NCURSES_PATCH = 20191221
+NCURSES_PATCH = 20191228
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
Index: misc/gen-pkgconfig.in
Prereq: 1.40
--- ncurses-6.1-20191221+/misc/gen-pkgconfig.in 2019-10-12 22:27:10.000000000 +0000
+++ ncurses-6.1-20191228/misc/gen-pkgconfig.in 2019-12-25 23:09:13.000000000 +0000
@@ -1,5 +1,5 @@
#!@SHELL@
-# $Id: gen-pkgconfig.in,v 1.40 2019/10/12 22:27:10 tom Exp $
+# $Id: gen-pkgconfig.in,v 1.42 2019/12/25 23:09:13 tom Exp $
##############################################################################
# Copyright (c) 2009-2018,2019 Free Software Foundation, Inc. #
# #
@@ -46,8 +46,6 @@
DFT_DEP_SUFFIX=@DFT_DEP_SUFFIX@
TINFO_ARG_SUFFIX=@TINFO_ARG_SUFFIX@
CXX_LIB_SUFFIX=@CXX_LIB_SUFFIX@
-RPATH_LIST=@RPATH_LIST@
-PRIVATE_LIBS="@PRIVATE_LIBS@"
suffix=@PC_MODULE_SUFFIX@
prefix="@prefix@"
@@ -55,6 +53,9 @@
includedir="@includedir@@includesubdir@"
libdir="@libdir@"
+RPATH_LIST=@RPATH_LIST@
+PRIVATE_LIBS="@PRIVATE_LIBS@"
+
show_prefix='@prefix@'
show_exec_prefix='@exec_prefix@'
show_includedir='@includedir@@includesubdir@'
@@ -84,6 +85,9 @@
-l*) # LIBS is handled specially below
continue
;;
+ -specs*) # ignore linker specs-files which were used to build library
+ continue
+ ;;
-Wl,-z,*) # ignore flags used to manipulate shared image
continue
;;
Index: misc/ncurses-config.in
Prereq: 1.41
--- ncurses-6.1-20191221+/misc/ncurses-config.in 2019-10-12 21:25:17.000000000 +0000
+++ ncurses-6.1-20191228/misc/ncurses-config.in 2019-12-25 00:54:55.000000000 +0000
@@ -1,5 +1,5 @@
#!@SHELL@
-# $Id: ncurses-config.in,v 1.41 2019/10/12 21:25:17 tom Exp $
+# $Id: ncurses-config.in,v 1.42 2019/12/25 00:54:55 tom Exp $
##############################################################################
# Copyright (c) 2006-2018,2019 Free Software Foundation, Inc. #
# #
@@ -103,6 +103,9 @@
for opt in -L$libdir @LDFLAGS@ @EXTRA_LDFLAGS@ $LIBS
do
case $opt in
+ -specs*) # ignore linker specs-files which were used to build library
+ continue
+ ;;
-Wl,-z,*) # ignore flags used to manipulate shared image
continue
;;
Index: package/debian-mingw/changelog
--- ncurses-6.1-20191221+/package/debian-mingw/changelog 2019-12-21 11:16:12.000000000 +0000
+++ ncurses-6.1-20191228/package/debian-mingw/changelog 2019-12-28 15:45:41.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20191221) unstable; urgency=low
+ncurses6 (6.1+20191228) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 21 Dec 2019 06:16:12 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Tue, 24 Dec 2019 06:02:28 -0500
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian-mingw64/changelog
--- ncurses-6.1-20191221+/package/debian-mingw64/changelog 2019-12-21 11:16:12.000000000 +0000
+++ ncurses-6.1-20191228/package/debian-mingw64/changelog 2019-12-28 15:45:41.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20191221) unstable; urgency=low
+ncurses6 (6.1+20191228) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 21 Dec 2019 06:16:12 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Tue, 24 Dec 2019 06:02:28 -0500
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian/changelog
--- ncurses-6.1-20191221+/package/debian/changelog 2019-12-21 11:16:12.000000000 +0000
+++ ncurses-6.1-20191228/package/debian/changelog 2019-12-28 15:45:41.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20191221) unstable; urgency=low
+ncurses6 (6.1+20191228) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 21 Dec 2019 06:16:12 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Tue, 24 Dec 2019 06:02:28 -0500
ncurses6 (5.9-20120608) unstable; urgency=low
Index: package/mingw-ncurses.nsi
Prereq: 1.366
--- ncurses-6.1-20191221+/package/mingw-ncurses.nsi 2019-12-21 11:16:12.000000000 +0000
+++ ncurses-6.1-20191228/package/mingw-ncurses.nsi 2019-12-24 11:02:28.000000000 +0000
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.366 2019/12/21 11:16:12 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.367 2019/12/24 11:02:28 tom Exp $
; TODO add examples
; TODO bump ABI to 6
@@ -10,7 +10,7 @@
!define VERSION_MAJOR "6"
!define VERSION_MINOR "1"
!define VERSION_YYYY "2019"
-!define VERSION_MMDD "1221"
+!define VERSION_MMDD "1228"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"
Index: package/mingw-ncurses.spec
--- ncurses-6.1-20191221+/package/mingw-ncurses.spec 2019-12-21 11:16:12.000000000 +0000
+++ ncurses-6.1-20191228/package/mingw-ncurses.spec 2019-12-24 11:02:28.000000000 +0000
@@ -3,7 +3,7 @@
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 6.1
-Release: 20191221
+Release: 20191228
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncurses.spec
--- ncurses-6.1-20191221+/package/ncurses.spec 2019-12-21 11:16:12.000000000 +0000
+++ ncurses-6.1-20191228/package/ncurses.spec 2019-12-24 14:48:17.000000000 +0000
@@ -1,15 +1,12 @@
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 6.1
-Release: 20191221
+Release: 20191228
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
# URL: https://invisible-island.net/ncurses/
-%define CC_NORMAL -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wconversion
-%define CC_STRICT %{CC_NORMAL} -W -Wbad-function-cast -Wcast-align -Wcast-qual -Wmissing-declarations -Wnested-externs -Wpointer-arith -Wwrite-strings -ansi -pedantic
-
%global MY_ABI 6
# save value before redefining
@@ -33,8 +30,11 @@
%global is_redhat %(test -f /etc/redhat-release && echo 1 || echo 0)
%global is_suse %(test -f /etc/SuSE-release && echo 1 || echo 0)
-# nor are debug-symbols
+%if %{is_redhat}
+# generate debug/debug-source packages.
+%else
%define debug_package %{nil}
+%endif
%if %{is_mandriva}
%define _disable_ld_as_needed 1
@@ -100,8 +100,6 @@
--without-debug \\\
--without-normal
-CFLAGS="%{CC_NORMAL}" \
-RPATH_LIST=../lib:%{_libdir} \
%configure %{CFG_OPTS}
make
@@ -113,6 +111,11 @@
rm -f test/ncurses
( cd test && make ncurses LOCAL_LIBDIR=%{_libdir} && mv ncurses $RPM_BUILD_ROOT/%{_bindir}/ncurses%{MY_ABI} )
+%if %{is_redhat}
+%ldconfig_scriptlets libs
+%ldconfig_scriptlets c++-libs
+%endif
+
%clean
if rm -rf $RPM_BUILD_ROOT; then
echo OK
@@ -129,6 +132,11 @@
%changelog
+* Tue Dec 24 2019 Thomas Dickey
+- drop custom CC_NORMAL warning flags because setting CFLAGS interferes with
+ matching Fedora's PIE/PIC configuration. Also, generate debug/debug-source
+ packages.
+
* Sat Nov 16 2019 Thomas Dickey
- modify clean-rule to work around Fedora NFS bugs.
Index: package/ncursest.spec
--- ncurses-6.1-20191221+/package/ncursest.spec 2019-12-21 11:16:12.000000000 +0000
+++ ncurses-6.1-20191228/package/ncursest.spec 2019-12-24 14:59:53.000000000 +0000
@@ -1,15 +1,12 @@
Summary: Curses library with POSIX thread support.
Name: ncursest6
Version: 6.1
-Release: 20191221
+Release: 20191228
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
# URL: https://invisible-island.net/ncurses/
-%define CC_NORMAL -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wconversion
-%define CC_STRICT %{CC_NORMAL} -W -Wbad-function-cast -Wcast-align -Wcast-qual -Wmissing-declarations -Wnested-externs -Wpointer-arith -Wwrite-strings -ansi -pedantic
-
%global MY_ABI 6
# save value before redefining
@@ -33,8 +30,11 @@
%global is_redhat %(test -f /etc/redhat-release && echo 1 || echo 0)
%global is_suse %(test -f /etc/SuSE-release && echo 1 || echo 0)
-# nor are debug-symbols
+%if %{is_redhat}
+# generate debug/debug-source packages.
+%else
%define debug_package %{nil}
+%endif
%if %{is_mandriva}
%define _disable_ld_as_needed 1
@@ -54,7 +54,6 @@
%setup -q -n ncurses-%{version}-%{release}
%build
-%define my_srcdir ..
%define CFG_OPTS \\\
--target %{_target_platform} \\\
--prefix=%{_prefix} \\\
@@ -101,8 +100,6 @@
--without-debug \\\
--without-normal
-CFLAGS="%{CC_NORMAL}" \
-RPATH_LIST=../lib:%{_libdir} \
%configure %{CFG_OPTS} \
--enable-interop \
--enable-sp-funcs \
@@ -117,6 +114,11 @@
rm -f test/ncurses
( cd test && make ncurses LOCAL_LIBDIR=%{_libdir} && mv ncurses $RPM_BUILD_ROOT/%{_bindir}/ncursest%{MY_ABI} )
+%if %{is_redhat}
+%ldconfig_scriptlets libs
+%ldconfig_scriptlets c++-libs
+%endif
+
%clean
if rm -rf $RPM_BUILD_ROOT; then
echo OK
@@ -133,6 +135,11 @@
%changelog
+* Tue Dec 24 2019 Thomas Dickey
+- drop custom CC_NORMAL warning flags because setting CFLAGS interferes with
+ matching Fedora's PIE/PIC configuration. Also, generate debug/debug-source
+ packages.
+
* Sat Nov 16 2019 Thomas Dickey
- modify clean-rule to work around Fedora NFS bugs.

24399
ncurses-6.1-20200104.patch
View File

File diff suppressed because it is too large Load Diff

14895
ncurses-6.1-20200111.patch
View File

File diff suppressed because it is too large Load Diff

6219
ncurses-6.1-20200118.patch
View File

File diff suppressed because it is too large Load Diff

1149
ncurses-6.2-20200215.patch Normal file
View File

File diff suppressed because it is too large Load Diff

1202
ncurses-6.2-20200222.patch Normal file
View File

File diff suppressed because it is too large Load Diff

27919
ncurses-6.2-20200229.patch Normal file
View File

File diff suppressed because it is too large Load Diff

210
ncurses-6.2-20200301.patch Normal file
View File

@ -0,0 +1,210 @@
# ncurses 6.2 - patch 20200301 - Thomas E. Dickey
#
# ------------------------------------------------------------------------------
#
# Ncurses 6.2 is at
# ftp.gnu.org:/pub/gnu
#
# Patches for ncurses 6.2 can be found at
# ftp://ftp.invisible-island.net/ncurses/6.2
# http://invisible-mirror.net/archives/ncurses/6.2
#
# ------------------------------------------------------------------------------
# ftp://ftp.invisible-island.net/ncurses/6.2/ncurses-6.2-20200301.patch.gz
# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created Mon Mar 2 23:18:56 UTC 2020
# ------------------------------------------------------------------------------
# NEWS | 8 +++++++-
# VERSION | 2 +-
# dist.mk | 4 ++--
# ncurses/base/lib_bkgd.c | 12 +++++++++++-
# 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 +-
# package/ncursest.spec | 2 +-
# 11 files changed, 32 insertions(+), 16 deletions(-)
# ------------------------------------------------------------------------------
Index: NEWS
Prereq: 1.3455
--- ncurses-6.2-20200229+/NEWS 2020-02-29 23:15:52.000000000 +0000
+++ ncurses-6.2-20200301/NEWS 2020-03-02 01:55:08.000000000 +0000
@@ -26,7 +26,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3455 2020/02/29 23:15:52 tom Exp $
+-- $Id: NEWS,v 1.3456 2020/03/02 01:55:08 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,12 @@
Changes through 1.9.9e did not credit all contributions;
it is not possible to add this information.
+20200301
+ + modify wbkgd() and wbkgrnd() to avoid storing a null in the
+ background character, because it may be used in cases where the
+ corresponding 0x80 is not treated as a null (report by Marc Rechte,
+ cf: 20181208).
+
20200229
+ modify CF_NCURSES_CONFIG to work around xcode's c99 "-W" option,
which conflicts with conventional use for passing linker options.
Index: VERSION
--- ncurses-6.2-20200229+/VERSION 2020-02-29 12:43:09.000000000 +0000
+++ ncurses-6.2-20200301/VERSION 2020-03-02 01:55:47.000000000 +0000
@@ -1 +1 @@
-5:0:10 6.2 20200229
+5:0:10 6.2 20200301
Index: dist.mk
Prereq: 1.1337
--- ncurses-6.2-20200229+/dist.mk 2020-02-29 12:43:09.000000000 +0000
+++ ncurses-6.2-20200301/dist.mk 2020-03-02 01:55:47.000000000 +0000
@@ -26,7 +26,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.1337 2020/02/29 12:43:09 tom Exp $
+# $Id: dist.mk,v 1.1338 2020/03/02 01:55:47 tom Exp $
# Makefile for creating ncurses distributions.
#
# This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@
# These define the major/minor/patch versions of ncurses.
NCURSES_MAJOR = 6
NCURSES_MINOR = 2
-NCURSES_PATCH = 20200229
+NCURSES_PATCH = 20200301
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
Index: ncurses/base/lib_bkgd.c
Prereq: 1.54
--- ncurses-6.2-20200229+/ncurses/base/lib_bkgd.c 2020-02-02 23:34:34.000000000 +0000
+++ ncurses-6.2-20200301/ncurses/base/lib_bkgd.c 2020-03-02 01:34:48.000000000 +0000
@@ -37,7 +37,9 @@
#include <curses.priv.h>
-MODULE_ID("$Id: lib_bkgd.c,v 1.54 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: lib_bkgd.c,v 1.55 2020/03/02 01:34:48 tom Exp $")
+
+static const NCURSES_CH_T blank = NewChar(BLANK_TEXT);
/*
* Set the window's background information.
@@ -143,6 +145,14 @@
SetPair(new_bkgd, 0);
}
+ /* avoid setting background-character to a null */
+ if (CharOf(new_bkgd) == 0) {
+ NCURSES_CH_T tmp_bkgd = blank;
+ SetAttr(tmp_bkgd, AttrOf(new_bkgd));
+ SetPair(tmp_bkgd, GetPair(new_bkgd));
+ new_bkgd = tmp_bkgd;
+ }
+
memset(&old_bkgd, 0, sizeof(old_bkgd));
(void) wgetbkgrnd(win, &old_bkgd);
Index: package/debian-mingw/changelog
--- ncurses-6.2-20200229+/package/debian-mingw/changelog 2020-02-29 12:43:09.000000000 +0000
+++ ncurses-6.2-20200301/package/debian-mingw/changelog 2020-03-02 01:55:47.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.2+20200229) unstable; urgency=low
+ncurses6 (6.2+20200301) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 29 Feb 2020 07:43:09 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sun, 01 Mar 2020 20:55:47 -0500
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian-mingw64/changelog
--- ncurses-6.2-20200229+/package/debian-mingw64/changelog 2020-02-29 12:43:09.000000000 +0000
+++ ncurses-6.2-20200301/package/debian-mingw64/changelog 2020-03-02 01:55:47.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.2+20200229) unstable; urgency=low
+ncurses6 (6.2+20200301) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 29 Feb 2020 07:43:09 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sun, 01 Mar 2020 20:55:47 -0500
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian/changelog
--- ncurses-6.2-20200229+/package/debian/changelog 2020-02-29 12:43:09.000000000 +0000
+++ ncurses-6.2-20200301/package/debian/changelog 2020-03-02 01:55:47.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.2+20200229) unstable; urgency=low
+ncurses6 (6.2+20200301) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 29 Feb 2020 07:43:09 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sun, 01 Mar 2020 20:55:47 -0500
ncurses6 (5.9-20120608) unstable; urgency=low
Index: package/mingw-ncurses.nsi
Prereq: 1.380
--- ncurses-6.2-20200229+/package/mingw-ncurses.nsi 2020-02-29 12:43:09.000000000 +0000
+++ ncurses-6.2-20200301/package/mingw-ncurses.nsi 2020-03-02 01:55:47.000000000 +0000
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.380 2020/02/29 12:43:09 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.381 2020/03/02 01:55:47 tom Exp $
; TODO add examples
; TODO bump ABI to 6
@@ -10,7 +10,7 @@
!define VERSION_MAJOR "6"
!define VERSION_MINOR "2"
!define VERSION_YYYY "2020"
-!define VERSION_MMDD "0229"
+!define VERSION_MMDD "0301"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"
Index: package/mingw-ncurses.spec
--- ncurses-6.2-20200229+/package/mingw-ncurses.spec 2020-02-29 12:43:09.000000000 +0000
+++ ncurses-6.2-20200301/package/mingw-ncurses.spec 2020-03-02 01:55:47.000000000 +0000
@@ -3,7 +3,7 @@
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 6.2
-Release: 20200229
+Release: 20200301
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncurses.spec
--- ncurses-6.2-20200229+/package/ncurses.spec 2020-02-29 12:43:09.000000000 +0000
+++ ncurses-6.2-20200301/package/ncurses.spec 2020-03-02 01:55:47.000000000 +0000
@@ -1,7 +1,7 @@
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 6.2
-Release: 20200229
+Release: 20200301
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncursest.spec
--- ncurses-6.2-20200229+/package/ncursest.spec 2020-02-29 12:43:09.000000000 +0000
+++ ncurses-6.2-20200301/package/ncursest.spec 2020-03-02 01:55:47.000000000 +0000
@@ -1,7 +1,7 @@
Summary: Curses library with POSIX thread support.
Name: ncursest6
Version: 6.2
-Release: 20200229
+Release: 20200301
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz

27944
ncurses-6.2-20200308.patch Normal file
View File

File diff suppressed because it is too large Load Diff

773
ncurses-6.2-20200314.patch Normal file
View File

@ -0,0 +1,773 @@
# ncurses 6.2 - patch 20200314 - Thomas E. Dickey
#
# ------------------------------------------------------------------------------
#
# Ncurses 6.2 is at
# ftp.gnu.org:/pub/gnu
#
# Patches for ncurses 6.2 can be found at
# ftp://ftp.invisible-island.net/ncurses/6.2
# http://invisible-mirror.net/archives/ncurses/6.2
#
# ------------------------------------------------------------------------------
# ftp://ftp.invisible-island.net/ncurses/6.2/ncurses-6.2-20200314.patch.gz
# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created Sun Mar 15 01:36:38 UTC 2020
# ------------------------------------------------------------------------------
# NEWS | 7 +++
# 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_printw.3x.html | 46 ++++++++++++++++++-----
# doc/html/man/curs_scanw.3x.html | 64 +++++++++++++++++++++++---------
# 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 | 27 +++++++++++--
# 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 | 2 -
# doc/html/man/toe.1m.html | 2 -
# doc/html/man/tput.1.html | 2 -
# doc/html/man/tset.1.html | 2 -
# man/curs_printw.3x | 38 ++++++++++++++++++-
# man/curs_scanw.3x | 40 +++++++++++++++++++-
# man/ncurses.3x | 25 ++++++++++++
# 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 -
# package/ncursest.spec | 2 -
# 31 files changed, 242 insertions(+), 63 deletions(-)
# ------------------------------------------------------------------------------
Index: NEWS
Prereq: 1.3461
--- ncurses-6.2-20200308+/NEWS 2020-03-08 14:28:23.000000000 +0000
+++ ncurses-6.2-20200314/NEWS 2020-03-15 00:15:32.000000000 +0000
@@ -26,7 +26,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3461 2020/03/08 14:28:23 tom Exp $
+-- $Id: NEWS,v 1.3463 2020/03/15 00:15:32 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,11 @@
Changes through 1.9.9e did not credit all contributions;
it is not possible to add this information.
+20200314
+ + add history note to curs_scanw.3x for <stdarg.h> and <varargs.h>
+ + add history note to curs_printw.3x for <stdarg.h> and <varargs.h>
+ + add portability note to ncurses.3x regarding <stdarg.h>
+
20200308
+ update copyright notices in test-packages.
+ modify tracemunch to guard against errors in its known_p1 table.
Index: VERSION
--- ncurses-6.2-20200308+/VERSION 2020-03-08 14:28:23.000000000 +0000
+++ ncurses-6.2-20200314/VERSION 2020-03-14 15:30:00.000000000 +0000
@@ -1 +1 @@
-5:0:10 6.2 20200308
+5:0:10 6.2 20200314
Index: dist.mk
Prereq: 1.1340
--- ncurses-6.2-20200308+/dist.mk 2020-03-08 14:28:23.000000000 +0000
+++ ncurses-6.2-20200314/dist.mk 2020-03-14 15:30:00.000000000 +0000
@@ -26,7 +26,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.1340 2020/03/08 14:28:23 tom Exp $
+# $Id: dist.mk,v 1.1341 2020/03/14 15:30:00 tom Exp $
# Makefile for creating ncurses distributions.
#
# This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@
# These define the major/minor/patch versions of ncurses.
NCURSES_MAJOR = 6
NCURSES_MINOR = 2
-NCURSES_PATCH = 20200308
+NCURSES_PATCH = 20200314
# 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.2-20200308+/doc/html/man/adacurses6-config.1.html 2020-02-23 01:14:14.000000000 +0000
+++ ncurses-6.2-20200314/doc/html/man/adacurses6-config.1.html 2020-03-15 00:28:07.000000000 +0000
@@ -126,7 +126,7 @@
</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
<STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
- This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200222).
+ This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200314).
Index: doc/html/man/captoinfo.1m.html
--- ncurses-6.2-20200308+/doc/html/man/captoinfo.1m.html 2020-02-23 01:14:14.000000000 +0000
+++ ncurses-6.2-20200314/doc/html/man/captoinfo.1m.html 2020-03-15 00:28:07.000000000 +0000
@@ -199,7 +199,7 @@
</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
<STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
- This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200222).
+ This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200314).
</PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
Index: doc/html/man/clear.1.html
--- ncurses-6.2-20200308+/doc/html/man/clear.1.html 2020-02-23 01:14:14.000000000 +0000
+++ ncurses-6.2-20200314/doc/html/man/clear.1.html 2020-03-15 00:28:08.000000000 +0000
@@ -149,7 +149,7 @@
</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
<STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
- This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200222).
+ This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200314).
Index: doc/html/man/curs_printw.3x.html
--- ncurses-6.2-20200308+/doc/html/man/curs_printw.3x.html 2020-02-03 01:26:26.000000000 +0000
+++ ncurses-6.2-20200314/doc/html/man/curs_printw.3x.html 2020-03-15 00:28:09.000000000 +0000
@@ -27,7 +27,7 @@
* sale, use or other dealings in this Software without prior written *
* authorization. *
****************************************************************************
- * @Id: curs_printw.3x,v 1.25 2020/02/02 23:34:34 tom Exp @
+ * @Id: curs_printw.3x,v 1.26 2020/03/14 23:48:47 tom Exp @
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
<HTML>
@@ -91,21 +91,48 @@
the window pointer is null.
+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+ While <STRONG>printw</STRONG> was implemented in 4BSD, it was unused until 4.2BSD (which
+ used it in games). That early version of curses was before the ANSI C
+ standard. It did not use &lt;varargs.h&gt;, though that was available. In
+ 1991 (a couple of years after SVr4 was generally available, and after
+ the C standard was published), other developers updated the library,
+ using &lt;stdarg.h&gt; internally in 4.4BSD curses. Even with this improve-
+ ment, BSD curses did not use function prototypes (or even declare func-
+ tions) in the &lt;curses.h&gt; header until 1992.
+
+ SVr2 documented <STRONG>printw</STRONG>, <STRONG>wprintw</STRONG> tersely as "printf on <EM>stdscr</EM>" and
+ tersely as "printf on <EM>win</EM>", respectively.
+
+ SVr3 added <STRONG>mvprintw</STRONG>, and <STRONG>mvwprintw</STRONG>, with a three-line summary saying
+ that they were analogous to <STRONG>printf(3)</STRONG>, explaining that the string which
+ would be output from <STRONG>printf(3)</STRONG> would instead be output using <STRONG>waddstr</STRONG> on
+ the given window. SVr3 also added <STRONG>vwprintw</STRONG>, saying that the third pa-
+ rameter is a <STRONG>va_list</STRONG>, defined in &lt;varargs.h&gt;, and referring the reader
+ to the manual pages for <EM>varargs</EM> and <EM>vprintf</EM> for detailed descriptions.
+
+ SVr4 added no new variations of <STRONG>printw</STRONG>, but provided for using
+ &lt;varargs.h&gt; or &lt;stdarg.h&gt; to define the <STRONG>va_list</STRONG> type.
+
+ X/Open Curses added <STRONG>vw_printw</STRONG> to replace <STRONG>vwprintw</STRONG>, stating that its
+ <STRONG>va_list</STRONG> definition requires &lt;stdarg.h&gt;.
+
+
</PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
- In this implementation, <STRONG>vw_printw</STRONG> and <STRONG>vwprintw</STRONG> are equivalent, to sup-
+ In this implementation, <STRONG>vw_printw</STRONG> and <STRONG>vwprintw</STRONG> are equivalent, to sup-
port legacy applications. However, the latter (<STRONG>vwprintw</STRONG>) is obsolete:
- <STRONG>o</STRONG> The XSI Curses standard, Issue 4 described these functions. The
- function <STRONG>vwprintw</STRONG> is marked TO BE WITHDRAWN, and is to be replaced
+ <STRONG>o</STRONG> The XSI Curses standard, Issue 4 described these functions. The
+ function <STRONG>vwprintw</STRONG> is marked TO BE WITHDRAWN, and is to be replaced
by a function <STRONG>vw_printw</STRONG> using the <STRONG>&lt;stdarg.h&gt;</STRONG> interface.
- <STRONG>o</STRONG> The Single Unix Specification, Version 2 states that <STRONG>vw_printw</STRONG> is
- preferred to <STRONG>vwprintw</STRONG> since the latter requires including
- <STRONG>&lt;varargs.h&gt;</STRONG>, which cannot be used in the same file as <STRONG>&lt;stdarg.h&gt;</STRONG>.
- This implementation uses <STRONG>&lt;stdarg.h&gt;</STRONG> for both, because that header
+ <STRONG>o</STRONG> The Single Unix Specification, Version 2 states that <STRONG>vw_printw</STRONG> is
+ preferred to <STRONG>vwprintw</STRONG> since the latter requires including
+ <STRONG>&lt;varargs.h&gt;</STRONG>, which cannot be used in the same file as <STRONG>&lt;stdarg.h&gt;</STRONG>.
+ This implementation uses <STRONG>&lt;stdarg.h&gt;</STRONG> for both, because that header
is included in <STRONG>&lt;curses.h</STRONG>&gt;.
- <STRONG>o</STRONG> X/Open Curses, Issue 5 (December 2007) marked <STRONG>vwprintw</STRONG> (along with
+ <STRONG>o</STRONG> X/Open Curses, Issue 5 (December 2007) marked <STRONG>vwprintw</STRONG> (along with
<STRONG>vwscanw</STRONG> and the termcap interface) as withdrawn.
@@ -123,6 +150,7 @@
<li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
<li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
<li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
+<li><a href="#h2-HISTORY">HISTORY</a></li>
<li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
</ul>
Index: doc/html/man/curs_scanw.3x.html
--- ncurses-6.2-20200308+/doc/html/man/curs_scanw.3x.html 2020-02-03 01:26:26.000000000 +0000
+++ ncurses-6.2-20200314/doc/html/man/curs_scanw.3x.html 2020-03-15 00:28:09.000000000 +0000
@@ -27,7 +27,7 @@
* sale, use or other dealings in this Software without prior written *
* authorization. *
****************************************************************************
- * @Id: curs_scanw.3x,v 1.26 2020/02/02 23:34:34 tom Exp @
+ * @Id: curs_scanw.3x,v 1.27 2020/03/15 00:14:30 tom Exp @
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
<HTML>
@@ -89,41 +89,70 @@
the window pointer is null.
+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+ While <STRONG>scanw</STRONG> was implemented in 4BSD, none of the BSD releases used it
+ until 4.4BSD (in a game). That early version of curses was before the
+ ANSI C standard. It did not use &lt;varargs.h&gt;, though that was avail-
+ able. In 1991 (a couple of years after SVr4 was generally available,
+ and after the C standard was published), other developers updated the
+ library, using &lt;stdarg.h&gt; internally in 4.4BSD curses. Even with this
+ improvement, BSD curses did not use function prototypes (or even
+ declare functions) in the &lt;curses.h&gt; header until 1992.
+
+ SVr2 documented <STRONG>scanw</STRONG>, <STRONG>wscanw</STRONG> tersely as "scanf through <EM>stdscr</EM>" and
+ tersely as "scanf through <EM>win</EM>", respectively.
+
+ SVr3 added <STRONG>mvscanw</STRONG>, and <STRONG>mvwscanw</STRONG>, with a three-line summary saying that
+ they were analogous to <STRONG>scanf(3)</STRONG>, explaining that the string which would
+ be output from <STRONG>scanf(3)</STRONG> would instead be output using <STRONG>waddstr</STRONG> on the
+ given window. SVr3 also added <STRONG>vwscanw</STRONG>, saying that the third parameter
+ is a <STRONG>va_list</STRONG>, defined in &lt;varargs.h&gt;, and referring the reader to the
+ manual pages for <EM>varargs</EM> and <EM>vprintf</EM> for detailed descriptions.
+ (Because the SVr3 documentation does not mention <EM>vscanf</EM>, that reference
+ to <EM>vprintf</EM> may not be an error).
+
+ SVr4 added no new variations of <STRONG>scanw</STRONG>, but provided for using
+ &lt;varargs.h&gt; or &lt;stdarg.h&gt; to define the <STRONG>va_list</STRONG> type.
+
+ X/Open Curses added <STRONG>vw_scanw</STRONG> to replace <STRONG>vwscanw</STRONG>, stating that its
+ <STRONG>va_list</STRONG> definition requires &lt;stdarg.h&gt;.
+
+
</PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
In this implementation, <STRONG>vw_scanw</STRONG> and <STRONG>vwscanw</STRONG> are equivalent, to support
legacy applications. However, the latter (<STRONG>vwscanw</STRONG>) is obsolete:
- <STRONG>o</STRONG> The XSI Curses standard, Issue 4 described these functions, noting
- that the function <STRONG>vwscanw</STRONG> is marked TO BE WITHDRAWN, and is to be
+ <STRONG>o</STRONG> The XSI Curses standard, Issue 4 described these functions, noting
+ that the function <STRONG>vwscanw</STRONG> is marked TO BE WITHDRAWN, and is to be
replaced by a function <STRONG>vw_scanw</STRONG> using the <STRONG>&lt;stdarg.h&gt;</STRONG> interface.
- <STRONG>o</STRONG> The Single Unix Specification, Version 2 states that <STRONG>vw_scanw</STRONG> is
- preferred to <STRONG>vwscanw</STRONG> since the latter requires including
- <STRONG>&lt;varargs.h&gt;</STRONG>, which cannot be used in the same file as <STRONG>&lt;stdarg.h&gt;</STRONG>.
- This implementation uses <STRONG>&lt;stdarg.h&gt;</STRONG> for both, because that header
+ <STRONG>o</STRONG> The Single Unix Specification, Version 2 states that <STRONG>vw_scanw</STRONG> is
+ preferred to <STRONG>vwscanw</STRONG> since the latter requires including
+ <STRONG>&lt;varargs.h&gt;</STRONG>, which cannot be used in the same file as <STRONG>&lt;stdarg.h&gt;</STRONG>.
+ This implementation uses <STRONG>&lt;stdarg.h&gt;</STRONG> for both, because that header
is included in <STRONG>&lt;curses.h</STRONG>&gt;.
- <STRONG>o</STRONG> X/Open Curses, Issue 5 (December 2007) marked <STRONG>vwscanw</STRONG> (along with
+ <STRONG>o</STRONG> X/Open Curses, Issue 5 (December 2007) marked <STRONG>vwscanw</STRONG> (along with
<STRONG>vwprintw</STRONG> and the termcap interface) as withdrawn.
- Both XSI and The Single Unix Specification, Version 2 state that these
+ Both XSI and The Single Unix Specification, Version 2 state that these
functions return <STRONG>ERR</STRONG> or <STRONG>OK</STRONG>.
- <STRONG>o</STRONG> Since the underlying <STRONG>scanf(3)</STRONG> can return the number of items
+ <STRONG>o</STRONG> Since the underlying <STRONG>scanf(3)</STRONG> can return the number of items
scanned, and the SVr4 code was documented to use this feature, this
- is probably an editing error which was introduced in XSI, rather
+ is probably an editing error which was introduced in XSI, rather
than being done intentionally.
- <STRONG>o</STRONG> This implementation returns the number of items scanned, for com-
- patibility with SVr4 curses. As of 2018, NetBSD curses also
- returns the number of items scanned. Both ncurses and NetBSD
+ <STRONG>o</STRONG> This implementation returns the number of items scanned, for com-
+ patibility with SVr4 curses. As of 2018, NetBSD curses also
+ returns the number of items scanned. Both ncurses and NetBSD
curses call <STRONG>vsscanf</STRONG> to scan the string, which returns <STRONG>EOF</STRONG> on error.
- <STRONG>o</STRONG> Portable applications should only test if the return value is <STRONG>ERR</STRONG>,
+ <STRONG>o</STRONG> Portable applications should only test if the return value is <STRONG>ERR</STRONG>,
since the <STRONG>OK</STRONG> value (zero) is likely to be misleading.
- One possible way to get useful results would be to use a "%n" con-
- version at the end of the format string to ensure that something
+ One possible way to get useful results would be to use a "%n" con-
+ version at the end of the format string to ensure that something
was processed.
@@ -141,6 +170,7 @@
<li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
<li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
<li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
+<li><a href="#h2-HISTORY">HISTORY</a></li>
<li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
</ul>
Index: doc/html/man/form.3x.html
--- ncurses-6.2-20200308+/doc/html/man/form.3x.html 2020-02-23 01:14:18.000000000 +0000
+++ ncurses-6.2-20200314/doc/html/man/form.3x.html 2020-03-15 00:28:10.000000000 +0000
@@ -247,7 +247,7 @@
<STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names begin "form_" for detailed
descriptions of the entry points.
- This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200222).
+ This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200314).
Index: doc/html/man/infocmp.1m.html
--- ncurses-6.2-20200308+/doc/html/man/infocmp.1m.html 2020-02-23 01:14:19.000000000 +0000
+++ ncurses-6.2-20200314/doc/html/man/infocmp.1m.html 2020-03-15 00:28:11.000000000 +0000
@@ -513,7 +513,7 @@
https://invisible-island.net/ncurses/tctest.html
- This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200222).
+ This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200314).
</PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
Index: doc/html/man/infotocap.1m.html
--- ncurses-6.2-20200308+/doc/html/man/infotocap.1m.html 2020-02-23 01:14:19.000000000 +0000
+++ ncurses-6.2-20200314/doc/html/man/infotocap.1m.html 2020-03-15 00:28:11.000000000 +0000
@@ -91,7 +91,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.2 (patch 20200222).
+ This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200314).
</PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
Index: doc/html/man/menu.3x.html
--- ncurses-6.2-20200308+/doc/html/man/menu.3x.html 2020-02-23 01:14:19.000000000 +0000
+++ ncurses-6.2-20200314/doc/html/man/menu.3x.html 2020-03-15 00:28:11.000000000 +0000
@@ -222,7 +222,7 @@
<STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names begin "menu_" for detailed
descriptions of the entry points.
- This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200222).
+ This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200314).
Index: doc/html/man/ncurses.3x.html
--- ncurses-6.2-20200308+/doc/html/man/ncurses.3x.html 2020-02-23 01:14:21.000000000 +0000
+++ ncurses-6.2-20200314/doc/html/man/ncurses.3x.html 2020-03-15 00:28:12.000000000 +0000
@@ -28,7 +28,7 @@
* sale, use or other dealings in this Software without prior written *
* authorization. *
****************************************************************************
- * @Id: ncurses.3x,v 1.145 2020/02/23 01:05:45 tom Exp @
+ * @Id: ncurses.3x,v 1.146 2020/03/14 23:13:18 tom Exp @
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
<HTML>
@@ -60,7 +60,7 @@
method of updating character screens with reasonable optimization.
This implementation is "new curses" (ncurses) and is the approved
replacement for 4.4BSD classic curses, which has been discontinued.
- This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200222).
+ This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200314).
The <STRONG>ncurses</STRONG> library emulates the curses library of System V Release 4
UNIX, and XPG4 (X/Open Portability Guide) curses (also known as XSI
@@ -1406,10 +1406,29 @@
ble. That depends on the value used for <STRONG>_XOPEN_SOURCE</STRONG> feature test
macro.
+ <STRONG>o</STRONG> X/Open Curses documents one required header, in a special case:
+ &lt;stdarg.h&gt; before &lt;curses.h&gt; to prototype the <STRONG>vw_printw</STRONG> and
+ <STRONG>vw_scanw</STRONG> functions (as well as the obsolete the <STRONG>vwprintw</STRONG> and <STRONG>vws-</STRONG>
+ <STRONG>canw</STRONG> functions). Each of those uses a <STRONG>va_list</STRONG> parameter.
+
+ The two obsolete functions were introduced in SVr3. The other
+ functions were introduced in X/Open Curses. In between, SVr4
+ curses provided for the possibility that an application might
+ include either &lt;varargs.h&gt; or &lt;stdarg.h&gt;. Initially, that was done
+ by using <STRONG>void*</STRONG> for the <STRONG>va_list</STRONG> parameter. Later, a special type
+ (defined in &lt;stdio.h&gt;) was introduced, to allow for compiler type-
+ checking. That special type is always available, because &lt;stdio.h&gt;
+ is always included by &lt;curses.h&gt;.
+
+ None of the X/Open Curses implementations require an application to
+ include &lt;stdarg.h&gt; before &lt;curses.h&gt; because they either have
+ allowed for a special type, or (like ncurses) include &lt;stdarg.h&gt;
+ directly to provide a portable interface.
+
</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
- If standard output from a <STRONG>ncurses</STRONG> program is re-directed to something
- which is not a tty, screen updates will be directed to standard error.
+ If standard output from a <STRONG>ncurses</STRONG> program is re-directed to something
+ which is not a tty, screen updates will be directed to standard error.
This was an undocumented feature of AT&amp;T System V Release 3 curses.
Index: doc/html/man/ncurses6-config.1.html
--- ncurses-6.2-20200308+/doc/html/man/ncurses6-config.1.html 2020-02-23 01:14:21.000000000 +0000
+++ ncurses-6.2-20200314/doc/html/man/ncurses6-config.1.html 2020-03-15 00:28:12.000000000 +0000
@@ -113,7 +113,7 @@
</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
<STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
- This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200222).
+ This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200314).
Index: doc/html/man/panel.3x.html
--- ncurses-6.2-20200308+/doc/html/man/panel.3x.html 2020-02-23 01:14:21.000000000 +0000
+++ ncurses-6.2-20200314/doc/html/man/panel.3x.html 2020-03-15 00:28:12.000000000 +0000
@@ -281,7 +281,7 @@
</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
<STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
- This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200222).
+ This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200314).
</PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
Index: doc/html/man/tabs.1.html
--- ncurses-6.2-20200308+/doc/html/man/tabs.1.html 2020-02-23 01:14:21.000000000 +0000
+++ ncurses-6.2-20200314/doc/html/man/tabs.1.html 2020-03-15 00:28:12.000000000 +0000
@@ -206,7 +206,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.2 (patch 20200222).
+ This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200314).
Index: doc/html/man/terminfo.5.html
--- ncurses-6.2-20200308+/doc/html/man/terminfo.5.html 2020-02-23 01:14:21.000000000 +0000
+++ ncurses-6.2-20200314/doc/html/man/terminfo.5.html 2020-03-15 00:28:12.000000000 +0000
@@ -105,7 +105,7 @@
have, by specifying how to perform screen operations, and by specifying
padding requirements and initialization sequences.
- This manual describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200222).
+ This manual describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200314).
</PRE><H3><a name="h3-Terminfo-Entry-Syntax">Terminfo Entry Syntax</a></H3><PRE>
Index: doc/html/man/tic.1m.html
--- ncurses-6.2-20200308+/doc/html/man/tic.1m.html 2020-02-23 01:14:21.000000000 +0000
+++ ncurses-6.2-20200314/doc/html/man/tic.1m.html 2020-03-15 00:28:12.000000000 +0000
@@ -461,7 +461,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>. <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>.
- This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200222).
+ This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200314).
</PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
Index: doc/html/man/toe.1m.html
--- ncurses-6.2-20200308+/doc/html/man/toe.1m.html 2020-02-23 01:14:21.000000000 +0000
+++ ncurses-6.2-20200314/doc/html/man/toe.1m.html 2020-03-15 00:28:12.000000000 +0000
@@ -171,7 +171,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>ter-</STRONG>
<STRONG><A HREF="terminfo.5.html">minfo(5)</A></STRONG>.
- This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200222).
+ This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200314).
Index: doc/html/man/tput.1.html
--- ncurses-6.2-20200308+/doc/html/man/tput.1.html 2020-02-23 01:14:21.000000000 +0000
+++ ncurses-6.2-20200314/doc/html/man/tput.1.html 2020-03-15 00:28:12.000000000 +0000
@@ -523,7 +523,7 @@
</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
<STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>, <STRONG>stty(1)</STRONG>, <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>, <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="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.2 (patch 20200222).
+ This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200314).
Index: doc/html/man/tset.1.html
--- ncurses-6.2-20200308+/doc/html/man/tset.1.html 2020-02-23 01:14:22.000000000 +0000
+++ ncurses-6.2-20200314/doc/html/man/tset.1.html 2020-03-15 00:28:12.000000000 +0000
@@ -390,7 +390,7 @@
<STRONG>csh(1)</STRONG>, <STRONG>sh(1)</STRONG>, <STRONG>stty(1)</STRONG>, <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>, <STRONG>tty(4)</STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>,
<STRONG>ttys(5)</STRONG>, <STRONG>environ(7)</STRONG>
- This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200222).
+ This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20200314).
Index: man/curs_printw.3x
Prereq: 1.25
--- ncurses-6.2-20200308+/man/curs_printw.3x 2020-02-02 23:34:34.000000000 +0000
+++ ncurses-6.2-20200314/man/curs_printw.3x 2020-03-14 23:48:47.000000000 +0000
@@ -27,7 +27,7 @@
.\" authorization. *
.\"***************************************************************************
.\"
-.\" $Id: curs_printw.3x,v 1.25 2020/02/02 23:34:34 tom Exp $
+.\" $Id: curs_printw.3x,v 1.26 2020/03/14 23:48:47 tom Exp $
.TH curs_printw 3X ""
.ie \n(.g .ds `` \(lq
.el .ds `` ``
@@ -89,6 +89,42 @@
Functions with a \*(``mv\*('' prefix first perform a cursor movement using
\fBwmove\fP, and return an error if the position is outside the window,
or if the window pointer is null.
+.SH HISTORY
+While \fBprintw\fP was implemented in 4BSD,
+it was unused until 4.2BSD (which used it in games).
+That early version of curses was before the ANSI C standard.
+It did not use <varargs.h>, though that was available.
+In 1991 (a couple of years after SVr4 was generally available,
+and after the C standard was published),
+other developers updated the library,
+using <stdarg.h> internally in 4.4BSD curses.
+Even with this improvement,
+BSD curses did not use function prototypes (or even declare
+functions) in the <curses.h> header until 1992.
+.PP
+SVr2 documented
+\fBprintw\fP,
+\fBwprintw\fP
+tersely as \*(``printf on \fIstdscr\fP\*('' and
+tersely as \*(``printf on \fIwin\fP\*('', respectively.
+.PP
+SVr3 added
+\fBmvprintw\fP, and
+\fBmvwprintw\fP, with a three-line summary saying that they were analogous
+to \fBprintf\fP(3),
+explaining that the string which would be output from \fBprintf\fP(3) would
+instead be output using \fBwaddstr\fP on the given window.
+SVr3 also added \fBvwprintw\fP, saying that the third parameter
+is a \fBva_list\fP, defined in <varargs.h>,
+and referring the reader to the manual pages for \fIvarargs\fP and
+\fIvprintf\fP for detailed descriptions.
+.PP
+SVr4 added no new variations of \fBprintw\fP,
+but provided for using <varargs.h> or <stdarg.h> to define the \fBva_list\fP
+type.
+.PP
+X/Open Curses added \fBvw_printw\fP to replace \fBvwprintw\fP,
+stating that its \fBva_list\fP definition requires <stdarg.h>.
.SH PORTABILITY
In this implementation, \fBvw_printw\fP and \fBvwprintw\fP are equivalent,
to support legacy applications.
Index: man/curs_scanw.3x
Prereq: 1.26
--- ncurses-6.2-20200308+/man/curs_scanw.3x 2020-02-02 23:34:34.000000000 +0000
+++ ncurses-6.2-20200314/man/curs_scanw.3x 2020-03-15 00:14:30.000000000 +0000
@@ -27,7 +27,7 @@
.\" authorization. *
.\"***************************************************************************
.\"
-.\" $Id: curs_scanw.3x,v 1.26 2020/02/02 23:34:34 tom Exp $
+.\" $Id: curs_scanw.3x,v 1.27 2020/03/15 00:14:30 tom Exp $
.TH curs_scanw 3X ""
.ie \n(.g .ds `` \(lq
.el .ds `` ``
@@ -83,6 +83,44 @@
Functions with a \*(``mv\*('' prefix first perform a cursor movement using
\fBwmove\fP, and return an error if the position is outside the window,
or if the window pointer is null.
+.SH HISTORY
+While \fBscanw\fP was implemented in 4BSD,
+none of the BSD releases used it until 4.4BSD (in a game).
+That early version of curses was before the ANSI C standard.
+It did not use <varargs.h>, though that was available.
+In 1991 (a couple of years after SVr4 was generally available,
+and after the C standard was published),
+other developers updated the library,
+using <stdarg.h> internally in 4.4BSD curses.
+Even with this improvement,
+BSD curses did not use function prototypes (or even declare
+functions) in the <curses.h> header until 1992.
+.PP
+SVr2 documented
+\fBscanw\fP,
+\fBwscanw\fP
+tersely as \*(``scanf through \fIstdscr\fP\*('' and
+tersely as \*(``scanf through \fIwin\fP\*('', respectively.
+.PP
+SVr3 added
+\fBmvscanw\fP, and
+\fBmvwscanw\fP, with a three-line summary saying that they were analogous
+to \fBscanf\fP(3),
+explaining that the string which would be output from \fBscanf\fP(3) would
+instead be output using \fBwaddstr\fP on the given window.
+SVr3 also added \fBvwscanw\fP, saying that the third parameter
+is a \fBva_list\fP, defined in <varargs.h>,
+and referring the reader to the manual pages for \fIvarargs\fP and
+\fIvprintf\fP for detailed descriptions.
+(Because the SVr3 documentation does not mention \fIvscanf\fP,
+that reference to \fIvprintf\fP may not be an error).
+.PP
+SVr4 added no new variations of \fBscanw\fP,
+but provided for using <varargs.h> or <stdarg.h> to define the \fBva_list\fP
+type.
+.PP
+X/Open Curses added \fBvw_scanw\fP to replace \fBvwscanw\fP,
+stating that its \fBva_list\fP definition requires <stdarg.h>.
.SH PORTABILITY
In this implementation, \fBvw_scanw\fP and \fBvwscanw\fP are equivalent,
to support legacy applications.
Index: man/ncurses.3x
Prereq: 1.145
--- ncurses-6.2-20200308+/man/ncurses.3x 2020-02-23 01:05:45.000000000 +0000
+++ ncurses-6.2-20200314/man/ncurses.3x 2020-03-14 23:13:18.000000000 +0000
@@ -28,7 +28,7 @@
.\" authorization. *
.\"***************************************************************************
.\"
-.\" $Id: ncurses.3x,v 1.145 2020/02/23 01:05:45 tom Exp $
+.\" $Id: ncurses.3x,v 1.146 2020/03/14 23:13:18 tom Exp $
.hy 0
.TH ncurses 3X ""
.ie \n(.g .ds `` \(lq
@@ -1483,6 +1483,29 @@
If the header is included, its symbols may be made visible.
That depends on the value used for \fB_XOPEN_SOURCE\fP
feature test macro.
+.bP
+X/Open Curses documents one required header,
+in a special case: <stdarg.h> before <curses.h> to prototype
+the \fBvw_printw\fP and \fBvw_scanw\fP functions
+(as well as the obsolete
+the \fBvwprintw\fP and \fBvwscanw\fP functions).
+Each of those uses a \fBva_list\fP parameter.
+.IP
+The two obsolete functions were introduced in SVr3.
+The other functions were introduced in X/Open Curses.
+In between, SVr4 curses provided for the possibility that
+an application might include either <varargs.h> or <stdarg.h>.
+Initially, that was done by using \fBvoid*\fP for the \fBva_list\fP
+parameter.
+Later, a special type (defined in <stdio.h>) was introduced,
+to allow for compiler type-checking.
+That special type is always available,
+because <stdio.h> is always included by <curses.h>.
+.IP
+None of the X/Open Curses implementations require an application
+to include <stdarg.h> before <curses.h> because they either
+have allowed for a special type, or (like ncurses) include <stdarg.h>
+directly to provide a portable interface.
.SH NOTES
.PP
If standard output from a \fBncurses\fR program is re-directed to something
Index: package/debian-mingw/changelog
--- ncurses-6.2-20200308+/package/debian-mingw/changelog 2020-03-08 14:28:23.000000000 +0000
+++ ncurses-6.2-20200314/package/debian-mingw/changelog 2020-03-14 15:30:00.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.2+20200308) unstable; urgency=low
+ncurses6 (6.2+20200314) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sun, 08 Mar 2020 10:28:23 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 14 Mar 2020 11:30:00 -0400
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian-mingw64/changelog
--- ncurses-6.2-20200308+/package/debian-mingw64/changelog 2020-03-08 14:28:23.000000000 +0000
+++ ncurses-6.2-20200314/package/debian-mingw64/changelog 2020-03-14 15:30:00.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.2+20200308) unstable; urgency=low
+ncurses6 (6.2+20200314) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sun, 08 Mar 2020 10:28:23 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 14 Mar 2020 11:30:00 -0400
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian/changelog
--- ncurses-6.2-20200308+/package/debian/changelog 2020-03-08 14:28:23.000000000 +0000
+++ ncurses-6.2-20200314/package/debian/changelog 2020-03-14 15:30:00.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.2+20200308) unstable; urgency=low
+ncurses6 (6.2+20200314) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sun, 08 Mar 2020 10:28:23 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 14 Mar 2020 11:30:00 -0400
ncurses6 (5.9-20120608) unstable; urgency=low
Index: package/mingw-ncurses.nsi
Prereq: 1.384
--- ncurses-6.2-20200308+/package/mingw-ncurses.nsi 2020-03-08 14:28:23.000000000 +0000
+++ ncurses-6.2-20200314/package/mingw-ncurses.nsi 2020-03-14 15:30:00.000000000 +0000
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.384 2020/03/08 14:28:23 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.385 2020/03/14 15:30:00 tom Exp $
; TODO add examples
; TODO bump ABI to 6
@@ -10,7 +10,7 @@
!define VERSION_MAJOR "6"
!define VERSION_MINOR "2"
!define VERSION_YYYY "2020"
-!define VERSION_MMDD "0308"
+!define VERSION_MMDD "0314"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"
Index: package/mingw-ncurses.spec
--- ncurses-6.2-20200308+/package/mingw-ncurses.spec 2020-03-08 14:28:23.000000000 +0000
+++ ncurses-6.2-20200314/package/mingw-ncurses.spec 2020-03-14 15:30:00.000000000 +0000
@@ -3,7 +3,7 @@
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 6.2
-Release: 20200308
+Release: 20200314
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncurses.spec
--- ncurses-6.2-20200308+/package/ncurses.spec 2020-03-08 14:28:23.000000000 +0000
+++ ncurses-6.2-20200314/package/ncurses.spec 2020-03-14 15:30:00.000000000 +0000
@@ -1,7 +1,7 @@
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 6.2
-Release: 20200308
+Release: 20200314
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncursest.spec
--- ncurses-6.2-20200308+/package/ncursest.spec 2020-03-08 14:28:23.000000000 +0000
+++ ncurses-6.2-20200314/package/ncursest.spec 2020-03-14 15:30:00.000000000 +0000
@@ -1,7 +1,7 @@
Summary: Curses library with POSIX thread support.
Name: ncursest6
Version: 6.2
-Release: 20200308
+Release: 20200314
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz

23786
ncurses-6.2-20200321.patch Normal file
View File

File diff suppressed because it is too large Load Diff

765
ncurses-6.2-20200328.patch Normal file
View File

@ -0,0 +1,765 @@
# ncurses 6.2 - patch 20200328 - Thomas E. Dickey
#
# ------------------------------------------------------------------------------
#
# Ncurses 6.2 is at
# ftp.gnu.org:/pub/gnu
#
# Patches for ncurses 6.2 can be found at
# ftp://ftp.invisible-island.net/ncurses/6.2
# http://invisible-mirror.net/archives/ncurses/6.2
#
# ------------------------------------------------------------------------------
# ftp://ftp.invisible-island.net/ncurses/6.2/ncurses-6.2-20200328.patch.gz
# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created Sun Mar 29 01:03:54 UTC 2020
# ------------------------------------------------------------------------------
# Ada95/src/Makefile.in | 10 +++++-----
# NEWS | 7 ++++++-
# VERSION | 2 +-
# dist.mk | 4 ++--
# form/fld_dup.c | 13 ++++++-------
# man/curs_print.3x | 4 ++--
# man/form.3x | 4 ++--
# man/form_field.3x | 4 ++--
# man/form_field_buffer.3x | 4 ++--
# man/form_field_new.3x | 6 +++---
# man/form_field_userptr.3x | 4 ++--
# man/form_fieldtype.3x | 4 ++--
# man/form_new.3x | 4 ++--
# man/form_requestname.3x | 6 +++---
# man/form_userptr.3x | 4 ++--
# man/menu_items.3x | 4 ++--
# man/menu_mark.3x | 4 ++--
# man/menu_new.3x | 4 ++--
# man/menu_pattern.3x | 4 ++--
# man/menu_requestname.3x | 6 +++---
# man/menu_userptr.3x | 4 ++--
# man/mitem_current.3x | 4 ++--
# man/mitem_name.3x | 4 ++--
# man/mitem_new.3x | 4 ++--
# man/mitem_userptr.3x | 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 +-
# package/ncursest.spec | 2 +-
# test/move_field.c | 9 +++++----
# 33 files changed, 79 insertions(+), 74 deletions(-)
# ------------------------------------------------------------------------------
Index: Ada95/src/Makefile.in
Prereq: 1.89
--- ncurses-6.2-20200321+/Ada95/src/Makefile.in 2020-02-02 23:34:34.000000000 +0000
+++ ncurses-6.2-20200328/Ada95/src/Makefile.in 2020-03-28 18:05:56.000000000 +0000
@@ -29,7 +29,7 @@
#
# Author: Juergen Pfeifer, 1996
#
-# $Id: Makefile.in,v 1.89 2020/02/02 23:34:34 tom Exp $
+# $Id: Makefile.in,v 1.90 2020/03/28 18:05:56 Adam.Van.Ymeren Exp $
#
.SUFFIXES:
@@ -273,9 +273,9 @@
@USE_GNAT_PROJECTS@ $(STATIC_DIRS)
@USE_GNAT_PROJECTS@ @cf_ada_config@gprconfig --batch --config=Ada --config=C,,,,@cf_ada_config_C@
@USE_GNAT_PROJECTS@ -rm -f $(GNAT_PROJECT)
-@USE_GNAT_PROJECTS@ $(SHELL) $(srcdir)/library-cfg.sh static $(srcdir)/library.gpr $(CFLAGS_NORMAL) >$(GNAT_PROJECT)
+@USE_GNAT_PROJECTS@ $(SHELL) $(srcdir)/library-cfg.sh static library.gpr $(CFLAGS_NORMAL) >$(GNAT_PROJECT)
@USE_GNAT_PROJECTS@ @echo "Using GNAT Project:"
-@USE_GNAT_PROJECTS@ @-$(SHELL) -c "diff -c $(srcdir)/library.gpr $(GNAT_PROJECT); exit 0"
+@USE_GNAT_PROJECTS@ @-$(SHELL) -c "diff -c library.gpr $(GNAT_PROJECT); exit 0"
@USE_GNAT_PROJECTS@ $(ADAMAKE) $(ADAMAKEFLAGS) -XLIB_KIND=static
@USE_GNAT_PROJECTS@ $(AR) $(ARFLAGS) $@ $(STATIC_C_OBJS)
@USE_GNAT_PROJECTS@ -rm -f $(GNAT_PROJECT)
@@ -311,9 +311,9 @@
@MAKE_ADA_SHAREDLIB@ cp $(SHARED_OBJS) $(BUILD_DIR)/dynamic-obj/
@MAKE_ADA_SHAREDLIB@ @cf_ada_config@gprconfig --batch --config=Ada --config=C,,,,@cf_ada_config_C@
@MAKE_ADA_SHAREDLIB@ -rm -f $(GNAT_PROJECT)
-@MAKE_ADA_SHAREDLIB@ $(SHELL) $(srcdir)/library-cfg.sh dynamic $(srcdir)/library.gpr $(CFLAGS_SHARED) >$(GNAT_PROJECT)
+@MAKE_ADA_SHAREDLIB@ $(SHELL) $(srcdir)/library-cfg.sh dynamic library.gpr $(CFLAGS_SHARED) >$(GNAT_PROJECT)
@MAKE_ADA_SHAREDLIB@ @echo "Making Ada shared-lib:"
-@MAKE_ADA_SHAREDLIB@ @-$(SHELL) -c "diff -c $(srcdir)/library.gpr $(GNAT_PROJECT); exit 0"
+@MAKE_ADA_SHAREDLIB@ @-$(SHELL) -c "diff -c library.gpr $(GNAT_PROJECT); exit 0"
@MAKE_ADA_SHAREDLIB@ $(ADAMAKE) $(ADAMAKEFLAGS) -XLIB_KIND=dynamic
@MAKE_ADA_SHAREDLIB@ -rm -f $(GNAT_PROJECT)
Index: NEWS
Prereq: 1.3466
--- ncurses-6.2-20200321+/NEWS 2020-03-22 00:28:35.000000000 +0000
+++ ncurses-6.2-20200328/NEWS 2020-03-28 23:33:04.000000000 +0000
@@ -26,7 +26,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3466 2020/03/22 00:28:35 tom Exp $
+-- $Id: NEWS,v 1.3469 2020/03/28 23:33:04 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,11 @@
Changes through 1.9.9e did not credit all contributions;
it is not possible to add this information.
+20200328
+ + correct length of buffer copied in dup_field().
+ + remove "$(srcdir)/" from path of library.gpr, needed for out-of-tree
+ builds of Ada95 (patch by Adam Van Ymeren).
+
20200321
+ improve configure-checks to reduce warnings about unused variables.
+ improve description of error-returns in waddch and waddnstr manual
Index: VERSION
--- ncurses-6.2-20200321+/VERSION 2020-03-21 12:15:18.000000000 +0000
+++ ncurses-6.2-20200328/VERSION 2020-03-28 10:37:50.000000000 +0000
@@ -1 +1 @@
-5:0:10 6.2 20200321
+5:0:10 6.2 20200328
Index: dist.mk
Prereq: 1.1342
--- ncurses-6.2-20200321+/dist.mk 2020-03-21 12:15:18.000000000 +0000
+++ ncurses-6.2-20200328/dist.mk 2020-03-28 10:37:50.000000000 +0000
@@ -26,7 +26,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.1342 2020/03/21 12:15:18 tom Exp $
+# $Id: dist.mk,v 1.1343 2020/03/28 10:37:50 tom Exp $
# Makefile for creating ncurses distributions.
#
# This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@
# These define the major/minor/patch versions of ncurses.
NCURSES_MAJOR = 6
NCURSES_MINOR = 2
-NCURSES_PATCH = 20200321
+NCURSES_PATCH = 20200328
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
Index: form/fld_dup.c
Prereq: 1.15
--- ncurses-6.2-20200321+/form/fld_dup.c 2020-02-02 23:34:34.000000000 +0000
+++ ncurses-6.2-20200328/form/fld_dup.c 2020-03-29 00:39:41.000000000 +0000
@@ -33,7 +33,7 @@
#include "form.priv.h"
-MODULE_ID("$Id: fld_dup.c,v 1.15 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: fld_dup.c,v 1.17 2020/03/29 00:39:41 tom Exp $")
/*---------------------------------------------------------------------------
| Facility : libnform
@@ -61,8 +61,8 @@
{
T((T_CREATE("field %p"), (void *)New_Field));
*New_Field = *_nc_Default_Field;
- New_Field->frow = (short) frow;
- New_Field->fcol = (short) fcol;
+ New_Field->frow = (short)frow;
+ New_Field->fcol = (short)fcol;
New_Field->link = New_Field;
New_Field->rows = field->rows;
New_Field->cols = field->cols;
@@ -80,13 +80,12 @@
if (_nc_Copy_Type(New_Field, field))
{
- size_t i, len;
+ size_t len;
len = Total_Buffer_Size(New_Field);
- if ((New_Field->buf = (FIELD_CELL *)malloc(len)))
+ if ((New_Field->buf = (FIELD_CELL *)malloc(len * 20)))
{
- for (i = 0; i < len; ++i)
- New_Field->buf[i] = field->buf[i];
+ memcpy(New_Field->buf, field->buf, len);
returnField(New_Field);
}
}
Index: man/curs_print.3x
Prereq: 1.14
--- ncurses-6.2-20200321+/man/curs_print.3x 2020-02-02 23:34:34.000000000 +0000
+++ ncurses-6.2-20200328/man/curs_print.3x 2020-03-28 19:06:28.000000000 +0000
@@ -27,7 +27,7 @@
.\" authorization. *
.\"***************************************************************************
.\"
-.\" $Id: curs_print.3x,v 1.14 2020/02/02 23:34:34 tom Exp $
+.\" $Id: curs_print.3x,v 1.15 2020/03/28 19:06:28 tom Exp $
.TH curs_print 3X ""
.SH NAME
\fBmcprint\fR \- ship binary data to printer
@@ -51,7 +51,7 @@
.SH RETURN VALUE
The \fBmcprint\fR function returns \fBERR\fR if the write operation aborted
for some reason.
-In this case, errno will contain either an error associated
+In this case, \fBerrno\fP will contain either an error associated
with \fBwrite\fP(2) or one of the following:
.TP 5
ENODEV
Index: man/form.3x
Prereq: 1.34
--- ncurses-6.2-20200321+/man/form.3x 2020-02-02 23:34:34.000000000 +0000
+++ ncurses-6.2-20200328/man/form.3x 2020-03-28 19:06:28.000000000 +0000
@@ -28,7 +28,7 @@
.\" authorization. *
.\"***************************************************************************
.\"
-.\" $Id: form.3x,v 1.34 2020/02/02 23:34:34 tom Exp $
+.\" $Id: form.3x,v 1.35 2020/03/28 19:06:28 tom Exp $
.TH form 3X ""
.ie \n(.g .ds `` \(lq
.el .ds `` ``
@@ -163,7 +163,7 @@
.TE
.SH RETURN VALUE
Routines that return pointers return \fBNULL\fR on error,
-and set errno to the corresponding error-code returned by functions
+and set \fBerrno\fP to the corresponding error-code returned by functions
returning an integer.
Routines that return
an integer return one of the following error codes:
Index: man/form_field.3x
Prereq: 1.14
--- ncurses-6.2-20200321+/man/form_field.3x 2020-02-02 23:34:34.000000000 +0000
+++ ncurses-6.2-20200328/man/form_field.3x 2020-03-28 19:06:28.000000000 +0000
@@ -28,7 +28,7 @@
.\" authorization. *
.\"***************************************************************************
.\"
-.\" $Id: form_field.3x,v 1.14 2020/02/02 23:34:34 tom Exp $
+.\" $Id: form_field.3x,v 1.15 2020/03/28 19:06:28 tom Exp $
.TH form_field 3X ""
.SH NAME
\fBform_field\fR \- make and break connections between fields and forms
@@ -55,7 +55,7 @@
to a specified location on the screen.
.SH RETURN VALUE
The function \fBform_fields\fR returns a pointer (which may be \fBNULL\fR).
-It does not set errno.
+It does not set \fBerrno\fP.
.PP
The function \fBfield_count\fR returns \fBERR\fR if the \fIform\fP parameter
is \fBNULL\fP.
Index: man/form_field_buffer.3x
Prereq: 1.25
--- ncurses-6.2-20200321+/man/form_field_buffer.3x 2020-02-02 23:34:34.000000000 +0000
+++ ncurses-6.2-20200328/man/form_field_buffer.3x 2020-03-28 19:06:28.000000000 +0000
@@ -28,7 +28,7 @@
.\" authorization. *
.\"***************************************************************************
.\"
-.\" $Id: form_field_buffer.3x,v 1.25 2020/02/02 23:34:34 tom Exp $
+.\" $Id: form_field_buffer.3x,v 1.26 2020/03/28 19:06:28 tom Exp $
.TH form_field_buffer 3X ""
.ie \n(.g .ds `` \(lq
.el .ds `` ``
@@ -99,7 +99,7 @@
An argument of 0 turns off any maximum size threshold for that field.
.SH RETURN VALUE
The \fBfield_buffer\fR function returns NULL on error.
-It sets errno according to their success:
+It sets \fBerrno\fP according to their success:
.TP 5
.B E_OK
The routine succeeded.
Index: man/form_field_new.3x
Prereq: 1.21
--- ncurses-6.2-20200321+/man/form_field_new.3x 2020-02-02 23:34:34.000000000 +0000
+++ ncurses-6.2-20200328/man/form_field_new.3x 2020-03-28 19:06:28.000000000 +0000
@@ -28,7 +28,7 @@
.\" authorization. *
.\"***************************************************************************
.\"
-.\" $Id: form_field_new.3x,v 1.21 2020/02/02 23:34:34 tom Exp $
+.\" $Id: form_field_new.3x,v 1.22 2020/03/28 19:06:28 tom Exp $
.TH form_field_new 3X ""
.SH NAME
\fBnew_field\fR,
@@ -67,9 +67,9 @@
.PP
The function \fBfree_field\fR de-allocates storage associated with a field.
.SH RETURN VALUE
-The function, \fBnew_field\fR, \fBdup_field\fR, \fBlink_field\fR return
+The functions \fBnew_field\fR, \fBdup_field\fR, \fBlink_field\fR return
\fBNULL\fR on error.
-They set errno according to their success:
+They set \fBerrno\fP according to their success:
.TP 5
.B E_OK
The routine succeeded.
Index: man/form_field_userptr.3x
Prereq: 1.13
--- ncurses-6.2-20200321+/man/form_field_userptr.3x 2020-02-02 23:34:34.000000000 +0000
+++ ncurses-6.2-20200328/man/form_field_userptr.3x 2020-03-28 19:06:28.000000000 +0000
@@ -28,7 +28,7 @@
.\" authorization. *
.\"***************************************************************************
.\"
-.\" $Id: form_field_userptr.3x,v 1.13 2020/02/02 23:34:34 tom Exp $
+.\" $Id: form_field_userptr.3x,v 1.14 2020/03/28 19:06:28 tom Exp $
.TH form_field_userptr 3X ""
.SH NAME
\fBset_field_userptr\fR,
@@ -47,7 +47,7 @@
that field.
.SH RETURN VALUE
The function \fBfield_userptr\fR returns a pointer (which may be \fBNULL\fR).
-It does not set errno.
+It does not set \fBerrno\fP.
.PP
The function \fBset_field_userptr\fR returns \fBE_OK\fP (success).
.SH SEE ALSO
Index: man/form_fieldtype.3x
Prereq: 1.20
--- ncurses-6.2-20200321+/man/form_fieldtype.3x 2020-02-02 23:34:34.000000000 +0000
+++ ncurses-6.2-20200328/man/form_fieldtype.3x 2020-03-28 19:06:28.000000000 +0000
@@ -28,7 +28,7 @@
.\" authorization. *
.\"***************************************************************************
.\"
-.\" $Id: form_fieldtype.3x,v 1.20 2020/02/02 23:34:34 tom Exp $
+.\" $Id: form_fieldtype.3x,v 1.21 2020/03/28 19:06:28 tom Exp $
.TH form_fieldtype 3X ""
.SH NAME
\fBform_fieldtype\fR \- define validation-field types
@@ -99,7 +99,7 @@
argument-block structure as arguments.
.SH RETURN VALUE
The pointer-valued routines return NULL on error.
-They set errno according to their success:
+They set \fBerrno\fP according to their success:
.TP 5
.B E_OK
The routine succeeded.
Index: man/form_new.3x
Prereq: 1.12
--- ncurses-6.2-20200321+/man/form_new.3x 2020-02-02 23:34:34.000000000 +0000
+++ ncurses-6.2-20200328/man/form_new.3x 2020-03-28 19:06:28.000000000 +0000
@@ -28,7 +28,7 @@
.\" authorization. *
.\"***************************************************************************
.\"
-.\" $Id: form_new.3x,v 1.12 2020/02/02 23:34:34 tom Exp $
+.\" $Id: form_new.3x,v 1.13 2020/03/28 19:06:28 tom Exp $
.TH form_new 3X ""
.SH NAME
\fBnew_form\fR,
@@ -48,7 +48,7 @@
and frees the storage allocated for the form.
.SH RETURN VALUE
The function \fBnew_form\fR returns \fBNULL\fR on error.
-It sets errno according to the function's success:
+It sets \fBerrno\fP according to the function's success:
.TP 5
.B E_OK
The routine succeeded.
Index: man/form_requestname.3x
Prereq: 1.12
--- ncurses-6.2-20200321+/man/form_requestname.3x 2020-02-02 23:34:34.000000000 +0000
+++ ncurses-6.2-20200328/man/form_requestname.3x 2020-03-28 19:06:28.000000000 +0000
@@ -28,7 +28,7 @@
.\" authorization. *
.\"***************************************************************************
.\"
-.\" $Id: form_requestname.3x,v 1.12 2020/02/02 23:34:34 tom Exp $
+.\" $Id: form_requestname.3x,v 1.13 2020/03/28 19:06:28 tom Exp $
.TH form_requestname 3X ""
.SH NAME
\fBform_request_by_name\fP,
@@ -48,11 +48,11 @@
with the given name and returns its request code.
Otherwise E_NO_MATCH is returned.
.SH RETURN VALUE
-\fBform_request_name\fR returns \fBNULL\fR on error and sets errno
+\fBform_request_name\fR returns \fBNULL\fR on error and sets \fBerrno\fP
to \fBE_BAD_ARGUMENT\fR.
.br
\fBform_request_by_name\fR returns \fBE_NO_MATCH\fR on error.
-It does not set errno.
+It does not set \fBerrno\fP.
.SH SEE ALSO
\fBcurses\fR(3X), \fBform\fR(3X).
.SH NOTES
Index: man/form_userptr.3x
Prereq: 1.16
--- ncurses-6.2-20200321+/man/form_userptr.3x 2020-02-02 23:34:34.000000000 +0000
+++ ncurses-6.2-20200328/man/form_userptr.3x 2020-03-28 19:06:28.000000000 +0000
@@ -28,7 +28,7 @@
.\" authorization. *
.\"***************************************************************************
.\"
-.\" $Id: form_userptr.3x,v 1.16 2020/02/02 23:34:34 tom Exp $
+.\" $Id: form_userptr.3x,v 1.17 2020/03/28 19:06:28 tom Exp $
.TH form_userptr 3X ""
.SH NAME
\fBset_form_userptr\fP,
@@ -46,7 +46,7 @@
These functions get and set the form user pointer field.
.SH RETURN VALUE
The function \fBform_userptr\fR returns a pointer (which may be \fBNULL\fR).
-It does not set errno.
+It does not set \fBerrno\fP.
.PP
The function \fBset_form_userptr\fR returns \fBE_OK\fP (success).
.SH SEE ALSO
Index: man/menu_items.3x
Prereq: 1.14
--- ncurses-6.2-20200321+/man/menu_items.3x 2020-02-02 23:34:34.000000000 +0000
+++ ncurses-6.2-20200328/man/menu_items.3x 2020-03-28 19:06:28.000000000 +0000
@@ -28,7 +28,7 @@
.\" authorization. *
.\"***************************************************************************
.\"
-.\" $Id: menu_items.3x,v 1.14 2020/02/02 23:34:34 tom Exp $
+.\" $Id: menu_items.3x,v 1.15 2020/03/28 19:06:28 tom Exp $
.TH menu_items 3X ""
.SH NAME
\fBset_menu_items\fR,
@@ -52,7 +52,7 @@
The function \fBitem_count\fR returns the count of items in \fImenu\fR.
.SH RETURN VALUE
The function \fBmenu_items\fR returns a pointer (which may be \fBNULL\fR).
-It does not set errno.
+It does not set \fBerrno\fP.
.PP
The function \fBitem_count\fR returns \fBERR\fR (the general \fBcurses\fR error
return value) if its \fImenu\fP parameter is \fBNULL\fP.
Index: man/menu_mark.3x
Prereq: 1.15
--- ncurses-6.2-20200321+/man/menu_mark.3x 2020-02-02 23:34:34.000000000 +0000
+++ ncurses-6.2-20200328/man/menu_mark.3x 2020-03-28 19:06:28.000000000 +0000
@@ -28,7 +28,7 @@
.\" authorization. *
.\"***************************************************************************
.\"
-.\" $Id: menu_mark.3x,v 1.15 2020/02/02 23:34:34 tom Exp $
+.\" $Id: menu_mark.3x,v 1.16 2020/03/28 19:06:28 tom Exp $
.TH menu_mark 3X ""
.SH NAME
\fBset_menu_mark\fP,
@@ -58,7 +58,7 @@
there is none).
.SH RETURN VALUE
The function \fBmenu_mark\fR returns a pointer (which may be \fBNULL\fR).
-It does not set errno.
+It does not set \fBerrno\fP.
.PP
The function \fBset_menu_mark\fR may return the following error codes:
.TP 5
Index: man/menu_new.3x
Prereq: 1.15
--- ncurses-6.2-20200321+/man/menu_new.3x 2020-02-02 23:34:34.000000000 +0000
+++ ncurses-6.2-20200328/man/menu_new.3x 2020-03-28 19:06:28.000000000 +0000
@@ -28,7 +28,7 @@
.\" authorization. *
.\"***************************************************************************
.\"
-.\" $Id: menu_new.3x,v 1.15 2020/02/02 23:34:34 tom Exp $
+.\" $Id: menu_new.3x,v 1.16 2020/03/28 19:06:28 tom Exp $
.TH menu_new 3X ""
.SH NAME
\fBnew_menu\fP,
@@ -48,7 +48,7 @@
and frees the storage allocated for the menu.
.SH RETURN VALUE
The function \fBnew_menu\fR returns \fBNULL\fR on error.
-It sets errno according to the function's failure:
+It sets \fBerrno\fP according to the function's failure:
.TP 5
.B E_NOT_CONNECTED
No items are connected to the menu.
Index: man/menu_pattern.3x
Prereq: 1.18
--- ncurses-6.2-20200321+/man/menu_pattern.3x 2020-02-02 23:34:34.000000000 +0000
+++ ncurses-6.2-20200328/man/menu_pattern.3x 2020-03-28 19:06:28.000000000 +0000
@@ -27,7 +27,7 @@
.\" authorization. *
.\"***************************************************************************
.\"
-.\" $Id: menu_pattern.3x,v 1.18 2020/02/02 23:34:34 tom Exp $
+.\" $Id: menu_pattern.3x,v 1.19 2020/03/28 19:06:28 tom Exp $
.TH menu_pattern 3X ""
.SH NAME
\fBset_menu_pattern\fP,
@@ -57,7 +57,7 @@
which is \fBNULL\fR if the \fImenu\fP parameter is \fBNULL\fP.
Otherwise, it is a pointer to a string which is empty
if no pattern has been set.
-It does not set errno.
+It does not set \fBerrno\fP.
.PP
The function \fBset_menu_pattern\fR may return the following error codes:
.TP 5
Index: man/menu_requestname.3x
Prereq: 1.12
--- ncurses-6.2-20200321+/man/menu_requestname.3x 2020-02-02 23:34:34.000000000 +0000
+++ ncurses-6.2-20200328/man/menu_requestname.3x 2020-03-28 19:06:28.000000000 +0000
@@ -28,7 +28,7 @@
.\" authorization. *
.\"***************************************************************************
.\"
-.\" $Id: menu_requestname.3x,v 1.12 2020/02/02 23:34:34 tom Exp $
+.\" $Id: menu_requestname.3x,v 1.13 2020/03/28 19:06:28 tom Exp $
.TH menu_requestname 3X ""
.SH NAME
\fBmenu_request_by_name\fP,
@@ -49,10 +49,10 @@
Otherwise E_NO_MATCH is returned.
.SH RETURN VALUE
\fBmenu_request_name\fR returns \fBNULL\fR on error
-and sets errno to \fBE_BAD_ARGUMENT\fR.
+and sets \fBerrno\fP to \fBE_BAD_ARGUMENT\fR.
.br
\fBmenu_request_by_name\fR returns \fBE_NO_MATCH\fR on error.
-It does not set errno.
+It does not set \fBerrno\fP.
.SH SEE ALSO
\fBcurses\fR(3X), \fBmenu\fR(3X).
.SH NOTES
Index: man/menu_userptr.3x
Prereq: 1.13
--- ncurses-6.2-20200321+/man/menu_userptr.3x 2020-02-02 23:34:34.000000000 +0000
+++ ncurses-6.2-20200328/man/menu_userptr.3x 2020-03-28 19:06:28.000000000 +0000
@@ -28,7 +28,7 @@
.\" authorization. *
.\"***************************************************************************
.\"
-.\" $Id: menu_userptr.3x,v 1.13 2020/02/02 23:34:34 tom Exp $
+.\" $Id: menu_userptr.3x,v 1.14 2020/03/28 19:06:28 tom Exp $
.TH menu_userptr 3X ""
.SH NAME
\fBset_menu_userptr\fP,
@@ -46,7 +46,7 @@
These functions get and set the menu user pointer field.
.SH RETURN VALUE
\fBmenu_userptr\fR returns a pointer (which may be \fBNULL\fR).
-It does not set errno.
+It does not set \fBerrno\fP.
.PP
\fBset_menu_userptr\fP returns \fBE_OK\fP (success).
.SH SEE ALSO
Index: man/mitem_current.3x
Prereq: 1.17
--- ncurses-6.2-20200321+/man/mitem_current.3x 2020-02-02 23:34:34.000000000 +0000
+++ ncurses-6.2-20200328/man/mitem_current.3x 2020-03-28 19:06:28.000000000 +0000
@@ -28,7 +28,7 @@
.\" authorization. *
.\"***************************************************************************
.\"
-.\" $Id: mitem_current.3x,v 1.17 2020/02/02 23:34:34 tom Exp $
+.\" $Id: mitem_current.3x,v 1.18 2020/03/28 19:06:28 tom Exp $
.TH mitem_current 3X ""
.SH NAME
\fBmitem_current\fR \- set and get current_menu_item
@@ -63,7 +63,7 @@
the menu's item pointer list.
.SH RETURN VALUE
\fBcurrent_item\fR returns a pointer (which may be \fBNULL\fR).
-It does not set errno.
+It does not set \fBerrno\fP.
.PP
\fBtop_row\fR and \fBitem_index\fR return \fBERR\fR (the general \fBcurses\fR
error value) if their \fImenu\fP parameter is \fBNULL\fP.
Index: man/mitem_name.3x
Prereq: 1.11
--- ncurses-6.2-20200321+/man/mitem_name.3x 2020-02-02 23:34:34.000000000 +0000
+++ ncurses-6.2-20200328/man/mitem_name.3x 2020-03-28 19:06:28.000000000 +0000
@@ -28,7 +28,7 @@
.\" authorization. *
.\"***************************************************************************
.\"
-.\" $Id: mitem_name.3x,v 1.11 2020/02/02 23:34:34 tom Exp $
+.\" $Id: mitem_name.3x,v 1.12 2020/03/28 19:06:28 tom Exp $
.TH mitem_name 3X ""
.SH NAME
\fBitem_name\fR,
@@ -47,7 +47,7 @@
item.
.SH RETURN VALUE
These routines return a pointer (which may be \fBNULL\fR).
-They do not set errno.
+They do not set \fBerrno\fP.
.SH SEE ALSO
\fBcurses\fR(3X), \fBmenu\fR(3X).
.SH NOTES
Index: man/mitem_new.3x
Prereq: 1.16
--- ncurses-6.2-20200321+/man/mitem_new.3x 2020-02-02 23:34:34.000000000 +0000
+++ ncurses-6.2-20200328/man/mitem_new.3x 2020-03-28 19:06:28.000000000 +0000
@@ -28,7 +28,7 @@
.\" authorization. *
.\"***************************************************************************
.\"
-.\" $Id: mitem_new.3x,v 1.16 2020/02/02 23:34:34 tom Exp $
+.\" $Id: mitem_new.3x,v 1.17 2020/03/28 19:06:28 tom Exp $
.TH mitem_new 3X ""
.SH NAME
\fBnew_item\fP,
@@ -56,7 +56,7 @@
name or the description of the item.
.SH RETURN VALUE
The function \fBnew_item\fR returns \fBNULL\fR on error.
-It sets errno according to the function's failure:
+It sets \fBerrno\fP according to the function's failure:
.TP 5
.B E_BAD_ARGUMENT
Routine detected an incorrect or out-of-range argument.
Index: man/mitem_userptr.3x
Prereq: 1.14
--- ncurses-6.2-20200321+/man/mitem_userptr.3x 2020-02-02 23:34:34.000000000 +0000
+++ ncurses-6.2-20200328/man/mitem_userptr.3x 2020-03-28 19:06:28.000000000 +0000
@@ -28,7 +28,7 @@
.\" authorization. *
.\"***************************************************************************
.\"
-.\" $Id: mitem_userptr.3x,v 1.14 2020/02/02 23:34:34 tom Exp $
+.\" $Id: mitem_userptr.3x,v 1.15 2020/03/28 19:06:28 tom Exp $
.TH mitem_userptr 3X ""
.SH NAME
\fBset_item_userptr\fP,
@@ -47,7 +47,7 @@
that field.
.SH RETURN VALUE
The function \fBitem_userptr\fR returns a pointer (possibly \fBNULL\fR).
-It does not set errno.
+It does not set \fBerrno\fP.
.PP
The \fBset_item_userptr\fP always returns \fBE_OK\fP (success).
.
Index: package/debian-mingw/changelog
--- ncurses-6.2-20200321+/package/debian-mingw/changelog 2020-03-21 12:15:18.000000000 +0000
+++ ncurses-6.2-20200328/package/debian-mingw/changelog 2020-03-28 10:37:50.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.2+20200321) unstable; urgency=low
+ncurses6 (6.2+20200328) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 21 Mar 2020 08:15:18 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 28 Mar 2020 06:37:50 -0400
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian-mingw64/changelog
--- ncurses-6.2-20200321+/package/debian-mingw64/changelog 2020-03-21 12:15:18.000000000 +0000
+++ ncurses-6.2-20200328/package/debian-mingw64/changelog 2020-03-28 10:37:50.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.2+20200321) unstable; urgency=low
+ncurses6 (6.2+20200328) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 21 Mar 2020 08:15:18 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 28 Mar 2020 06:37:50 -0400
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian/changelog
--- ncurses-6.2-20200321+/package/debian/changelog 2020-03-21 12:15:18.000000000 +0000
+++ ncurses-6.2-20200328/package/debian/changelog 2020-03-28 10:37:50.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.2+20200321) unstable; urgency=low
+ncurses6 (6.2+20200328) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 21 Mar 2020 08:15:18 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 28 Mar 2020 06:37:50 -0400
ncurses6 (5.9-20120608) unstable; urgency=low
Index: package/mingw-ncurses.nsi
Prereq: 1.386
--- ncurses-6.2-20200321+/package/mingw-ncurses.nsi 2020-03-21 12:15:18.000000000 +0000
+++ ncurses-6.2-20200328/package/mingw-ncurses.nsi 2020-03-28 10:37:50.000000000 +0000
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.386 2020/03/21 12:15:18 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.387 2020/03/28 10:37:50 tom Exp $
; TODO add examples
; TODO bump ABI to 6
@@ -10,7 +10,7 @@
!define VERSION_MAJOR "6"
!define VERSION_MINOR "2"
!define VERSION_YYYY "2020"
-!define VERSION_MMDD "0321"
+!define VERSION_MMDD "0328"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"
Index: package/mingw-ncurses.spec
--- ncurses-6.2-20200321+/package/mingw-ncurses.spec 2020-03-21 12:15:18.000000000 +0000
+++ ncurses-6.2-20200328/package/mingw-ncurses.spec 2020-03-28 10:37:50.000000000 +0000
@@ -3,7 +3,7 @@
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 6.2
-Release: 20200321
+Release: 20200328
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncurses.spec
--- ncurses-6.2-20200321+/package/ncurses.spec 2020-03-21 12:15:18.000000000 +0000
+++ ncurses-6.2-20200328/package/ncurses.spec 2020-03-28 10:37:50.000000000 +0000
@@ -1,7 +1,7 @@
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 6.2
-Release: 20200321
+Release: 20200328
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncursest.spec
--- ncurses-6.2-20200321+/package/ncursest.spec 2020-03-21 12:15:18.000000000 +0000
+++ ncurses-6.2-20200328/package/ncursest.spec 2020-03-28 10:37:50.000000000 +0000
@@ -1,7 +1,7 @@
Summary: Curses library with POSIX thread support.
Name: ncursest6
Version: 6.2
-Release: 20200321
+Release: 20200328
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: test/move_field.c
Prereq: 1.5
--- ncurses-6.2-20200321+/test/move_field.c 2020-03-21 22:04:03.000000000 +0000
+++ ncurses-6.2-20200328/test/move_field.c 2020-03-28 17:43:03.000000000 +0000
@@ -26,7 +26,7 @@
* authorization. *
****************************************************************************/
/*
- * $Id: move_field.c,v 1.5 2020/03/21 22:04:03 tom Exp $
+ * $Id: move_field.c,v 1.6 2020/03/28 17:43:03 tom Exp $
*
* Demonstrate move_field().
*/
@@ -269,7 +269,7 @@
}
static FIELD **
-copy_fields(FIELD **source, int length)
+copy_fields(FIELD **source, size_t length)
{
FIELD **target = calloc(length + 1, sizeof(FIELD *));
memcpy(target, source, length * sizeof(FIELD *));
@@ -305,8 +305,9 @@
FIELD *my_field = current_field(form);
if (count > 0 && my_field != NULL) {
- FIELD **old_fields = copy_fields(form_fields(form), count);
- FIELD **new_fields = copy_fields(form_fields(form), count);
+ size_t needed = (size_t) count;
+ FIELD **old_fields = copy_fields(form_fields(form), needed);
+ FIELD **new_fields = copy_fields(form_fields(form), needed);
int ch;
if (old_fields != NULL && new_fields != NULL) {

129
ncurses.spec
View File

@ -3,8 +3,8 @@
%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.1.20200118 Version: 6.2.20200328
Release: 2mamba Release: 1mamba
Summary: A CRT screen handling and optimization package Summary: A CRT screen handling and optimization package
Group: System/Libraries Group: System/Libraries
Vendor: openmamba Vendor: openmamba
@ -13,40 +13,40 @@ 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/%{majver}/patch-%{majver}-20190609.sh.gz Source1: ftp://dickey.his.com/ncurses/patches/patch-%{majver}-20200212.sh.gz
Source2: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190615.patch.gz Source2: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20200215.patch.gz
Source3: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190623.patch.gz Source3: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20200222.patch.gz
Source4: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190630.patch.gz Source4: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20200229.patch.gz
Source5: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190706.patch.gz Source5: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20200301.patch.gz
Source6: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190713.patch.gz Source6: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20200308.patch.gz
Source7: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190720.patch.gz Source7: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20200314.patch.gz
Source8: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190727.patch.gz Source8: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20200321.patch.gz
Source9: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190728.patch.gz Source9: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20200328.patch.gz
Source10: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190803.patch.gz #Source10: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190803.patch.gz
Source11: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190810.patch.gz #Source11: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190810.patch.gz
Source12: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190817.patch.gz #Source12: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190817.patch.gz
Source13: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190824.patch.gz #Source13: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190824.patch.gz
Source14: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190831.patch.gz #Source14: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190831.patch.gz
Source15: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190907.patch.gz #Source15: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190907.patch.gz
Source16: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190914.patch.gz #Source16: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190914.patch.gz
Source17: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190921.patch.gz #Source17: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190921.patch.gz
Source18: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190928.patch.gz #Source18: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190928.patch.gz
Source19: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20191005.patch.gz #Source19: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20191005.patch.gz
Source20: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20191012.patch.gz #Source20: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20191012.patch.gz
Source21: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20191015.patch.gz #Source21: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20191015.patch.gz
Source22: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20191019.patch.gz #Source22: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20191019.patch.gz
Source23: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20191026.patch.gz #Source23: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20191026.patch.gz
Source24: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20191102.patch.gz #Source24: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20191102.patch.gz
Source25: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20191109.patch.gz #Source25: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20191109.patch.gz
Source26: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20191116.patch.gz #Source26: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20191116.patch.gz
Source27: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20191123.patch.gz #Source27: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20191123.patch.gz
Source28: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20191130.patch.gz #Source28: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20191130.patch.gz
Source29: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20191207.patch.gz #Source29: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20191207.patch.gz
Source30: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20191214.patch.gz #Source30: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20191214.patch.gz
Source31: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20191221.patch.gz #Source31: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20191221.patch.gz
Source32: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20191228.patch.gz #Source32: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20191228.patch.gz
Source33: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20200104.patch.gz #Source33: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20200104.patch.gz
Source34: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20200111.patch.gz #Source34: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20200111.patch.gz
Source99: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-%{patchver}.patch.gz Source99: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-%{patchver}.patch.gz
%endif %endif
License: MIT License: MIT
@ -103,7 +103,7 @@ The header files and libraries for developing applications that use the ncurses
#:<< _EOF #:<< _EOF
%if "%{?patchver}" != "" %if "%{?patchver}" != ""
gunzip -c %{SOURCE1} | bash #gunzip -c %{SOURCE1} | bash
gunzip -c %{SOURCE2} | patch -p1 gunzip -c %{SOURCE2} | patch -p1
gunzip -c %{SOURCE3} | patch -p1 gunzip -c %{SOURCE3} | patch -p1
@ -112,32 +112,32 @@ gunzip -c %{SOURCE5} | patch -p1
gunzip -c %{SOURCE6} | patch -p1 gunzip -c %{SOURCE6} | patch -p1
gunzip -c %{SOURCE7} | patch -p1 gunzip -c %{SOURCE7} | patch -p1
gunzip -c %{SOURCE8} | patch -p1 gunzip -c %{SOURCE8} | patch -p1
gunzip -c %{SOURCE9} | patch -p1 #gunzip -c %{SOURCE9} | patch -p1
gunzip -c %{SOURCE10} | patch -p1 #gunzip -c %{SOURCE10} | patch -p1
gunzip -c %{SOURCE11} | patch -p1 #gunzip -c %{SOURCE11} | patch -p1
gunzip -c %{SOURCE12} | patch -p1 #gunzip -c %{SOURCE12} | patch -p1
gunzip -c %{SOURCE13} | patch -p1 #gunzip -c %{SOURCE13} | patch -p1
gunzip -c %{SOURCE14} | patch -p1 #gunzip -c %{SOURCE14} | patch -p1
gunzip -c %{SOURCE15} | patch -p1 #gunzip -c %{SOURCE15} | patch -p1
gunzip -c %{SOURCE16} | patch -p1 #gunzip -c %{SOURCE16} | patch -p1
gunzip -c %{SOURCE17} | patch -p1 #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 %{SOURCE21} | patch -p1
gunzip -c %{SOURCE22} | patch -p1 #gunzip -c %{SOURCE22} | patch -p1
gunzip -c %{SOURCE23} | patch -p1 #gunzip -c %{SOURCE23} | patch -p1
gunzip -c %{SOURCE24} | patch -p1 #gunzip -c %{SOURCE24} | patch -p1
gunzip -c %{SOURCE25} | patch -p1 #gunzip -c %{SOURCE25} | patch -p1
gunzip -c %{SOURCE26} | patch -p1 #gunzip -c %{SOURCE26} | patch -p1
gunzip -c %{SOURCE27} | patch -p1 #gunzip -c %{SOURCE27} | patch -p1
gunzip -c %{SOURCE28} | patch -p1 #gunzip -c %{SOURCE28} | patch -p1
gunzip -c %{SOURCE29} | patch -p1 #gunzip -c %{SOURCE29} | patch -p1
gunzip -c %{SOURCE30} | patch -p1 #gunzip -c %{SOURCE30} | patch -p1
gunzip -c %{SOURCE31} | patch -p1 #gunzip -c %{SOURCE31} | patch -p1
gunzip -c %{SOURCE32} | patch -p1 #gunzip -c %{SOURCE32} | patch -p1
gunzip -c %{SOURCE33} | patch -p1 #gunzip -c %{SOURCE33} | patch -p1
gunzip -c %{SOURCE34} | patch -p1 #gunzip -c %{SOURCE34} | patch -p1
gunzip -c %{SOURCE99} | patch -p1 gunzip -c %{SOURCE99} | patch -p1
%endif %endif
@ -326,6 +326,9 @@ fi
%{_datadir}/terminfo/* %{_datadir}/terminfo/*
%changelog %changelog
* Tue Mar 31 2020 Ercole 'ercolinux' Carpanetto <ercole69@gmail.com> 6.2.20200328-1mamba
- update to 6.2.20200328
* Mon Feb 10 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 6.1.20200118-2mamba * Mon Feb 10 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 6.1.20200118-2mamba
- postrans workaround to fix libtinfo.so.6 disappearing on upgrade - postrans workaround to fix libtinfo.so.6 disappearing on upgrade

BIN
patch-6.1-20190609.sh.gz
View File

Binary file not shown.

BIN
patch-6.2-20200212.sh.gz Normal file
View File

Binary file not shown.