From 4546e76f7d630a849ac9e17deda7bee36919f800 Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Sun, 24 Jan 2021 00:36:13 +0000 Subject: [PATCH] ncurses 6.2 - patch 20210123 + modify package/config scripts to provide an explicit -L option for cases when the loader search path has other directories preceding the one in which ncurses is installed (report by Yuri Victorovich). + minor build-fixes in configure script and makefiles to work around quirks of pmake. --- Ada95/Makefile.in | 14 +++++------ Ada95/doc/Makefile.in | 6 ++--- Ada95/gen/Makefile.in | 6 ++--- Ada95/samples/Makefile.in | 6 ++--- Ada95/src/Makefile.in | 8 +++--- NEWS | 9 ++++++- VERSION | 2 +- aclocal.m4 | 20 +++++++-------- c++/Makefile.in | 12 ++++----- configure | 16 ++++++------ dist.mk | 4 +-- form/Makefile.in | 6 ++--- misc/Makefile.in | 8 +++--- misc/gen-pkgconfig.in | 43 ++++++++++++++++++++++++++++---- misc/ncurses-config.in | 43 ++++++++++++++++++++++++++++---- ncurses/Makefile.in | 12 ++++----- 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 +- progs/Makefile.in | 16 ++++++------ 24 files changed, 163 insertions(+), 90 deletions(-) diff --git a/Ada95/Makefile.in b/Ada95/Makefile.in index 67625d7e..8d78bbf4 100644 --- a/Ada95/Makefile.in +++ b/Ada95/Makefile.in @@ -1,6 +1,6 @@ -# $Id: Makefile.in,v 1.23 2020/02/02 23:34:34 tom Exp $ +# $Id: Makefile.in,v 1.26 2021/01/23 20:34:50 tom Exp $ ############################################################################## -# Copyright 2020 Thomas E. Dickey # +# Copyright 2020,2021 Thomas E. Dickey # # Copyright 1998-2010,2015 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -31,7 +31,7 @@ # Author: Juergen Pfeifer, 1996 # # Version Control -# $Revision: 1.23 $ +# $Revision: 1.26 $ # SHELL = @SHELL@ VPATH = @srcdir@ @@ -39,7 +39,7 @@ THIS = Makefile SUBDIRS = @ADA_SUBDIRS@ -CF_MFLAGS = @cf_cv_makeflags@ +TOP_MFLAGS = @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" RPATH_LIST="$(RPATH_LIST)" @SET_MAKE@ all \ @@ -50,19 +50,19 @@ install.libs \ uninstall \ uninstall.libs :: for d in $(SUBDIRS); do \ - (cd $$d ; $(MAKE) $(CF_MFLAGS) $@) ;\ + ( cd $$d && $(MAKE) $(TOP_MFLAGS) $@ ) ;\ done clean \ mostlyclean :: for d in $(SUBDIRS); do \ - (cd $$d ; $(MAKE) $(CF_MFLAGS) $@) ;\ + ( cd $$d && $(MAKE) $(TOP_MFLAGS) $@ ) ;\ done distclean \ realclean :: for d in $(SUBDIRS); do \ - (cd $$d ; $(MAKE) $(CF_MFLAGS) $@) ;\ + ( cd $$d && $(MAKE) $(TOP_MFLAGS) $@ ) ;\ done rm -rf lib for lib_kind in static dynamic; do \ diff --git a/Ada95/doc/Makefile.in b/Ada95/doc/Makefile.in index 3ef39000..bde5c611 100644 --- a/Ada95/doc/Makefile.in +++ b/Ada95/doc/Makefile.in @@ -1,6 +1,6 @@ -# $Id: Makefile.in,v 1.7 2020/02/02 23:34:34 tom Exp $ +# $Id: Makefile.in,v 1.8 2021/01/23 20:42:08 tom Exp $ ############################################################################## -# Copyright 2019,2020 Thomas E. Dickey # +# Copyright 2019-2020,2021 Thomas E. Dickey # # Copyright 2011-2015,2018 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -69,7 +69,7 @@ uninstall uninstall.man : # HTML documentation is optional, usually in a separate package. install.html : $(DOCDIR) - cd $(srcdir) && tar -cf - *.htm* ada | tar -C $(DOCDIR) -xf - + ( cd $(srcdir) && tar -cf - *.htm* ada | tar -C $(DOCDIR) -xf - ) uninstall.html : -rm -rf $(DOCDIR) diff --git a/Ada95/gen/Makefile.in b/Ada95/gen/Makefile.in index 3518b60f..13835743 100644 --- a/Ada95/gen/Makefile.in +++ b/Ada95/gen/Makefile.in @@ -1,5 +1,5 @@ ############################################################################## -# Copyright 2019,2020 Thomas E. Dickey # +# Copyright 2019-2020,2021 Thomas E. Dickey # # Copyright 1998-2015,2018 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -30,7 +30,7 @@ # Author: Juergen Pfeifer, 1996 # and: Thomas E. Dickey, 1997 # -# $Id: Makefile.in,v 1.95 2020/08/29 16:58:25 tom Exp $ +# $Id: Makefile.in,v 1.96 2021/01/23 20:42:08 tom Exp $ # .SUFFIXES: @@ -311,7 +311,7 @@ adahtml: test -n "$(GNATHTML)" || exit 1 @find $(HTML_DIR) -type f -exec rm -f {} \; @mkdir -p $(HTML_DIR) - cp -p ../src/*.ad[sb] . && chmod +w *.ad[sb] + ( cp -p ../src/*.ad[sb] . && chmod +w *.ad[sb] ) @USE_OLD_MAKERULES@ ln -sf ../src/*.ali . @USE_GNAT_PROJECTS@ ln -sf ../static-ali/*.ali . @echo "Filtering generated files" diff --git a/Ada95/samples/Makefile.in b/Ada95/samples/Makefile.in index f7cd1e88..3a0c272f 100644 --- a/Ada95/samples/Makefile.in +++ b/Ada95/samples/Makefile.in @@ -1,5 +1,5 @@ ############################################################################## -# Copyright 2018-2019,2020 Thomas E. Dickey # +# Copyright 2018-2020,2021 Thomas E. Dickey # # Copyright 1998-2015,2018 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -29,7 +29,7 @@ # # Author: Juergen Pfeifer, 1996 # -# $Id: Makefile.in,v 1.61 2020/08/29 17:01:19 tom Exp $ +# $Id: Makefile.in,v 1.62 2021/01/23 20:42:08 tom Exp $ # .SUFFIXES: @@ -131,7 +131,7 @@ install.examples :: $(MY_DATADIR) $(INSTALL_DATA) explain.txt $(MY_DATADIR) uninstall.examples :: - -cd $(BINDIR) && rm -f $(PROGS) + -( cd $(BINDIR) && rm -f $(PROGS) ) -rmdir $(BINDIR) -rm -f $(MY_DATADIR)/explain.txt -rmdir $(MY_DATADIR) diff --git a/Ada95/src/Makefile.in b/Ada95/src/Makefile.in index 5855a107..8360779e 100644 --- a/Ada95/src/Makefile.in +++ b/Ada95/src/Makefile.in @@ -1,5 +1,5 @@ ############################################################################## -# Copyright 2018-2019,2020 Thomas E. Dickey # +# Copyright 2018-2020,2021 Thomas E. Dickey # # Copyright 1999-2016,2018 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -29,7 +29,7 @@ # # Author: Juergen Pfeifer, 1996 # -# $Id: Makefile.in,v 1.94 2020/12/05 21:19:40 tom Exp $ +# $Id: Makefile.in,v 1.95 2021/01/23 20:42:08 tom Exp $ # .SUFFIXES: @@ -184,7 +184,7 @@ $(BUILD_DIR_LIB) : mkdir -p $@ $(GENERATED_SOURCES) : - cd ../gen; $(MAKE) $(ADA_MFLAGS) + ( cd ../gen; $(MAKE) $(ADA_MFLAGS) ) sources : $(GENERATED_SOURCES) @echo made $@ @@ -391,7 +391,7 @@ uninstall.libs :: @MAKE_ADA_SHAREDLIB@ $(INSTALL_LIB) \ @MAKE_ADA_SHAREDLIB@ $(BUILD_DIR_LIB)/$(SHARED_LIBNAME) \ @MAKE_ADA_SHAREDLIB@ $(LIBDIR) -@MAKE_ADA_SHAREDLIB@ cd $(LIBDIR) && $(LN_S) $(SHARED_LIBNAME) $(SHARED_SYMLINK) +@MAKE_ADA_SHAREDLIB@ ( cd $(LIBDIR) && $(LN_S) $(SHARED_LIBNAME) $(SHARED_SYMLINK) ) @MAKE_ADA_SHAREDLIB@ @MAKE_ADA_SHAREDLIB@uninstall \ @MAKE_ADA_SHAREDLIB@uninstall.libs :: diff --git a/NEWS b/NEWS index c04424f4..3ef2cae1 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.3619 2021/01/17 00:50:16 tom Exp $ +-- $Id: NEWS,v 1.3622 2021/01/23 23:31:40 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. +20210123 + + modify package/config scripts to provide an explicit -L option for + cases when the loader search path has other directories preceding + the one in which ncurses is installed (report by Yuri Victorovich). + + minor build-fixes in configure script and makefiles to work around + quirks of pmake. + 20210116 + add comment for linux2.6 regarding CONFIG_CONSOLE_TRANSLATIONS (report by Patrick McDermott) -TD diff --git a/VERSION b/VERSION index 75a9a075..2f258bdd 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5:0:10 6.2 20210116 +5:0:10 6.2 20210123 diff --git a/aclocal.m4 b/aclocal.m4 index eaaf235c..87d508e3 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.947 2021/01/09 10:23:08 tom Exp $ +dnl $Id: aclocal.m4,v 1.949 2021/01/23 20:39:11 tom Exp $ dnl Macros used in NCURSES auto-configuration script. dnl dnl These macros are maintained separately from NCURSES. The copyright on @@ -4225,7 +4225,7 @@ ifelse($1,,,[$1=$LIB_PREFIX]) AC_SUBST(LIB_PREFIX) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_LIB_RULES version: 93 updated: 2021/01/04 18:48:01 +dnl CF_LIB_RULES version: 94 updated: 2021/01/23 15:37:41 dnl ------------ dnl Append definitions and rules for the given models to the subdirectory dnl Makefiles, and the recursion rule for the top-level Makefile. If the @@ -4606,7 +4606,7 @@ CF_EOF done fi - echo ' cd '$cf_dir' && ${MAKE} ${TOP_MFLAGS} [$]@' >>Makefile + echo ' ( cd '$cf_dir' && ${MAKE} ${TOP_MFLAGS} [$]@ )' >>Makefile done for cf_dir in $SRC_SUBDIRS @@ -4621,7 +4621,7 @@ do echo 'libs \' >> Makefile echo 'install.libs \' >> Makefile echo 'uninstall.libs ::' >> Makefile - echo ' cd '$cf_dir' && ${MAKE} ${TOP_MFLAGS} [$]@' >> Makefile + echo ' ( cd '$cf_dir' && ${MAKE} ${TOP_MFLAGS} [$]@ )' >> Makefile ;; esac fi @@ -4644,7 +4644,7 @@ install.libs \\ uninstall.libs \\ install.$cf_dir \\ uninstall.$cf_dir :: - cd "$cf_dir" && \${MAKE} \${TOP_MFLAGS} \[$]@ + ( cd "$cf_dir" && \${MAKE} \${TOP_MFLAGS} \[$]@ ) CF_EOF elif test -f "$srcdir/$cf_dir/headers" ; then cat >> Makefile <> Makefile <> Makefile <> Makefile <> Makefile <>Makefile + echo ' ( cd '$cf_dir' && ${MAKE} ${TOP_MFLAGS} $@ )' >>Makefile done for cf_dir in $SRC_SUBDIRS @@ -30097,7 +30097,7 @@ do echo 'libs \' >> Makefile echo 'install.libs \' >> Makefile echo 'uninstall.libs ::' >> Makefile - echo ' cd '$cf_dir' && ${MAKE} ${TOP_MFLAGS} $@' >> Makefile + echo ' ( cd '$cf_dir' && ${MAKE} ${TOP_MFLAGS} $@ )' >> Makefile ;; esac fi @@ -30120,7 +30120,7 @@ install.libs \\ uninstall.libs \\ install.$cf_dir \\ uninstall.$cf_dir :: - cd "$cf_dir" && \${MAKE} \${TOP_MFLAGS} \$@ + ( cd "$cf_dir" && \${MAKE} \${TOP_MFLAGS} \$@ ) CF_EOF elif test -f "$srcdir/$cf_dir/headers" ; then cat >> Makefile <> Makefile <> Makefile <> Makefile <> Makefile < Sat, 16 Jan 2021 05:31:57 -0500 + -- Thomas E. Dickey Sat, 23 Jan 2021 10:02:29 -0500 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog index 2350bbde..b5a73a58 100644 --- a/package/debian-mingw64/changelog +++ b/package/debian-mingw64/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.2+20210116) unstable; urgency=low +ncurses6 (6.2+20210123) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 16 Jan 2021 05:31:57 -0500 + -- Thomas E. Dickey Sat, 23 Jan 2021 10:02:29 -0500 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian/changelog b/package/debian/changelog index f413bc67..f0858f9d 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.2+20210116) unstable; urgency=low +ncurses6 (6.2+20210123) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 16 Jan 2021 05:31:57 -0500 + -- Thomas E. Dickey Sat, 23 Jan 2021 10:02:29 -0500 ncurses6 (5.9-20120608) unstable; urgency=low diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi index 542a0cef..99bc0960 100644 --- a/package/mingw-ncurses.nsi +++ b/package/mingw-ncurses.nsi @@ -1,4 +1,4 @@ -; $Id: mingw-ncurses.nsi,v 1.439 2021/01/16 10:31:57 tom Exp $ +; $Id: mingw-ncurses.nsi,v 1.440 2021/01/23 15:02:30 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 "0116" +!define VERSION_MMDD "0123" !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} !define MY_ABI "5" diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec index 45d8b6bc..fec7f9d1 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: 20210116 +Release: 20210123 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncurses.spec b/package/ncurses.spec index a2ee5190..33bd5639 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: 20210116 +Release: 20210123 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncursest.spec b/package/ncursest.spec index b7a58433..49a95fee 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: 20210116 +Release: 20210123 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/progs/Makefile.in b/progs/Makefile.in index b1180105..1511ec27 100644 --- a/progs/Makefile.in +++ b/progs/Makefile.in @@ -1,6 +1,6 @@ -# $Id: Makefile.in,v 1.106 2020/08/29 14:50:45 tom Exp $ +# $Id: Makefile.in,v 1.108 2021/01/23 20:42:08 tom Exp $ ############################################################################## -# Copyright 2020 Thomas E. Dickey # +# Copyright 2020,2021 Thomas E. Dickey # # Copyright 1998-2016,2018 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -47,7 +47,7 @@ SHELL = @SHELL@ VPATH = @srcdir@ THIS = Makefile -CF_MFLAGS = @cf_cv_makeflags@ +TOP_MFLAGS = @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" RPATH_LIST="$(RPATH_LIST)" @SET_MAKE@ x = @EXEEXT@ @@ -203,10 +203,10 @@ install.progs: $(AUTO_SRC) $(PROGS) $(DESTDIR)$(bindir) @MAKE_TERMINFO@ $(LIBTOOL_INSTALL) $(INSTALL_PROG) toe$x $(DESTDIR)$(bindir)/$(actual_toe) @MAKE_TERMINFO@ @echo "linking $(actual_infotocap) to $(actual_tic)" @MAKE_TERMINFO@ -@rm -f $(DESTDIR)$(bindir)/$(actual_infotocap) -@MAKE_TERMINFO@ (cd $(DESTDIR)$(bindir) && $(LN_S) $(actual_tic) $(actual_infotocap)) +@MAKE_TERMINFO@ ( cd $(DESTDIR)$(bindir) && $(LN_S) $(actual_tic) $(actual_infotocap) ) @MAKE_TERMINFO@ @echo "linking $(actual_captoinfo) to $(actual_tic)" @MAKE_TERMINFO@ -@rm -f $(DESTDIR)$(bindir)/$(actual_captoinfo) -@MAKE_TERMINFO@ (cd $(DESTDIR)$(bindir) && $(LN_S) $(actual_tic) $(actual_captoinfo)) +@MAKE_TERMINFO@ ( cd $(DESTDIR)$(bindir) && $(LN_S) $(actual_tic) $(actual_captoinfo) ) $(LIBTOOL_INSTALL) $(INSTALL_PROG) infocmp$x $(DESTDIR)$(bindir)/$(actual_infocmp) $(LIBTOOL_INSTALL) $(INSTALL_PROG) clear$x $(DESTDIR)$(bindir)/$(actual_clear) $(LIBTOOL_INSTALL) $(INSTALL_PROG) tabs$x $(DESTDIR)$(bindir)/$(actual_tabs) @@ -214,7 +214,7 @@ install.progs: $(AUTO_SRC) $(PROGS) $(DESTDIR)$(bindir) $(LIBTOOL_INSTALL) $(INSTALL_PROG) tset$x $(DESTDIR)$(bindir)/$(actual_tset) @echo "linking $(actual_reset) to $(actual_tset)" -@rm -f $(DESTDIR)$(bindir)/$(actual_reset) - (cd $(DESTDIR)$(bindir) && $(LN_S) $(actual_tset) $(actual_reset)) + ( cd $(DESTDIR)$(bindir) && $(LN_S) $(actual_tset) $(actual_reset) ) uninstall.progs: @MAKE_TERMINFO@ -@$(LIBTOOL_CLEAN) rm -f $(DESTDIR)$(bindir)/$(actual_tic) @@ -323,9 +323,9 @@ realclean :: distclean ../include/hashsize.h \ ../include/parametrized.h \ ../include/term.h : - cd ../include; $(MAKE) $(CF_MFLAGS) + ( cd ../include && $(MAKE) $(TOP_MFLAGS) ) $(DEPS_CURSES) : - cd ../ncurses; $(MAKE) $(CF_MFLAGS) + ( cd ../ncurses && $(MAKE) $(TOP_MFLAGS) ) lint: @MAKE_TERMINFO@ $(LINT) $(LINT_OPTS) $(CPPFLAGS) $(srcdir)/tic.c $(srcdir)/dump_entry.c $(LINT_LIBS) -- 2.44.0