mirror/ncursesw-morphos
2
0
Fork 0
mirror of https://github.com/Aigor44/ncursesw-morphos.git synced 2025-03-07 16:16:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

ncurses 6.2 - patch 20200523

Browse Source 
+ update version-check for gnat to allow for gnat 10.x to 99.x
+ fix an uninitialized variable in lib_mouse.c changes (cf: 20200502)
+ add a check in EmitRange to guard against repeat_char emitting digits
  which could be interpreted as BSD-style padding when --enable-bsdpad
  is configured (report/patch by Hiltjo Posthuma).
+ add --disable-pkg-ldflags to suppress EXTRA_LDFLAGS from the
  generated pkg-config and ncurses*-config files, to simplify
  configuring in the case where rpath is used but the packager wants
  to hide the feature (report by Michael Stapelberg).
> fixes for building with Visual Studio C++ and msys2 (patches by
  "Maarten Anonymous"):
+ modify CF_SHARED_OPTS to generate a script which translates linker
  options into Visual Studio's dialect.
+ omit parentheses around function-names in generated lib_gen.c to
  work around a Visual Studio C++ limitation.
This commit is contained in:
Thomas E. Dickey 2020-05-24 01:57:50 +00:00
parent 54d0d62f0e
commit 3e37c7d3fa
24 changed files with 4081 additions and 3631 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

204
Ada95/aclocal.m4 vendored
View File

