ncurses 6.1 - patch 20181125

+ build-fix (reports by Chih-Hsuan Yen, Sven Joachim).

diff --git a/NEWS b/NEWS
index 89c7a6ecb3d3a5572aa2abe7e55fbb82300e3fb2..1b8d3af51a55652f2270b982e9fc14f0b6b648bf 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -25,7 +25,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3219 2018/11/24 22:39:15 tom Exp $
+-- $Id: NEWS,v 1.3222 2018/11/25 11:29:51 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -45,6 +45,9 @@ 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.
 
+20181125
+       + build-fix (reports by Chih-Hsuan Yen, Sven Joachim).
+
 20181124
        + check --with-fallbacks option to ensure there is a value, and add
          the fallback information to top-level Makefile summary.

diff --git a/VERSION b/VERSION
index d57e179e7342f5656f1556d90201ad8c84ab3468..4f05ff0adaf19b5192e277b0138d43c3fc7d9259 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10 6.1     20181124
+5:0:10 6.1     20181125

diff --git a/dist.mk b/dist.mk
index 23d0cb88a45e34355c61479360fc553ebcefb4c1..9bb06b65cb62a23053f869868a3021f5a3a2b22b 100644 (file)
--- a/dist.mk
+++ b/dist.mk
@@ -25,7 +25,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1252 2018/11/24 14:57:06 tom Exp $
+# $Id: dist.mk,v 1.1253 2018/11/25 11:25:14 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -37,7 +37,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 1
-NCURSES_PATCH = 20181124
+NCURSES_PATCH = 20181125
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)

diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h
index ade33c79f8ee2821b8899ab9cdc7d0bc3e110061..fd093f846477a96a84ce4059ea512c025519c65f 100644 (file)
--- a/ncurses/curses.priv.h
+++ b/ncurses/curses.priv.h
@@ -34,7 +34,7 @@
  ****************************************************************************/
 
 /*
- * $Id: curses.priv.h,v 1.607 2018/11/24 17:27:36 tom Exp $
+ * $Id: curses.priv.h,v 1.608 2018/11/25 11:26:03 tom Exp $
  *
  *     curses.priv.h
  *
@@ -1724,6 +1724,9 @@ extern NCURSES_EXPORT_VAR(SIG_ATOMIC_T) _nc_have_sigwinch;
 #define T_CREATE(fmt) "create :" fmt
 #define T_RETURN(fmt) "return }" fmt
 
+#define NonNull(s)              ((s) != 0 ? s : "<null>")
+#define NonEmpty(s)             ((s) != 0 && *(s) != '\0')
+
 #ifdef TRACE
 
 #if USE_REENTRANT
@@ -1762,8 +1765,6 @@ extern NCURSES_EXPORT(void)       _nc_locked_tracef (const char *, ...) GCC_PRINTFLIKE
 typedef void VoidFunc(void);
 
 #define TR_FUNC(value)          ((const char*) (value))
-#define NonNull(s)              ((s) != 0 ? s : "<null>")
-#define NonEmpty(s)             ((s) != 0 && *(s) != '\0')
 
 #define returnAttr(code)       TRACE_RETURN(code,attr_t)
 #define returnBits(code)       TRACE_RETURN(code,unsigned)

diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index b9529a133b6e0b3cd77e704ad3fc081145f437c4..7bad8b9dfa3f45423fb4436200779228c28b98b5 100644 (file)
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20181124) unstable; urgency=low
+ncurses6 (6.1+20181125) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 24 Nov 2018 09:57:06 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 25 Nov 2018 06:25:14 -0500
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 

diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index b9529a133b6e0b3cd77e704ad3fc081145f437c4..7bad8b9dfa3f45423fb4436200779228c28b98b5 100644 (file)
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20181124) unstable; urgency=low
+ncurses6 (6.1+20181125) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 24 Nov 2018 09:57:06 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 25 Nov 2018 06:25:14 -0500
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 

diff --git a/package/debian/changelog b/package/debian/changelog
index afbdb29a64962c61ce1c16753cfc619ac9395c30..1d8001ab96c2f94439533493fa18201c546b0f4c 100644 (file)
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20181124) unstable; urgency=low
+ncurses6 (6.1+20181125) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 24 Nov 2018 09:57:06 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 25 Nov 2018 06:25:14 -0500
 
 ncurses6 (5.9-20120608) unstable; urgency=low
 

diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index e48ef6e41bcca0143d42a7b00f382f3a612bbdaa..ed8793fbde8e0d50a5677378e235f5f0ec699669 100644 (file)
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.299 2018/11/24 14:57:06 tom Exp $\r
+; $Id: mingw-ncurses.nsi,v 1.300 2018/11/25 11:25:14 tom Exp $\r
 \r
 ; TODO add examples\r
 ; TODO bump ABI to 6\r
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"\r
 !define VERSION_MINOR "1"\r
 !define VERSION_YYYY  "2018"\r
-!define VERSION_MMDD  "1124"\r
+!define VERSION_MMDD  "1125"\r
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}\r
 \r
 !define MY_ABI   "5"\r

diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 19b31d4ecaee47118dad22eab55934f1710cc937..def525caf85fe5e73eadf8af5324df706837011f 100644 (file)
--- 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.1
-Release: 20181124
+Release: 20181125
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

diff --git a/package/ncurses.spec b/package/ncurses.spec
index fe9731bdd76ff0f5b3bca45d3dc0b0ecb4466bfc..77e60e81527df6287c6f2e2459cf62254b0ec3cd 100644 (file)
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.1
-Release: 20181124
+Release: 20181125
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

diff --git a/package/ncursest.spec b/package/ncursest.spec
index bcb8fbb88a703a208dd0fb5c5067de1de3e8ea1d..05cbc6099d95bdd39c698a8136b21f202abc7ddb 100644 (file)
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.1
-Release: 20181124
+Release: 20181125
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz