1# ncurses 6.1 - patch 20191005 - 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-20191005.patch.gz
14# patch by Thomas E. Dickey <dickey@invisible-island.net>
15# created  Sun Oct  6 00:58:27 UTC 2019
16# ------------------------------------------------------------------------------
17# NEWS                             |    6 +++++-
18# VERSION                          |    2 +-
19# dist.mk                          |    4 ++--
20# misc/gen-pkgconfig.in            |    5 +++--
21# misc/ncurses-config.in           |    4 ++--
22# package/debian-mingw/changelog   |    4 ++--
23# package/debian-mingw64/changelog |    4 ++--
24# package/debian/changelog         |    4 ++--
25# package/mingw-ncurses.nsi        |    4 ++--
26# package/mingw-ncurses.spec       |    2 +-
27# package/ncurses.spec             |    2 +-
28# package/ncursest.spec            |    2 +-
29# 12 files changed, 24 insertions(+), 19 deletions(-)
30# ------------------------------------------------------------------------------
31Index: NEWS
32Prereq:  1.3380
33--- ncurses-6.1-20190928+/NEWS	2019-09-28 12:57:39.000000000 +0000
34+++ ncurses-6.1-20191005/NEWS	2019-10-05 22:53:18.000000000 +0000
35@@ -25,7 +25,7 @@
36 -- sale, use or other dealings in this Software without prior written        --
37 -- authorization.                                                            --
38 -------------------------------------------------------------------------------
39--- $Id: NEWS,v 1.3380 2019/09/28 12:57:39 tom Exp $
40+-- $Id: NEWS,v 1.3382 2019/10/05 22:53:18 tom Exp $
41 -------------------------------------------------------------------------------
42
43 This is a log of changes that ncurses has gone through since Zeyd started
44@@ -45,6 +45,10 @@
45 Changes through 1.9.9e did not credit all contributions;
46 it is not possible to add this information.
47
48+20191005
49+	+ modify the ncurse*-config and pc-files to more closely match for the
50+	  -I and -l options.
51+
52 20190928
53 	+ amend the ncurse*-config and pc-files to take into account the rpath
54 	  hack which differed between those files.
55Index: VERSION
56--- ncurses-6.1-20190928+/VERSION	2019-09-27 18:43:59.000000000 +0000
57+++ ncurses-6.1-20191005/VERSION	2019-10-05 14:44:23.000000000 +0000
58@@ -1 +1 @@
59-5:0:10	6.1	20190928
60+5:0:10	6.1	20191005
61Index: dist.mk
62Prereq:  1.1307
63--- ncurses-6.1-20190928+/dist.mk	2019-09-27 18:43:59.000000000 +0000
64+++ ncurses-6.1-20191005/dist.mk	2019-10-05 14:44:23.000000000 +0000
65@@ -25,7 +25,7 @@
66 # use or other dealings in this Software without prior written               #
67 # authorization.                                                             #
68 ##############################################################################
69-# $Id: dist.mk,v 1.1307 2019/09/27 18:43:59 tom Exp $
70+# $Id: dist.mk,v 1.1308 2019/10/05 14:44:23 tom Exp $
71 # Makefile for creating ncurses distributions.
72 #
73 # This only needs to be used directly as a makefile by developers, but
74@@ -37,7 +37,7 @@
75 # These define the major/minor/patch versions of ncurses.
76 NCURSES_MAJOR = 6
77 NCURSES_MINOR = 1
78-NCURSES_PATCH = 20190928
79+NCURSES_PATCH = 20191005
80
81 # We don't append the patch to the version, since this only applies to releases
82 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
83Index: misc/gen-pkgconfig.in
84Prereq:  1.36
85--- ncurses-6.1-20190928+/misc/gen-pkgconfig.in	2019-09-28 12:53:53.000000000 +0000
86+++ ncurses-6.1-20191005/misc/gen-pkgconfig.in	2019-10-05 22:25:47.000000000 +0000
87@@ -1,5 +1,5 @@
88 #!@SHELL@
89-# $Id: gen-pkgconfig.in,v 1.36 2019/09/28 12:53:53 tom Exp $
90+# $Id: gen-pkgconfig.in,v 1.38 2019/10/05 22:25:47 tom Exp $
91 ##############################################################################
92 # Copyright (c) 2009-2018,2019 Free Software Foundation, Inc.                #
93 #                                                                            #
94@@ -70,11 +70,11 @@
95 if [ "$includedir" != "/usr/include" ]; then
96 	includetop=`echo "$includedir" | sed -e 's,/include/[^/]*$,/include,'`
97 	[ "$includetop" = "/usr/include" ] && includetop="$includedir"
98+	CFLAGS="$CFLAGS -I\${includedir}"
99 	if [ "x$includetop" != "x$includedir" ]
100 	then
101 		CFLAGS="$CFLAGS -I${includetop}"
102 	fi
103-	CFLAGS="$CFLAGS -I\${includedir}"
104 fi
105
106 LDFLAGS=
107@@ -106,6 +106,7 @@
108 	if [ $name = $MAIN_LIBRARY ]; then
109 		desc="$desc library"
110 		[ $NEED_TINFO = yes ] && LIBS="$LIBS -l$TINFO_ARG_SUFFIX"
111+		[ -n "@LIBS@" ] && LIBS="$LIBS @LIBS@"
112 	elif [ $name = $SUB_LIBRARY ]; then
113 		desc="$desc terminal interface library"
114 	elif expr $name : ".*${CXX_NAME}.*" >/dev/null ; then
115Index: misc/ncurses-config.in
116Prereq:  1.39
117--- ncurses-6.1-20190928+/misc/ncurses-config.in	2019-09-28 12:54:17.000000000 +0000
118+++ ncurses-6.1-20191005/misc/ncurses-config.in	2019-10-05 22:24:20.000000000 +0000
119@@ -1,5 +1,5 @@
120 #!@SHELL@
121-# $Id: ncurses-config.in,v 1.39 2019/09/28 12:54:17 tom Exp $
122+# $Id: ncurses-config.in,v 1.40 2019/10/05 22:24:20 tom Exp $
123 ##############################################################################
124 # Copyright (c) 2006-2018,2019 Free Software Foundation, Inc.                #
125 #                                                                            #
126@@ -86,7 +86,7 @@
127 	esac
128 fi
129
130-LIBS="@LIBS@ @PRIVATE_LIBS@"
131+LIBS="@LIBS@"
132 if [ "@TINFO_NAME@" = "@LIB_NAME@" ]; then
133 	LIBS="-l${THIS} $LIBS"
134 else
135Index: package/debian-mingw/changelog
136--- ncurses-6.1-20190928+/package/debian-mingw/changelog	2019-09-27 18:43:59.000000000 +0000
137+++ ncurses-6.1-20191005/package/debian-mingw/changelog	2019-10-05 14:44:23.000000000 +0000
138@@ -1,8 +1,8 @@
139-ncurses6 (6.1+20190928) unstable; urgency=low
140+ncurses6 (6.1+20191005) unstable; urgency=low
141
142   * latest weekly patch
143
144- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 22 Sep 2019 14:43:59 -0400
145+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 05 Oct 2019 10:44:23 -0400
146
147 ncurses6 (5.9-20131005) unstable; urgency=low
148
149Index: package/debian-mingw64/changelog
150--- ncurses-6.1-20190928+/package/debian-mingw64/changelog	2019-09-27 18:43:59.000000000 +0000
151+++ ncurses-6.1-20191005/package/debian-mingw64/changelog	2019-10-05 14:44:23.000000000 +0000
152@@ -1,8 +1,8 @@
153-ncurses6 (6.1+20190928) unstable; urgency=low
154+ncurses6 (6.1+20191005) unstable; urgency=low
155
156   * latest weekly patch
157
158- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 22 Sep 2019 14:43:59 -0400
159+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 05 Oct 2019 10:44:23 -0400
160
161 ncurses6 (5.9-20131005) unstable; urgency=low
162
163Index: package/debian/changelog
164--- ncurses-6.1-20190928+/package/debian/changelog	2019-09-27 18:43:59.000000000 +0000
165+++ ncurses-6.1-20191005/package/debian/changelog	2019-10-05 14:44:23.000000000 +0000
166@@ -1,8 +1,8 @@
167-ncurses6 (6.1+20190928) unstable; urgency=low
168+ncurses6 (6.1+20191005) unstable; urgency=low
169
170   * latest weekly patch
171
172- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 22 Sep 2019 14:43:59 -0400
173+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 05 Oct 2019 10:44:23 -0400
174
175 ncurses6 (5.9-20120608) unstable; urgency=low
176
177Index: package/mingw-ncurses.nsi
178Prereq:  1.353
179--- ncurses-6.1-20190928+/package/mingw-ncurses.nsi	2019-09-27 18:43:59.000000000 +0000
180+++ ncurses-6.1-20191005/package/mingw-ncurses.nsi	2019-10-05 14:44:23.000000000 +0000
181@@ -1,4 +1,4 @@
182-; $Id: mingw-ncurses.nsi,v 1.353 2019/09/27 18:43:59 tom Exp $
183+; $Id: mingw-ncurses.nsi,v 1.354 2019/10/05 14:44:23 tom Exp $
184
185 ; TODO add examples
186 ; TODO bump ABI to 6
187@@ -10,7 +10,7 @@
188 !define VERSION_MAJOR "6"
189 !define VERSION_MINOR "1"
190 !define VERSION_YYYY  "2019"
191-!define VERSION_MMDD  "0928"
192+!define VERSION_MMDD  "1005"
193 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
194
195 !define MY_ABI   "5"
196Index: package/mingw-ncurses.spec
197--- ncurses-6.1-20190928+/package/mingw-ncurses.spec	2019-09-27 18:43:59.000000000 +0000
198+++ ncurses-6.1-20191005/package/mingw-ncurses.spec	2019-10-05 14:44:23.000000000 +0000
199@@ -3,7 +3,7 @@
200 Summary: shared libraries for terminal handling
201 Name: mingw32-ncurses6
202 Version: 6.1
203-Release: 20190928
204+Release: 20191005
205 License: X11
206 Group: Development/Libraries
207 Source: ncurses-%{version}-%{release}.tgz
208Index: package/ncurses.spec
209--- ncurses-6.1-20190928+/package/ncurses.spec	2019-09-27 18:43:59.000000000 +0000
210+++ ncurses-6.1-20191005/package/ncurses.spec	2019-10-05 14:44:23.000000000 +0000
211@@ -1,7 +1,7 @@
212 Summary: shared libraries for terminal handling
213 Name: ncurses6
214 Version: 6.1
215-Release: 20190928
216+Release: 20191005
217 License: X11
218 Group: Development/Libraries
219 Source: ncurses-%{version}-%{release}.tgz
220Index: package/ncursest.spec
221--- ncurses-6.1-20190928+/package/ncursest.spec	2019-09-27 18:43:59.000000000 +0000
222+++ ncurses-6.1-20191005/package/ncursest.spec	2019-10-05 14:44:23.000000000 +0000
223@@ -1,7 +1,7 @@
224 Summary: Curses library with POSIX thread support.
225 Name: ncursest6
226 Version: 6.1
227-Release: 20190928
228+Release: 20191005
229 License: X11
230 Group: Development/Libraries
231 Source: ncurses-%{version}-%{release}.tgz
232