mirror/ncursesw-morphos
2
0
Fork 0
mirror of https://github.com/Aigor44/ncursesw-morphos.git synced 2025-01-06 14:44:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

ncurses 5.9 - patch 20120804

Browse Source 
+ update test/configure, adding check for tinfo library.
+ improve limit-checks for the getch fifo (report by Werner Fink).
+ fix a remaining mismatch between $with_echo and the symbols updated
  by CF_DISABLE_ECHO affecting parameters for mk-2nd.awk (report by
  Sven Joachim, cf:  20120317).
+ modify followup check for pkg-config's library directory in the
  --enable-pc-files option to validate syntax (report by Sven Joachim,
  cf: 20110716).
This commit is contained in:
Thomas E. Dickey 2012-08-04 23:37:25 +00:00
parent 5bfda87916
commit 634674af07
14 changed files with 2575 additions and 2478 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Ada95/aclocal.m4 vendored
View File

@ -28,7 +28,7 @@ dnl***************************************************************************
dnl
dnl Author: Thomas E. Dickey
dnl
dnl $Id: aclocal.m4,v 1.51 2012/06/30 21:28:18 tom Exp $
dnl $Id: aclocal.m4,v 1.52 2012/08/04 18:12:47 tom Exp $
dnl Macros used in NCURSES Ada95 auto-configuration script.
dnl
dnl These macros are maintained separately from NCURSES. The copyright on
@ -772,7 +772,7 @@ AC_SUBST(SHOW_CC)
AC_SUBST(ECHO_CC)
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_ENABLE_PC_FILES version: 7 updated: 2011/12/10 18:58:47
dnl CF_ENABLE_PC_FILES version: 9 updated: 2012/08/04 13:59:54
dnl ------------------
dnl This is the "--enable-pc-files" option, which is available if there is a
dnl pkg-config configuration on the local machine.
@ -781,16 +781,15 @@ AC_REQUIRE([CF_PKG_CONFIG])
AC_REQUIRE([CF_WITH_PKG_CONFIG_LIBDIR])
if test "$PKG_CONFIG" != none ; then
if test -n "$PKG_CONFIG_LIBDIR" && test -d "$PKG_CONFIG_LIBDIR" ; then
AC_MSG_CHECKING(if we should install .pc files for $PKG_CONFIG)
AC_ARG_ENABLE(pc-files,
[ --enable-pc-files generate and install .pc files for pkg-config],
[enable_pc_files=$enableval],
[enable_pc_files=no])
AC_MSG_RESULT($enable_pc_files)
elif test -z "$PKG_CONFIG_LIBDIR" || test "$PKG_CONFIG_LIBDIR" != no; then
enable_pc_files=no
AC_MSG_WARN(did not find $PKG_CONFIG library)
AC_MSG_CHECKING(if we should install .pc files for $PKG_CONFIG)
AC_ARG_ENABLE(pc-files,
[ --enable-pc-files generate and install .pc files for pkg-config],
[enable_pc_files=$enableval],
[enable_pc_files=no])
AC_MSG_RESULT($enable_pc_files)
if test "$enable_pc_files" != no
then
CF_PATH_SYNTAX(PKG_CONFIG_LIBDIR)
fi
else
enable_pc_files=no

1691
Ada95/configure vendored
View File

File diff suppressed because it is too large Load Diff

12
NEWS
View File

@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
-- $Id: NEWS,v 1.1936 2012/07/29 00:02:10 tom Exp $
-- $Id: NEWS,v 1.1940 2012/08/04 18:14:29 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
@ -45,6 +45,16 @@ 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.
20120804
+ update test/configure, adding check for tinfo library.
+ improve limit-checks for the getch fifo (report by Werner Fink).
+ fix a remaining mismatch between $with_echo and the symbols updated
by CF_DISABLE_ECHO affecting parameters for mk-2nd.awk (report by
Sven Joachim, cf: 20120317).
+ modify followup check for pkg-config's library directory in the
--enable-pc-files option to validate syntax (report by Sven Joachim,
cf: 20110716).
20120728
+ correct path for ncurses_mingw.h in include/headers, in case build
is done outside source-tree (patch by Roumen Petrov).