@ -29,7 +29,7 @@ dnl***************************************************************************
dnl
dnl Author: Thomas E. Dickey
dnl
dnl $Id: aclocal.m4,v 1.155 2020/03/20 00:23:48 tom Exp $
dnl $Id: aclocal.m4,v 1.156 2020/05/23 23:39:36 tom Exp $
dnl Macros used in NCURSES Ada95 auto-configuration script.
dnl
dnl These macros are maintained separately from NCURSES. The copyright on
@ -100,10 +100,11 @@ AC_DEFUN([CF_ADD_ADAFLAGS],[
AC_SUBST(ADAFLAGS)
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_ADD_CFLAGS version: 13 updated: 2017/02/25 18:57:40
dnl CF_ADD_CFLAGS version: 14 updated: 2020/04/04 16:16:13
dnl -------------
dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS
dnl The second parameter if given makes this macro verbose.
dnl $1 = flags to add
dnl $2 = if given makes this macro verbose.
dnl
dnl Put any preprocessor definitions that use quoted strings in $EXTRA_CPPFLAGS,
dnl to simplify use of $CPPFLAGS in compiler checks, etc., that are easily
@ -378,7 +379,7 @@ ifelse([$3],,[ :]dnl
])dnl
])])dnl
dnl ---------------------------------------------------------------------------
dnl CF_AR_FLAGS version: 6 updated: 2015/10/10 15:25:05
dnl CF_AR_FLAGS version: 7 updated: 2020/04/04 11:37:29
dnl -----------
dnl Check for suitable "ar" (archiver) options for updating an archive.
dnl
@ -389,39 +390,55 @@ AC_DEFUN([CF_AR_FLAGS],[
AC_REQUIRE([CF_PROG_AR])
AC_CACHE_CHECK(for options to update archives, cf_cv_ar_flags,[
cf_cv_ar_flags=unknown
for cf_ar_flags in -curvU -curv curv -crv crv -cqv cqv -rv rv
do
case $cf_cv_system_name in
(*-msvc*)
cf_cv_ar_flags=''
cat >mk_static_lib.sh <<-EOF
#!$SHELL
MSVC_BIN="[$]AR"
out="\[$]1"
shift
exec \[$]MSVC_BIN -out:"\[$]out" \[$]@
EOF
chmod +x mk_static_lib.sh
AR=`pwd`/mk_static_lib.sh
;;
(*)
cf_cv_ar_flags=unknown
for cf_ar_flags in -curvU -curv curv -crv crv -cqv cqv -rv rv
do
# check if $ARFLAGS already contains this choice
if test "x$ARFLAGS" != "x" ; then
cf_check_ar_flags=`echo "x$ARFLAGS" | sed -e "s/$cf_ar_flags\$//" -e "s/$cf_ar_flags / /"`
if test "x$ARFLAGS" != "$cf_check_ar_flags" ; then
cf_cv_ar_flags=
break
# check if $ARFLAGS already contains this choice
if test "x$ARFLAGS" != "x" ; then
cf_check_ar_flags=`echo "x$ARFLAGS" | sed -e "s/$cf_ar_flags\$//" -e "s/$cf_ar_flags / /"`
if test "x$ARFLAGS" != "$cf_check_ar_flags" ; then
cf_cv_ar_flags=
break
fi
fi
fi
rm -f conftest.$ac_cv_objext
rm -f conftest.a
rm -f conftest.$ac_cv_objext
rm -f conftest.a
cat >conftest.$ac_ext <<EOF
cat >conftest.$ac_ext <<EOF
#line __oline__ "configure"
int testdata[[3]] = { 123, 456, 789 };
EOF
if AC_TRY_EVAL(ac_compile) ; then
echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&AC_FD_CC
$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&AC_FD_CC 1>/dev/null
if test -f conftest.a ; then
cf_cv_ar_flags=$cf_ar_flags
if AC_TRY_EVAL(ac_compile) ; then
echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&AC_FD_CC
$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&AC_FD_CC 1>/dev/null
if test -f conftest.a ; then
cf_cv_ar_flags=$cf_ar_flags
break
fi
else
CF_VERBOSE(cannot compile test-program)
break
fi
else
CF_VERBOSE(cannot compile test-program)
break
fi
done
rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext
done
rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext
;;
esac
])
if test -n "$ARFLAGS" ; then
@ -680,13 +697,13 @@ if test ".$system_name" != ".$cf_cv_system_name" ; then
fi
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_CHECK_GNAT_VERSION version: 2 updated: 2019/12/31 08:53:54
dnl CF_CHECK_GNAT_VERSION version: 3 updated: 2020/05/23 19:39:36
dnl ---------------------
AC_DEFUN([CF_CHECK_GNAT_VERSION],
[
AC_REQUIRE([CF_GNAT_VERSION])
case $cf_cv_gnat_version in
(3.1[[1-9]]*|3.[[2-9]]*|[[4-9]].*|20[[0-9]][[0-9]])
(3.1[[1-9]]*|3.[[2-9]]*|[[4-9]].*|[[1-9]][[0-9]].[[0-9]]*|20[[0-9]][[0-9]])
cf_cv_prog_gnat_correct=yes
;;
(*)
@ -2110,7 +2127,7 @@ CF_SUBDIR_PATH($1,$2,lib)
$1="$cf_library_path_list [$]$1"
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_LIB_PREFIX version: 12 updated: 2015/10/17 19:03:33
dnl CF_LIB_PREFIX version: 13 updated: 2020/04/04 10:11:47
dnl -------------
dnl Compute the library-prefix for the given host system
dnl $1 = variable to set
@ -2124,6 +2141,9 @@ define([CF_LIB_PREFIX],
LIB_PREFIX=''
fi
;;
(*-msvc*)
LIB_PREFIX=''
;;
(*) LIB_PREFIX='lib'
;;
esac
@ -2131,7 +2151,7 @@ ifelse($1,,,[$1=$LIB_PREFIX])
AC_SUBST(LIB_PREFIX)
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_LIB_SUFFIX version: 25 updated: 2015/04/17 21:13:04
dnl CF_LIB_SUFFIX version: 26 updated: 2020/04/04 10:11:47
dnl -------------
dnl Compute the library file-suffix from the given model name
dnl $1 = model name
@ -2146,11 +2166,25 @@ AC_DEFUN([CF_LIB_SUFFIX],
$3=[$]$2
;;
(Xdebug)
$2='_g.a'
case $cf_cv_system_name in
(*-msvc*)
$2='_g.lib'
;;
(*)
$2='_g.a'
;;
esac
$3=[$]$2
;;
(Xprofile)
$2='_p.a'
case $cf_cv_system_name in
(*-msvc*)
$2='_p.lib'
;;
(*)
$2='_p.a'
;;
esac
$3=[$]$2
;;
(Xshared)
@ -2159,6 +2193,10 @@ AC_DEFUN([CF_LIB_SUFFIX],
$2='.so'
$3=[$]$2
;;
(*-msvc*)
$2='.dll'
$3='.dll.lib'
;;
(cygwin*|msys*|mingw*)
$2='.dll'
$3='.dll.a'
@ -2186,7 +2224,14 @@ AC_DEFUN([CF_LIB_SUFFIX],
esac
;;
(*)
$2='.a'
case $target in
(*-msvc*)
$2='.lib'
;;
(*)
$2='.a'
;;
esac
$3=[$]$2
;;
esac
@ -3494,7 +3539,7 @@ do
done
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_SHARED_OPTS version: 94 updated: 2020/02/29 16:09:19
dnl CF_SHARED_OPTS version: 96 updated: 2020/05/23 19:39:36
dnl --------------
dnl --------------
dnl Attempt to determine the appropriate CC/LD options for creating a shared
@ -3721,8 +3766,8 @@ CF_EOF
MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $[@]'
;;
(mingw*msvc*)
cf_cv_shlib_version=mingw
cf_cv_shlib_version_infix=mingw
cf_cv_shlib_version=msvcdll
cf_cv_shlib_version_infix=msvcdll
shlibdir=$bindir
MAKE_DLLS=
if test "$DFT_LWR_MODEL" = "shared" ; then
@ -3731,25 +3776,96 @@ CF_EOF
EXTRA_LDFLAGS="-link -dll $EXTRA_LDFLAGS"
fi
CC_SHARED_OPTS=
MK_SHARED_LIB=$SHELL' '$rel_builddir'/mk_shared_lib.sh $@ ${LD} ${CFLAGS}'
RM_SHARED_OPTS="$RM_SHARED_OPTS $rel_builddir/mk_shared_lib.sh *.dll.a"
MK_SHARED_LIB=$SHELL' '$rel_builddir'/mk_shared_lib.sh [$]@ ${LD} [$]{CFLAGS}'
RM_SHARED_OPTS="$RM_SHARED_OPTS $rel_builddir/mk_shared_lib.sh *.dll.lib"
cat >mk_shared_lib.sh <<-CF_EOF
#!$SHELL
SHARED_LIB=\$1
IMPORT_LIB=\`echo "\$1" | sed -e 's/[0-9]*\.dll$\.dll.a/'\`
SHARED_LIB=\[$]1
IMPORT_LIB=\`echo "\[$]1" | sed -e 's/[[0-9]]*\.dll[$]/.dll.lib/'\`
shift
my_ld=\$1
my_ld=\[$]1
shift
cat <<-EOF
Linking shared library
** SHARED LIB \$SHARED_LIB
** IMPORT_LIB \$IMPORT_LIB
EOF
args=\$(echo \$* | sed -E "s#-l(\w*)#lib\1.a#g" | sed -E "s#-L(\w*)#-LIBPATH:\1#g")
args=\$(echo \[$]* | sed -E "s#-l(\w*)#\1.dll.lib#g" | sed -E "s#-L(\w*)#-LIBPATH:\1#g")
exec \$my_ld -DLL -IMPLIB:"\${IMPORT_LIB}" -OUT:"\${SHARED_LIB}" ${LDFLAGS} \$args
mv "\${IMPORT_LIB}" "\${IMPORT_LIB}"
CF_EOF
chmod +x mk_shared_lib.sh
cat >mk_prog.sh <<-CF_EOF
#!$SHELL
shift
# Ignore first argument (compiler) and use LD (link.exe) unconditionally
LD="[$]LD"
clopts=()
ldopts=()
libs=()
isdll=0
while test \[$]# -gt 0; do
case "\[$]1" in
-link)
# ignore -link argument
;;
-dll)
isdll=1
;;
-W* | -w*)
# ignore warnings
;;
-D*)
clopts+=("\[$]1")
;;
-I*)
clopts+=("\[$]1")
;;
-l*)
libs+=("\`echo \"\[$]1\" | sed \"s/^-l//\"\`")
;;
-L*)
ldopts+=("\`echo \"\[$]1\" | sed \"s/^-L/-LIBPATH:/\"\`")
;;
*.obj | *.o)
ldopts+=("\[$]1")
;;
-Wl,*)
for linkarg in \`echo '\[$]1' | sed -e 's/-Wl,//' -e 's/,/ /'\`; do
ldopts+=("\[$]{linkarg}")
done
;;
*.lib)
ldopts+=("\[$]1")
;;
-o)
shift
ldopts+=("-out:\[$]1")
;;
*)
clopts+=("\[$]1")
ldopts+=("\[$]1")
;;
esac
shift
done
if [[ "\$isdll" -ne 0 ]]; then
for lib in \[$]{libs[[*]]}; do
ldopts+=("\[$]lib.dll.lib")
done
else
for lib in \[$]{libs[[*]]}; do
ldopts+=("\[$]lib.lib")
done
fi
cat <<-EOF
Creating program
** ld options: "\[$]{ldopts[[@]]}"
EOF
exec \[$]LD \[$]{ldopts[[@]]}
CF_EOF
chmod +x mk_prog.sh
LINK_PROGS="$SHELL ${rel_builddir}/mk_prog.sh"
;;
(mingw*)
cf_cv_shlib_version=mingw

2361
Ada95/configure vendored
View File

File diff suppressed because it is too large Load Diff

10
INSTALL
View File

@ -26,7 +26,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
-- $Id: INSTALL,v 1.222 2020/04/05 00:05:52 tom Exp $
-- $Id: INSTALL,v 1.223 2020/05/23 18:30:33 tom Exp $
---------------------------------------------------------------------
How to install Ncurses/Terminfo on your system
---------------------------------------------------------------------
@ -456,6 +456,14 @@ SUMMARY OF CONFIGURE OPTIONS:
--with-menu-libname=nmenu
--with-panel-libname=npanel
--disable-pkg-ldflags
Omit options in $EXTRA_LDFLAGS from the pkg-config ".pc" and
corresponding ncurses*-config script which normally are listed via
the "--libs" option. These options are normally used to facilitate
linking to ncurses when it was configured to use the rpath feature.
See also --enable-rpath and --disable-rpath-hack.
--disable-relink
If --enable-rpath is given, the generated makefiles normally will
rebuild shared libraries during install. Use this option to simply

19
NEWS
View File

@ -26,7 +26,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
-- $Id: NEWS,v 1.3486 2020/05/17 00:40:58 tom Exp $
-- $Id: NEWS,v 1.3491 2020/05/24 00:07:37 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
@ -46,6 +46,23 @@ 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.
20200523
+ update version-check for gnat to allow for gnat 10.x to 99.x
+ fix an uninitialized variable in lib_mouse.c changes (cf: 20200502)
+ add a check in EmitRange to guard against repeat_char emitting digits
which could be interpreted as BSD-style padding when --enable-bsdpad
is configured (report/patch by Hiltjo Posthuma).
+ add --disable-pkg-ldflags to suppress EXTRA_LDFLAGS from the
generated pkg-config and ncurses*-config files, to simplify
configuring in the case where rpath is used but the packager wants
to hide the feature (report by Michael Stapelberg).
> fixes for building with Visual Studio C++ and msys2 (patches by
"Maarten Anonymous"):
+ modify CF_SHARED_OPTS to generate a script which translates linker
options into Visual Studio's dialect.
+ omit parentheses around function-names in generated lib_gen.c to
work around a Visual Studio C++ limitation.
20200516
+ add notes on termcap.h header in curs_termcap.3x
+ update notes on vscode / xterm.js -TD

2
VERSION
View File

@ -1 +1 @@
5:0:10 6.2 20200516
5:0:10 6.2 20200523

79
aclocal.m4 vendored
View File

@ -29,7 +29,7 @@ dnl***************************************************************************
dnl
dnl Author: Thomas E. Dickey 1995-on
dnl
dnl $Id: aclocal.m4,v 1.912 2020/04/04 20:16:13 tom Exp $
dnl $Id: aclocal.m4,v 1.913 2020/05/23 23:46:10 tom Exp $
dnl Macros used in NCURSES auto-configuration script.
dnl
dnl These macros are maintained separately from NCURSES. The copyright on
@ -1196,13 +1196,13 @@ then
fi
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_CHECK_GNAT_VERSION version: 2 updated: 2019/12/31 08:53:54
dnl CF_CHECK_GNAT_VERSION version: 3 updated: 2020/05/23 19:39:36
dnl ---------------------
AC_DEFUN([CF_CHECK_GNAT_VERSION],
[
AC_REQUIRE([CF_GNAT_VERSION])
case $cf_cv_gnat_version in
(3.1[[1-9]]*|3.[[2-9]]*|[[4-9]].*|20[[0-9]][[0-9]])
(3.1[[1-9]]*|3.[[2-9]]*|[[4-9]].*|[[1-9]][[0-9]].[[0-9]]*|20[[0-9]][[0-9]])
cf_cv_prog_gnat_correct=yes
;;
(*)
@ -6644,7 +6644,7 @@ do
done
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_SHARED_OPTS version: 95 updated: 2020/04/04 10:11:47
dnl CF_SHARED_OPTS version: 96 updated: 2020/05/23 19:39:36
dnl --------------
dnl --------------
dnl Attempt to determine the appropriate CC/LD options for creating a shared
@ -6900,6 +6900,77 @@ EOF
mv "\${IMPORT_LIB}" "\${IMPORT_LIB}"
CF_EOF
chmod +x mk_shared_lib.sh
cat >mk_prog.sh <<-CF_EOF
#!$SHELL
shift
# Ignore first argument (compiler) and use LD (link.exe) unconditionally
LD="[$]LD"
clopts=()
ldopts=()
libs=()
isdll=0
while test \[$]# -gt 0; do
case "\[$]1" in
-link)
# ignore -link argument
;;
-dll)
isdll=1
;;
-W* | -w*)
# ignore warnings
;;
-D*)
clopts+=("\[$]1")
;;
-I*)
clopts+=("\[$]1")
;;
-l*)
libs+=("\`echo \"\[$]1\" | sed \"s/^-l//\"\`")
;;
-L*)
ldopts+=("\`echo \"\[$]1\" | sed \"s/^-L/-LIBPATH:/\"\`")
;;
*.obj | *.o)
ldopts+=("\[$]1")
;;
-Wl,*)
for linkarg in \`echo '\[$]1' | sed -e 's/-Wl,//' -e 's/,/ /'\`; do
ldopts+=("\[$]{linkarg}")
done
;;
*.lib)
ldopts+=("\[$]1")
;;
-o)
shift
ldopts+=("-out:\[$]1")
;;
*)
clopts+=("\[$]1")
ldopts+=("\[$]1")
;;
esac
shift
done
if [[ "\$isdll" -ne 0 ]]; then
for lib in \[$]{libs[[*]]}; do
ldopts+=("\[$]lib.dll.lib")
done
else
for lib in \[$]{libs[[*]]}; do
ldopts+=("\[$]lib.lib")
done
fi
cat <<-EOF
Creating program
** ld options: "\[$]{ldopts[[@]]}"
EOF
exec \[$]LD \[$]{ldopts[[@]]}
CF_EOF
chmod +x mk_prog.sh
LINK_PROGS="$SHELL ${rel_builddir}/mk_prog.sh"
;;
(mingw*)
cf_cv_shlib_version=mingw

4941
configure vendored
View File

File diff suppressed because it is too large Load Diff

21
configure.in
View File

@ -29,7 +29,7 @@ dnl***************************************************************************
dnl
dnl Author: Thomas E. Dickey 1995-on
dnl
dnl $Id: configure.in,v 1.705 2020/04/04 23:33:09 tom Exp $
dnl $Id: configure.in,v 1.707 2020/05/23 18:16:07 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.705 $)
AC_REVISION($Revision: 1.707 $)
AC_INIT(ncurses/base/lib_initscr.c)
AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
@ -543,6 +543,23 @@ if test "$DFT_LWR_MODEL" = "shared" && test "x$cf_cv_enable_rpath" != xno; then
CF_DISABLE_RPATH_HACK
fi
### Depending on the system, someone may use rpath to build ncurses but not
# want users of the package to rely upon that feature. Give those people an
# option to suppress that detail from EXTRA_LDFLAGS.
EXTRA_PKG_LDFLAGS="$EXTRA_LDFLAGS"
if test -n "$EXTRA_PKG_LDFLAGS"
then
AC_MSG_CHECKING(if you want to disable extra LDFLAGS for package-scripts)
CF_ARG_DISABLE(pkg-ldflags,
[ --disable-pkg-ldflags disable extra LDFLAGS for package-scripts],
[disable_pkg_ldflags=yes],
[disable_pkg_ldflags=no],
no)
AC_MSG_RESULT($disable_pkg_ldflags)
test "$disable_pkg_ldflags" = yes && EXTRA_PKG_LDFLAGS=
fi
AC_SUBST(EXTRA_PKG_LDFLAGS)
###############################################################################
CF_HELP_MESSAGE(Fine-Tuning Your Configuration:)

4
dist.mk
View File

@ -26,7 +26,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
# $Id: dist.mk,v 1.1350 2020/05/16 12:23:59 tom Exp $
# $Id: dist.mk,v 1.1351 2020/05/23 09:35:39 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 = 20200516
NCURSES_PATCH = 20200523
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)

4
misc/gen-pkgconfig.in
View File

@ -1,5 +1,5 @@
#!@SHELL@
# $Id: gen-pkgconfig.in,v 1.45 2020/03/08 01:57:33 tom Exp $
# $Id: gen-pkgconfig.in,v 1.46 2020/05/23 17:56:46 tom Exp $
##############################################################################
# Copyright 2018-2019,2020 Thomas E. Dickey #
# Copyright 2009-2015,2018 Free Software Foundation, Inc. #
@ -83,7 +83,7 @@ if [ "$includedir" != "/usr/include" ]; then
fi
lib_flags=
for opt in -L$libdir @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@
for opt in -L$libdir @LDFLAGS@ @EXTRA_PKG_LDFLAGS@ @LIBS@
do
case $opt in
-l*) # LIBS is handled specially below

4
misc/ncurses-config.in
View File

@ -1,5 +1,5 @@
#!@SHELL@
# $Id: ncurses-config.in,v 1.43 2020/02/02 23:34:34 tom Exp $
# $Id: ncurses-config.in,v 1.44 2020/05/23 17:56:52 tom Exp $
##############################################################################
# Copyright 2018-2019,2020 Thomas E. Dickey #
# Copyright 2006-2015,2017 Free Software Foundation, Inc. #
@ -101,7 +101,7 @@ fi
# There is no portable way to find the list of standard library directories.
# Require a POSIX shell anyway, to keep this simple.
lib_flags=
for opt in -L$libdir @LDFLAGS@ @EXTRA_LDFLAGS@ $LIBS
for opt in -L$libdir @LDFLAGS@ @EXTRA_PKG_LDFLAGS@ $LIBS
do
case $opt in
-specs*) # ignore linker specs-files which were used to build library

4
ncurses/base/MKlib_gen.sh
View File

@ -2,7 +2,7 @@
#
# MKlib_gen.sh -- generate sources from curses.h macro definitions
#
# ($Id: MKlib_gen.sh,v 1.65 2020/04/04 20:56:30 tom Exp $)
# ($Id: MKlib_gen.sh,v 1.66 2020/05/23 23:59:39 anonymous.maarten Exp $)
#
##############################################################################
# Copyright 2018,2020 Thomas E. Dickey #
@ -178,7 +178,7 @@ EOF3
if test "$USE" = generated ; then
cat >$ED4 <<EOF
s/^\(.*\) \(.*\) (\(.*\))\$/NCURSES_EXPORT(\1) (\2) (\3)/
s/^\(.*\) \(.*\) (\(.*\))\$/NCURSES_EXPORT(\1) \2 (\3)/
/attr_[sg]et.* z)/s,z),z GCC_UNUSED),
EOF
else

4
ncurses/base/lib_mouse.c
View File

@ -85,7 +85,7 @@
#define CUR SP_TERMTYPE
#endif
MODULE_ID("$Id: lib_mouse.c,v 1.187 2020/05/09 23:24:03 tom Exp $")
MODULE_ID("$Id: lib_mouse.c,v 1.188 2020/05/23 23:35:35 tom Exp $")
#include <tic.h>
@ -963,7 +963,7 @@ static bool
decode_X10_bstate(SCREEN *sp, MEVENT * eventp, unsigned intro)
{
bool result;
int button;
int button = 0;
int wheel = (intro & 96) == 96;
eventp->bstate = 0;

4
ncurses/base/lib_screen.c
View File

@ -42,7 +42,7 @@
#define CUR SP_TERMTYPE
#endif
MODULE_ID("$Id: lib_screen.c,v 1.98 2020/04/06 00:33:50 tom Exp $")
MODULE_ID("$Id: lib_screen.c,v 1.99 2020/05/23 19:12:01 tom Exp $")
#define MAX_SIZE 0x3fff /* 16k is big enough for a window or pad */
@ -441,7 +441,7 @@ read_win(WINDOW *win, FILE *fp)
}
static int
read_row(char *source, NCURSES_CH_T * prior, NCURSES_CH_T * target, int length)
read_row(char *source, NCURSES_CH_T *prior, NCURSES_CH_T *target, int length)
{
while (*source != '\0' && length > 0) {
#if NCURSES_WIDECHAR

5
ncurses/base/lib_set_term.c
View File

@ -47,7 +47,7 @@
#undef CUR
#define CUR SP_TERMTYPE
MODULE_ID("$Id: lib_set_term.c,v 1.169 2020/02/02 23:34:34 tom Exp $")
MODULE_ID("$Id: lib_set_term.c,v 1.171 2020/05/23 19:13:12 tom Exp $")
#ifdef USE_TERM_DRIVER
#define MaxColors InfoOf(sp).maxcolors
@ -340,8 +340,9 @@ NCURSES_SP_NAME(_nc_setupscreen) (
sp->_next_screen = _nc_screen_chain;
_nc_screen_chain = sp;
if ((sp->_current_attr = typeCalloc(NCURSES_CH_T, 1)) == 0)
if ((sp->_current_attr = typeCalloc(NCURSES_CH_T, 1)) == 0) {
returnCode(ERR);
}
#endif
/*

17
ncurses/tty/tty_update.c
View File

@ -85,7 +85,7 @@
#include <ctype.h>
MODULE_ID("$Id: tty_update.c,v 1.305 2020/02/02 23:34:34 tom Exp $")
MODULE_ID("$Id: tty_update.c,v 1.307 2020/05/23 19:10:35 tom Exp $")
/*
* This define controls the line-breakout optimization. Every once in a
@ -117,14 +117,14 @@ static int ClrBottom(SCREEN *, int total);
static void ClearScreen(SCREEN *, NCURSES_CH_T blank);
static void ClrUpdate(SCREEN *);
static void DelChar(SCREEN *, int count);
static void InsStr(SCREEN *, NCURSES_CH_T * line, int count);
static void InsStr(SCREEN *, NCURSES_CH_T *line, int count);
static void TransformLine(SCREEN *, int const lineno);
#else
static int ClrBottom(int total);
static void ClearScreen(NCURSES_CH_T blank);
static void ClrUpdate(void);
static void DelChar(int count);
static void InsStr(NCURSES_CH_T * line, int count);
static void InsStr(NCURSES_CH_T *line, int count);
static void TransformLine(int const lineno);
#endif
@ -567,7 +567,7 @@ can_clear_with(NCURSES_SP_DCLx ARG_CH_T ch)
* This code is optimized using ech and rep.
*/
static int
EmitRange(NCURSES_SP_DCLx const NCURSES_CH_T * ntext, int num)
EmitRange(NCURSES_SP_DCLx const NCURSES_CH_T *ntext, int num)
{
int i;
@ -620,6 +620,9 @@ EmitRange(NCURSES_SP_DCLx const NCURSES_CH_T * ntext, int num)
return 1; /* cursor stays in the middle */
}
} else if (repeat_char != 0 &&
#if BSD_TPUTS
!isdigit(UChar(CharOf(ntext0))) &&
#endif
#if USE_WIDEC_SUPPORT
(!SP_PARM->_screen_unicode &&
(CharOf(ntext0) < ((AttrOf(ntext0) & A_ALTCHARSET)
@ -679,8 +682,8 @@ EmitRange(NCURSES_SP_DCLx const NCURSES_CH_T * ntext, int num)
*/
static int
PutRange(NCURSES_SP_DCLx
const NCURSES_CH_T * otext,
const NCURSES_CH_T * ntext,
const NCURSES_CH_T *otext,
const NCURSES_CH_T *ntext,
int row,
int first, int last)
{
@ -1701,7 +1704,7 @@ ClearScreen(NCURSES_SP_DCLx NCURSES_CH_T blank)
*/
static void
InsStr(NCURSES_SP_DCLx NCURSES_CH_T * line, int count)
InsStr(NCURSES_SP_DCLx NCURSES_CH_T *line, int count)
{
TR(TRACE_UPDATE, ("InsStr(%p, %p,%d) called",
(void *) SP_PARM,

4
package/debian-mingw/changelog
View File

@ -1,8 +1,8 @@
ncurses6 (6.2+20200516) unstable; urgency=low
ncurses6 (6.2+20200523) unstable; urgency=low
* latest weekly patch
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 16 May 2020 08:23:59 -0400
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 23 May 2020 05:35:39 -0400
ncurses6 (5.9-20131005) unstable; urgency=low

4
package/debian-mingw64/changelog
View File

@ -1,8 +1,8 @@
ncurses6 (6.2+20200516) unstable; urgency=low
ncurses6 (6.2+20200523) unstable; urgency=low
* latest weekly patch
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 16 May 2020 08:23:59 -0400
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 23 May 2020 05:35:39 -0400
ncurses6 (5.9-20131005) unstable; urgency=low

4
package/debian/changelog
View File

@ -1,8 +1,8 @@
ncurses6 (6.2+20200516) unstable; urgency=low
ncurses6 (6.2+20200523) unstable; urgency=low
* latest weekly patch
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 16 May 2020 08:23:59 -0400
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 23 May 2020 05:35:39 -0400
ncurses6 (5.9-20120608) unstable; urgency=low

4
package/mingw-ncurses.nsi
View File

@ -1,4 +1,4 @@
; $Id: mingw-ncurses.nsi,v 1.394 2020/05/16 12:23:59 tom Exp $
; $Id: mingw-ncurses.nsi,v 1.395 2020/05/23 09:35:39 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 "0516"
!define VERSION_MMDD "0523"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"

2
package/mingw-ncurses.spec
View File

@ -3,7 +3,7 @@
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 6.2
Release: 20200516
Release: 20200523
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz

2
package/ncurses.spec
View File

@ -1,7 +1,7 @@
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 6.2
Release: 20200516
Release: 20200523
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz

2
package/ncursest.spec
View File

@ -1,7 +1,7 @@
Summary: Curses library with POSIX thread support.
Name: ncursest6
Version: 6.2
Release: 20200516
Release: 20200523
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz

7
test/aclocal.m4 vendored
View File

@ -27,7 +27,7 @@ dnl sale, use or other dealings in this Software without prior written *
dnl authorization. *
dnl***************************************************************************
dnl
dnl $Id: aclocal.m4,v 1.179 2020/03/20 00:23:48 tom Exp $
dnl $Id: aclocal.m4,v 1.180 2020/04/04 20:16:13 tom Exp $
dnl
dnl Author: Thomas E. Dickey
dnl
@ -92,10 +92,11 @@ define([CF_ACVERSION_COMPARE],
[ifelse([$8], , ,[$8])],
[ifelse([$9], , ,[$9])])])dnl
dnl ---------------------------------------------------------------------------
dnl CF_ADD_CFLAGS version: 13 updated: 2017/02/25 18:57:40
dnl CF_ADD_CFLAGS version: 14 updated: 2020/04/04 16:16:13
dnl -------------
dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS
dnl The second parameter if given makes this macro verbose.
dnl $1 = flags to add
dnl $2 = if given makes this macro verbose.
dnl
dnl Put any preprocessor definitions that use quoted strings in $EXTRA_CPPFLAGS,
dnl to simplify use of $CPPFLAGS in compiler checks, etc., that are easily