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.0 - patch 20151017

Browse Source 
+ modify ncurses/Makefile.in to sort keys.list in POSIX locale
  (Debian #801864, patch by Esa Peuha).
+ remove an early-return from _nc_do_color, which can interfere with
  data needed by bkgd when ncurses is configured with extended colors
  (patch by Denis Tikhomirov).
> fixes for OS/2 (patches by KO Myung-Hun)
+ use button instead of kbuf[0] in EMX-specific part of lib_mouse.c
+ support building with libtool on OS/2
+ use stdc++ on OS/2 kLIBC
+ clear cf_XOPEN_SOURCE on OS/2
This commit is contained in:
Thomas E. Dickey 2015-10-18 00:40:46 +00:00
parent 9eb6f49919
commit def73dda3f
20 changed files with 3457 additions and 3383 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Ada95/aclocal.m4 vendored
View File

@ -28,7 +28,7 @@ dnl***************************************************************************
dnl
dnl Author: Thomas E. Dickey
dnl
dnl $Id: aclocal.m4,v 1.107 2015/10/10 19:52:33 tom Exp $
dnl $Id: aclocal.m4,v 1.108 2015/10/17 23:07:06 tom Exp $
dnl Macros used in NCURSES Ada95 auto-configuration script.
dnl
dnl These macros are maintained separately from NCURSES. The copyright on
@ -1755,7 +1755,7 @@ CF_SUBDIR_PATH($1,$2,lib)
$1="$cf_library_path_list [$]$1"
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_LIB_PREFIX version: 11 updated: 2015/04/18 08:56:57
dnl CF_LIB_PREFIX version: 12 updated: 2015/10/17 19:03:33
dnl -------------
dnl Compute the library-prefix for the given host system
dnl $1 = variable to set
@ -1763,7 +1763,11 @@ define([CF_LIB_PREFIX],
[
case $cf_cv_system_name in
(OS/2*|os2*)
LIB_PREFIX=''
if test "$DFT_LWR_MODEL" = libtool; then
LIB_PREFIX='lib'
else
LIB_PREFIX=''
fi
;;
(*) LIB_PREFIX='lib'
;;
@ -3849,7 +3853,7 @@ AC_ARG_WITH(system-type,
])
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_XOPEN_SOURCE version: 49 updated: 2015/04/12 15:39:00
dnl CF_XOPEN_SOURCE version: 50 updated: 2015/10/17 19:03:33
dnl ---------------
dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
dnl or adapt to the vendor's definitions to get equivalent functionality,
@ -3919,6 +3923,9 @@ case $host_os in
(openbsd*)
# setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
;;
(os2*)
cf_XOPEN_SOURCE=
;;
(osf[[45]]*)
cf_xopen_source="-D_OSF_SOURCE"
;;

977
Ada95/configure vendored
View File

File diff suppressed because it is too large Load Diff

16
NEWS
View File

@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
-- $Id: NEWS,v 1.2505 2015/10/10 20:24:26 tom Exp $
-- $Id: NEWS,v 1.2509 2015/10/17 22:02:46 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
@ -45,6 +45,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.
20151017
+ modify ncurses/Makefile.in to sort keys.list in POSIX locale
(Debian #801864, patch by Esa Peuha).
+ remove an early-return from _nc_do_color, which can interfere with
data needed by bkgd when ncurses is configured with extended colors
(patch by Denis Tikhomirov).
> fixes for OS/2 (patches by KO Myung-Hun)
+ use button instead of kbuf[0] in EMX-specific part of lib_mouse.c
+ support building with libtool on OS/2
+ use stdc++ on OS/2 kLIBC
+ clear cf_XOPEN_SOURCE on OS/2
20151010
+ add configure check for openpty to test/configure script, for ditto.
+ minor fixes to test/view.c in investigating Debian #790847.
@ -1713,7 +1725,7 @@ it is not possible to add this information.
+ modify check_existence() in db_iterator.c to simply check if the
path is a directory or file, according to the need. Checking for
directory size also gives no usable result with OS/2 (cf: 20120107).
+ support OS/2 kLIBC (patch by KO Myung-Han).
+ support OS/2 kLIBC (patch by KO Myung-Hun).
20120114
+ several improvements to test/movewindow.c (prompted by discussion on

2
VERSION
View File

@ -1 +1 @@
5:0:9 6.0 20151010
5:0:9 6.0 20151017

27
aclocal.m4 vendored
View File

@ -28,7 +28,7 @@ dnl***************************************************************************
dnl
dnl Author: Thomas E. Dickey 1995-on
dnl
dnl $Id: aclocal.m4,v 1.770 2015/10/10 19:27:07 tom Exp $
dnl $Id: aclocal.m4,v 1.774 2015/10/17 23:05:09 tom Exp $
dnl Macros used in NCURSES auto-configuration script.
dnl
dnl These macros are maintained separately from NCURSES. The copyright on
@ -3221,7 +3221,7 @@ fi
test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_LIB_PREFIX version: 11 updated: 2015/04/18 08:56:57
dnl CF_LIB_PREFIX version: 12 updated: 2015/10/17 19:03:33
dnl -------------
dnl Compute the library-prefix for the given host system
dnl $1 = variable to set
@ -3229,7 +3229,11 @@ define([CF_LIB_PREFIX],
[
case $cf_cv_system_name in
(OS/2*|os2*)
LIB_PREFIX=''
if test "$DFT_LWR_MODEL" = libtool; then
LIB_PREFIX='lib'
else
LIB_PREFIX=''
fi
;;
(*) LIB_PREFIX='lib'
;;
@ -6257,7 +6261,7 @@ if test -n "$ADA_SUBDIRS"; then
fi
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_STDCPP_LIBRARY version: 10 updated: 2015/09/12 15:53:39
dnl CF_STDCPP_LIBRARY version: 11 updated: 2015/10/17 19:03:33
dnl -----------------
dnl Check for -lstdc++, which is GNU's standard C++ library.
dnl If $CXXLIBS is set, add that to the libraries used for test-linking.
@ -6282,7 +6286,11 @@ if test -n "$GXX" ; then
then
case $cf_cv_system_name in
(os2*)
cf_stdcpp_libname=stdcpp
if test -z "`g++ -dM -E - < /dev/null | grep __KLIBC__`"; then
cf_stdcpp_libname=stdcpp
else
cf_stdcpp_libname=stdc++
fi
;;
(*)
cf_stdcpp_libname=stdc++
@ -7047,7 +7055,7 @@ if test "$with_gpm" != no ; then
fi
])
dnl ---------------------------------------------------------------------------
dnl CF_WITH_LIBTOOL version: 32 updated: 2015/04/17 21:13:04
dnl CF_WITH_LIBTOOL version: 33 updated: 2015/10/17 19:03:33
dnl ---------------
dnl Provide a configure option to incorporate libtool. Define several useful
dnl symbols for the makefile rules.
@ -7145,7 +7153,7 @@ ifdef([AC_PROG_LIBTOOL],[
# special hack to add -no-undefined (which libtool should do for itself)
LT_UNDEF=
case "$cf_cv_system_name" in
(cygwin*|msys*|mingw32*|uwin*|aix[[4-7]])
(cygwin*|msys*|mingw32*|os2*|uwin*|aix[[4-7]])
LT_UNDEF=-no-undefined
;;
esac
@ -7643,7 +7651,7 @@ AC_SUBST(VERSIONED_SYMS)
AC_SUBST(WILDCARD_SYMS)
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_XOPEN_SOURCE version: 49 updated: 2015/04/12 15:39:00
dnl CF_XOPEN_SOURCE version: 50 updated: 2015/10/17 19:03:33
dnl ---------------
dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
dnl or adapt to the vendor's definitions to get equivalent functionality,
@ -7713,6 +7721,9 @@ case $host_os in
(openbsd*)
# setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
;;
(os2*)
cf_XOPEN_SOURCE=
;;
(osf[[45]]*)
cf_xopen_source="-D_OSF_SOURCE"
;;

4
c++/Makefile.in
View File

@ -1,4 +1,4 @@
# $Id: Makefile.in,v 1.111 2015/08/05 23:15:41 tom Exp $
# $Id: Makefile.in,v 1.113 2015/10/17 22:59:12 tom Exp $
##############################################################################
# Copyright (c) 1998-2014,2015 Free Software Foundation, Inc. #
# #
@ -58,7 +58,7 @@ INCLUDEDIR = $(DESTDIR)$(includedir)$(includesubdir)
PACKAGE = @PACKAGE@
LIBTOOL = @LIBTOOL_CXX@
LIBTOOL_OPTS = @LIBTOOL_OPTS@
LIBTOOL_OPTS = @LIBTOOL_OPTS@ @LIBTOOL_OPTS_CXX@
LIBTOOL_CLEAN = @LIB_CLEAN@
LIBTOOL_COMPILE = @LIB_COMPILE@
LIBTOOL_LINK = @LIB_LINK@

3156
configure vendored
View File

File diff suppressed because it is too large Load Diff

15
configure.in
View File

@ -28,14 +28,14 @@ dnl***************************************************************************
dnl
dnl Author: Thomas E. Dickey 1995-on
dnl
dnl $Id: configure.in,v 1.619 2015/08/05 23:32:27 tom Exp $
dnl $Id: configure.in,v 1.620 2015/10/17 23:01:54 tom Exp $
dnl Process this file with autoconf to produce a configure script.
dnl
dnl See http://invisible-island.net/autoconf/ for additional information.
dnl
dnl ---------------------------------------------------------------------------
AC_PREREQ(2.52.20030208)
AC_REVISION($Revision: 1.619 $)
AC_REVISION($Revision: 1.620 $)
AC_INIT(ncurses/base/lib_initscr.c)
AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
@ -2075,6 +2075,17 @@ AC_SUBST(MENU_NAME)
AC_SUBST(FORM_NAME)
AC_SUBST(CXX_NAME)
# workaround for OS/2 (20151017)
case $cf_cv_system_name in
(os2*)
LIBTOOL_OPTS_CXX="-os2dllname ncurs++"
;;
(*)
LIBTOOL_OPTS_CXX=
;;
esac
AC_SUBST(LIBTOOL_OPTS_CXX)
# workaround for g++ versus Solaris (20131116)
case $cf_cv_system_name in
(solaris2*)

4
dist.mk
View File

@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
# $Id: dist.mk,v 1.1073 2015/10/10 17:06:12 tom Exp $
# $Id: dist.mk,v 1.1074 2015/10/17 20:29:47 tom Exp $
# Makefile for creating ncurses distributions.
#
# This only needs to be used directly as a makefile by developers, but
@ -37,7 +37,7 @@ SHELL = /bin/sh
# These define the major/minor/patch versions of ncurses.
NCURSES_MAJOR = 6
NCURSES_MINOR = 0
NCURSES_PATCH = 20151010
NCURSES_PATCH = 20151017
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)

4
ncurses/Makefile.in
View File

@ -1,4 +1,4 @@
# $Id: Makefile.in,v 1.147 2015/08/05 23:15:41 tom Exp $
# $Id: Makefile.in,v 1.148 2015/10/17 21:48:15 Esa.Peuha Exp $
##############################################################################
# Copyright (c) 1998-2014,2015 Free Software Foundation, Inc. #
# #
@ -225,7 +225,7 @@ init_keytry.h: make_keys$(BUILD_EXEEXT) keys.list
./make_keys$(BUILD_EXEEXT) keys.list > $@
keys.list : $(tinfo)/MKkeys_list.sh
AWK=$(AWK) $(SHELL) $(tinfo)/MKkeys_list.sh $(TERMINFO_CAPS) | sort >$@
AWK=$(AWK) $(SHELL) $(tinfo)/MKkeys_list.sh $(TERMINFO_CAPS) | LC_ALL=C sort >$@
make_keys$(BUILD_EXEEXT) : \
$(tinfo)/make_keys.c \

4
ncurses/base/lib_color.c
View File

@ -45,7 +45,7 @@
#define CUR SP_TERMTYPE
#endif
MODULE_ID("$Id: lib_color.c,v 1.111 2015/08/22 22:38:58 tom Exp $")
MODULE_ID("$Id: lib_color.c,v 1.112 2015/10/17 20:39:18 Denis.Tikhomirov Exp $")
#ifdef USE_TERM_DRIVER
#define CanChange InfoOf(SP_PARM).canchange
@ -858,8 +858,6 @@ NCURSES_SP_NAME(_nc_do_color) (NCURSES_SP_DCLx
}
} else {
reset_color_pair(NCURSES_SP_ARG);
if (old_pair < 0)
return;
}
#if NCURSES_EXT_FUNCS

4
ncurses/base/lib_mouse.c
View File

@ -84,7 +84,7 @@
#define CUR SP_TERMTYPE
#endif
MODULE_ID("$Id: lib_mouse.c,v 1.166 2015/07/05 00:28:27 tom Exp $")
MODULE_ID("$Id: lib_mouse.c,v 1.167 2015/10/17 22:08:05 KO.Myung-Hun Exp $")
#include <tic.h>
@ -888,7 +888,7 @@ _nc_mouse_event(SCREEN *sp)
do { \
eventp->bstate = MASK_PRESS(n); \
sp->_mouse_bstate |= MASK_PRESS(n); \
if (kbuf[0] & 0x40) { \
if (button & 0x40) { \
eventp->bstate = MASK_RELEASE(n); \
sp->_mouse_bstate &= ~MASK_PRESS(n); \
} \

4
package/debian-mingw/changelog
View File

@ -1,8 +1,8 @@
ncurses6 (6.0+20151010) unstable; urgency=low
ncurses6 (6.0+20151017) unstable; urgency=low
* latest weekly patch
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 10 Oct 2015 13:06:12 -0400
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 17 Oct 2015 16:29:47 -0400
ncurses6 (5.9-20131005) unstable; urgency=low

4
package/debian-mingw64/changelog
View File

@ -1,8 +1,8 @@
ncurses6 (6.0+20151010) unstable; urgency=low
ncurses6 (6.0+20151017) unstable; urgency=low
* latest weekly patch
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 10 Oct 2015 13:06:12 -0400
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 17 Oct 2015 16:29:47 -0400
ncurses6 (5.9-20131005) unstable; urgency=low

4
package/debian/changelog
View File

@ -1,8 +1,8 @@
ncurses6 (6.0+20151010) unstable; urgency=low
ncurses6 (6.0+20151017) unstable; urgency=low
* latest weekly patch
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 10 Oct 2015 13:06:12 -0400
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 17 Oct 2015 16:29:47 -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.126 2015/10/10 17:06:12 tom Exp $
; $Id: mingw-ncurses.nsi,v 1.127 2015/10/17 20:29:47 tom Exp $
; TODO add examples
; TODO bump ABI to 6
@ -10,7 +10,7 @@
!define VERSION_MAJOR "6"
!define VERSION_MINOR "0"
!define VERSION_YYYY "2015"
!define VERSION_MMDD "1010"
!define VERSION_MMDD "1017"
!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.0
Release: 20151010
Release: 20151017
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.0
Release: 20151010
Release: 20151017
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz

7
test/aclocal.m4 vendored
View File

@ -26,7 +26,7 @@ dnl sale, use or other dealings in this Software without prior written *
dnl authorization. *
dnl***************************************************************************
dnl
dnl $Id: aclocal.m4,v 1.121 2015/10/10 20:30:48 tom Exp $
dnl $Id: aclocal.m4,v 1.122 2015/10/17 23:06:10 tom Exp $
dnl
dnl Author: Thomas E. Dickey
dnl
@ -3306,7 +3306,7 @@ AC_TRY_LINK([
test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_XOPEN_SOURCE version: 49 updated: 2015/04/12 15:39:00
dnl CF_XOPEN_SOURCE version: 50 updated: 2015/10/17 19:03:33
dnl ---------------
dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
dnl or adapt to the vendor's definitions to get equivalent functionality,
@ -3376,6 +3376,9 @@ case $host_os in
(openbsd*)
# setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
;;
(os2*)
cf_XOPEN_SOURCE=
;;
(osf[[45]]*)
cf_xopen_source="-D_OSF_SOURCE"
;;

2585
test/configure vendored
View File

File diff suppressed because it is too large Load Diff