23
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.617 2012/06/30 21:26:38 tom Exp $
dnl $Id: aclocal.m4,v 1.619 2012/08/04 18:04:12 tom Exp $
dnl Macros used in NCURSES auto-configuration script.
dnl
dnl These macros are maintained separately from NCURSES. The copyright on
@ -1332,7 +1332,7 @@ if test "$cf_disable_rpath_hack" = no ; then
fi
])
dnl ---------------------------------------------------------------------------
dnl CF_ENABLE_PC_FILES version: 7 updated: 2011/12/10 18:58:47
dnl CF_ENABLE_PC_FILES version: 9 updated: 2012/08/04 13:59:54
dnl ------------------
dnl This is the "--enable-pc-files" option, which is available if there is a
dnl pkg-config configuration on the local machine.
@ -1341,16 +1341,15 @@ AC_REQUIRE([CF_PKG_CONFIG])
AC_REQUIRE([CF_WITH_PKG_CONFIG_LIBDIR])
if test "$PKG_CONFIG" != none ; then
if test -n "$PKG_CONFIG_LIBDIR" && test -d "$PKG_CONFIG_LIBDIR" ; then
AC_MSG_CHECKING(if we should install .pc files for $PKG_CONFIG)
AC_ARG_ENABLE(pc-files,
[ --enable-pc-files generate and install .pc files for pkg-config],
[enable_pc_files=$enableval],
[enable_pc_files=no])
AC_MSG_RESULT($enable_pc_files)
elif test -z "$PKG_CONFIG_LIBDIR" || test "$PKG_CONFIG_LIBDIR" != no; then
enable_pc_files=no
AC_MSG_WARN(did not find $PKG_CONFIG library)
AC_MSG_CHECKING(if we should install .pc files for $PKG_CONFIG)
AC_ARG_ENABLE(pc-files,
[ --enable-pc-files generate and install .pc files for pkg-config],
[enable_pc_files=$enableval],
[enable_pc_files=no])
AC_MSG_RESULT($enable_pc_files)
if test "$enable_pc_files" != no
then
CF_PATH_SYNTAX(PKG_CONFIG_LIBDIR)
fi
else
enable_pc_files=no

3205
configure vendored
View File

File diff suppressed because it is too large Load Diff

6
configure.in
View File

@ -28,14 +28,14 @@ dnl***************************************************************************
dnl
dnl Author: Thomas E. Dickey 1995-on
dnl
dnl $Id: configure.in,v 1.551 2012/07/14 21:00:49 tom Exp $
dnl $Id: configure.in,v 1.552 2012/08/04 14:52:27 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.13.20020210)
AC_REVISION($Revision: 1.551 $)
AC_REVISION($Revision: 1.552 $)
AC_INIT(ncurses/base/lib_initscr.c)
AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
@ -1950,7 +1950,7 @@ TINFO_NAME="$TINFO_NAME"
TINFO_SUFFIX="$TINFO_SUFFIX"
USE_OLD_MAKERULES="$USE_OLD_MAKERULES"
WITH_CURSES_H="$with_curses_h"
WITH_ECHO="$with_echo"
WITH_ECHO="${enable_echo:=yes}"
WITH_OVERWRITE="$with_overwrite"
cf_LIST_MODELS="$cf_list_models"
cf_cv_abi_version="$cf_cv_abi_version"

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.884 2012/07/28 17:43:44 tom Exp $
# $Id: dist.mk,v 1.885 2012/08/04 14:27:23 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 = 5
NCURSES_MINOR = 9
NCURSES_PATCH = 20120728
NCURSES_PATCH = 20120804
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)

