From 2a3e5b0949f9eca0620d2548488cf81904ad3c83 Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Tue, 1 Sep 2020 00:23:25 +0000 Subject: [PATCH 1/1] ncurses 6.2 - patch 20200831 + build-fix for awk-scripts modified for win32-driver (report by Werner Fink). --- NEWS | 8 ++++++-- VERSION | 2 +- dist.mk | 4 ++-- mk-1st.awk | 3 +-- mk-2nd.awk | 3 +-- mk-hdr.awk | 3 +-- 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, 23 insertions(+), 22 deletions(-) diff --git a/NEWS b/NEWS index 86343ee1..18dec72b 100644 --- a/NEWS +++ b/NEWS @@ -26,7 +26,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: NEWS,v 1.3550 2020/08/30 00:55:34 tom Exp $ +-- $Id: NEWS,v 1.3552 2020/09/01 00:21:01 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -46,6 +46,10 @@ See the AUTHORS file for the corresponding full names. Changes through 1.9.9e did not credit all contributions; it is not possible to add this information. +20200831 + + build-fix for awk-scripts modified for win32-driver (report by Werner + Fink). + 20200829 + remove a redundant NCURSES_EXPORT as a build-fix for "Maarten Anonymous". @@ -54,7 +58,7 @@ it is not possible to add this information. + modify configure script, moving gcc -Werror options to EXTRA_CFLAGS to avoid breaking configure-checks (adapted from ongoing work on mawk and lynx). - > errate for terminfo.src (report by Florian Weimer): + > errata for terminfo.src (report by Florian Weimer): + correct icl6404 csr + correct ti916 cup + improve ndr9500 diff --git a/VERSION b/VERSION index 10b0d98c..563782ac 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5:0:10 6.2 20200829 +5:0:10 6.2 20200831 diff --git a/dist.mk b/dist.mk index babedaaf..1a26f01d 100644 --- a/dist.mk +++ b/dist.mk @@ -26,7 +26,7 @@ # use or other dealings in this Software without prior written # # authorization. # ############################################################################## -# $Id: dist.mk,v 1.1370 2020/08/29 10:53:55 tom Exp $ +# $Id: dist.mk,v 1.1371 2020/08/31 19:51:51 tom Exp $ # Makefile for creating ncurses distributions. # # This only needs to be used directly as a makefile by developers, but @@ -38,7 +38,7 @@ SHELL = /bin/sh # These define the major/minor/patch versions of ncurses. NCURSES_MAJOR = 6 NCURSES_MINOR = 2 -NCURSES_PATCH = 20200829 +NCURSES_PATCH = 20200831 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) diff --git a/mk-1st.awk b/mk-1st.awk index 7f261e72..74bc2ebe 100644 --- a/mk-1st.awk +++ b/mk-1st.awk @@ -1,4 +1,4 @@ -# $Id: mk-1st.awk,v 1.108 2020/08/29 22:02:56 tom Exp $ +# $Id: mk-1st.awk,v 1.109 2020/08/31 23:49:24 tom Exp $ ############################################################################## # Copyright 2018,2020 Thomas E. Dickey # # Copyright 1998-2016,2017 Free Software Foundation, Inc. # @@ -262,7 +262,6 @@ function install_dll(directory,filename) { function in_subset(value) { value = " " value " "; check = subset; - sub(" .*$", "", check); gsub("[+]", " ", check); check = " " check " "; return index(check,value); diff --git a/mk-2nd.awk b/mk-2nd.awk index 147ea0d3..3fe7ed3d 100644 --- a/mk-2nd.awk +++ b/mk-2nd.awk @@ -1,4 +1,4 @@ -# $Id: mk-2nd.awk,v 1.21 2020/08/29 22:05:45 tom Exp $ +# $Id: mk-2nd.awk,v 1.22 2020/08/31 23:49:17 tom Exp $ ############################################################################## # Copyright 2020 Thomas E. Dickey # # Copyright 1998-2004,2005 Free Software Foundation, Inc. # @@ -56,7 +56,6 @@ function in_subset(value) { value = " " value " "; check = subset; - sub(" .*$", "", check); gsub("[+]", " ", check); check = " " check " "; return index(check,value); diff --git a/mk-hdr.awk b/mk-hdr.awk index b4b9e723..2fa5941e 100644 --- a/mk-hdr.awk +++ b/mk-hdr.awk @@ -1,4 +1,4 @@ -# $Id: mk-hdr.awk,v 1.6 2020/08/29 22:07:18 tom Exp $ +# $Id: mk-hdr.awk,v 1.7 2020/08/31 23:48:44 tom Exp $ ############################################################################## # Copyright 2020 Thomas E. Dickey # # Copyright 2007-2010,2013 Free Software Foundation, Inc. # @@ -42,7 +42,6 @@ function basename(path) { function in_subset(value) { value = " " value " "; check = subset; - sub(" .*$", "", check); gsub("[+]", " ", check); check = " " check " "; return index(check,value); diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog index 94dff821..fa26472a 100644 --- a/package/debian-mingw/changelog +++ b/package/debian-mingw/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.2+20200829) unstable; urgency=low +ncurses6 (6.2+20200831) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 29 Aug 2020 06:53:55 -0400 + -- Thomas E. Dickey Mon, 31 Aug 2020 15:51:51 -0400 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog index 94dff821..fa26472a 100644 --- a/package/debian-mingw64/changelog +++ b/package/debian-mingw64/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.2+20200829) unstable; urgency=low +ncurses6 (6.2+20200831) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 29 Aug 2020 06:53:55 -0400 + -- Thomas E. Dickey Mon, 31 Aug 2020 15:51:51 -0400 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian/changelog b/package/debian/changelog index 35ecd430..936003ed 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.2+20200829) unstable; urgency=low +ncurses6 (6.2+20200831) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 29 Aug 2020 06:53:55 -0400 + -- Thomas E. Dickey Mon, 31 Aug 2020 15:51:51 -0400 ncurses6 (5.9-20120608) unstable; urgency=low diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi index 0b6a4ef0..17561615 100644 --- a/package/mingw-ncurses.nsi +++ b/package/mingw-ncurses.nsi @@ -1,4 +1,4 @@ -; $Id: mingw-ncurses.nsi,v 1.414 2020/08/29 10:53:55 tom Exp $ +; $Id: mingw-ncurses.nsi,v 1.415 2020/08/31 19:51:51 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 "0829" +!define VERSION_MMDD "0831" !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} !define MY_ABI "5" diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec index c407c339..a5c08994 100644 --- a/package/mingw-ncurses.spec +++ b/package/mingw-ncurses.spec @@ -3,7 +3,7 @@ Summary: shared libraries for terminal handling Name: mingw32-ncurses6 Version: 6.2 -Release: 20200829 +Release: 20200831 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncurses.spec b/package/ncurses.spec index d32a4570..e99aefa2 100644 --- a/package/ncurses.spec +++ b/package/ncurses.spec @@ -1,7 +1,7 @@ Summary: shared libraries for terminal handling Name: ncurses6 Version: 6.2 -Release: 20200829 +Release: 20200831 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncursest.spec b/package/ncursest.spec index 965900f3..49c36532 100644 --- a/package/ncursest.spec +++ b/package/ncursest.spec @@ -1,7 +1,7 @@ Summary: Curses library with POSIX thread support. Name: ncursest6 Version: 6.2 -Release: 20200829 +Release: 20200831 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz -- 2.44.0