mirror of
https://github.com/Aigor44/ncursesw-morphos.git
synced 2024-12-15 07:30:12 +08:00
ncurses 6.2 - patch 20200816
+ amend tic/infocmp check to allow for the respective tool's absence (report by Steve Wills, cf: 20200808). + improved some of the build-scripts with shellcheck + filter out -MT/-MD/-MTd/-MDd options in script for Visual Studio C++ (discussion with "Maarten Anonymous").
This commit is contained in:
Thomas E. Dickey
parent
e8c3445229
commit
dafd158641
@ -35,7 +35,7 @@
|
||||
|
||||
/*
|
||||
Version Control
|
||||
$Id: gen.c,v 1.76 2020/08/09 00:57:30 tom Exp $
|
||||
$Id: gen.c,v 1.77 2020/08/16 18:05:05 tom Exp $
|
||||
--------------------------------------------------------------------------*/
|
||||
/*
|
||||
This program prints on its standard output the source for the
|
||||
@ -517,7 +517,7 @@ main(int argc, const char *argv[])
|
||||
#ifdef BUTTON1_RESERVED_EVENT
|
||||
PRINT_MOUSE_EVENT(BUTTON1_RESERVED_EVENT);
|
||||
#endif
|
||||
print_constant(fp, "all_events_button_1", all_events);
|
||||
print_constant(fp, "all_events_button_1", (UINT) all_events);
|
||||
|
||||
all_events = 0;
|
||||
PRINT_MOUSE_EVENT(BUTTON2_RELEASED);
|
||||
@ -528,7 +528,7 @@ main(int argc, const char *argv[])
|
||||
#ifdef BUTTON2_RESERVED_EVENT
|
||||
PRINT_MOUSE_EVENT(BUTTON2_RESERVED_EVENT);
|
||||
#endif
|
||||
print_constant(fp, "all_events_button_2", all_events);
|
||||
print_constant(fp, "all_events_button_2", (UINT) all_events);
|
||||
|
||||
all_events = 0;
|
||||
PRINT_MOUSE_EVENT(BUTTON3_RELEASED);
|
||||
@ -539,7 +539,7 @@ main(int argc, const char *argv[])
|
||||
#ifdef BUTTON3_RESERVED_EVENT
|
||||
PRINT_MOUSE_EVENT(BUTTON3_RESERVED_EVENT);
|
||||
#endif
|
||||
print_constant(fp, "all_events_button_3", all_events);
|
||||
print_constant(fp, "all_events_button_3", (UINT) all_events);
|
||||
|
||||
all_events = 0;
|
||||
PRINT_MOUSE_EVENT(BUTTON4_RELEASED);
|
||||
@ -550,7 +550,7 @@ main(int argc, const char *argv[])
|
||||
#ifdef BUTTON4_RESERVED_EVENT
|
||||
PRINT_MOUSE_EVENT(BUTTON4_RESERVED_EVENT);
|
||||
#endif
|
||||
print_constant(fp, "all_events_button_4", all_events);
|
||||
print_constant(fp, "all_events_button_4", (UINT) all_events);
|
||||
}
|
||||
PRINT_NAMED_CONSTANT(BUTTON_CTRL);
|
||||
PRINT_NAMED_CONSTANT(BUTTON_SHIFT);
|
||||
|
||||
9
NEWS
9
NEWS
@ -26,7 +26,7 @@
|
||||
-- sale, use or other dealings in this Software without prior written --
|
||||
-- authorization. --
|
||||
-------------------------------------------------------------------------------
|
||||
-- $Id: NEWS,v 1.3532 2020/08/08 23:43:32 tom Exp $
|
||||
-- $Id: NEWS,v 1.3536 2020/08/16 18:03:39 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.
|
||||
|
||||
20200816
|
||||
+ amend tic/infocmp check to allow for the respective tool's absence
|
||||
(report by Steve Wills, cf: 20200808).
|
||||
+ improved some of the build-scripts with shellcheck
|
||||
+ filter out -MT/-MD/-MTd/-MDd options in script for Visual Studio C++
|
||||
(discussion with "Maarten Anonymous").
|
||||
|
||||
20200808
|
||||
+ improve discussion of the system's tic utility when used as part
|
||||
of cross-compiling (discussion with Keith Marshall).
|
||||
|
||||
7
aclocal.m4
vendored
7
aclocal.m4
vendored
@ -29,7 +29,7 @@ dnl***************************************************************************
|
||||
dnl
|
||||
dnl Author: Thomas E. Dickey 1995-on
|
||||
dnl
|
||||
dnl $Id: aclocal.m4,v 1.921 2020/07/25 23:04:09 anonymous.maarten Exp $
|
||||
dnl $Id: aclocal.m4,v 1.923 2020/08/16 18:09:06 tom Exp $
|
||||
dnl Macros used in NCURSES auto-configuration script.
|
||||
dnl
|
||||
dnl These macros are maintained separately from NCURSES. The copyright on
|
||||
@ -6644,7 +6644,7 @@ do
|
||||
done
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_SHARED_OPTS version: 98 updated: 2020/07/25 19:03:05
|
||||
dnl CF_SHARED_OPTS version: 99 updated: 2020/08/16 14:07:28
|
||||
dnl --------------
|
||||
dnl --------------
|
||||
dnl Attempt to determine the appropriate CC/LD options for creating a shared
|
||||
@ -6914,6 +6914,9 @@ CF_EOF
|
||||
-link)
|
||||
# ignore -link argument
|
||||
;;
|
||||
-M[[TD]] | -M[[TD]]d)
|
||||
# ignore runtime-library option
|
||||
;;
|
||||
-dll)
|
||||
isdll=1
|
||||
;;
|
||||
|
||||
20
configure.in
20
configure.in
@ -29,7 +29,7 @@ dnl***************************************************************************
|
||||
dnl
|
||||
dnl Author: Thomas E. Dickey 1995-on
|
||||
dnl
|
||||
dnl $Id: configure.in,v 1.715 2020/08/08 22:14:09 tom Exp $
|
||||
dnl $Id: configure.in,v 1.716 2020/08/16 16:21:37 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.20200111)
|
||||
AC_REVISION($Revision: 1.715 $)
|
||||
AC_REVISION($Revision: 1.716 $)
|
||||
AC_INIT(ncurses/base/lib_initscr.c)
|
||||
AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
|
||||
|
||||
@ -654,11 +654,6 @@ case ".$with_fallback" in
|
||||
;;
|
||||
esac
|
||||
|
||||
USE_FALLBACKS=
|
||||
test -z "$FALLBACK_LIST" && USE_FALLBACKS="#"
|
||||
AC_SUBST(FALLBACK_LIST)
|
||||
AC_SUBST(USE_FALLBACKS)
|
||||
|
||||
# The fallback feature in ncurses relies upon tic/infocmp outside the build
|
||||
# tree for generating the terminal descriptions that will be compiled into the
|
||||
# library. If your toolchain is old, it may not handle current terminal
|
||||
@ -670,10 +665,21 @@ if test -n "$FALLBACK_LIST"
|
||||
then
|
||||
CF_WITH_PATH_PROG(TIC, tic, [for fallbacks], $PATH:/usr/local/ncurses/bin)
|
||||
CF_WITH_PATH_PROG(INFOCMP, infocmp, [for fallbacks], $PATH:/usr/local/ncurses/bin)
|
||||
test -z "$TIC" && FALLBACK_LIST=
|
||||
test -z "$INFOCMP" && FALLBACK_LIST=
|
||||
if test -z "$FALLBACK_LIST"
|
||||
then
|
||||
AC_MSG_WARN(ignoring fallback option because tic/infocmp are not available)
|
||||
fi
|
||||
fi
|
||||
AC_SUBST(TIC)
|
||||
AC_SUBST(INFOCMP)
|
||||
|
||||
USE_FALLBACKS=
|
||||
test -z "$FALLBACK_LIST" && USE_FALLBACKS="#"
|
||||
AC_SUBST(FALLBACK_LIST)
|
||||
AC_SUBST(USE_FALLBACKS)
|
||||
|
||||
AC_MSG_CHECKING(if you want modern xterm or antique)
|
||||
AC_ARG_WITH(xterm-new,
|
||||
[ --without-xterm-new specify if xterm terminfo should be old version],
|
||||
|
||||
4
dist.mk
4
dist.mk
@ -26,7 +26,7 @@
|
||||
# use or other dealings in this Software without prior written #
|
||||
# authorization. #
|
||||
##############################################################################
|
||||
# $Id: dist.mk,v 1.1364 2020/08/08 11:03:32 tom Exp $
|
||||
# $Id: dist.mk,v 1.1366 2020/08/16 15:31:41 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 = 20200808
|
||||
NCURSES_PATCH = 20200816
|
||||
|
||||
# We don't append the patch to the version, since this only applies to releases
|
||||
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $Id: Makefile.in,v 1.171 2020/07/18 19:17:35 tom Exp $
|
||||
# $Id: Makefile.in,v 1.172 2020/08/16 15:35:00 tom Exp $
|
||||
##############################################################################
|
||||
# Copyright 2018-2019,2020 Thomas E. Dickey #
|
||||
# Copyright 1998-2017,2018 Free Software Foundation, Inc. #
|
||||
@ -229,7 +229,7 @@ $(DESTDIR)$(libdir) :
|
||||
../lib : ; mkdir $@
|
||||
|
||||
./fallback.c : $(tinfo)/MKfallback.sh
|
||||
$(SHELL) -e $(tinfo)/MKfallback.sh $(TERMINFO) $(TERMINFO_SRC) $(TIC_PATH) $(INFOCMP_PATH) $(FALLBACK_LIST) >$@
|
||||
$(SHELL) -e $(tinfo)/MKfallback.sh $(TERMINFO) $(TERMINFO_SRC) "$(TIC_PATH)" "$(INFOCMP_PATH)" $(FALLBACK_LIST) >$@
|
||||
|
||||
./lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h
|
||||
$(SHELL) -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
#
|
||||
# MKlib_gen.sh -- generate sources from curses.h macro definitions
|
||||
#
|
||||
# ($Id: MKlib_gen.sh,v 1.66 2020/05/23 23:59:39 anonymous.maarten Exp $)
|
||||
# ($Id: MKlib_gen.sh,v 1.67 2020/08/16 16:05:57 tom Exp $)
|
||||
#
|
||||
##############################################################################
|
||||
# Copyright 2018,2020 Thomas E. Dickey #
|
||||
@ -73,12 +73,12 @@ USE="$3"
|
||||
# appears in gcc 5.0 and (with modification) in 5.1, making it necessary to
|
||||
# determine if we are using gcc, and if so, what version because the proposed
|
||||
# solution uses a nonstandard option.
|
||||
PRG=`echo "$1" | $AWK '{ sub(/^[ ]*/,""); sub(/[ ].*$/, ""); print; }' || exit 0`
|
||||
PRG=`echo "$1" | "$AWK" '{ sub(/^[ ]*/,""); sub(/[ ].*$/, ""); print; }' || exit 0`
|
||||
FSF=`("$PRG" --version 2>/dev/null || exit 0) | fgrep "Free Software Foundation" | head -n 1`
|
||||
ALL=`"$PRG" -dumpversion 2>/dev/null || exit 0`
|
||||
ONE=`echo "$ALL" | sed -e 's/\..*$//'`
|
||||
if test -n "$FSF" && test -n "$ALL" && test -n "$ONE" ; then
|
||||
if test $ONE -ge 5 ; then
|
||||
if test "$ONE" -ge 5 ; then
|
||||
echo ".. adding -P option to work around $PRG $ALL" >&2
|
||||
preprocessor="$preprocessor -P"
|
||||
fi
|
||||
@ -96,7 +96,6 @@ trap "rm -f $ED1 $ED2 $ED3 $ED4 $AW1 $AW2 $TMP" 0 1 2 3 15
|
||||
|
||||
ALL=$USE
|
||||
if test "$USE" = implemented ; then
|
||||
CALL="call_"
|
||||
cat >$ED1 <<EOF1
|
||||
/^extern.*implemented/{
|
||||
h
|
||||
@ -119,7 +118,6 @@ if test "$USE" = implemented ; then
|
||||
}
|
||||
EOF1
|
||||
else
|
||||
CALL=""
|
||||
cat >$ED1 <<EOF1
|
||||
/^extern.*${ALL}/{
|
||||
h
|
||||
@ -496,7 +494,7 @@ EOF
|
||||
sed -n -f $ED1 \
|
||||
| sed -e 's/NCURSES_EXPORT(\(.*\)) \(.*\) (\(.*\))/\1 \2(\3)/' \
|
||||
| sed -f $ED2 \
|
||||
| $AWK -f $AW1 using=$USE \
|
||||
| "$AWK" -f $AW1 using="$USE" \
|
||||
| sed \
|
||||
-e 's/ [ ]*$//g' \
|
||||
-e 's/^\([a-zA-Z_][a-zA-Z_]*[ *]*\)/\1 gen_/' \
|
||||
@ -508,7 +506,7 @@ $preprocessor $TMP 2>/dev/null \
|
||||
-e 's/ / /g' \
|
||||
-e 's/^ //' \
|
||||
-e 's/_Bool/NCURSES_BOOL/g' \
|
||||
| $AWK -f $AW2 \
|
||||
| "$AWK" -f $AW2 \
|
||||
| sed -f $ED3 \
|
||||
| sed \
|
||||
-e 's/^.*T_CALLED.*returnCode( \([a-z].*) \));/ return \1;/' \
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
# use or other dealings in this Software without prior written #
|
||||
# authorization. #
|
||||
##############################################################################
|
||||
# $Id: MKfallback.sh,v 1.24 2020/02/08 21:52:37 tom Exp $
|
||||
# $Id: MKfallback.sh,v 1.25 2020/08/16 15:58:44 tom Exp $
|
||||
#
|
||||
# MKfallback.sh -- create fallback table for entry reads
|
||||
#
|
||||
@ -44,12 +44,14 @@ terminfo_src=$1
|
||||
shift
|
||||
|
||||
tic_path=$1
|
||||
test -z "$tic_path" && tic_path=tic
|
||||
shift
|
||||
|
||||
infocmp_path=$1
|
||||
test -z "$infocmp_path" && infocmp_path=infocmp
|
||||
shift
|
||||
|
||||
case $tic_path in #(vi
|
||||
case "$tic_path" in #(vi
|
||||
/*)
|
||||
tic_head=`echo "$tic_path" | sed -e 's,/[^/]*$,,'`
|
||||
PATH=$tic_head:$PATH
|
||||
@ -67,7 +69,7 @@ if test $# != 0 ; then
|
||||
TERMINFO_DIRS=$TERMINFO:$terminfo_dir
|
||||
export TERMINFO_DIRS
|
||||
|
||||
$tic_path -x $terminfo_src >&2
|
||||
"$tic_path" -x "$terminfo_src" >&2
|
||||
else
|
||||
tmp_info=
|
||||
fi
|
||||
@ -90,10 +92,10 @@ then
|
||||
|
||||
/* fallback entries for: $* */
|
||||
EOF
|
||||
for x in $*
|
||||
for x in "$@"
|
||||
do
|
||||
echo "/* $x */"
|
||||
$infocmp_path -E $x | sed -e 's/\<short\>/NCURSES_INT2/g'
|
||||
"$infocmp_path" -E "$x" | sed -e 's/\<short\>/NCURSES_INT2/g'
|
||||
done
|
||||
|
||||
cat <<EOF
|
||||
@ -101,10 +103,10 @@ static const TERMTYPE2 fallbacks[$#] =
|
||||
{
|
||||
EOF
|
||||
comma=""
|
||||
for x in $*
|
||||
for x in "$@"
|
||||
do
|
||||
echo "$comma /* $x */"
|
||||
$infocmp_path -e $x
|
||||
"$infocmp_path" -e "$x"
|
||||
comma=","
|
||||
done
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
ncurses6 (6.2+20200808) unstable; urgency=low
|
||||
ncurses6 (6.2+20200816) unstable; urgency=low
|
||||
|
||||
* latest weekly patch
|
||||
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 08 Aug 2020 07:03:32 -0400
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sun, 16 Aug 2020 11:31:41 -0400
|
||||
|
||||
ncurses6 (5.9-20131005) unstable; urgency=low
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
ncurses6 (6.2+20200808) unstable; urgency=low
|
||||
ncurses6 (6.2+20200816) unstable; urgency=low
|
||||
|
||||
* latest weekly patch
|
||||
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 08 Aug 2020 07:03:32 -0400
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sun, 16 Aug 2020 11:31:41 -0400
|
||||
|
||||
ncurses6 (5.9-20131005) unstable; urgency=low
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
ncurses6 (6.2+20200808) unstable; urgency=low
|
||||
ncurses6 (6.2+20200816) unstable; urgency=low
|
||||
|
||||
* latest weekly patch
|
||||
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 08 Aug 2020 07:03:32 -0400
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sun, 16 Aug 2020 11:31:41 -0400
|
||||
|
||||
ncurses6 (5.9-20120608) unstable; urgency=low
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; $Id: mingw-ncurses.nsi,v 1.408 2020/08/08 11:03:32 tom Exp $
|
||||
; $Id: mingw-ncurses.nsi,v 1.410 2020/08/16 15:31:41 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 "2020"
|
||||
!define VERSION_MMDD "0808"
|
||||
!define VERSION_MMDD "0816"
|
||||
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
|
||||
|
||||
!define MY_ABI "5"
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
Summary: shared libraries for terminal handling
|
||||
Name: mingw32-ncurses6
|
||||
Version: 6.2
|
||||
Release: 20200808
|
||||
Release: 20200816
|
||||
License: X11
|
||||
Group: Development/Libraries
|
||||
Source: ncurses-%{version}-%{release}.tgz
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
Summary: shared libraries for terminal handling
|
||||
Name: ncurses6
|
||||
Version: 6.2
|
||||
Release: 20200808
|
||||
Release: 20200816
|
||||
License: X11
|
||||
Group: Development/Libraries
|
||||
Source: ncurses-%{version}-%{release}.tgz
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
Summary: Curses library with POSIX thread support.
|
||||
Name: ncursest6
|
||||
Version: 6.2
|
||||
Release: 20200808
|
||||
Release: 20200816
|
||||
License: X11
|
||||
Group: Development/Libraries
|
||||
Source: ncurses-%{version}-%{release}.tgz
|
||||
|
||||
Loading…
Reference in New Issue
Block a user