mirror/ncursesw-morphos
2
0
Fork 0
mirror of https://github.com/Aigor44/ncursesw-morphos.git synced 2025-01-30 15:19:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

ncurses 5.9 - patch 20121222

Browse Source 
+ add *.dSYM directories to clean-rule in ncurses directory makefile,
  for Mac OS builds.
+ add a configure check for gcc option -no-cpp-precomp, which is not
  available in all Mac OS X configurations (report by Andras Salamon,
  cf: 20011208).
+ improve 20021221 workaround for broken acs, handling a case where
  that ACS_xxx character is not in the acsc string but there is a known
  wide-character which can be used.
This commit is contained in:
Thomas E. Dickey 2012-12-23 02:10:42 +00:00
parent 1c551ea75e
commit 925cd3b851
13 changed files with 1953 additions and 1811 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Ada95/aclocal.m4 vendored
View File

@ -28,7 +28,7 @@ dnl***************************************************************************
dnl
dnl Author: Thomas E. Dickey
dnl
dnl $Id: aclocal.m4,v 1.62 2012/11/11 00:18:37 tom Exp $
dnl $Id: aclocal.m4,v 1.63 2012/12/23 00:58:27 tom Exp $
dnl Macros used in NCURSES Ada95 auto-configuration script.
dnl
dnl These macros are maintained separately from NCURSES. The copyright on
@ -2833,7 +2833,7 @@ define([CF_REMOVE_LIB],
$1=`echo "$2" | sed -e 's/-l$3[[ ]]//g' -e 's/-l$3[$]//'`
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_SHARED_OPTS version: 70 updated: 2012/02/25 15:20:07
dnl CF_SHARED_OPTS version: 71 updated: 2012/12/22 19:34:47
dnl --------------
dnl --------------
dnl Attempt to determine the appropriate CC/LD options for creating a shared
@ -2889,6 +2889,7 @@ AC_DEFUN([CF_SHARED_OPTS],
AC_MSG_RESULT($cf_cv_shlib_version)
cf_cv_rm_so_locs=no
cf_try_cflags=
# Some less-capable ports of gcc support only -fpic
CC_SHARED_OPTS=
@ -2941,7 +2942,7 @@ CF_EOF
chmod +x mk_shared_lib.sh
;;
darwin*) #(vi
EXTRA_CFLAGS="-no-cpp-precomp"
cf_try_cflags="no-cpp-precomp"
CC_SHARED_OPTS="-dynamic"
MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $[@]` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $[@]'
test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
@ -3160,6 +3161,33 @@ CF_EOF
;;
esac
if test -n "$cf_try_cflags"
then
cat > conftest.$ac_ext <<EOF
#line __oline__ "${as_me:-configure}"
#include <stdio.h>
int main(int argc, char *argv[[]])
{
printf("hello\n");
return (argv[[argc-1]] == 0) ;
}
EOF
cf_save_CFLAGS="$CFLAGS"
for cf_opt in $cf_try_cflags
do
CFLAGS="$cf_save_CFLAGS -$cf_opt"
AC_MSG_CHECKING(if CFLAGS option -$cf_opt works)
if AC_TRY_EVAL(ac_compile); then
AC_MSG_RESULT(yes)
cf_save_CFLAGS="$CFLAGS"
else
AC_MSG_RESULT(no)
fi
done
CFLAGS="$cf_save_CFLAGS"
fi
# RPATH_LIST is a colon-separated list of directories
test -n "$cf_ld_rpath_opt" && MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${RPATH_LIST}"
test -z "$RPATH_LIST" && RPATH_LIST="\${libdir}"

858
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.1998 2012/12/16 00:13:07 tom Exp $
-- $Id: NEWS,v 1.2002 2012/12/23 01:15:35 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.
20121222
+ add *.dSYM directories to clean-rule in ncurses directory makefile,
for Mac OS builds.
+ add a configure check for gcc option -no-cpp-precomp, which is not
available in all Mac OS X configurations (report by Andras Salamon,
cf: 20011208).
+ improve 20021221 workaround for broken acs, handling a case where
that ACS_xxx character is not in the acsc string but there is a known
wide-character which can be used.
20121215
+ fix several warnings from clang 3.1 --analyze, includes correcting
a null-pointer check in _nc_mvcur_resume.

34
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.643 2012/11/11 00:17:28 tom Exp $
dnl $Id: aclocal.m4,v 1.644 2012/12/23 00:45:32 tom Exp $
dnl Macros used in NCURSES auto-configuration script.
dnl
dnl These macros are maintained separately from NCURSES. The copyright on
@ -5227,7 +5227,7 @@ CF_VERBOSE(...checked $1 [$]$1)
AC_SUBST(EXTRA_LDFLAGS)
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_SHARED_OPTS version: 70 updated: 2012/02/25 15:20:07
dnl CF_SHARED_OPTS version: 71 updated: 2012/12/22 19:34:47
dnl --------------
dnl --------------
dnl Attempt to determine the appropriate CC/LD options for creating a shared
@ -5283,6 +5283,7 @@ AC_DEFUN([CF_SHARED_OPTS],
AC_MSG_RESULT($cf_cv_shlib_version)
cf_cv_rm_so_locs=no
cf_try_cflags=
# Some less-capable ports of gcc support only -fpic
CC_SHARED_OPTS=
@ -5335,7 +5336,7 @@ CF_EOF
chmod +x mk_shared_lib.sh
;;
darwin*) #(vi
EXTRA_CFLAGS="-no-cpp-precomp"
cf_try_cflags="no-cpp-precomp"
CC_SHARED_OPTS="-dynamic"
MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $[@]` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $[@]'
test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
@ -5554,6 +5555,33 @@ CF_EOF
;;
esac
if test -n "$cf_try_cflags"
then
cat > conftest.$ac_ext <<EOF
#line __oline__ "${as_me:-configure}"
#include <stdio.h>
int main(int argc, char *argv[[]])
{
printf("hello\n");
return (argv[[argc-1]] == 0) ;
}
EOF
cf_save_CFLAGS="$CFLAGS"
for cf_opt in $cf_try_cflags
do
CFLAGS="$cf_save_CFLAGS -$cf_opt"
AC_MSG_CHECKING(if CFLAGS option -$cf_opt works)
if AC_TRY_EVAL(ac_compile); then
AC_MSG_RESULT(yes)
cf_save_CFLAGS="$CFLAGS"
else
AC_MSG_RESULT(no)
fi
done
CFLAGS="$cf_save_CFLAGS"
fi
# RPATH_LIST is a colon-separated list of directories
test -n "$cf_ld_rpath_opt" && MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${RPATH_LIST}"
test -z "$RPATH_LIST" && RPATH_LIST="\${libdir}"

2792
configure vendored
View File

File diff suppressed because it is too large Load Diff

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.905 2012/12/15 16:32:44 tom Exp $
# $Id: dist.mk,v 1.906 2012/12/22 17:51:44 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 = 20121215
NCURSES_PATCH = 20121222
# 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.135 2012/10/06 18:58:03 tom Exp $
# $Id: Makefile.in,v 1.136 2012/12/22 23:34:40 tom Exp $
##############################################################################
# Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. #
# #
@ -264,7 +264,7 @@ clean :: mostlyclean
-rm -f $(AUTO_SRC)
-rm -f make_keys$(BUILD_EXEEXT)
-rm -f make_hash$(BUILD_EXEEXT)
-rm -rf .libs
-rm -rf .libs *.dSYM
distclean :: clean
-rm -f Makefile

5
ncurses/base/lib_set_term.c
View File

@ -47,7 +47,7 @@
#define CUR SP_TERMTYPE
#endif
MODULE_ID("$Id: lib_set_term.c,v 1.146 2012/10/27 23:04:17 tom Exp $")
MODULE_ID("$Id: lib_set_term.c,v 1.147 2012/12/22 21:30:04 tom Exp $")
#ifdef USE_TERM_DRIVER
#define MaxColors InfoOf(sp).maxcolors
@ -581,12 +581,13 @@ NCURSES_SP_NAME(_nc_setupscreen) (
NCURSES_SP_NAME(_nc_init_acs) (NCURSES_SP_ARG);
#if USE_WIDEC_SUPPORT
sp->_screen_unicode = _nc_unicode_locale();
_nc_init_wacs();
if (_nc_wacs == 0) {
ReturnScreenError();
}
sp->_screen_acs_fix = (_nc_unicode_locale()
sp->_screen_acs_fix = (sp->_screen_unicode
&& _nc_locale_breaks_acs(sp->_term));
#endif
env = _nc_get_locale();

3
ncurses/curses.priv.h
View File

@ -34,7 +34,7 @@
****************************************************************************/
/*
* $Id: curses.priv.h,v 1.514 2012/12/15 20:03:45 tom Exp $
* $Id: curses.priv.h,v 1.515 2012/12/22 21:20:22 tom Exp $
*
* curses.priv.h
*
@ -1208,6 +1208,7 @@ struct screen {
* UTF-8, but do not permit ACS at the same time (see tty_update.c).
*/
bool _screen_acs_fix;
bool _screen_unicode;
#endif
bool _use_tioctl;

5
ncurses/tinfo/tinfo_driver.c
View File

@ -50,7 +50,7 @@
# endif
#endif
MODULE_ID("$Id: tinfo_driver.c,v 1.24 2012/07/28 20:12:11 tom Exp $")
MODULE_ID("$Id: tinfo_driver.c,v 1.25 2012/12/22 21:44:10 tom Exp $")
/*
* SCO defines TIOCGSIZE and the corresponding struct. Other systems (SunOS,
@ -1150,7 +1150,8 @@ _nc_cookie_init(SCREEN *sp)
/* initialize normal acs before wide, since we use mapping in the latter */
#if !USE_WIDEC_SUPPORT
if (_nc_unicode_locale() && _nc_locale_breaks_acs(sp->_term)) {
sp->_screen_unicode = _nc_unicode_locale();
if (sp->screen_unicode && _nc_locale_breaks_acs(sp->_term)) {
acs_chars = NULL;
ena_acs = NULL;
enter_alt_charset_mode = NULL;

7
ncurses/tty/tty_update.c
View File

@ -82,7 +82,7 @@
#include <ctype.h>
MODULE_ID("$Id: tty_update.c,v 1.272 2012/12/15 21:00:19 tom Exp $")
MODULE_ID("$Id: tty_update.c,v 1.273 2012/12/22 21:38:17 tom Exp $")
/*
* This define controls the line-breakout optimization. Every once in a
@ -278,6 +278,11 @@ PutAttrChar(NCURSES_SP_DCLx CARG_CH_T ch)
&& SP_PARM->_screen_acs_map[CharOf(my_ch)]) {
RemAttr(attr, A_ALTCHARSET);
my_ch = _nc_wacs[CharOf(my_ch)];
} else if (SP_PARM->_screen_unicode
&& !SP_PARM->_screen_acs_map[CharOf(my_ch)]
&& _nc_wacs[CharOf(my_ch)].chars[0]) {
RemAttr(attr, A_ALTCHARSET);
my_ch = _nc_wacs[CharOf(my_ch)];
}
#endif
/*

4
package/debian/changelog
View File

@ -1,8 +1,8 @@
ncurses6 (5.9-20121215) unstable; urgency=low
ncurses6 (5.9-20121222) unstable; urgency=low
* latest weekly patch
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 15 Dec 2012 11:32:40 -0500
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 22 Dec 2012 12:57:01 -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: 20121215
Version: 20121222
License: X11
Group: Development/Libraries
Source: ncurses-%{release}-%{version}.tgz