From 1a0bb95ebd085cdfd60b68c7b3cccbb31493d6d5 Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Sat, 8 Oct 2022 23:49:01 +0000 Subject: [PATCH] ncurses 6.3 - patch 20221008 + correct a switch-statement case in configure script to allow for test builds with ABI=7. + modify misc/gen-pkgconfig.in to allow for the case where the library directory does not yet exist, since this is processed before doing an install (report by Michal Liszcz). --- NEWS | 9 ++++++++- VERSION | 2 +- configure | 4 ++-- configure.in | 6 +++--- dist.mk | 4 ++-- misc/gen-pkgconfig.in | 8 ++++++-- 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, 33 insertions(+), 22 deletions(-) diff --git a/NEWS b/NEWS index 71154b93..1c0ee42b 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.3862 2022/10/01 22:20:28 tom Exp $ +-- $Id: NEWS,v 1.3864 2022/10/08 16:50:03 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -46,6 +46,13 @@ 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. +20221008 + + correct a switch-statement case in configure script to allow for test + builds with ABI=7. + + modify misc/gen-pkgconfig.in to allow for the case where the library + directory does not yet exist, since this is processed before doing an + install (report by Michal Liszcz). + 20221001 + modify configure/scripts to work around interference by GNU grep 3.8 (report by Sam James). diff --git a/VERSION b/VERSION index a5e3c00c..5c043d13 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5:0:10 6.3 20221001 +5:0:10 6.3 20221008 diff --git a/configure b/configure index df715aec..128cca2a 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.749 . +# From configure.in Revision: 1.750 . # Guess values for system-dependent variables and create Makefiles. # Generated by Autoconf 2.52.20210509. # @@ -15409,7 +15409,7 @@ case $cf_cv_abi_version in (6) NCURSES_MOUSE_VERSION=2 ;; -(789) +([789]) NCURSES_MOUSE_VERSION=3 ;; esac diff --git a/configure.in b/configure.in index 70e8ae1c..6a90e20f 100644 --- a/configure.in +++ b/configure.in @@ -29,7 +29,7 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey 1995-on dnl -dnl $Id: configure.in,v 1.749 2022/10/01 13:16:18 tom Exp $ +dnl $Id: configure.in,v 1.750 2022/10/08 15:54:35 tom Exp $ dnl Process this file with autoconf to produce a configure script. dnl dnl For additional information, see @@ -38,7 +38,7 @@ dnl https://invisible-island.net/autoconf/my-autoconf.html dnl dnl --------------------------------------------------------------------------- AC_PREREQ(2.52.20210101) -AC_REVISION($Revision: 1.749 $) +AC_REVISION($Revision: 1.750 $) AC_INIT(ncurses/base/lib_initscr.c) AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin) @@ -1272,7 +1272,7 @@ case $cf_cv_abi_version in (6) NCURSES_MOUSE_VERSION=2 ;; -([789]) +([[789]]) NCURSES_MOUSE_VERSION=3 ;; esac diff --git a/dist.mk b/dist.mk index fe6721fa..fd35b793 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.1505 2022/10/01 13:15:31 tom Exp $ +# $Id: dist.mk,v 1.1506 2022/10/08 10:25:44 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 = 3 -NCURSES_PATCH = 20221001 +NCURSES_PATCH = 20221008 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) diff --git a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in index 99ab584f..89a5cd4a 100644 --- a/misc/gen-pkgconfig.in +++ b/misc/gen-pkgconfig.in @@ -1,5 +1,5 @@ #!@SHELL@ -# $Id: gen-pkgconfig.in,v 1.55 2022/08/27 19:07:03 tom Exp $ +# $Id: gen-pkgconfig.in,v 1.56 2022/10/08 16:45:20 tom Exp $ ############################################################################## # Copyright 2018-2021,2022 Thomas E. Dickey # # Copyright 2009-2015,2018 Free Software Foundation, Inc. # @@ -103,7 +103,11 @@ do ;; -L*) lib_check=`echo "x$opt" | sed -e 's/^.-L//'` - [ -d "$lib_check" ] || continue + # on a new/nonstandard install, $libdir may not yet exist at this point + if [ "$libdir" != "$lib_check" ] + then + [ -d "$lib_check" ] || continue + fi case "$lib_check" in @LD_SEARCHPATH@) # skip standard libdir if [ "$lib_check" = "$libdir" ] diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog index 6cb5c7a2..75a6e552 100644 --- a/package/debian-mingw/changelog +++ b/package/debian-mingw/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.3+20221001) unstable; urgency=low +ncurses6 (6.3+20221008) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Fri, 30 Sep 2022 20:16:53 -0400 + -- Thomas E. Dickey Sat, 08 Oct 2022 06:25:44 -0400 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog index 6cb5c7a2..75a6e552 100644 --- a/package/debian-mingw64/changelog +++ b/package/debian-mingw64/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.3+20221001) unstable; urgency=low +ncurses6 (6.3+20221008) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Fri, 30 Sep 2022 20:16:53 -0400 + -- Thomas E. Dickey Sat, 08 Oct 2022 06:25:44 -0400 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian/changelog b/package/debian/changelog index 28f08aa5..31b14a14 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.3+20221001) unstable; urgency=low +ncurses6 (6.3+20221008) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Fri, 30 Sep 2022 20:16:53 -0400 + -- Thomas E. Dickey Sat, 08 Oct 2022 06:25:44 -0400 ncurses6 (5.9-20120608) unstable; urgency=low diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi index e00eccb7..02acf867 100644 --- a/package/mingw-ncurses.nsi +++ b/package/mingw-ncurses.nsi @@ -1,4 +1,4 @@ -; $Id: mingw-ncurses.nsi,v 1.544 2022/10/01 09:34:57 tom Exp $ +; $Id: mingw-ncurses.nsi,v 1.545 2022/10/08 10:25:44 tom Exp $ ; TODO add examples ; TODO bump ABI to 6 @@ -10,7 +10,7 @@ !define VERSION_MAJOR "6" !define VERSION_MINOR "3" !define VERSION_YYYY "2022" -!define VERSION_MMDD "1001" +!define VERSION_MMDD "1008" !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} !define MY_ABI "5" diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec index 6ca2069a..7645a57c 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.3 -Release: 20221001 +Release: 20221008 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncurses.spec b/package/ncurses.spec index f2ccaaac..20f06a1a 100644 --- a/package/ncurses.spec +++ b/package/ncurses.spec @@ -1,7 +1,7 @@ Summary: shared libraries for terminal handling Name: ncurses6 Version: 6.3 -Release: 20221001 +Release: 20221008 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncursest.spec b/package/ncursest.spec index 0075bdfb..af9e0dfa 100644 --- a/package/ncursest.spec +++ b/package/ncursest.spec @@ -1,7 +1,7 @@ Summary: Curses library with POSIX thread support. Name: ncursest6 Version: 6.3 -Release: 20221001 +Release: 20221008 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz -- 2.45.0