1# ncurses 6.1 - patch 20191116 - Thomas E. Dickey
2#
3# ------------------------------------------------------------------------------
4#
5# Ncurses 6.1 is at
6# 	ftp.gnu.org:/pub/gnu
7#
8# Patches for ncurses 6.1 can be found at
9# 	ftp://ftp.invisible-island.net/ncurses/6.1
10#	http://invisible-mirror.net/archives/ncurses/6.1
11#
12# ------------------------------------------------------------------------------
13# ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20191116.patch.gz
14# patch by Thomas E. Dickey <dickey@invisible-island.net>
15# created  Sun Nov 17 01:23:05 UTC 2019
16# ------------------------------------------------------------------------------
17# NEWS                             |   10 +++++++++-
18# VERSION                          |    2 +-
19# configure                        |    4 ++--
20# configure.in                     |    6 +++---
21# dist.mk                          |    4 ++--
22# ncurses/Makefile.in              |   10 +++++-----
23# package/debian-mingw/changelog   |    4 ++--
24# package/debian-mingw64/changelog |    4 ++--
25# package/debian/changelog         |    4 ++--
26# package/mingw-ncurses.nsi        |    4 ++--
27# package/mingw-ncurses.spec       |    2 +-
28# package/ncurses.spec             |    2 +-
29# package/ncursest.spec            |    2 +-
30# 13 files changed, 33 insertions(+), 25 deletions(-)
31# ------------------------------------------------------------------------------
32Index: NEWS
33Prereq:  1.3404
34--- ncurses-6.1-20191109+/NEWS	2019-11-10 00:18:59.000000000 +0000
35+++ ncurses-6.1-20191116/NEWS	2019-11-16 20:48:27.000000000 +0000
36@@ -25,7 +25,7 @@
37 -- sale, use or other dealings in this Software without prior written        --
38 -- authorization.                                                            --
39 -------------------------------------------------------------------------------
40--- $Id: NEWS,v 1.3404 2019/11/10 00:18:59 tom Exp $
41+-- $Id: NEWS,v 1.3407 2019/11/16 20:48:27 tom Exp $
42 -------------------------------------------------------------------------------
43
44 This is a log of changes that ncurses has gone through since Zeyd started
45@@ -45,6 +45,14 @@
46 Changes through 1.9.9e did not credit all contributions;
47 it is not possible to add this information.
48
49+20191116
50+	+ modify ncurses/Makefile.in to fix a case where Debian/testing changes
51+	  to the ld --as-needed configuration broke ncurses-examples test
52+	  packages.
53+	+ drop library-dependency on psapi for MinGW port, since win_driver.c
54+	  defines PSAPI_VERSION to 2, making it use GetProcessImageFileName
55+	  from kernel32.dll (prompted by patch by Simon Sobish, cf: 20140503).
56+
57 20191109
58 	+ add warning-check in tic for terminals with parm_dch vs parm_ich.
59 	+ drop ich1 from rxvt-basic, Eterm and mlterm to improve compatibility
60Index: VERSION
61--- ncurses-6.1-20191109+/VERSION	2019-11-06 09:37:05.000000000 +0000
62+++ ncurses-6.1-20191116/VERSION	2019-11-16 15:09:15.000000000 +0000
63@@ -1 +1 @@
64-5:0:10	6.1	20191109
65+5:0:10	6.1	20191116
66Index: configure
67--- ncurses-6.1-20191109+/configure	2019-11-02 20:33:48.000000000 +0000
68+++ ncurses-6.1-20191116/configure	2019-11-16 15:59:28.000000000 +0000
69@@ -1,5 +1,5 @@
70 #! /bin/sh
71-# From configure.in Revision: 1.690 .
72+# From configure.in Revision: 1.691 .
73 # Guess values for system-dependent variables and create Makefiles.
74 # Generated by Autoconf 2.52.20190901.
75 #
76@@ -17119,7 +17119,7 @@
77 case $cf_cv_system_name in
78 (*mingw32*|*mingw64*)
79 	CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
80-	LIBS=" -lpsapi $LIBS"
81+	# Note: WINVER may be a problem with Windows 10
82 	;;
83 (*)
84 echo "$as_me:17125: checking for gettimeofday" >&5
85Index: configure.in
86Prereq:  1.690
87--- ncurses-6.1-20191109+/configure.in	2019-09-27 21:12:34.000000000 +0000
88+++ ncurses-6.1-20191116/configure.in	2019-11-16 15:54:47.000000000 +0000
89@@ -28,14 +28,14 @@
90 dnl
91 dnl Author: Thomas E. Dickey 1995-on
92 dnl
93-dnl $Id: configure.in,v 1.690 2019/09/27 21:12:34 tom Exp $
94+dnl $Id: configure.in,v 1.691 2019/11/16 15:54:47 tom Exp $
95 dnl Process this file with autoconf to produce a configure script.
96 dnl
97 dnl See https://invisible-island.net/autoconf/ for additional information.
98 dnl
99 dnl ---------------------------------------------------------------------------
100 AC_PREREQ(2.52.20170501)
101-AC_REVISION($Revision: 1.690 $)
102+AC_REVISION($Revision: 1.691 $)
103 AC_INIT(ncurses/base/lib_initscr.c)
104 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
105
106@@ -1616,7 +1616,7 @@
107 case $cf_cv_system_name in
108 (*mingw32*|*mingw64*)
109 	CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
110-	LIBS=" -lpsapi $LIBS"
111+	# Note: WINVER may be a problem with Windows 10
112 	;;
113 (*)
114 AC_CHECK_FUNC(gettimeofday,
115Index: dist.mk
116Prereq:  1.1314
117--- ncurses-6.1-20191109+/dist.mk	2019-11-06 09:37:05.000000000 +0000
118+++ ncurses-6.1-20191116/dist.mk	2019-11-16 15:09:15.000000000 +0000
119@@ -25,7 +25,7 @@
120 # use or other dealings in this Software without prior written               #
121 # authorization.                                                             #
122 ##############################################################################
123-# $Id: dist.mk,v 1.1314 2019/11/06 09:37:05 tom Exp $
124+# $Id: dist.mk,v 1.1315 2019/11/16 15:09:15 tom Exp $
125 # Makefile for creating ncurses distributions.
126 #
127 # This only needs to be used directly as a makefile by developers, but
128@@ -37,7 +37,7 @@
129 # These define the major/minor/patch versions of ncurses.
130 NCURSES_MAJOR = 6
131 NCURSES_MINOR = 1
132-NCURSES_PATCH = 20191109
133+NCURSES_PATCH = 20191116
134
135 # We don't append the patch to the version, since this only applies to releases
136 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
137Index: ncurses/Makefile.in
138Prereq:  1.163
139--- ncurses-6.1-20191109+/ncurses/Makefile.in	2019-06-30 14:57:27.000000000 +0000
140+++ ncurses-6.1-20191116/ncurses/Makefile.in	2019-11-16 20:42:40.000000000 +0000
141@@ -1,4 +1,4 @@
142-# $Id: Makefile.in,v 1.163 2019/06/30 14:57:27 tom Exp $
143+# $Id: Makefile.in,v 1.164 2019/11/16 20:42:40 tom Exp $
144 ##############################################################################
145 # Copyright (c) 1998-2018,2019 Free Software Foundation, Inc.                #
146 #                                                                            #
147@@ -126,12 +126,12 @@
148 CFLAGS_DEFAULT	= $(CFLAGS_@DFT_UPR_MODEL@)
149
150 LINK		= $(LIBTOOL)
151-LDFLAGS		= @LDFLAGS@ @LD_MODEL@ @LIBS@
152+LDFLAGS		= @LDFLAGS@ @LD_MODEL@
153
154 SHLIB_DIRS	= -L../lib
155-SHLIB_LIST	= $(SHLIB_DIRS) @SHLIB_LIST@
156-TINFO_LIST	= $(SHLIB_DIRS) @TINFO_LIST@
157-TICS_LIST	= $(SHLIB_DIRS) @TICS_LIST@
158+SHLIB_LIST	= $(SHLIB_DIRS) @SHLIB_LIST@ @LIBS@
159+TINFO_LIST	= $(SHLIB_DIRS) @TINFO_LIST@ @LIBS@
160+TICS_LIST	= $(SHLIB_DIRS) @TICS_LIST@ @LIBS@
161
162 RPATH_LIST	= @RPATH_LIST@
163 RESULTING_SYMS	= @RESULTING_SYMS@
164Index: package/debian-mingw/changelog
165--- ncurses-6.1-20191109+/package/debian-mingw/changelog	2019-11-06 09:37:05.000000000 +0000
166+++ ncurses-6.1-20191116/package/debian-mingw/changelog	2019-11-16 15:09:15.000000000 +0000
167@@ -1,8 +1,8 @@
168-ncurses6 (6.1+20191109) unstable; urgency=low
169+ncurses6 (6.1+20191116) unstable; urgency=low
170
171   * latest weekly patch
172
173- -- Thomas E. Dickey <dickey@invisible-island.net>  Wed, 06 Nov 2019 04:37:04 -0500
174+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 16 Nov 2019 10:09:15 -0500
175
176 ncurses6 (5.9-20131005) unstable; urgency=low
177
178Index: package/debian-mingw64/changelog
179--- ncurses-6.1-20191109+/package/debian-mingw64/changelog	2019-11-06 09:37:05.000000000 +0000
180+++ ncurses-6.1-20191116/package/debian-mingw64/changelog	2019-11-16 15:09:15.000000000 +0000
181@@ -1,8 +1,8 @@
182-ncurses6 (6.1+20191109) unstable; urgency=low
183+ncurses6 (6.1+20191116) unstable; urgency=low
184
185   * latest weekly patch
186
187- -- Thomas E. Dickey <dickey@invisible-island.net>  Wed, 06 Nov 2019 04:37:05 -0500
188+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 16 Nov 2019 10:09:15 -0500
189
190 ncurses6 (5.9-20131005) unstable; urgency=low
191
192Index: package/debian/changelog
193--- ncurses-6.1-20191109+/package/debian/changelog	2019-11-06 09:37:05.000000000 +0000
194+++ ncurses-6.1-20191116/package/debian/changelog	2019-11-16 15:09:15.000000000 +0000
195@@ -1,8 +1,8 @@
196-ncurses6 (6.1+20191109) unstable; urgency=low
197+ncurses6 (6.1+20191116) unstable; urgency=low
198
199   * latest weekly patch
200
201- -- Thomas E. Dickey <dickey@invisible-island.net>  Wed, 06 Nov 2019 04:37:04 -0500
202+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 16 Nov 2019 10:09:15 -0500
203
204 ncurses6 (5.9-20120608) unstable; urgency=low
205
206Index: package/mingw-ncurses.nsi
207Prereq:  1.360
208--- ncurses-6.1-20191109+/package/mingw-ncurses.nsi	2019-11-06 09:37:05.000000000 +0000
209+++ ncurses-6.1-20191116/package/mingw-ncurses.nsi	2019-11-16 15:09:15.000000000 +0000
210@@ -1,4 +1,4 @@
211-; $Id: mingw-ncurses.nsi,v 1.360 2019/11/06 09:37:05 tom Exp $
212+; $Id: mingw-ncurses.nsi,v 1.361 2019/11/16 15:09:15 tom Exp $
213
214 ; TODO add examples
215 ; TODO bump ABI to 6
216@@ -10,7 +10,7 @@
217 !define VERSION_MAJOR "6"
218 !define VERSION_MINOR "1"
219 !define VERSION_YYYY  "2019"
220-!define VERSION_MMDD  "1109"
221+!define VERSION_MMDD  "1116"
222 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
223
224 !define MY_ABI   "5"
225Index: package/mingw-ncurses.spec
226--- ncurses-6.1-20191109+/package/mingw-ncurses.spec	2019-11-06 09:37:05.000000000 +0000
227+++ ncurses-6.1-20191116/package/mingw-ncurses.spec	2019-11-16 15:09:15.000000000 +0000
228@@ -3,7 +3,7 @@
229 Summary: shared libraries for terminal handling
230 Name: mingw32-ncurses6
231 Version: 6.1
232-Release: 20191109
233+Release: 20191116
234 License: X11
235 Group: Development/Libraries
236 Source: ncurses-%{version}-%{release}.tgz
237Index: package/ncurses.spec
238--- ncurses-6.1-20191109+/package/ncurses.spec	2019-11-06 09:37:05.000000000 +0000
239+++ ncurses-6.1-20191116/package/ncurses.spec	2019-11-16 15:09:15.000000000 +0000
240@@ -1,7 +1,7 @@
241 Summary: shared libraries for terminal handling
242 Name: ncurses6
243 Version: 6.1
244-Release: 20191109
245+Release: 20191116
246 License: X11
247 Group: Development/Libraries
248 Source: ncurses-%{version}-%{release}.tgz
249Index: package/ncursest.spec
250--- ncurses-6.1-20191109+/package/ncursest.spec	2019-11-06 09:37:05.000000000 +0000
251+++ ncurses-6.1-20191116/package/ncursest.spec	2019-11-16 15:09:15.000000000 +0000
252@@ -1,7 +1,7 @@
253 Summary: Curses library with POSIX thread support.
254 Name: ncursest6
255 Version: 6.1
256-Release: 20191109
257+Release: 20191116
258 License: X11
259 Group: Development/Libraries
260 Source: ncurses-%{version}-%{release}.tgz
261