From: Thomas E. Dickey Date: Sun, 18 Jul 2021 23:45:17 +0000 (+0000) Subject: ncurses 6.2 - patch 20210718 X-Git-Tag: v6.3~17 X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=commitdiff_plain;h=ac1479a2aceab5094e64da97ae11dde43c942d7a ncurses 6.2 - patch 20210718 + correct typo in "vip" comments (report by Nick Black), reviewed this against Glink manual -TD + fill in some missing pieces for pccons, to make it comparable to the vt220 entry -TD + modify mk-1st.awk to account for extra-suffix configure option (report by Juergen Pfeifer). + change default for --disable-wattr-macros option to help packagers who reuse wide ncursesw header file with non-wide ncurses library. + build-fix for test/test_opaque.c, for configurations without opaque curses structs. --- diff --git a/INSTALL b/INSTALL index c9402e70..bef656cb 100644 --- a/INSTALL +++ b/INSTALL @@ -26,7 +26,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: INSTALL,v 1.231 2021/06/26 21:02:02 tom Exp $ +-- $Id: INSTALL,v 1.232 2021/07/17 16:30:27 tom Exp $ --------------------------------------------------------------------- How to install Ncurses/Terminfo on your system --------------------------------------------------------------------- @@ -516,26 +516,6 @@ CONFIGURE OPTIONS: list documented in X/Open. ncurses provides varargs support for this function. Use --disable-tparm-varargs to disable this support. - --disable-wattr-macros - The 6.0 ABI adds support for extended colors and for extended mouse. - The former is a noticeable problem when developers inadvertently - compile using the ncurses6 header files and link with an ncurses5 - library, because the wattr* macros use a new field in the WINDOW - structure. These macros are used in several applications. - - Since ncurses provides an actual function for each of these macros, - suppressing them from the curses.h header allows the ncurses5 libraries - to be used in most applications. - - NOTE: The extended colors also are used in the cchar_t structure, but - fewer applications use that. - - NOTE: This workaround does not help with mismatches in the ncurses - mouse version. The extended mouse feature uses one less fewer bit for - each button, so that only the first button will work as expected with - a mismatch between header and library. Again, most applications will - work, since most use only the first button. - --enable-assertions For testing, compile-in assertion code. This is used only for a few places where ncurses cannot easily recover by returning an error code. @@ -778,6 +758,26 @@ CONFIGURE OPTIONS: --enable-warnings Turn on GCC compiler warnings. There should be only a few. + --enable-wattr-macros + The 6.0 ABI adds support for extended colors and for extended mouse. + The former is a noticeable problem when developers inadvertently + compile using the ncurses6 header files and link with an ncurses5 + library, because the wattr* macros use a new field in the WINDOW + structure. These macros are used in several applications. + + Since ncurses provides an actual function for each of these macros, + suppressing them from the curses.h header allows the ncurses5 libraries + to be used in most applications. + + NOTE: The extended colors also are used in the cchar_t structure, but + fewer applications use that. + + NOTE: This workaround does not help with mismatches in the ncurses + mouse version. The extended mouse feature uses one less fewer bit for + each button, so that only the first button will work as expected with + a mismatch between header and library. Again, most applications will + work, since most use only the first button. + --enable-weak-symbols If the --with-pthread option is set, check if the compiler supports weak-symbols. If it does, then name the thread-capable library without diff --git a/NEWS b/NEWS index 7d7d3d7d..04a91cea 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.3683 2021/07/10 22:55:59 tom Exp $ +-- $Id: NEWS,v 1.3686 2021/07/18 19:58:36 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -46,6 +46,18 @@ 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. +20210718 + + correct typo in "vip" comments (report by Nick Black), reviewed this + against Glink manual -TD + + fill in some missing pieces for pccons, to make it comparable to the + vt220 entry -TD + + modify mk-1st.awk to account for extra-suffix configure option + (report by Juergen Pfeifer). + + change default for --disable-wattr-macros option to help packagers + who reuse wide ncursesw header file with non-wide ncurses library. + + build-fix for test/test_opaque.c, for configurations without opaque + curses structs. + 20210710 + improve history section for tset manpage based on the 1BSD tarball, which preceded BSD's SCCS checkins by more than three years. diff --git a/VERSION b/VERSION index 884f567d..a835b108 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5:0:10 6.2 20210710 +5:0:10 6.2 20210718 diff --git a/aclocal.m4 b/aclocal.m4 index 6b784cd9..56338921 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.969 2021/07/03 20:17:35 tom Exp $ +dnl $Id: aclocal.m4,v 1.971 2021/07/17 17:12:05 tom Exp $ dnl Macros used in NCURSES auto-configuration script. dnl dnl These macros are maintained separately from NCURSES. The copyright on @@ -4302,7 +4302,7 @@ ifelse($1,,,[$1=$LIB_PREFIX]) AC_SUBST(LIB_PREFIX) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_LIB_RULES version: 96 updated: 2021/07/03 16:16:40 +dnl CF_LIB_RULES version: 97 updated: 2021/07/17 13:10:54 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 @@ -4641,6 +4641,7 @@ CF_EOF MODEL=$cf_ITEM \ CXX_MODEL=$CXX_MODEL \ LIB_SUFFIX=$LIB_SUFFIX \ + USE_LIB_SUFFIX=$USE_LIB_SUFFIX \ make_phony="${cf_cv_make_PHONY:-no}" \ model=$cf_subdir \ prefix=$cf_prefix \ diff --git a/configure b/configure index 3d0c17f6..212ad040 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.734 . +# From configure.in Revision: 1.736 . # Guess values for system-dependent variables and create Makefiles. # Generated by Autoconf 2.52.20210509. # @@ -793,7 +793,7 @@ Fine-Tuning Your Configuration: --disable-largefile omit support for large files --disable-tparm-varargs compile tparm() without varargs interface --disable-tic-depends link tic library without explicit dependency on ncurses library - --disable-wattr-macros suppress wattr* macros to help with ncurses5/ncurses6 transition + --enable-wattr-macros enable wattr* macros --with-x11-rgb=FILE file containing X11 rgb information (EPREFIX/lib/X11/rgb.txt) --with-bool=TYPE override fallback type of bool variable --with-caps=alt compile with alternate Caps file @@ -13606,25 +13606,25 @@ else with_tic_depends=no fi -### use option --disable-wattr-macros to suppress wattr* macros from curses.h -echo "$as_me:13610: checking if you want to suppress wattr* macros to help with ncurses5/ncurses6 transition" >&5 -echo $ECHO_N "checking if you want to suppress wattr* macros to help with ncurses5/ncurses6 transition... $ECHO_C" >&6 +### use option --enable-wattr-macros to enable wattr* macros in curses.h +echo "$as_me:13610: checking if you want to enable wattr* macros" >&5 +echo $ECHO_N "checking if you want to enable wattr* macros... $ECHO_C" >&6 # Check whether --enable-wattr-macros or --disable-wattr-macros was given. if test "${enable_wattr_macros+set}" = set; then enableval="$enable_wattr_macros" with_wattr_macros=$enableval else - with_wattr_macros=yes + with_wattr_macros=no fi; if [ "x$with_wattr_macros" != xyes ]; then NCURSES_WATTR_MACROS=0 - echo "$as_me:13622: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$as_me:13622: result: no" >&5 +echo "${ECHO_T}no" >&6 else NCURSES_WATTR_MACROS=1 - echo "$as_me:13626: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$as_me:13626: result: yes" >&5 +echo "${ECHO_T}yes" >&6 fi echo "$as_me:13630: checking for X11 rgb file" >&5 @@ -30202,6 +30202,7 @@ eval cf_libname="\$${cf_map_lib_basename}_NAME" MODEL=$cf_ITEM \ CXX_MODEL=$CXX_MODEL \ LIB_SUFFIX=$LIB_SUFFIX \ + USE_LIB_SUFFIX=$USE_LIB_SUFFIX \ make_phony="${cf_cv_make_PHONY:-no}" \ model=$cf_subdir \ prefix=$cf_prefix \ diff --git a/configure.in b/configure.in index aa90570a..798b95a6 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.734 2021/07/03 14:51:53 tom Exp $ +dnl $Id: configure.in,v 1.736 2021/07/18 22:17:57 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.734 $) +AC_REVISION($Revision: 1.736 $) AC_INIT(ncurses/base/lib_initscr.c) AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin) @@ -1019,18 +1019,18 @@ else with_tic_depends=no fi -### use option --disable-wattr-macros to suppress wattr* macros from curses.h -AC_MSG_CHECKING(if you want to suppress wattr* macros to help with ncurses5/ncurses6 transition) +### use option --enable-wattr-macros to enable wattr* macros in curses.h +AC_MSG_CHECKING(if you want to enable wattr* macros) AC_ARG_ENABLE(wattr-macros, - [ --disable-wattr-macros suppress wattr* macros to help with ncurses5/ncurses6 transition], + [ --enable-wattr-macros enable wattr* macros], [with_wattr_macros=$enableval], - [with_wattr_macros=yes]) + [with_wattr_macros=no]) if [[ "x$with_wattr_macros" != xyes ]]; then NCURSES_WATTR_MACROS=0 - AC_MSG_RESULT(yes) + AC_MSG_RESULT(no) else NCURSES_WATTR_MACROS=1 - AC_MSG_RESULT(no) + AC_MSG_RESULT(yes) fi AC_SUBST(NCURSES_WATTR_MACROS) diff --git a/dist.mk b/dist.mk index 3ee413fc..bbcbfb74 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.1424 2021/07/10 10:38:50 tom Exp $ +# $Id: dist.mk,v 1.1426 2021/07/18 19:58:36 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 = 20210710 +NCURSES_PATCH = 20210718 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) diff --git a/misc/terminfo.src b/misc/terminfo.src index a28b0843..fc6144c4 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.876 $ -# $Date: 2021/06/26 18:47:42 $ +# $Revision: 1.881 $ +# $Date: 2021/07/18 00:11:20 $ # # 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 @@ -1649,12 +1649,11 @@ pccon+sgr+acs0|sgr and simple ASCII pseudographics for OpenBSD PC console, sgr=\E[0%?%p1%p3%|%t;7%;%?%p6%t;1%;%?%p2%t;4%;m, sgr0=\E[m, pccon+sgr+acs|sgr and default ASCII pseudographics for OpenBSD PC console, - acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy - yzz{{||}}~~, - enacs=\E)0$<5>, rmacs=\E(B$<5>, + acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, + enacs=\E)0, rmacs=\E(B, sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e - \E(B%;$<2>, - sgr0=\E[m\E(B$<5>, smacs=\E(0$<5>, + \E(B%;, + sgr0=\E[m\E(B, smacs=\E(0, # underline renders as color pccon+colors|ANSI colors for OpenBSD PC console, bce, @@ -1663,20 +1662,24 @@ pccon+colors|ANSI colors for OpenBSD PC console, pccon+base|base capabilities for OpenBSD PC console, am, km, mc5i, msgr, npc, nxon, xenl, xon, cols#80, it#8, lines#24, - bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=\r, cub1=^H, cud1=\n, - cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, - dch=\E[%p1%dP, dch1=\E[P, dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, - el=\E[K, el1=\E[1K, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, - il1=\E[L, ind=\ED, nel=\EE, rev=\E[7m, ri=\EM, rmam=\E[?7l, - rmso=\E[27m, rmul=\E[24m, rs2=\Ec$<50>, smam=\E[?7h, - smso=\E[7m, smul=\E[4m, tbc=\E[3g, u6=\E[%i%d;%dR, - u7=\E[6n, + bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=\r, + csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, + cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, + cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, + dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, + ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, + flash=\E[?5h$<200/>\E[?5l, home=\E[H, ht=^I, hts=\EH, + ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=\ED, nel=\EE, + rc=\E8, rev=\E[7m, ri=\EM, rmam=\E[?7l, rmso=\E[27m, + rmul=\E[24m, rs2=\Ec, sc=\E7, smam=\E[?7h, smso=\E[7m, + smul=\E[4m, tbc=\E[3g, u6=\E[%i%d;%dR, u7=\E[6n, pccon0-m|OpenBSD PC console without colors & with simple ASCII pseudographics, use=pccon+sgr+acs0, use=pccon+base, use=pccon+keys, pccon0|OpenBSD PC console with simple ASCII pseudographics, use=pccon0-m, use=pccon+colors, pccon-m|OpenBSD PC console without colors, use=pccon+base, use=pccon+sgr+acs, use=pccon+keys, + use=ansi+enq, use=vt220+cvis, pccon|OpenBSD PC console, use=pccon-m, use=pccon+colors, @@ -21962,52 +21965,52 @@ bq300-8-pc-w-rv|Questar 303 with PC keyboard full 8 bits reverse 132 columns, #======================================================# # normal mode, 8 bits, 80 columns terminal. -# RES reset : ^[e -# RIS reset initial state: ^[c -# BLE bell enable ^[h -# BLD bell disable ^[g -# CAMS char. attr. mode set ^[[D -# CAMR char. attr. mode reset ^[[G -# CLR clear ^[` -# KBU keyboard unlock (set) ^[[W -# KBL keyboard lock (reset) ^[[X -# CM character mode (async.) ^[k -# NEP non echoplex mode (by host) ^[l -# EP echoplex mode (by host) ^[m -# IM insert mode set ^[[I -# IM insert mode reset ^[[J -# RMS roll mode set ^[r -# RMR roll mode reset ^[q -# SM78 set mode vip7800 ^[[1q -# SD scroll up (72 lines) ^[[0s -# SD scroll down (72 lines) ^[[1s -# RBM block mode reset ^[[E -# SLS status line set ^[w -# SLR status line reset ^[v -# SLL status line lock ^[O -# LGS Line-graphic mode set ^[G -# LGR Line-graphic mode reset ^[F -# TBC tab clear (at cursor pos.) ^[[g -# TBI tab initialize ^[[N -# TBS tab set (at cursor pos.) ^[p -# PDS print data space ^[[0p -# PHD print host data ^[[3p -# PDT print data terminator ^[[

