From 414771292d2331e48bc09f49813998adc33929e2 Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Sat, 27 Aug 2022 23:30:06 +0000 Subject: [PATCH] ncurses 6.3 - patch 20220827 + modify configure scripts to use overlooked cases for LD and PKG_CONFIG variables (report by Alan Webb, Gentoo #866398). + modify nsterm to use xterm+alt1049 (report by Paul Handly) -TD + modify putty to use xterm+alt1049 -TD --- NEWS | 8 +++++++- VERSION | 2 +- aclocal.m4 | 6 +++--- configure | 2 +- dist.mk | 4 ++-- misc/gen-pkgconfig.in | 4 ++-- misc/terminfo.src | 29 ++++++++++++++++++----------- 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, 45 insertions(+), 32 deletions(-) diff --git a/NEWS b/NEWS index 521b8c7a..0d85c72d 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.3848 2022/08/20 18:30:07 tom Exp $ +-- $Id: NEWS,v 1.3851 2022/08/27 19:29:31 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -46,6 +46,12 @@ 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. +20220827 + + modify configure scripts to use overlooked cases for LD and + PKG_CONFIG variables (report by Alan Webb, Gentoo #866398). + + modify nsterm to use xterm+alt1049 (report by Paul Handly) -TD + + modify putty to use xterm+alt1049 -TD + 20220820 + fix some cppcheck warnings, mostly style, in ncurses and c++ libraries and progs directory. diff --git a/VERSION b/VERSION index 8d283238..290b0f4e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5:0:10 6.3 20220820 +5:0:10 6.3 20220827 diff --git a/aclocal.m4 b/aclocal.m4 index 7fc80c4d..31378748 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.1008 2022/08/20 20:07:55 tom Exp $ +dnl $Id: aclocal.m4,v 1.1009 2022/08/27 19:47:35 tom Exp $ dnl Macros used in NCURSES auto-configuration script. dnl dnl These macros are maintained separately from NCURSES. The copyright on @@ -4309,7 +4309,7 @@ then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_LD_SEARCHPATH version: 3 updated: 2021/03/05 19:13:35 +dnl CF_LD_SEARCHPATH version: 4 updated: 2022/08/27 15:43:08 dnl ---------------- dnl Try to obtain the linker's search-path, for use in scripts. dnl @@ -4320,7 +4320,7 @@ AC_CACHE_CHECK(for linker search path,cf_cv_ld_searchpath,[ if test "$cross_compiling" != yes ; then # GNU binutils' ld does not involve permissions which may stop ldconfig. -cf_pathlist=`ld --verbose 2>/dev/null | grep SEARCH_DIR | sed -e 's,SEARCH_DIR[[("=]][[("=]]*,,g' -e 's/"[[)]];//gp' | sort -u` +cf_pathlist=`${LD:-ld} --verbose 2>/dev/null | grep SEARCH_DIR | sed -e 's,SEARCH_DIR[[("=]][[("=]]*,,g' -e 's/"[[)]];//gp' | sort -u` # The -NX options tell newer versions of Linux ldconfig to not attempt to # update the cache, which makes it run faster. diff --git a/configure b/configure index e7dff243..aeb93b87 100755 --- a/configure +++ b/configure @@ -29084,7 +29084,7 @@ else if test "$cross_compiling" != yes ; then # GNU binutils' ld does not involve permissions which may stop ldconfig. -cf_pathlist=`ld --verbose 2>/dev/null | grep SEARCH_DIR | sed -e 's,SEARCH_DIR[("=][("=]*,,g' -e 's/"[)];//gp' | sort -u` +cf_pathlist=`${LD:-ld} --verbose 2>/dev/null | grep SEARCH_DIR | sed -e 's,SEARCH_DIR[("=][("=]*,,g' -e 's/"[)];//gp' | sort -u` # The -NX options tell newer versions of Linux ldconfig to not attempt to # update the cache, which makes it run faster. diff --git a/dist.mk b/dist.mk index 8b4cbe79..7cd25aeb 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.1498 2022/08/20 09:47:59 tom Exp $ +# $Id: dist.mk,v 1.1499 2022/08/27 09:47:02 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 = 20220820 +NCURSES_PATCH = 20220827 # 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 cc6791e1..99ab584f 100644 --- a/misc/gen-pkgconfig.in +++ b/misc/gen-pkgconfig.in @@ -1,5 +1,5 @@ #!@SHELL@ -# $Id: gen-pkgconfig.in,v 1.54 2022/07/26 20:19:50 tom Exp $ +# $Id: gen-pkgconfig.in,v 1.55 2022/08/27 19:07:03 tom Exp $ ############################################################################## # Copyright 2018-2021,2022 Thomas E. Dickey # # Copyright 2009-2015,2018 Free Software Foundation, Inc. # @@ -170,7 +170,7 @@ fi # The "URL" feature came in pkg-config 0.17 USEURL="" -CFGVER=`pkg-config --version 2>/dev/null |head -n 1 | awk -F. '/0.[0-9][0-9]/{print $2;}'` +CFGVER=`${PKG_CONFIG:-pkg-config} --version 2>/dev/null |head -n 1 | awk -F. '/0.[0-9][0-9]/{print $2;}'` # A missing version should simply fail, but some packagers insist on building # packages on machines which do not actually have the tools they depend on at # runtime. diff --git a/misc/terminfo.src b/misc/terminfo.src index 6c2b8f0c..8a4f9d5c 100644 --- a/misc/terminfo.src +++ b/misc/terminfo.src @@ -6,8 +6,8 @@ # Report bugs and new terminal descriptions to # bug-ncurses@gnu.org # -# $Revision: 1.1029 $ -# $Date: 2022/07/03 21:39:22 $ +# $Revision: 1.1032 $ +# $Date: 2022/08/27 18:44:46 $ # # The original header is preserved below for reference. It is noted that there # is a "newer" version which differs in some cosmetic details (but actually @@ -3691,9 +3691,12 @@ nsterm-build400|Terminal.app in OS X 10.13, rmso=\E[27m, rmul=\E[24m, use=xterm+sm+1006, use=ecma+italics, use=nsterm-build361, +nsterm-build440|Terminal.app in MacOS 11.6.8, + use=xterm+alt1049, use=nsterm-build400, + # This is an alias which should always point to the "current" version nsterm|nsterm-256color|Apple_Terminal|AppKit Terminal.app, - use=nsterm-build400, + use=nsterm-build440, #### iTerm, iTerm2 @@ -4276,20 +4279,20 @@ putty|PuTTY terminal emulator, kbs=^?, kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kind=\E[B, kri=\E[A, kspd=^Z, nel=\r\n, oc=\E]R, op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O, - rmam=\E[?7l, rmcup=\E[2J\E[?47l, rmir=\E[4l, - rmkx=\E[?1l\E>, rmpch=\E[10m, rmso=\E[27m, rmul=\E[24m, + rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, rmpch=\E[10m, + rmso=\E[27m, rmul=\E[24m, rs2=\E<\E["p\E[50;6"p\Ec\E[?3l\E]R\E[?1000l, s0ds=\E[10m, s1ds=\E[11m, s2ds=\E[12m, sc=\E7, setab=\E[4%p1%dm, setaf=\E[3%p1%dm, sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5 %;m%?%p9%t\016%e\017%;, - sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smcup=\E[?47h, - smir=\E[4h, smkx=\E[?1h\E=, smpch=\E[11m, smso=\E[7m, - smul=\E[4m, vpa=\E[%i%p1%dd, E3=\E[3J, use=vt220+pcedit, + sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smir=\E[4h, + smkx=\E[?1h\E=, smpch=\E[11m, smso=\E[7m, smul=\E[4m, + vpa=\E[%i%p1%dd, E3=\E[3J, use=vt220+pcedit, use=ansi+tabs, use=ansi+rep, use=ecma+index, - use=xterm+sm+1006, use=putty+fnkeys, use=vt102+enq, - use=xterm+sl, use=vt100+fnkeys, use=putty+keypad, - use=vt220+cvis, + use=xterm+alt1049, use=xterm+sm+1006, use=putty+fnkeys, + use=vt102+enq, use=xterm+sl, use=vt100+fnkeys, + use=putty+keypad, use=vt220+cvis, putty+keypad|PuTTY numeric keypad, kp1=\EOq, kp2=\EOr, kp3=\EOs, kp4=\EOt, kp5=\EOu, kp6=\EOv, kp7=\EOw, kp8=\EOx, kp9=\EOy, kpADD=\EOl, kpDIV=\EOQ, @@ -27649,4 +27652,8 @@ v3220|LANPAR Vision II model 3220/3221/3222, # supported the u6-u9 extension -TD # + add/use apollo+vt132, xterm+alt47 -TD # +# 2022-08-27 +# + modify nsterm to use xterm+alt1049 (report by Paul Handly) -TD +# + modify putty to use xterm+alt1049 -TD +# ######## SHANTIH! SHANTIH! SHANTIH! diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog index 84887742..60fa2926 100644 --- a/package/debian-mingw/changelog +++ b/package/debian-mingw/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.3+20220820) unstable; urgency=low +ncurses6 (6.3+20220827) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 20 Aug 2022 05:47:59 -0400 + -- Thomas E. Dickey Sat, 27 Aug 2022 05:47:02 -0400 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog index 84887742..60fa2926 100644 --- a/package/debian-mingw64/changelog +++ b/package/debian-mingw64/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.3+20220820) unstable; urgency=low +ncurses6 (6.3+20220827) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 20 Aug 2022 05:47:59 -0400 + -- Thomas E. Dickey Sat, 27 Aug 2022 05:47:02 -0400 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian/changelog b/package/debian/changelog index 5897d431..c43427b5 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.3+20220820) unstable; urgency=low +ncurses6 (6.3+20220827) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 20 Aug 2022 05:47:59 -0400 + -- Thomas E. Dickey Sat, 27 Aug 2022 05:47:02 -0400 ncurses6 (5.9-20120608) unstable; urgency=low diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi index 0f9f4a02..06f0f188 100644 --- a/package/mingw-ncurses.nsi +++ b/package/mingw-ncurses.nsi @@ -1,4 +1,4 @@ -; $Id: mingw-ncurses.nsi,v 1.538 2022/08/20 09:47:59 tom Exp $ +; $Id: mingw-ncurses.nsi,v 1.539 2022/08/27 09:47:02 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 "0820" +!define VERSION_MMDD "0827" !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} !define MY_ABI "5" diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec index 74bca996..d2d154bc 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: 20220820 +Release: 20220827 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncurses.spec b/package/ncurses.spec index 668b9db3..c059e1ee 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: 20220820 +Release: 20220827 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncursest.spec b/package/ncursest.spec index b0975304..477fb8e5 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: 20220820 +Release: 20220827 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz -- 2.44.0