ncurses 6.1 - patch 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).

diff --git a/NEWS b/NEWS
index 08a5db7c835137424cb32df90c448373c4d06b83..cba4bc872ab6732640fb0238c029f382baccaa78 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -25,7 +25,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
 -- 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
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started


@@ -45,6 +45,14 @@ 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.
 
 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
 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

diff --git a/VERSION b/VERSION
index 80ea91ec185891f3404d6577ae8a1f362d03c233..1296c1fcc43932282e08e5d7638bfc06d5add97d 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10 6.1     20191109
+5:0:10 6.1     20191116

diff --git a/configure b/configure
index fe8269b18daad2494b9d4666a0593ac7bf851ba7..41c59062ed31225bfd301d88b62513e3ce1d70d0 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
 #! /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.
 #
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20190901.
 #


@@ -17119,7 +17119,7 @@ echo "${ECHO_T}$enable_gnat_projects" >&6
 case $cf_cv_system_name in
 (*mingw32*|*mingw64*)
        CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
 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
        ;;
 (*)
 echo "$as_me:17125: checking for gettimeofday" >&5

diff --git a/configure.in b/configure.in
index c8991a4438eaec5ae862750a1fb298b15b74cdbd..4201c33ef79617ff28e05e5130eb118bc6e75873 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -28,14 +28,14 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
 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)
 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)
 
 AC_INIT(ncurses/base/lib_initscr.c)
 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
 


@@ -1616,7 +1616,7 @@ CF_DISABLE_GNAT_PROJECTS
 case $cf_cv_system_name in
 (*mingw32*|*mingw64*)
        CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
 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,
        ;;
 (*)
 AC_CHECK_FUNC(gettimeofday,

diff --git a/dist.mk b/dist.mk
index e5fa629a7157e0ab745fbb5e90f8fc65a0629282..4cc2b9df310494e46dec732c5c42125609bc853f 100644 (file)
--- a/dist.mk
+++ b/dist.mk
@@ -25,7 +25,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
 # 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
 # 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
 # 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)
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)

diff --git a/ncurses/Makefile.in b/ncurses/Makefile.in
index 7c4bb15d1a483347d3181b321e8159994a9b162c..27f7689b7124d6bcd31b428bbf3e856c8d0c6e6a 100644 (file)
--- a/ncurses/Makefile.in
+++ b/ncurses/Makefile.in
@@ -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.                #
 #                                                                            #
 ##############################################################################
 # Copyright (c) 1998-2018,2019 Free Software Foundation, Inc.                #
 #                                                                            #


@@ -126,12 +126,12 @@ CFLAGS_SHARED     = $(CCFLAGS) @CC_SHARED_OPTS@
 CFLAGS_DEFAULT = $(CFLAGS_@DFT_UPR_MODEL@)
 
 LINK           = $(LIBTOOL)
 CFLAGS_DEFAULT = $(CFLAGS_@DFT_UPR_MODEL@)
 
 LINK           = $(LIBTOOL)

-LDFLAGS                = @LDFLAGS@ @LD_MODEL@ @LIBS@
+LDFLAGS                = @LDFLAGS@ @LD_MODEL@

 
 SHLIB_DIRS     = -L../lib
 
 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@
 
 RPATH_LIST     = @RPATH_LIST@
 RESULTING_SYMS = @RESULTING_SYMS@

diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index e41a8ca13abbd6d4ca9c6ed3271f8f2a6085c088..caab034c10e7d6002a555357c6c785e6c9e3f006 100644 (file)
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20191109) unstable; urgency=low
+ncurses6 (6.1+20191116) unstable; urgency=low

 
   * latest weekly patch
 
 
   * 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
 
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 

diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index a1424183a40b2b93e846042ba196bb9d3cb34468..caab034c10e7d6002a555357c6c785e6c9e3f006 100644 (file)
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20191109) unstable; urgency=low
+ncurses6 (6.1+20191116) unstable; urgency=low

 
   * latest weekly patch
 
 
   * 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
 
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 

diff --git a/package/debian/changelog b/package/debian/changelog
index f464f3f4ef882b5bfd54eb604f5baf05b7e24342..252c8297f1a72c5d72af39bba7857c375938f4a1 100644 (file)
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20191109) unstable; urgency=low
+ncurses6 (6.1+20191116) unstable; urgency=low

 
   * latest weekly patch
 
 
   * 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
 
 
 ncurses6 (5.9-20120608) unstable; urgency=low
 

diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 2983c513073003d76bac767b791b83e1774c3d0f..bf7ffe7cc3bd726b3a33092a6e12bbbcd1e795b5 100644 (file)
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.360 2019/11/06 09:37:05 tom Exp $\r
+; $Id: mingw-ncurses.nsi,v 1.361 2019/11/16 15:09:15 tom Exp $\r

 \r
 ; TODO add examples\r
 ; TODO bump ABI to 6\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  "2019"\r
 !define VERSION_MAJOR "6"\r
 !define VERSION_MINOR "1"\r
 !define VERSION_YYYY  "2019"\r

-!define VERSION_MMDD  "1109"\r
+!define VERSION_MMDD  "1116"\r

 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}\r
 \r
 !define MY_ABI   "5"\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 24d9fdc0ad586ce7d802dccf0fec84d1a2325420..2a763888741a906e61f75949d2016969e6a024de 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
 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
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

diff --git a/package/ncurses.spec b/package/ncurses.spec
index d5cc631f0f6718a121a1be9fe25d28db04ed1241..3f536bc8ca694116d08fd1f160e0006d6d614a05 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
 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
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

diff --git a/package/ncursest.spec b/package/ncursest.spec
index 90f6c5b787848243bd573b9b11f3773ac35ff040..791311390c6f9ecacbdaea565d11c9903994f555 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
 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
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz