mirror/ncursesw-morphos
2
0
Fork 0
mirror of https://github.com/Aigor44/ncursesw-morphos.git synced 2024-12-15 07:30:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

ncurses 6.2 - patch 20200801

Browse Source 
+ remove remaining parts of checks for ISC Unix (cf: 20121006).
+ add user32.lib to LDFLAGS for Visual Studio C++ configuration
  (discussion with "Maarten Anonymous").
+ modify MKkey_defs.sh to hide ncurses' definition of KEY_EVENTS to
  reduce Visual Studio C++ redefinition warnings.
+ improve/update checks for external functions in test/configure
This commit is contained in:
Thomas E. Dickey 2020-08-01 23:44:17 +00:00
parent 5899b5e464
commit 3b3a6d094f
19 changed files with 2295 additions and 2395 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
NEWS
View File

@ -26,7 +26,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
-- $Id: NEWS,v 1.3527 2020/07/25 23:08:42 tom Exp $
-- $Id: NEWS,v 1.3530 2020/08/01 21:09:01 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
@ -46,6 +46,14 @@ 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.
20200801
+ remove remaining parts of checks for ISC Unix (cf: 20121006).
+ add user32.lib to LDFLAGS for Visual Studio C++ configuration
(discussion with "Maarten Anonymous").
+ modify MKkey_defs.sh to hide ncurses' definition of KEY_EVENTS to
reduce Visual Studio C++ redefinition warnings.
+ improve/update checks for external functions in test/configure
20200725
+ set LINK_TESTS in CF_SHARED_OPTS for msvc (patch by
"Maarten Anonymous")

2
VERSION
View File

@ -1 +1 @@
5:0:10 6.2 20200725
5:0:10 6.2 20200801

3853
configure vendored
View File

File diff suppressed because it is too large Load Diff

20
configure.in
View File

@ -29,7 +29,7 @@ dnl***************************************************************************
dnl
dnl Author: Thomas E. Dickey 1995-on
dnl
dnl $Id: configure.in,v 1.711 2020/07/11 20:18:40 tom Exp $
dnl $Id: configure.in,v 1.713 2020/08/01 21:07:44 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.711 $)
AC_REVISION($Revision: 1.713 $)
AC_INIT(ncurses/base/lib_initscr.c)
AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
@ -311,6 +311,14 @@ CF_HELP_MESSAGE(Build-Tools Needed to Compile Temporary Applications for Cross-c
# If we're cross-compiling, allow the user to override the tools and their
# options. The configure script is oriented toward identifying the host
# compiler, etc., but we need a build compiler to generate parts of the source.
case $cf_cv_system_name in
(*-msvc*)
LDFLAGS="$LDFLAGS user32.lib"
export LDFLAGS
;;
esac
CF_BUILD_CC
###############################################################################
@ -1679,7 +1687,6 @@ limits.h \
locale.h \
math.h \
poll.h \
sys/bsdtypes.h \
sys/ioctl.h \
sys/param.h \
sys/poll.h \
@ -1701,13 +1708,6 @@ then
AC_MSG_WARN(The NCURSES_TRACE environment variable is not supported with this configuration)
fi
# check for ISC (this may also define _POSIX_SOURCE)
# Note: even non-Posix ISC needs <sys/bsdtypes.h> to declare fd_set
if test "x$ISC" = xyes ; then
AC_CHECK_LIB(cposix,main)
AC_CHECK_LIB(inet,bzero,CF_ADD_LIB(inet))dnl also 'select()'
fi
CF_SYS_TIME_SELECT
### checks for compiler characteristics

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.1362 2020/07/25 13:50:32 tom Exp $
# $Id: dist.mk,v 1.1363 2020/08/01 12:50:57 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 = 20200725
NCURSES_PATCH = 20200801
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)

15
include/MKkey_defs.sh
View File

@ -1,5 +1,5 @@
#! /bin/sh
# $Id: MKkey_defs.sh,v 1.19 2020/02/02 23:34:34 tom Exp $
# $Id: MKkey_defs.sh,v 1.20 2020/08/01 18:20:15 tom Exp $
##############################################################################
# Copyright 2019,2020 Thomas E. Dickey #
# Copyright 2001-2013,2017 Free Software Foundation, Inc. #
@ -63,8 +63,8 @@ fi
# add keys that we generate automatically:
cat >>$data <<EOF
key_resize kr1 str R1 KEY_RESIZE + ----- Terminal resize event
key_event kv1 str V1 KEY_EVENT + ----- We were interrupted by an event
key_resize kr1 str R1 KEY_RESIZE + NCURSES_EXT_FUNCS Terminal resize event
key_event kv1 str V1 KEY_EVENT + NCURSES_WGETCH_EVENTS We were interrupted by an event
EOF
THIS=./`basename $0`
@ -142,6 +142,12 @@ $5 != "-" && $6 != "-" {
maxkey = thiskey;
if (pass == 2 || pass == 3) {
showkey=sprintf(octal_fmt, thiskey);
ifdef = 0;
if (index($7,"NCURSES_") == 1) {
ifdef = 1;
printf "\n";
printf "#ifdef %s\n", $7;
}
if ($5 == "KEY_F(0)" ) {
printf "#define "
print_cols("KEY_F0", 16);
@ -160,6 +166,9 @@ $5 != "-" && $6 != "-" {
printf " %s", $i
print " */"
}
if (ifdef != 0) {
printf "#endif\n";
}
}
}
END {

4
include/ncurses_defs
View File

@ -1,4 +1,4 @@
# $Id: ncurses_defs,v 1.93 2020/02/29 15:46:00 anonymous.maarten Exp $
# $Id: ncurses_defs,v 1.95 2020/08/01 19:48:21 tom Exp $
##############################################################################
# Copyright 2018-2019,2020 Thomas E. Dickey #
# Copyright 2000-2016,2017 Free Software Foundation, Inc. #
@ -63,6 +63,8 @@ HAVE_DERWIN 1
HAVE_DIRENT_H
HAVE_DUPWIN 1
HAVE_ERRNO
HAVE_EXIT_CURSES 1
HAVE_EXIT_TERMINFO 1
HAVE_FCNTL_H
HAVE_FILTER 1
HAVE_FORM_H

6
ncurses/curses.priv.h
View File

@ -35,7 +35,7 @@
****************************************************************************/
/*
* $Id: curses.priv.h,v 1.632 2020/07/25 22:55:59 tom Exp $
* $Id: curses.priv.h,v 1.633 2020/08/01 21:10:26 tom Exp $
*
* curses.priv.h
*
@ -72,10 +72,6 @@ extern "C" {
#include <unistd.h>
#endif
#if HAVE_SYS_BSDTYPES_H && !(defined(_WIN32) || defined(_WIN64))
#include <sys/bsdtypes.h> /* needed for ISC */
#endif
#if HAVE_LIMITS_H
# include <limits.h>
#elif HAVE_SYS_PARAM_H

4
package/debian-mingw/changelog
View File

@ -1,8 +1,8 @@
ncurses6 (6.2+20200725) unstable; urgency=low
ncurses6 (6.2+20200801) unstable; urgency=low
* latest weekly patch
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 25 Jul 2020 09:50:32 -0400
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 01 Aug 2020 08:50:57 -0400
ncurses6 (5.9-20131005) unstable; urgency=low

4
package/debian-mingw64/changelog
View File

@ -1,8 +1,8 @@
ncurses6 (6.2+20200725) unstable; urgency=low
ncurses6 (6.2+20200801) unstable; urgency=low
* latest weekly patch
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 25 Jul 2020 09:50:32 -0400
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 01 Aug 2020 08:50:57 -0400
ncurses6 (5.9-20131005) unstable; urgency=low

4
package/debian/changelog
View File

@ -1,8 +1,8 @@
ncurses6 (6.2+20200725) unstable; urgency=low
ncurses6 (6.2+20200801) unstable; urgency=low
* latest weekly patch
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 25 Jul 2020 09:50:32 -0400
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 01 Aug 2020 08:50:57 -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.406 2020/07/25 13:50:32 tom Exp $
; $Id: mingw-ncurses.nsi,v 1.407 2020/08/01 12:50:57 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 "0725"
!define VERSION_MMDD "0801"
!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: 20200725
Release: 20200801
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: 20200725
Release: 20200801
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: 20200725
Release: 20200801
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz

6
progs/progs.priv.h
View File

@ -31,7 +31,7 @@
* Author: Thomas E. Dickey 1997-on *
****************************************************************************/
/*
* $Id: progs.priv.h,v 1.50 2020/07/25 22:56:33 tom Exp $
* $Id: progs.priv.h,v 1.51 2020/08/01 21:07:50 tom Exp $
*
* progs.priv.h
*
@ -58,10 +58,6 @@
#include <unistd.h>
#endif
#if HAVE_SYS_BSDTYPES_H
#include <sys/bsdtypes.h> /* needed for ISC */
#endif
#if HAVE_LIMITS_H
# include <limits.h>
#elif HAVE_SYS_PARAM_H

738
test/configure vendored
View File

File diff suppressed because it is too large Load Diff

6
test/configure.in
View File

@ -29,7 +29,7 @@ dnl***************************************************************************
dnl
dnl Author: Thomas E. Dickey 1996-on
dnl
dnl $Id: configure.in,v 1.159 2020/05/30 00:13:37 tom Exp $
dnl $Id: configure.in,v 1.161 2020/08/01 17:20:19 tom Exp $
dnl This is a simple configuration-script for the ncurses test programs that
dnl allows the test-directory to be separately configured against a reference
dnl system (i.e., sysvr4 curses)
@ -257,6 +257,7 @@ AC_CHECK_FUNCS( \
getopt \
gettimeofday \
snprintf \
strdup \
strstr \
tsearch \
)
@ -323,6 +324,8 @@ color_set \
copywin \
delscreen \
dupwin \
exit_curses \
exit_terminfo \
filter \
getbegx \
getcurx \
@ -349,6 +352,7 @@ setupterm \
slk_color \
slk_init \
termattrs \
termname \
tgetent \
tigetnum \
tigetstr \

4
test/test.priv.h
View File

@ -30,7 +30,7 @@
/****************************************************************************
* Author: Thomas E. Dickey 1996-on *
****************************************************************************/
/* $Id: test.priv.h,v 1.188 2020/07/25 22:56:33 tom Exp $ */
/* $Id: test.priv.h,v 1.189 2020/08/01 16:55:28 tom Exp $ */
#ifndef __TEST_PRIV_H
#define __TEST_PRIV_H 1
@ -914,7 +914,7 @@ extern int TABSIZE;
#if defined(NCURSES_VERSION) && HAVE_NC_ALLOC_H
#include <nc_alloc.h>
#if HAVE_NC_FREEALL && defined(USE_TINFO)
#if HAVE_EXIT_TERMINFO && defined(USE_TINFO)
#undef ExitProgram
#define ExitProgram(code) exit_terminfo(code)
#endif