18
ncurses/base/lib_getch.c
View File

@ -42,7 +42,7 @@
#include <curses.priv.h>
MODULE_ID("$Id: lib_getch.c,v 1.124 2012/01/21 19:21:29 KO.Myung-Hun Exp $")
MODULE_ID("$Id: lib_getch.c,v 1.125 2012/08/04 17:11:37 tom Exp $")
#include <fifo_defs.h>
@ -163,7 +163,7 @@ check_mouse_activity(SCREEN *sp, int delay EVENTLIST_2nd(_nc_eventlist * evl))
static NCURSES_INLINE int
fifo_peek(SCREEN *sp)
{
int ch = sp->_fifo[peek];
int ch = (peek >= 0) ? sp->_fifo[peek] : ERR;
TR(TRACE_IEVENT, ("peeking at %d", peek));
p_inc();
@ -173,15 +173,16 @@ fifo_peek(SCREEN *sp)
static NCURSES_INLINE int
fifo_pull(SCREEN *sp)
{
int ch;
ch = sp->_fifo[head];
int ch = (head >= 0) ? sp->_fifo[head] : ERR;
TR(TRACE_IEVENT, ("pulling %s from %d", _nc_tracechar(sp, ch), head));
if (peek == head) {
h_inc();
peek = head;
} else
} else {
h_inc();
}
#ifdef TRACE
if (USE_TRACEF(TRACE_IEVENT)) {
@ -200,7 +201,7 @@ fifo_push(SCREEN *sp EVENTLIST_2nd(_nc_eventlist * evl))
int mask = 0;
(void) mask;
if (tail == -1)
if (tail < 0)
return ERR;
#ifdef HIDE_EINTR
@ -716,10 +717,11 @@ kgetch(SCREEN *sp EVENTLIST_2nd(_nc_eventlist * evl))
if (ptr->value != 0) { /* sequence terminated */
TR(TRACE_IEVENT, ("end of sequence"));
if (peek == tail)
if (peek == tail) {
fifo_clear(sp);
else
} else {
head = peek;
}
return (ptr->value);
}

11
ncurses/base/lib_ungetch.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* Copyright (c) 1998-2009,2011 Free Software Foundation, Inc. *
* Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. *
* *
* Permission is hereby granted, free of charge, to any person obtaining a *
* copy of this software and associated documentation files (the *
@ -42,7 +42,7 @@
#include <curses.priv.h>
MODULE_ID("$Id: lib_ungetch.c,v 1.15 2011/05/28 22:52:06 tom Exp $")
MODULE_ID("$Id: lib_ungetch.c,v 1.16 2012/08/04 17:38:53 tom Exp $")
#include <fifo_defs.h>
@ -64,13 +64,14 @@ safe_ungetch(SCREEN *sp, int ch)
T((T_CALLED("ungetch(%p,%s)"), (void *) sp, _nc_tracechar(sp, ch)));
if (sp != 0 && tail != -1) {
if (head == -1) {
if (sp != 0 && tail >= 0) {
if (head < 0) {
head = 0;
t_inc();
peek = tail; /* no raw keys */
} else
} else {
h_dec();
}
sp->_fifo[head] = ch;
T(("ungetch %s ok", _nc_tracechar(sp, ch)));

46
ncurses/fifo_defs.h
View File

@ -1,5 +1,5 @@
/****************************************************************************
* Copyright (c) 1998-2002,2008 Free Software Foundation, Inc. *
* Copyright (c) 1998-2008,2012 Free Software Foundation, Inc. *
* *
* Permission is hereby granted, free of charge, to any person obtaining a *
* copy of this software and associated documentation files (the *
@ -34,7 +34,7 @@
/*
* Common macros for lib_getch.c, lib_ungetch.c
*
* $Id: fifo_defs.h,v 1.6 2008/06/28 15:52:32 tom Exp $
* $Id: fifo_defs.h,v 1.7 2012/08/04 15:59:17 tom Exp $
*/
#ifndef FIFO_DEFS_H
@ -45,14 +45,42 @@
/* peek points to next uninterpreted character */
#define peek sp->_fifopeek
#define h_inc() { head == FIFO_SIZE-1 ? head = 0 : head++; if (head == tail) head = -1, tail = 0;}
#define h_dec() { head == 0 ? head = FIFO_SIZE-1 : head--; if (head == tail) tail = -1;}
#define t_inc() { tail == FIFO_SIZE-1 ? tail = 0 : tail++; if (tail == head) tail = -1;}
#define t_dec() { tail == 0 ? tail = FIFO_SIZE-1 : tail--; if (head == tail) fifo_clear(sp);}
#define p_inc() { peek == FIFO_SIZE-1 ? peek = 0 : peek++;}
#define h_inc() { \
(head >= FIFO_SIZE-1) \
? head = 0 \
: head++; \
if (head == tail) \
head = -1, tail = 0; \
}
#define h_dec() { \
(head <= 0) \
? head = FIFO_SIZE-1 \
: head--; \
if (head == tail) \
tail = -1; \
}
#define t_inc() { \
(tail >= FIFO_SIZE-1) \
? tail = 0 \
: tail++; \
if (tail == head) \
tail = -1; \
}
#define t_dec() { \
(tail <= 0) \
? tail = FIFO_SIZE-1 \
: tail--; \
if (head == tail) \
fifo_clear(sp); \
}
#define p_inc() { \
(peek >= FIFO_SIZE-1) \
? peek = 0 \
: peek++; \
}
#define cooked_key_in_fifo() ((head != -1) && (peek != head))
#define raw_key_in_fifo() ((head != -1) && (peek != tail))
#define cooked_key_in_fifo() ((head >= 0) && (peek != head))
#define raw_key_in_fifo() ((head >= 0) && (peek != tail))
#undef HIDE_EINTR

