mirror of
https://github.com/Aigor44/ncursesw-morphos.git
synced 2025-02-23 16:09:15 +08:00
ncurses 5.7 - patch 20110220
+ configure script rpath fixes from xterm #269. + workaround for cygwin's non-functional features.h, to force ncurses' configure script to define _XOPEN_SOURCE_EXTENDED when building wide-character configuration. + build-fix in run_tic.sh for OS/2 EMX install + add cons25-debian entry (patch by Brian M Carlson, Debina #607662).
This commit is contained in:
Thomas E. Dickey
parent
da5e7c6148
commit
90ffd62494
10
NEWS
10
NEWS
@ -25,7 +25,7 @@
|
||||
-- sale, use or other dealings in this Software without prior written --
|
||||
-- authorization. --
|
||||
-------------------------------------------------------------------------------
|
||||
-- $Id: NEWS,v 1.1643 2011/02/13 01:16:09 tom Exp $
|
||||
-- $Id: NEWS,v 1.1645 2011/02/21 01:42:08 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.
|
||||
|
||||
20110220
|
||||
+ configure script rpath fixes from xterm #269.
|
||||
+ workaround for cygwin's non-functional features.h, to force ncurses'
|
||||
configure script to define _XOPEN_SOURCE_EXTENDED when building
|
||||
wide-character configuration.
|
||||
+ build-fix in run_tic.sh for OS/2 EMX install
|
||||
+ add cons25-debian entry (patch by Brian M Carlson, Debina #607662).
|
||||
|
||||
20110212
|
||||
+ regenerated html manpages.
|
||||
+ use _tracef() in show_where() function of tic, to work correctly with
|
||||
|
||||
48
aclocal.m4
vendored
48
aclocal.m4
vendored
@ -1,5 +1,5 @@
|
||||
dnl***************************************************************************
|
||||
dnl Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. *
|
||||
dnl Copyright (c) 1998-2010,2011 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 1995-on
|
||||
dnl
|
||||
dnl $Id: aclocal.m4,v 1.547 2010/11/13 19:17:50 tom Exp $
|
||||
dnl $Id: aclocal.m4,v 1.549 2011/02/21 01:40:21 tom Exp $
|
||||
dnl Macros used in NCURSES auto-configuration script.
|
||||
dnl
|
||||
dnl These macros are maintained separately from NCURSES. The copyright on
|
||||
@ -1104,7 +1104,7 @@ fi
|
||||
AC_SUBST(LIBTOOL_VERSION)
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_DISABLE_RPATH_HACK version: 1 updated: 2010/04/11 10:54:00
|
||||
dnl CF_DISABLE_RPATH_HACK version: 2 updated: 2011/02/13 13:31:33
|
||||
dnl ---------------------
|
||||
dnl The rpath-hack makes it simpler to build programs, particularly with the
|
||||
dnl *BSD ports which may have essential libraries in unusual places. But it
|
||||
@ -1112,7 +1112,7 @@ dnl can interfere with building an executable for the base system. Use this
|
||||
dnl option in that case.
|
||||
AC_DEFUN([CF_DISABLE_RPATH_HACK],
|
||||
[
|
||||
AC_MSG_CHECKING(if rpath should be not be set)
|
||||
AC_MSG_CHECKING(if rpath-hack should be disabled)
|
||||
CF_ARG_DISABLE(rpath-hack,
|
||||
[ --disable-rpath-hack don't add rpath options for additional libraries],
|
||||
[cf_disable_rpath_hack=yes],
|
||||
@ -4258,7 +4258,7 @@ case ".[$]$1" in #(vi
|
||||
esac
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_PKG_CONFIG version: 3 updated: 2009/01/25 10:55:09
|
||||
dnl CF_PKG_CONFIG version: 4 updated: 2011/02/18 20:26:24
|
||||
dnl -------------
|
||||
dnl Check for the package-config program, unless disabled by command-line.
|
||||
AC_DEFUN([CF_PKG_CONFIG],
|
||||
@ -4275,7 +4275,7 @@ no) #(vi
|
||||
PKG_CONFIG=none
|
||||
;;
|
||||
yes) #(vi
|
||||
AC_PATH_PROG(PKG_CONFIG, pkg-config, none)
|
||||
AC_PATH_TOOL(PKG_CONFIG, pkg-config, none)
|
||||
;;
|
||||
*)
|
||||
PKG_CONFIG=$withval
|
||||
@ -4751,7 +4751,7 @@ define([CF_REMOVE_LIB],
|
||||
$1=`echo "$2" | sed -e 's/-l$3[[ ]]//g' -e 's/-l$3[$]//'`
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_RPATH_HACK version: 8 updated: 2010/04/17 15:38:58
|
||||
dnl CF_RPATH_HACK version: 9 updated: 2011/02/13 13:31:33
|
||||
dnl -------------
|
||||
AC_DEFUN([CF_RPATH_HACK],
|
||||
[
|
||||
@ -4764,9 +4764,36 @@ if test -n "$LD_RPATH_OPT" ; then
|
||||
cf_rpath_list="/usr/lib /lib"
|
||||
if test "$cf_ldd_prog" != no
|
||||
then
|
||||
cf_rpath_oops=
|
||||
|
||||
AC_TRY_LINK([#include <stdio.h>],
|
||||
[printf("Hello");],
|
||||
[cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[[ ]]/%/%' -e 's%/[[^/]][[^/]]*$%%' |sort -u`])
|
||||
[cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort -u`
|
||||
cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[[ ]]/%/%' -e 's%/[[^/]][[^/]]*$%%' |sort -u`])
|
||||
|
||||
# If we passed the link-test, but get a "not found" on a given library,
|
||||
# this could be due to inept reconfiguration of gcc to make it only
|
||||
# partly honor /usr/local/lib (or whatever). Sometimes this behavior
|
||||
# is intentional, e.g., installing gcc in /usr/bin and suppressing the
|
||||
# /usr/local libraries.
|
||||
if test -n "$cf_rpath_oops"
|
||||
then
|
||||
for cf_rpath_src in $cf_rpath_oops
|
||||
do
|
||||
for cf_rpath_dir in \
|
||||
/usr/local \
|
||||
/usr/pkg \
|
||||
/opt/sfw
|
||||
do
|
||||
if test -f $cf_rpath_dir/lib/$cf_rpath_src
|
||||
then
|
||||
CF_VERBOSE(...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src)
|
||||
LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
|
||||
break
|
||||
fi
|
||||
done
|
||||
done
|
||||
fi
|
||||
fi
|
||||
|
||||
CF_VERBOSE(...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS)
|
||||
@ -6341,7 +6368,7 @@ CF_NO_LEAKS_OPTION(valgrind,
|
||||
[USE_VALGRIND])
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_XOPEN_SOURCE version: 34 updated: 2010/05/26 05:38:42
|
||||
dnl CF_XOPEN_SOURCE version: 35 updated: 2011/02/20 20:37:37
|
||||
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,
|
||||
@ -6360,6 +6387,9 @@ case $host_os in #(vi
|
||||
aix[[456]]*) #(vi
|
||||
cf_xopen_source="-D_ALL_SOURCE"
|
||||
;;
|
||||
cygwin) #(vi
|
||||
cf_XOPEN_SOURCE=600
|
||||
;;
|
||||
darwin[[0-8]].*) #(vi
|
||||
cf_xopen_source="-D_APPLE_C_SOURCE"
|
||||
;;
|
||||
|
||||
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.795 2011/02/12 15:14:34 tom Exp $
|
||||
# $Id: dist.mk,v 1.796 2011/02/20 20:46:53 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 = 7
|
||||
NCURSES_PATCH = 20110212
|
||||
NCURSES_PATCH = 20110220
|
||||
|
||||
# We don't append the patch to the version, since this only applies to releases
|
||||
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# $Id: Makefile.in,v 1.54 2010/11/27 21:45:27 tom Exp $
|
||||
# $Id: Makefile.in,v 1.56 2011/02/21 01:09:31 tom Exp $
|
||||
##############################################################################
|
||||
# Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. #
|
||||
# Copyright (c) 1998-2010,2011 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 "Software"), #
|
||||
@ -64,7 +64,8 @@ ticfile = $(ticdir).db
|
||||
source = @TERMINFO_SRC@
|
||||
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_PROG = @INSTALL_SCRIPT@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
|
||||
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
|
||||
@ -103,7 +104,7 @@ install.data : terminfo.tmp \
|
||||
NCURSES_CONFIG = ncurses@DFT_ARG_SUFFIX@@cf_cv_abi_version@-config
|
||||
|
||||
install.libs :: $(DESTDIR)$(bindir) ncurses-config
|
||||
$(INSTALL_PROG) ncurses-config $(DESTDIR)$(bindir)/$(NCURSES_CONFIG)
|
||||
$(INSTALL_SCRIPT) ncurses-config $(DESTDIR)$(bindir)/$(NCURSES_CONFIG)
|
||||
|
||||
@MAKE_PC_FILES@install.libs :: pc-files $(DESTDIR)$(PKG_CONFIG_LIBDIR)
|
||||
@MAKE_PC_FILES@ $(SHELL) -c 'for name in *.pc; do $(INSTALL_DATA) $$name $(DESTDIR)$(PKG_CONFIG_LIBDIR)/$$name; done'
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#!@SHELL@
|
||||
# $Id: run_tic.in,v 1.29 2010/10/23 20:49:04 tom Exp $
|
||||
# $Id: run_tic.in,v 1.30 2011/02/21 01:05:37 tom Exp $
|
||||
##############################################################################
|
||||
# Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. #
|
||||
# Copyright (c) 1998-2010,2011 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 "Software"), #
|
||||
@ -66,16 +66,21 @@ then
|
||||
if test -f ../progs/tic$suffix
|
||||
then
|
||||
case "$PATH" in
|
||||
@PATH_SEPARATOR@*)
|
||||
PATH=../progs@PATH_SEPARATOR@../lib@PATH_SEPARATOR@${DESTDIR}$bindir$PATH
|
||||
\@PATH_SEPARATOR@*)
|
||||
PATH="../progs@PATH_SEPARATOR@../lib@PATH_SEPARATOR@${DESTDIR}$bindir$PATH"
|
||||
;;
|
||||
*)
|
||||
PATH=../progs@PATH_SEPARATOR@../lib@PATH_SEPARATOR@${DESTDIR}$bindir@PATH_SEPARATOR@$PATH
|
||||
PATH="../progs@PATH_SEPARATOR@../lib@PATH_SEPARATOR@${DESTDIR}$bindir@PATH_SEPARATOR@$PATH"
|
||||
;;
|
||||
esac
|
||||
export PATH
|
||||
SHLIB="sh $srcdir/shlib"
|
||||
TIC_PATH="$SHLIB tic"
|
||||
if test @DFT_LWR_MODEL@ = shared
|
||||
then
|
||||
SHLIB="sh $srcdir/shlib"
|
||||
TIC_PATH="$SHLIB tic"
|
||||
else
|
||||
TIC_PATH="tic"
|
||||
fi
|
||||
elif test "$TIC_PATH" = unknown
|
||||
then
|
||||
echo '? no tic program found'
|
||||
|
||||
@ -6,8 +6,8 @@
|
||||
# Report bugs and new terminal descriptions to
|
||||
# bug-ncurses@gnu.org
|
||||
#
|
||||
# $Revision: 1.382 $
|
||||
# $Date: 2011/02/05 23:41:18 $
|
||||
# $Revision: 1.383 $
|
||||
# $Date: 2011/02/20 20:46:53 $
|
||||
#
|
||||
# The original header is preserved below for reference. It is noted that there
|
||||
# is a "newer" version which differs in some cosmetic details (but actually
|
||||
@ -1919,6 +1919,8 @@ cons25w|ansiw|ansi80x25-raw|freebsd console (25-line raw mode),
|
||||
cons25|ansis|ansi80x25|freebsd console (25-line ansi mode),
|
||||
acsc=-\030.^Y0\333`\004a\260f\370g\361h\261i\025j\331k\277l\332m\300n\305q\304t\303u\264v\301w\302x\263y\363z\362~\371,
|
||||
use=cons25w,
|
||||
cons25-debian|freebsd console with debian backspace (25-line ansi mode),
|
||||
kbs=\177, kdch1=\E[3~, use=cons25,
|
||||
cons25-m|ansis-mono|ansi80x25-mono|freebsd console (25-line mono ansi mode),
|
||||
colors@, pairs@,
|
||||
bold@, dim@, op@, rmul=\E[m, setab@, setaf@,
|
||||
@ -22351,4 +22353,7 @@ v3220|LANPAR Vision II model 3220/3221/3222,
|
||||
# support VT100 SI/SO when processing UTF-8 encoding -TD
|
||||
# * add xterm-utf8 as a demo of the U8 feature -TD
|
||||
#
|
||||
# 2011-02-20
|
||||
# * add cons25-debian entry (Brian M Carlson, Debina #607662).
|
||||
#
|
||||
######## SHANTIH! SHANTIH! SHANTIH!
|
||||
|
||||
Loading…
Reference in New Issue
Block a user