From 4a864172ab2e7d301d9db9e80fb4c617e3ed7b6e Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Sun, 17 Oct 2021 21:17:19 +0000 Subject: [PATCH] ncurses 6.2 - patch 20211017 + amend change for pkg-config to account for "none" being returned in the libdir-path result rather than "no" (report by Gabriele Balducci). --- Ada95/aclocal.m4 | 6 +++--- Ada95/configure | 2 +- NEWS | 6 +++++- VERSION | 2 +- aclocal.m4 | 10 +++++----- configure | 4 ++-- dist.mk | 4 ++-- 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 +- 14 files changed, 30 insertions(+), 26 deletions(-) diff --git a/Ada95/aclocal.m4 b/Ada95/aclocal.m4 index 76152855..75e68c75 100644 --- a/Ada95/aclocal.m4 +++ b/Ada95/aclocal.m4 @@ -29,7 +29,7 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey dnl -dnl $Id: aclocal.m4,v 1.184 2021/10/11 00:18:09 tom Exp $ +dnl $Id: aclocal.m4,v 1.185 2021/10/17 15:16:03 tom Exp $ dnl Macros used in NCURSES Ada95 auto-configuration script. dnl dnl These macros are maintained separately from NCURSES. The copyright on @@ -4771,7 +4771,7 @@ eval $3="$withval" AC_SUBST($3)dnl ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_PKG_CONFIG_LIBDIR version: 12 updated: 2021/10/10 20:18:09 +dnl CF_WITH_PKG_CONFIG_LIBDIR version: 13 updated: 2021/10/17 11:12:47 dnl ------------------------- dnl Allow the choice of the pkg-config library directory to be overridden. dnl @@ -4883,7 +4883,7 @@ do done AC_MSG_RESULT($cf_pkg_config_path) -if test "x$cf_pkg_config_path" != xno ; then +if test "x$cf_pkg_config_path" != xnone ; then # limit this to the first directory found PKG_CONFIG_LIBDIR="$cf_pkg_config_path" fi diff --git a/Ada95/configure b/Ada95/configure index 185849ae..0507ec8c 100755 --- a/Ada95/configure +++ b/Ada95/configure @@ -3379,7 +3379,7 @@ done echo "$as_me:3379: result: $cf_pkg_config_path" >&5 echo "${ECHO_T}$cf_pkg_config_path" >&6 -if test "x$cf_pkg_config_path" != xno ; then +if test "x$cf_pkg_config_path" != xnone ; then # limit this to the first directory found PKG_CONFIG_LIBDIR="$cf_pkg_config_path" fi diff --git a/NEWS b/NEWS index 632ef227..92aceb00 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.3727 2021/10/16 15:17:50 tom Exp $ +-- $Id: NEWS,v 1.3729 2021/10/17 15:11:55 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. +20211017 + + amend change for pkg-config to account for "none" being returned in + the libdir-path result rather than "no" (report by Gabriele Balducci). + 20211016 + build-fix for pmake with libtool. + improve make-tar.sh scripts, adding COPYING to tar file, and clean up diff --git a/VERSION b/VERSION index 0fb1b0e0..477411b6 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5:0:10 6.2 20211016 +5:0:10 6.2 20211017 diff --git a/aclocal.m4 b/aclocal.m4 index e746475d..96cae09c 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -29,7 +29,7 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey 1995-on dnl -dnl $Id: aclocal.m4,v 1.979 2021/10/11 00:20:48 tom Exp $ +dnl $Id: aclocal.m4,v 1.981 2021/10/17 15:14:04 tom Exp $ dnl Macros used in NCURSES auto-configuration script. dnl dnl These macros are maintained separately from NCURSES. The copyright on @@ -2041,7 +2041,7 @@ fi AC_SUBST(BROKEN_LINKER) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_ENABLE_PC_FILES version: 13 updated: 2015/11/01 05:27:39 +dnl CF_ENABLE_PC_FILES version: 14 updated: 2021/10/17 11:12:47 dnl ------------------ dnl This is the "--enable-pc-files" option, which is available if there is a dnl pkg-config configuration on the local machine. @@ -2066,7 +2066,7 @@ if test "x$enable_pc_files" != xno then MAKE_PC_FILES= case "x$PKG_CONFIG_LIBDIR" in - (xno|xyes) + (xno|xnone|xyes) AC_MSG_WARN(no PKG_CONFIG_LIBDIR was found) ;; (*) @@ -9206,7 +9206,7 @@ if test "x$with_pcre2" != xno ; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_PKG_CONFIG_LIBDIR version: 12 updated: 2021/10/10 20:18:09 +dnl CF_WITH_PKG_CONFIG_LIBDIR version: 13 updated: 2021/10/17 11:12:47 dnl ------------------------- dnl Allow the choice of the pkg-config library directory to be overridden. dnl @@ -9318,7 +9318,7 @@ do done AC_MSG_RESULT($cf_pkg_config_path) -if test "x$cf_pkg_config_path" != xno ; then +if test "x$cf_pkg_config_path" != xnone ; then # limit this to the first directory found PKG_CONFIG_LIBDIR="$cf_pkg_config_path" fi diff --git a/configure b/configure index 5c4add91..421cf859 100755 --- a/configure +++ b/configure @@ -4238,7 +4238,7 @@ done echo "$as_me:4238: result: $cf_pkg_config_path" >&5 echo "${ECHO_T}$cf_pkg_config_path" >&6 -if test "x$cf_pkg_config_path" != xno ; then +if test "x$cf_pkg_config_path" != xnone ; then # limit this to the first directory found PKG_CONFIG_LIBDIR="$cf_pkg_config_path" fi @@ -4266,7 +4266,7 @@ if test "x$enable_pc_files" != xno then MAKE_PC_FILES= case "x$PKG_CONFIG_LIBDIR" in - (xno|xyes) + (xno|xnone|xyes) { echo "$as_me:4270: WARNING: no PKG_CONFIG_LIBDIR was found" >&5 echo "$as_me: WARNING: no PKG_CONFIG_LIBDIR was found" >&2;} ;; diff --git a/dist.mk b/dist.mk index 06eeec0b..c521e145 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.1440 2021/10/16 08:28:32 tom Exp $ +# $Id: dist.mk,v 1.1441 2021/10/17 14:58:11 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 = 20211016 +NCURSES_PATCH = 20211017 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog index 8897eec1..729ccb35 100644 --- a/package/debian-mingw/changelog +++ b/package/debian-mingw/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.2+20211016) unstable; urgency=low +ncurses6 (6.2+20211017) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sun, 10 Oct 2021 11:29:02 -0400 + -- Thomas E. Dickey Sun, 17 Oct 2021 10:58:11 -0400 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog index 8897eec1..729ccb35 100644 --- a/package/debian-mingw64/changelog +++ b/package/debian-mingw64/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.2+20211016) unstable; urgency=low +ncurses6 (6.2+20211017) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sun, 10 Oct 2021 11:29:02 -0400 + -- Thomas E. Dickey Sun, 17 Oct 2021 10:58:11 -0400 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian/changelog b/package/debian/changelog index 3c3641bd..d59c231b 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.2+20211016) unstable; urgency=low +ncurses6 (6.2+20211017) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sun, 10 Oct 2021 11:29:02 -0400 + -- Thomas E. Dickey Sun, 17 Oct 2021 10:58:11 -0400 ncurses6 (5.9-20120608) unstable; urgency=low diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi index 85faaef3..7fa33938 100644 --- a/package/mingw-ncurses.nsi +++ b/package/mingw-ncurses.nsi @@ -1,4 +1,4 @@ -; $Id: mingw-ncurses.nsi,v 1.482 2021/10/10 15:29:02 tom Exp $ +; $Id: mingw-ncurses.nsi,v 1.483 2021/10/17 14:58:11 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 "2021" -!define VERSION_MMDD "1016" +!define VERSION_MMDD "1017" !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} !define MY_ABI "5" diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec index 5be2dd3b..b907a567 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: 20211016 +Release: 20211017 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncurses.spec b/package/ncurses.spec index fe3c2e5b..9e9767b3 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: 20211016 +Release: 20211017 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncursest.spec b/package/ncursest.spec index 68cc9fd3..51ab385c 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: 20211016 +Release: 20211017 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz -- 2.44.0