4
package/debian/changelog
View File

@ -1,8 +1,8 @@
ncurses6 (5.9-20120728) unstable; urgency=low
ncurses6 (5.9-20120804) unstable; urgency=low
* latest weekly patch
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 28 Jul 2012 19:51:08 -0400
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 04 Aug 2012 14:40:02 -0400
ncurses6 (5.9-20120608) unstable; urgency=low

2
package/ncurses.spec
View File

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

6
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.77 2012/06/30 21:29:31 tom Exp $
dnl $Id: aclocal.m4,v 1.78 2012/08/04 18:14:48 tom Exp $
dnl
dnl Author: Thomas E. Dickey
dnl
@ -711,7 +711,7 @@ fi
AC_CHECK_HEADERS($cf_cv_ncurses_header)
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_CURSES_LIBS version: 35 updated: 2011/08/09 21:06:37
dnl CF_CURSES_LIBS version: 36 updated: 2012/07/07 21:02:48
dnl --------------
dnl Look for the curses libraries. Older curses implementations may require
dnl termcap/termlib to be linked as well. Call CF_CURSES_CPPFLAGS first.
@ -791,7 +791,7 @@ if test ".$ac_cv_func_initscr" != .yes ; then
# Check for library containing tgoto. Do this before curses library
# because it may be needed to link the test-case for initscr.
AC_CHECK_FUNC(tgoto,[cf_term_lib=predefined],[
for cf_term_lib in $cf_check_list otermcap termcap termlib unknown
for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown
do
AC_CHECK_LIB($cf_term_lib,tgoto,[break])
done

2
test/configure vendored
View File

@ -6226,7 +6226,7 @@ if test $ac_cv_func_tgoto = yes; then
cf_term_lib=predefined
else
for cf_term_lib in $cf_check_list otermcap termcap termlib unknown
for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown
do
as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh`
echo "$as_me:6232: checking for tgoto in -l$cf_term_lib" >&5