From: Thomas E. Dickey Date: Sun, 17 Nov 2019 01:23:05 +0000 (+0000) Subject: ncurses 6.1 - patch 20191116 X-Git-Tag: v6.2~10 X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=commitdiff_plain;h=97893bbc7248f5e4009f32c3afc7ca575172c5f3;ds=sidebyside 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 08a5db7c..cba4bc87 100644 --- a/NEWS +++ b/NEWS @@ -25,7 +25,7 @@ -- 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 @@ -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. +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 diff --git a/VERSION b/VERSION index 80ea91ec..1296c1fc 100644 --- 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 fe8269b1..41c59062 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /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. # @@ -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" - LIBS=" -lpsapi $LIBS" + # Note: WINVER may be a problem with Windows 10 ;; (*) echo "$as_me:17125: checking for gettimeofday" >&5 diff --git a/configure.in b/configure.in index c8991a44..4201c33e 100644 --- a/configure.in +++ b/configure.in @@ -28,14 +28,14 @@ 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) -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) @@ -1616,7 +1616,7 @@ CF_DISABLE_GNAT_PROJECTS 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, diff --git a/dist.mk b/dist.mk index e5fa629a..4cc2b9df 100644 --- 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.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 @@ -37,7 +37,7 @@ SHELL = /bin/sh # 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) diff --git a/ncurses/Makefile.in b/ncurses/Makefile.in index 7c4bb15d..27f7689b 100644 --- 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. # # # @@ -126,12 +126,12 @@ CFLAGS_SHARED = $(CCFLAGS) @CC_SHARED_OPTS@ CFLAGS_DEFAULT = $(CFLAGS_@DFT_UPR_MODEL@) LINK = $(LIBTOOL) -LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@ +LDFLAGS = @LDFLAGS@ @LD_MODEL@ 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@ diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog index e41a8ca1..caab034c 100644 --- 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 - -- Thomas E. Dickey Wed, 06 Nov 2019 04:37:04 -0500 + -- Thomas E. Dickey Sat, 16 Nov 2019 10:09:15 -0500 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog index a1424183..caab034c 100644 --- 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 - -- Thomas E. Dickey Wed, 06 Nov 2019 04:37:05 -0500 + -- Thomas E. Dickey Sat, 16 Nov 2019 10:09:15 -0500 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian/changelog b/package/debian/changelog index f464f3f4..252c8297 100644 --- 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 - -- Thomas E. Dickey Wed, 06 Nov 2019 04:37:04 -0500 + -- Thomas E. Dickey Sat, 16 Nov 2019 10:09:15 -0500 ncurses6 (5.9-20120608) unstable; urgency=low diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi index 2983c513..bf7ffe7c 100644 --- 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 $ +; $Id: mingw-ncurses.nsi,v 1.361 2019/11/16 15:09:15 tom Exp $ ; TODO add examples ; TODO bump ABI to 6 @@ -10,7 +10,7 @@ !define VERSION_MAJOR "6" !define VERSION_MINOR "1" !define VERSION_YYYY "2019" -!define VERSION_MMDD "1109" +!define VERSION_MMDD "1116" !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} !define MY_ABI "5" diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec index 24d9fdc0..2a763888 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.1 -Release: 20191109 +Release: 20191116 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncurses.spec b/package/ncurses.spec index d5cc631f..3f536bc8 100644 --- a/package/ncurses.spec +++ b/package/ncurses.spec @@ -1,7 +1,7 @@ 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 diff --git a/package/ncursest.spec b/package/ncursest.spec index 90f6c5b7..79131139 100644 --- 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: 20191109 +Release: 20191116 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz