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 5.9 - patch 20130209

Browse Source 
+ modify test/configure script to make it simpler to override names
  of curses-related libraries, to help with linking with pdcurses in
  mingw environment.
+ if the --with-terminfo-dirs configure option is not used, there is
  no corresponding compiled-in value for that.  Fill in "no default
  value" for that part of the manpage substitution.
This commit is contained in:
Thomas E. Dickey 2013-02-10 02:14:53 +00:00
parent eee1237c85
commit 1385381954
10 changed files with 1213 additions and 1158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
NEWS
View File

@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
-- $Id: NEWS,v 1.2020 2013/02/03 00:19:36 tom Exp $
-- $Id: NEWS,v 1.2021 2013/02/09 22:39:26 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
@ -45,6 +45,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.
20130209
+ modify test/configure script to make it simpler to override names
of curses-related libraries, to help with linking with pdcurses in
mingw environment.
+ if the --with-terminfo-dirs configure option is not used, there is
no corresponding compiled-in value for that. Fill in "no default
value" for that part of the manpage substitution.
20130202
+ correct initialization in knight.c which let it occasionally make
an incorrect move (cf: 20001028).

16
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.649 2013/02/02 22:15:00 tom Exp $
dnl $Id: aclocal.m4,v 1.650 2013/02/09 17:55:03 tom Exp $
dnl Macros used in NCURSES auto-configuration script.
dnl
dnl These macros are maintained separately from NCURSES. The copyright on
@ -4092,7 +4092,7 @@ AC_ARG_WITH(manpage-tbl,
AC_MSG_RESULT($MANPAGE_TBL)
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_MAN_PAGES version: 42 updated: 2013/02/02 17:13:57
dnl CF_MAN_PAGES version: 43 updated: 2013/02/09 12:53:45
dnl ------------
dnl Try to determine if the man-pages on the system are compressed, and if
dnl so, what format is used. Use this information to construct a script that
@ -4210,12 +4210,12 @@ case \$i in #(vi
if test ! -f $cf_man_alias ; then
cat >>$cf_man_alias <<-CF_EOF2
s,@DATADIR@,\$datadir,g
s,@TERMINFO@,\$TERMINFO,g
s,@TERMINFO_DIRS@,\$TERMINFO_DIRS,g
s,@NCURSES_MAJOR@,\$NCURSES_MAJOR,g
s,@NCURSES_MINOR@,\$NCURSES_MINOR,g
s,@NCURSES_PATCH@,\$NCURSES_PATCH,g
s,@NCURSES_OSPEED@,\$NCURSES_OSPEED,g
s,@TERMINFO@,\${TERMINFO:="no default value"},g
s,@TERMINFO_DIRS@,\${TERMINFO_DIRS:="no default value"},g
s,@NCURSES_MAJOR@,\${NCURSES_MAJOR:="no default value"},g
s,@NCURSES_MINOR@,\${NCURSES_MINOR:="no default value"},g
s,@NCURSES_PATCH@,\${NCURSES_PATCH:="no default value"},g
s,@NCURSES_OSPEED@,\${NCURSES_OSPEED:="no default value"},g
CF_EOF
ifelse($1,,,[
for cf_name in $1

12
configure vendored
View File

@ -10389,12 +10389,12 @@ case \$i in #(vi
if test ! -f $cf_man_alias ; then
cat >>$cf_man_alias <<-CF_EOF2
s,@DATADIR@,\$datadir,g
s,@TERMINFO@,\$TERMINFO,g
s,@TERMINFO_DIRS@,\$TERMINFO_DIRS,g
s,@NCURSES_MAJOR@,\$NCURSES_MAJOR,g
s,@NCURSES_MINOR@,\$NCURSES_MINOR,g
s,@NCURSES_PATCH@,\$NCURSES_PATCH,g
s,@NCURSES_OSPEED@,\$NCURSES_OSPEED,g
s,@TERMINFO@,\${TERMINFO:="no default value"},g
s,@TERMINFO_DIRS@,\${TERMINFO_DIRS:="no default value"},g
s,@NCURSES_MAJOR@,\${NCURSES_MAJOR:="no default value"},g
s,@NCURSES_MINOR@,\${NCURSES_MINOR:="no default value"},g
s,@NCURSES_PATCH@,\${NCURSES_PATCH:="no default value"},g
s,@NCURSES_OSPEED@,\${NCURSES_OSPEED:="no default value"},g
CF_EOF
for cf_name in captoinfo clear infocmp infotocap tabs tic toe tput tset

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.912 2013/02/02 11:42:23 tom Exp $
# $Id: dist.mk,v 1.913 2013/02/09 17:27:48 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 = 20130202
NCURSES_PATCH = 20130209
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)

4
package/debian/changelog
View File

@ -1,8 +1,8 @@
ncurses6 (5.9-20130202) unstable; urgency=low
ncurses6 (5.9-20130209) unstable; urgency=low
* latest weekly patch
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 02 Feb 2013 12:02:06 -0500
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 09 Feb 2013 12:28:44 -0500
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: 20130202
Version: 20130209
License: X11
Group: Development/Libraries
Source: ncurses-%{release}-%{version}.tgz

110
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.84 2012/10/27 17:20:04 tom Exp $
dnl $Id: aclocal.m4,v 1.85 2013/02/09 22:36:13 tom Exp $
dnl
dnl Author: Thomas E. Dickey
dnl
@ -646,7 +646,7 @@ fi
AC_CHECK_HEADERS($cf_cv_ncurses_header)
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_CURSES_LIBS version: 36 updated: 2012/07/07 21:02:48
dnl CF_CURSES_LIBS version: 37 updated: 2013/02/09 17:33:50
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.
@ -683,7 +683,7 @@ hpux10.*) #(vi
ac_cv_func_initscr=yes
])])
fi
;;
;;
linux*)
case `arch 2>/dev/null` in
x86_64)
@ -698,7 +698,7 @@ linux*)
CF_ADD_LIBDIR(/lib)
;;
esac
;;
;;
sunos3*|sunos4*)
if test "x$cf_cv_screen" = "xcurses_5lib"
then
@ -712,59 +712,63 @@ sunos3*|sunos4*)
esac
if test ".$ac_cv_func_initscr" != .yes ; then
cf_save_LIBS="$LIBS"
cf_term_lib=""
cf_curs_lib=""
cf_save_LIBS="$LIBS"
if test ".${cf_cv_ncurses_version:-no}" != .no
then
cf_check_list="ncurses curses cursesX"
else
cf_check_list="cursesX curses ncurses"
fi
if test ".${cf_cv_ncurses_version:-no}" != .no
then
cf_check_list="ncurses curses cursesX"
else
cf_check_list="cursesX curses ncurses"
fi
# 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 tinfo termlib unknown
do
AC_CHECK_LIB($cf_term_lib,tgoto,[break])
done
])
# Check for library containing tgoto. Do this before curses library
# because it may be needed to link the test-case for initscr.
if test "x$cf_term_lib" = x
then
AC_CHECK_FUNC(tgoto,[cf_term_lib=predefined],[
for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown
do
AC_CHECK_LIB($cf_term_lib,tgoto,[break])
done
])
fi
# Check for library containing initscr
test "$cf_term_lib" != predefined && test "$cf_term_lib" != unknown && LIBS="-l$cf_term_lib $cf_save_LIBS"
for cf_curs_lib in $cf_check_list xcurses jcurses pdcurses unknown
do
AC_CHECK_LIB($cf_curs_lib,initscr,[break])
done
test $cf_curs_lib = unknown && AC_MSG_ERROR(no curses library found)
# Check for library containing initscr
test "$cf_term_lib" != predefined && test "$cf_term_lib" != unknown && LIBS="-l$cf_term_lib $cf_save_LIBS"
if test "x$cf_curs_lib" = x
then
for cf_curs_lib in $cf_check_list xcurses jcurses pdcurses unknown
do
AC_CHECK_LIB($cf_curs_lib,initscr,[break])
done
fi
test $cf_curs_lib = unknown && AC_MSG_ERROR(no curses library found)
LIBS="-l$cf_curs_lib $cf_save_LIBS"
if test "$cf_term_lib" = unknown ; then
AC_MSG_CHECKING(if we can link with $cf_curs_lib library)
AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
[initscr()],
[cf_result=yes],
[cf_result=no])
AC_MSG_RESULT($cf_result)
test $cf_result = no && AC_MSG_ERROR(Cannot link curses library)
elif test "$cf_curs_lib" = "$cf_term_lib" ; then
:
elif test "$cf_term_lib" != predefined ; then
AC_MSG_CHECKING(if we need both $cf_curs_lib and $cf_term_lib libraries)
AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
[initscr(); tgoto((char *)0, 0, 0);],
[cf_result=no],
[
LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
[initscr()],
[cf_result=yes],
[cf_result=error])
])
AC_MSG_RESULT($cf_result)
fi
LIBS="-l$cf_curs_lib $cf_save_LIBS"
if test "$cf_term_lib" = unknown ; then
AC_MSG_CHECKING(if we can link with $cf_curs_lib library)
AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
[initscr()],
[cf_result=yes],
[cf_result=no])
AC_MSG_RESULT($cf_result)
test $cf_result = no && AC_MSG_ERROR(Cannot link curses library)
elif test "$cf_curs_lib" = "$cf_term_lib" ; then
:
elif test "$cf_term_lib" != predefined ; then
AC_MSG_CHECKING(if we need both $cf_curs_lib and $cf_term_lib libraries)
AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
[initscr(); tgoto((char *)0, 0, 0);],
[cf_result=no],
[
LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
[initscr()],
[cf_result=yes],
[cf_result=error])
])
AC_MSG_RESULT($cf_result)
fi
fi
fi

2162
test/configure vendored
View File

File diff suppressed because it is too large Load Diff

13
test/configure.in
View File

@ -1,5 +1,5 @@
dnl***************************************************************************
dnl Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. *
dnl Copyright (c) 1998-2012,2013 Free Software Foundation, Inc. *
dnl *
dnl Permission is hereby granted, free of charge, to any person obtaining a *
dnl copy of this software and associated documentation files (the *
@ -28,7 +28,7 @@ dnl***************************************************************************
dnl
dnl Author: Thomas E. Dickey 1996, etc.
dnl
dnl $Id: configure.in,v 1.109 2012/11/03 19:26:33 tom Exp $
dnl $Id: configure.in,v 1.110 2013/02/09 22:31:27 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)
@ -138,9 +138,12 @@ pdcurses) #(vi
;;
*)
# look for curses-related libraries
AC_CHECK_LIB(panel$cf_cv_libtype,new_panel)
AC_CHECK_LIB(menu$cf_cv_libtype,menu_driver)
AC_CHECK_LIB(form$cf_cv_libtype,form_driver)
: ${cf_panel_lib:=panel}
: ${cf_menu_lib:=menu}
: ${cf_form_lib:=form}
AC_CHECK_LIB($cf_panel_lib$cf_cv_libtype,new_panel)
AC_CHECK_LIB($cf_menu_lib$cf_cv_libtype,menu_driver)
AC_CHECK_LIB($cf_form_lib$cf_cv_libtype,form_driver)
# look for curses-related headers
AC_CHECK_HEADERS( \

38
test/test.priv.h
View File

@ -1,5 +1,5 @@
/****************************************************************************
* Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. *
* Copyright (c) 1998-2012,2013 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 *
@ -29,7 +29,7 @@
/****************************************************************************
* Author: Thomas E. Dickey 1996-on *
****************************************************************************/
/* $Id: test.priv.h,v 1.115 2012/12/02 00:46:34 tom Exp $ */
/* $Id: test.priv.h,v 1.117 2013/02/10 01:00:04 tom Exp $ */
#ifndef __TEST_PRIV_H
#define __TEST_PRIV_H 1
@ -174,10 +174,22 @@
#define HAVE_SLK_INIT 0
#endif
#ifndef HAVE_SYS_IOCTL_H
#define HAVE_SYS_IOCTL_H 0
#endif
#ifndef HAVE_SYS_SELECT_H
#define HAVE_SYS_SELECT_H 0
#endif
#ifndef HAVE_TERMATTRS
#define HAVE_TERMATTRS 0
#endif
#ifndef HAVE_TERMIOS_H
#define HAVE_TERMIOS_H 0
#endif
#ifndef HAVE_TERMNAME
#define HAVE_TERMNAME 0
#endif
@ -628,8 +640,28 @@ extern char *strnames[], *strcodes[], *strfnames[];
#define EXIT_FAILURE 1
#endif
#ifdef __MINGW32__
#if defined(__MINGW32__)
#if defined(PDCURSES)
#ifdef WINVER
# if WINVER < 0x0501
# error WINVER must at least be 0x0501
# endif
#else
# define WINVER 0x0501
#endif
#include <windows.h>
#include <sys/time.h> /* for struct timeval */
#undef sleep
#define sleep(n) Sleep((n) * 1000)
#define SIGHUP 1
#define SIGKILL 9
#define getlogin() "username"
#else
#include <nc_mingw.h>
#endif
/* conflicts in test/firstlast.c */
#undef large
#undef small