mirror of
https://github.com/Aigor44/ncursesw-morphos.git
synced 2024-12-21 07:39:06 +08:00
ncurses 6.1 - patch 20181020
+ ignore $TERMINFO as a default value in configure script if it came from the infocmp -Q option. + allow value for --with-versioned-syms to be a relative pathname + add a couple of broken-linker symbols to the list of versioned symbols to help with link-time optimization versus weak symbols. + apply shift/control/alt logic when decoding xterm's 1006 mode to wheel-mouse events (Redhat #1610681).
This commit is contained in:
Thomas E. Dickey
parent
c28f91b50f
commit
5f0c3bcf3f
11
NEWS
11
NEWS
@ -25,7 +25,7 @@
|
||||
-- sale, use or other dealings in this Software without prior written --
|
||||
-- authorization. --
|
||||
-------------------------------------------------------------------------------
|
||||
-- $Id: NEWS,v 1.3199 2018/10/13 19:31:51 tom Exp $
|
||||
-- $Id: NEWS,v 1.3204 2018/10/21 00:24:16 tom Exp $
|
||||
-------------------------------------------------------------------------------
|
||||
|
||||
This is a log of changes that ncurses has gone through since Zeyd started
|
||||
@ -45,6 +45,15 @@ 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.
|
||||
|
||||
20181020
|
||||
+ ignore $TERMINFO as a default value in configure script if it came
|
||||
from the infocmp -Q option.
|
||||
+ allow value for --with-versioned-syms to be a relative pathname
|
||||
+ add a couple of broken-linker symbols to the list of versioned
|
||||
symbols to help with link-time optimization versus weak symbols.
|
||||
+ apply shift/control/alt logic when decoding xterm's 1006 mode to
|
||||
wheel-mouse events (Redhat #1610681).
|
||||
|
||||
20181013
|
||||
+ amend change from 20180818, which undid a fix for the $INSTALL value
|
||||
to make it an absolute path.
|
||||
|
||||
20
aclocal.m4
vendored
20
aclocal.m4
vendored
@ -28,7 +28,7 @@ dnl***************************************************************************
|
||||
dnl
|
||||
dnl Author: Thomas E. Dickey 1995-on
|
||||
dnl
|
||||
dnl $Id: aclocal.m4,v 1.850 2018/10/13 19:43:04 tom Exp $
|
||||
dnl $Id: aclocal.m4,v 1.853 2018/10/21 00:25:40 tom Exp $
|
||||
dnl Macros used in NCURSES auto-configuration script.
|
||||
dnl
|
||||
dnl These macros are maintained separately from NCURSES. The copyright on
|
||||
@ -8090,7 +8090,7 @@ CF_NO_LEAKS_OPTION(valgrind,
|
||||
[USE_VALGRIND])
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_WITH_VERSIONED_SYMS version: 7 updated: 2015/10/24 20:50:26
|
||||
dnl CF_WITH_VERSIONED_SYMS version: 8 updated: 2018/10/20 20:24:34
|
||||
dnl ----------------------
|
||||
dnl Use this when building shared library with ELF, to markup symbols with the
|
||||
dnl version identifier from the given input file. Generally that identifier is
|
||||
@ -8104,11 +8104,21 @@ AC_ARG_WITH(versioned-syms,
|
||||
[ --with-versioned-syms=X markup versioned symbols using ld],
|
||||
[with_versioned_syms=$withval],
|
||||
[with_versioned_syms=no])
|
||||
if test "x$with_versioned_syms" = xyes
|
||||
then
|
||||
case "x$with_versioned_syms" in
|
||||
(xyes)
|
||||
with_versioned_syms='${top_srcdir}/package/ifelse($1,,${PACKAGE},[$1]).map'
|
||||
AC_SUBST(PACKAGE)
|
||||
fi
|
||||
;;
|
||||
(xno)
|
||||
;;
|
||||
(x/*)
|
||||
test -f "$with_versioned_syms" || AC_MSG_ERROR(expected a filename: $with_versioned_syms)
|
||||
;;
|
||||
(*)
|
||||
test -f "$with_versioned_syms" || AC_MSG_ERROR(expected a filename: $with_versioned_syms)
|
||||
with_versioned_syms=`pwd`/"$with_versioned_syms"
|
||||
;;
|
||||
esac
|
||||
AC_MSG_RESULT($with_versioned_syms)
|
||||
|
||||
RESULTING_SYMS=
|
||||
|
||||
11
configure.in
11
configure.in
@ -28,14 +28,14 @@ dnl***************************************************************************
|
||||
dnl
|
||||
dnl Author: Thomas E. Dickey 1995-on
|
||||
dnl
|
||||
dnl $Id: configure.in,v 1.666 2018/10/13 19:32:11 tom Exp $
|
||||
dnl $Id: configure.in,v 1.667 2018/10/20 23:56:05 tom Exp $
|
||||
dnl Process this file with autoconf to produce a configure script.
|
||||
dnl
|
||||
dnl See https://invisible-island.net/autoconf/ for additional information.
|
||||
dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
AC_PREREQ(2.52.20170501)
|
||||
AC_REVISION($Revision: 1.666 $)
|
||||
AC_REVISION($Revision: 1.667 $)
|
||||
AC_INIT(ncurses/base/lib_initscr.c)
|
||||
AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
|
||||
|
||||
@ -662,6 +662,13 @@ CF_WITH_PATHLIST(terminfo-dirs,
|
||||
AC_MSG_RESULT($TERMINFO_DIRS)
|
||||
test -n "$TERMINFO_DIRS" && AC_DEFINE_UNQUOTED(TERMINFO_DIRS,"$TERMINFO_DIRS",[Define as needed to predefine the TERMINFO_DIR searchlist])
|
||||
|
||||
case "x$TERMINFO" in
|
||||
x???:*)
|
||||
AC_MSG_WARN(ignoring non-directory/file TERMINFO value)
|
||||
unset TERMINFO
|
||||
;;
|
||||
esac
|
||||
|
||||
AC_MSG_CHECKING(for default terminfo directory)
|
||||
CF_WITH_PATH(default-terminfo-dir,
|
||||
[ --with-default-terminfo-dir=DIR default terminfo directory],
|
||||
|
||||
4
dist.mk
4
dist.mk
@ -25,7 +25,7 @@
|
||||
# use or other dealings in this Software without prior written #
|
||||
# authorization. #
|
||||
##############################################################################
|
||||
# $Id: dist.mk,v 1.1246 2018/10/13 14:25:06 tom Exp $
|
||||
# $Id: dist.mk,v 1.1247 2018/10/20 10:33:10 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 = 1
|
||||
NCURSES_PATCH = 20181013
|
||||
NCURSES_PATCH = 20181020
|
||||
|
||||
# We don't append the patch to the version, since this only applies to releases
|
||||
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
|
||||
|
||||
@ -84,7 +84,7 @@
|
||||
#define CUR SP_TERMTYPE
|
||||
#endif
|
||||
|
||||
MODULE_ID("$Id: lib_mouse.c,v 1.178 2018/09/23 08:40:23 tom Exp $")
|
||||
MODULE_ID("$Id: lib_mouse.c,v 1.179 2018/10/20 18:33:23 tom Exp $")
|
||||
|
||||
#include <tic.h>
|
||||
|
||||
@ -1276,15 +1276,15 @@ decode_xterm_SGR1006(SCREEN *sp, MEVENT * eventp)
|
||||
} else {
|
||||
eventp->bstate = REPORT_MOUSE_POSITION;
|
||||
}
|
||||
if (b & 4) {
|
||||
eventp->bstate |= BUTTON_SHIFT;
|
||||
}
|
||||
if (b & 8) {
|
||||
eventp->bstate |= BUTTON_ALT;
|
||||
}
|
||||
if (b & 16) {
|
||||
eventp->bstate |= BUTTON_CTRL;
|
||||
}
|
||||
}
|
||||
if (b & 4) {
|
||||
eventp->bstate |= BUTTON_SHIFT;
|
||||
}
|
||||
if (b & 8) {
|
||||
eventp->bstate |= BUTTON_ALT;
|
||||
}
|
||||
if (b & 16) {
|
||||
eventp->bstate |= BUTTON_CTRL;
|
||||
}
|
||||
result = (eventp->bstate & REPORT_MOUSE_POSITION) ? TRUE : FALSE;
|
||||
eventp->x = (data.params[1] ? (data.params[1] - 1) : 0);
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
ncurses6 (6.1+20181013) unstable; urgency=low
|
||||
ncurses6 (6.1+20181020) unstable; urgency=low
|
||||
|
||||
* latest weekly patch
|
||||
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 13 Oct 2018 10:25:06 -0400
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 20 Oct 2018 06:33:10 -0400
|
||||
|
||||
ncurses6 (5.9-20131005) unstable; urgency=low
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
ncurses6 (6.1+20181013) unstable; urgency=low
|
||||
ncurses6 (6.1+20181020) unstable; urgency=low
|
||||
|
||||
* latest weekly patch
|
||||
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 13 Oct 2018 10:25:06 -0400
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 20 Oct 2018 06:33:10 -0400
|
||||
|
||||
ncurses6 (5.9-20131005) unstable; urgency=low
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
ncurses6 (6.1+20181013) unstable; urgency=low
|
||||
ncurses6 (6.1+20181020) unstable; urgency=low
|
||||
|
||||
* latest weekly patch
|
||||
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 13 Oct 2018 10:25:06 -0400
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 20 Oct 2018 06:33:10 -0400
|
||||
|
||||
ncurses6 (5.9-20120608) unstable; urgency=low
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; $Id: mingw-ncurses.nsi,v 1.293 2018/10/13 14:25:06 tom Exp $
|
||||
; $Id: mingw-ncurses.nsi,v 1.294 2018/10/20 10:33:10 tom Exp $
|
||||
|
||||
; TODO add examples
|
||||
; TODO bump ABI to 6
|
||||
@ -10,7 +10,7 @@
|
||||
!define VERSION_MAJOR "6"
|
||||
!define VERSION_MINOR "1"
|
||||
!define VERSION_YYYY "2018"
|
||||
!define VERSION_MMDD "1013"
|
||||
!define VERSION_MMDD "1020"
|
||||
!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.1
|
||||
Release: 20181013
|
||||
Release: 20181020
|
||||
License: X11
|
||||
Group: Development/Libraries
|
||||
Source: ncurses-%{version}-%{release}.tgz
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
Summary: shared libraries for terminal handling
|
||||
Name: ncurses6
|
||||
Version: 6.1
|
||||
Release: 20181013
|
||||
Release: 20181020
|
||||
License: X11
|
||||
Group: Development/Libraries
|
||||
Source: ncurses-%{version}-%{release}.tgz
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $Id: ncursest.map,v 1.41 2017/12/30 20:51:38 tom Exp $
|
||||
# $Id: ncursest.map,v 1.42 2018/10/20 22:22:03 tom Exp $
|
||||
# script for shared library symbol-versioning using ld
|
||||
#
|
||||
# This file was generated by ncu-mapsyms
|
||||
@ -54,6 +54,7 @@ NCURSES_TIC_5.0.19991023 {
|
||||
_nc_read_entry_source;
|
||||
_nc_reset_input;
|
||||
_nc_resolve_uses;
|
||||
_nc_screen;
|
||||
_nc_set_writedir;
|
||||
_nc_syntax;
|
||||
_nc_tic_expand;
|
||||
@ -158,6 +159,7 @@ NCURSES_TINFO_5.0.19991023 {
|
||||
_nc_tail;
|
||||
_nc_tic_dir;
|
||||
_nc_timed_wait;
|
||||
_nc_tinfo_fkeysf;
|
||||
_nc_trace_buf;
|
||||
_nc_tracing;
|
||||
_nc_update_screensize;
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
Summary: Curses library with POSIX thread support.
|
||||
Name: ncursest6
|
||||
Version: 6.1
|
||||
Release: 20181013
|
||||
Release: 20181020
|
||||
License: X11
|
||||
Group: Development/Libraries
|
||||
Source: ncurses-%{version}-%{release}.tgz
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $Id: ncursest.sym,v 1.34 2017/08/12 21:34:38 tom Exp $
|
||||
# $Id: ncursest.sym,v 1.35 2018/10/20 22:23:54 tom Exp $
|
||||
# script for shared library symbol-visibility using libtool
|
||||
#
|
||||
# This file was generated by ncu-mapsyms
|
||||
@ -192,6 +192,7 @@ _nc_ripoffline
|
||||
_nc_rootname
|
||||
_nc_safe_strcat
|
||||
_nc_safe_strcpy
|
||||
_nc_screen
|
||||
_nc_screen_chain
|
||||
_nc_screen_of
|
||||
_nc_set_buffer
|
||||
@ -222,6 +223,7 @@ _nc_tic_expand
|
||||
_nc_tic_written
|
||||
_nc_timed_wait
|
||||
_nc_tinfo_fkeys
|
||||
_nc_tinfo_fkeysf
|
||||
_nc_tparm_analyze
|
||||
_nc_tparm_err
|
||||
_nc_trace_buf
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $Id: ncursestw.map,v 1.43 2018/01/31 23:58:06 tom Exp $
|
||||
# $Id: ncursestw.map,v 1.44 2018/10/20 22:16:09 tom Exp $
|
||||
# script for shared library symbol-versioning using ld
|
||||
#
|
||||
# This file was generated by ncu-mapsyms
|
||||
@ -54,6 +54,7 @@ NCURSES_TIC_5.0.19991023 {
|
||||
_nc_read_entry_source;
|
||||
_nc_reset_input;
|
||||
_nc_resolve_uses;
|
||||
_nc_screen;
|
||||
_nc_set_writedir;
|
||||
_nc_syntax;
|
||||
_nc_tic_expand;
|
||||
@ -158,6 +159,7 @@ NCURSES_TINFO_5.0.19991023 {
|
||||
_nc_tail;
|
||||
_nc_tic_dir;
|
||||
_nc_timed_wait;
|
||||
_nc_tinfo_fkeysf;
|
||||
_nc_trace_buf;
|
||||
_nc_tracing;
|
||||
_nc_update_screensize;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $Id: ncursestw.sym,v 1.33 2018/01/31 23:58:56 tom Exp $
|
||||
# $Id: ncursestw.sym,v 1.34 2018/10/20 22:23:42 tom Exp $
|
||||
# script for shared library symbol-visibility using libtool
|
||||
#
|
||||
# This file was generated by ncu-mapsyms
|
||||
@ -192,6 +192,7 @@ _nc_ripoffline
|
||||
_nc_rootname
|
||||
_nc_safe_strcat
|
||||
_nc_safe_strcpy
|
||||
_nc_screen
|
||||
_nc_screen_chain
|
||||
_nc_screen_of
|
||||
_nc_set_buffer
|
||||
@ -222,6 +223,7 @@ _nc_tic_expand
|
||||
_nc_tic_written
|
||||
_nc_timed_wait
|
||||
_nc_tinfo_fkeys
|
||||
_nc_tinfo_fkeysf
|
||||
_nc_tparm_analyze
|
||||
_nc_tparm_err
|
||||
_nc_trace_buf
|
||||
|
||||
Loading…
Reference in New Issue
Block a user