u -# SSP0 partition 0 set ^[[00u -# SSP1 partition n format 1 ^[[PnPnSTRINGu -# SSP2 partition n format 2 ^[[PnPnSTRINGu -# SSP3 partition n format 3 ^[[PnPnu +# BLD bell disable ^[g +# BLE bell enable ^[h +# CAMR char. attr. mode reset ^[[G +# CAMS char. attr. mode set ^[[D +# CLR clear ^[` +# CM character mode (async.) ^[k +# EP echoplex mode (by host) ^[m +# IM insert mode set ^[[I +# IMR insert mode reset ^[[J +# KBL keyboard lock (reset) ^[[X +# KBU keyboard unlock (set) ^[[W +# LGR Line-graphic mode reset ^[F +# LGS Line-graphic mode set ^[G +# NEP non echoplex mode (by host) ^[l +# PDS print data space ^[[0p +# PDT print data terminator ^[[

u +# TBC tab clear (at cursor pos.) ^[[g +# TBI tab initialize ^[[N +# TBS tab set (at cursor pos.) ^[p +# # ATR attribute (visual) -# blink : ^[sB -# dim : ^[sL -# hide (blank) : ^[sH -# restore : ^[sR -# inverse video : ^[sI -# prot. : ^[sP -# underline : ^[s_ -# reset : ^{ +# blink : ^[sB +# dim : ^[sL +# hide (blank) : ^[sH +# inverse video : ^[sI +# protected : ^[sP +# reset : ^[sR +# underline : ^[s_ # # This covers the vip7800 and BQ3155-vip7800 vip|Bull Questar 3155-7800, @@ -27042,4 +27045,10 @@ v3220|LANPAR Vision II model 3220/3221/3222, # + correct rmacs/smacs in aaa+dec, aaa+rv -TD # + add hpterm-color2 and hp98550-color (Martin Trusler) # +# 2021-07-17 +# + correct typo in "vip" comments (report by Nick Black), reviewed this +# against Glink manual -TD +# + fill in some missing pieces for pccons, to make it comparable to the +# vt220 entry -TD +# ######## SHANTIH! SHANTIH! SHANTIH! diff --git a/mk-1st.awk b/mk-1st.awk index bf3b85da..beb8911f 100644 --- a/mk-1st.awk +++ b/mk-1st.awk @@ -1,4 +1,4 @@ -# $Id: mk-1st.awk,v 1.115 2021/07/10 17:15:43 tom Exp $ +# $Id: mk-1st.awk,v 1.122 2021/07/18 18:47:20 tom Exp $ ############################################################################## # Copyright 2018-2020,2021 Thomas E. Dickey # # Copyright 1998-2016,2017 Free Software Foundation, Inc. # @@ -37,6 +37,7 @@ # MODEL (e.g., "DEBUG", uppercase; toupper is not portable) # CXX_MODEL (e.g., "DEBUG", uppercase) # LIB_SUFFIX (e.g., "", "w", "t", "tw") +# USE_LIB_SUFFIX (e.g., "", "w", "t", "tw") # model (directory into which we compile, e.g., "obj") # prefix (e.g., "lib", for Unix-style libraries) # suffix (e.g., "_g.a", for debug libraries) @@ -268,6 +269,15 @@ function in_subset(value) { check = " " check " "; return index(check,value); } +function trim_suffix(value) { + if (USE_LIB_SUFFIX != "" && length(value) > length(USE_LIB_SUFFIX)) { + check = substr(value, 1 + length(value) - length(USE_LIB_SUFFIX)); + if (check == USE_LIB_SUFFIX) { + value = substr(value, 1, length(value) - length(USE_LIB_SUFFIX)); + } + } + return value; +} BEGIN { TOOL_PREFIX = ""; found = 0; @@ -298,6 +308,7 @@ BEGIN { printf "# MODEL: %s\n", MODEL printf "# CXX_MODEL: %s\n", CXX_MODEL printf "# LIB_SUFFIX: %s\n", LIB_SUFFIX + printf "# USE_LIB_SUFFIX: %s\n", USE_LIB_SUFFIX printf "# model: %s\n", model printf "# prefix: %s\n", prefix printf "# suffix: %s\n", suffix @@ -465,11 +476,16 @@ END { else if ( MODEL == "LIBTOOL" ) { end_name = lib_name; + use_name = trim_suffix(TermlibRoot) USE_LIB_SUFFIX + printf "# FIXME\n"; + printf "# name '%s'\n", name; + printf "# end_name '%s'\n", end_name; + printf "# use_name '%s'\n", use_name; printf "../lib/%s : \\\n", lib_name - if ( (name != TermlibRoot ) && ( index(name, "++") == 0 ) && ( index(name, "tic") == 1 || index(name, "ncurses") == 1 ) ) { - printf "\t\t../lib/lib%s.la \\\n", TermlibRoot; + if ( (name != use_name ) && ( index(name, "++") == 0 ) && ( index(name, "tic") == 1 || index(name, "ncurses") == 1 ) ) { + printf "\t\t../lib/lib%s.la \\\n", use_name; if ( index(name, "tic") == 1 && index(TermlibRoot, "ncurses") != 1 ) { - printf "\t\t../lib/lib%s%s.la \\\n", "ncurses", LIB_SUFFIX; + printf "\t\t../lib/lib%s%s.la \\\n", "ncurses", USE_LIB_SUFFIX; } } printf "\t\t$(%s_OBJS)\n", OBJS @@ -486,17 +502,18 @@ END { printf "\t\t%s $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(%s) $(LDFLAGS)\n", libtool_version, which_list; if ( make_phony == "yes" ) { print "" - printf ".PHONY :\tinstall.%s\n", name; + printf ".PHONY :\tinstall.%s\n", trim_suffix(name); } print "" print "install \\" print "install.libs \\" - printf "install.%s :: \\\n", name; + printf "install.%s :: \\\n", trim_suffix(name); printf "\t\t$(DESTDIR)$(libdir) \\\n"; - if ( (name != TermlibRoot ) && ( index(name, "++") == 0 ) && ( index(name, "tic") == 1 || index(name, "ncurses") == 1 ) ) { - printf "\t\tinstall.%s \\\n", TermlibRoot; + use_name = TermlibRoot USE_LIB_SUFFIX + if ( (name != use_name ) && ( index(name, "++") == 0 ) && ( index(name, "tic") == 1 || index(name, "ncurses") == 1 ) ) { + printf "\t\tinstall.%s \\\n", trim_suffix(TermlibRoot); if ( index(name, "tic") == 1 && index(TermlibRoot, "ncurses") != 1 ) { - printf "\t\tinstall.%s%s \\\n", "ncurses", LIB_SUFFIX; + printf "\t\tinstall.%s \\\n", "ncurses"; } } printf "\t\t../lib/%s\n", lib_name @@ -505,7 +522,7 @@ END { print "" print "uninstall \\" print "uninstall.libs \\" - printf "uninstall.%s ::\n", name + printf "uninstall.%s ::\n", trim_suffix(name) printf "\t@echo uninstalling $(DESTDIR)$(libdir)/%s\n", lib_name printf "\t-@$(LIBTOOL_UNINSTALL) rm -f $(DESTDIR)$(libdir)/%s\n", lib_name } diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog index e14d320a..7ad58ae1 100644 --- a/package/debian-mingw/changelog +++ b/package/debian-mingw/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.2+20210710) unstable; urgency=low +ncurses6 (6.2+20210718) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Mon, 05 Jul 2021 07:05:25 -0400 + -- Thomas E. Dickey Sun, 18 Jul 2021 15:58:36 -0400 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog index e14d320a..7ad58ae1 100644 --- a/package/debian-mingw64/changelog +++ b/package/debian-mingw64/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.2+20210710) unstable; urgency=low +ncurses6 (6.2+20210718) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Mon, 05 Jul 2021 07:05:25 -0400 + -- Thomas E. Dickey Sun, 18 Jul 2021 15:58:36 -0400 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian/changelog b/package/debian/changelog index 82e7ebf3..55e4e181 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.2+20210710) unstable; urgency=low +ncurses6 (6.2+20210718) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Mon, 05 Jul 2021 07:05:25 -0400 + -- Thomas E. Dickey Sun, 18 Jul 2021 15:58:36 -0400 ncurses6 (5.9-20120608) unstable; urgency=low diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi index 620ae1b1..5d421324 100644 --- a/package/mingw-ncurses.nsi +++ b/package/mingw-ncurses.nsi @@ -1,4 +1,4 @@ -; $Id: mingw-ncurses.nsi,v 1.466 2021/07/10 10:38:50 tom Exp $ +; $Id: mingw-ncurses.nsi,v 1.468 2021/07/18 19:58:36 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 "0710" +!define VERSION_MMDD "0718" !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} !define MY_ABI "5" diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec index 3d83060f..e7129a94 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: 20210710 +Release: 20210718 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncurses.spec b/package/ncurses.spec index b49b81ac..ded01ce6 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: 20210710 +Release: 20210718 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncursest.spec b/package/ncursest.spec index fb10746c..921e26be 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: 20210710 +Release: 20210718 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/test/test_opaque.c b/test/test_opaque.c index eeea2302..52a5b490 100644 --- a/test/test_opaque.c +++ b/test/test_opaque.c @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: test_opaque.c,v 1.12 2021/03/06 23:53:34 tom Exp $ + * $Id: test_opaque.c,v 1.13 2021/07/11 09:13:49 tom Exp $ * * Author: Thomas E Dickey * @@ -55,7 +55,7 @@ #define BASE_Y 6 #define MAX_COLS 1024 -#if defined(NCURSES_VERSION_PATCH) && (NCURSES_VERSION_PATCH >= 20080119) && NCURSES_EXT_FUNCS +#if defined(NCURSES_VERSION_PATCH) && (NCURSES_VERSION_PATCH >= 20080119) && NCURSES_EXT_FUNCS && NCURSES_OPAQUE static bool Quit(int ch)