mirror of
https://github.com/Aigor44/ncursesw-morphos.git
synced 2025-01-24 15:13:56 +08:00
ncurses 6.0 - patch 20171230
+ build-fix for ncurses-examples with Fedora27, adding check for reset_color_pairs() -- not yet in Fedora's package. + consistently add $CFLAGS to $MK_SHARED_LIB symbol in configure script when the latter happens to use the C compiler rather than directly using the loader (report by Jeffrey Walton). + set ABI for upcoming 6.1 release in "*.map" files. While there are some remaining internals to apply, no ABI-related changes are anticipated. + add configure --with-config-suffix option to work around filename conflict with Redhat packages versus test-packages.
This commit is contained in:
Thomas E. Dickey
parent
aed072e27e
commit
b0bdfbb1c7
20
Ada95/aclocal.m4
vendored
20
Ada95/aclocal.m4
vendored
@ -28,7 +28,7 @@ dnl***************************************************************************
|
||||
dnl
|
||||
dnl Author: Thomas E. Dickey
|
||||
dnl
|
||||
dnl $Id: aclocal.m4,v 1.121 2017/12/02 23:57:36 tom Exp $
|
||||
dnl $Id: aclocal.m4,v 1.122 2017/12/30 23:09:09 tom Exp $
|
||||
dnl Macros used in NCURSES Ada95 auto-configuration script.
|
||||
dnl
|
||||
dnl These macros are maintained separately from NCURSES. The copyright on
|
||||
@ -2944,7 +2944,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: 91 updated: 2017/12/02 18:43:13
|
||||
dnl CF_SHARED_OPTS version: 92 updated: 2017/12/30 17:26:05
|
||||
dnl --------------
|
||||
dnl --------------
|
||||
dnl Attempt to determine the appropriate CC/LD options for creating a shared
|
||||
@ -3045,11 +3045,11 @@ AC_DEFUN([CF_SHARED_OPTS],
|
||||
(aix4.[3-9]*|aix[[5-7]]*)
|
||||
if test "$GCC" = yes; then
|
||||
CC_SHARED_OPTS='-Wl,-brtl'
|
||||
MK_SHARED_LIB='${CC} ${LDFLAGS} -shared -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o [$]@'
|
||||
MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o [$]@'
|
||||
else
|
||||
CC_SHARED_OPTS='-brtl'
|
||||
# as well as '-qpic=large -G' or perhaps "-bM:SRE -bnoentry -bexpall"
|
||||
MK_SHARED_LIB='${CC} ${LDFLAGS} -G -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o [$]@'
|
||||
MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -G -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o [$]@'
|
||||
fi
|
||||
;;
|
||||
(beos*)
|
||||
@ -3143,7 +3143,7 @@ CF_EOF
|
||||
cf_shared_soname='`basename $[@]`'
|
||||
fi
|
||||
CC_SHARED_OPTS=
|
||||
MK_SHARED_LIB='${CC} ${LDFLAGS} -shared -Wl,-rpath,${RPATH_LIST} -Wl,-h,'$cf_shared_soname' -o $[@]'
|
||||
MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-rpath,${RPATH_LIST} -Wl,-h,'$cf_shared_soname' -o $[@]'
|
||||
;;
|
||||
(irix*)
|
||||
if test "$cf_cv_enable_rpath" = yes ; then
|
||||
@ -3152,9 +3152,9 @@ CF_EOF
|
||||
# tested with IRIX 5.2 and 'cc'.
|
||||
if test "$GCC" != yes; then
|
||||
CC_SHARED_OPTS='-KPIC'
|
||||
MK_SHARED_LIB='${CC} ${LDFLAGS} -shared -rdata_shared -soname `basename $[@]` -o $[@]'
|
||||
MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -rdata_shared -soname `basename $[@]` -o $[@]'
|
||||
else
|
||||
MK_SHARED_LIB='${CC} ${LDFLAGS} -shared -Wl,-soname,`basename $[@]` -o $[@]'
|
||||
MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-soname,`basename $[@]` -o $[@]'
|
||||
fi
|
||||
cf_cv_rm_so_locs=yes
|
||||
;;
|
||||
@ -3239,7 +3239,7 @@ CF_EOF
|
||||
CF_SHARED_SONAME
|
||||
MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname' -o $[@]'
|
||||
else
|
||||
MK_SHARED_LIB='${CC} ${LDFLAGS} -Wl,-shared -Wl,-Bshareable -o $[@]'
|
||||
MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -Wl,-shared -Wl,-Bshareable -o $[@]'
|
||||
fi
|
||||
;;
|
||||
(osf*|mls+*)
|
||||
@ -3301,9 +3301,9 @@ CF_EOF
|
||||
done
|
||||
CFLAGS="$cf_save_CFLAGS"
|
||||
CC_SHARED_OPTS=$cf_shared_opts
|
||||
MK_SHARED_LIB='${CC} ${LDFLAGS} -dy -G -h '$cf_cv_shared_soname' -o $[@]'
|
||||
MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dy -G -h '$cf_cv_shared_soname' -o $[@]'
|
||||
else
|
||||
MK_SHARED_LIB='${CC} ${LDFLAGS} -shared -dy -G -h '$cf_cv_shared_soname' -o $[@]'
|
||||
MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -dy -G -h '$cf_cv_shared_soname' -o $[@]'
|
||||
fi
|
||||
;;
|
||||
(sysv5uw7*|unix_sv*)
|
||||
|
||||
16
Ada95/configure
vendored
16
Ada95/configure
vendored
@ -9500,11 +9500,11 @@ echo "${ECHO_T}$CC_SHARED_OPTS" >&6
|
||||
(aix4.3-9*|aix[5-7]*)
|
||||
if test "$GCC" = yes; then
|
||||
CC_SHARED_OPTS='-Wl,-brtl'
|
||||
MK_SHARED_LIB='${CC} ${LDFLAGS} -shared -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o $@'
|
||||
MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o $@'
|
||||
else
|
||||
CC_SHARED_OPTS='-brtl'
|
||||
# as well as '-qpic=large -G' or perhaps "-bM:SRE -bnoentry -bexpall"
|
||||
MK_SHARED_LIB='${CC} ${LDFLAGS} -G -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o $@'
|
||||
MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -G -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o $@'
|
||||
fi
|
||||
;;
|
||||
(beos*)
|
||||
@ -9636,7 +9636,7 @@ echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
|
||||
cf_shared_soname='`basename $@`'
|
||||
fi
|
||||
CC_SHARED_OPTS=
|
||||
MK_SHARED_LIB='${CC} ${LDFLAGS} -shared -Wl,-rpath,${RPATH_LIST} -Wl,-h,'$cf_shared_soname' -o $@'
|
||||
MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-rpath,${RPATH_LIST} -Wl,-h,'$cf_shared_soname' -o $@'
|
||||
;;
|
||||
(irix*)
|
||||
if test "$cf_cv_enable_rpath" = yes ; then
|
||||
@ -9645,9 +9645,9 @@ echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
|
||||
# tested with IRIX 5.2 and 'cc'.
|
||||
if test "$GCC" != yes; then
|
||||
CC_SHARED_OPTS='-KPIC'
|
||||
MK_SHARED_LIB='${CC} ${LDFLAGS} -shared -rdata_shared -soname `basename $@` -o $@'
|
||||
MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -rdata_shared -soname `basename $@` -o $@'
|
||||
else
|
||||
MK_SHARED_LIB='${CC} ${LDFLAGS} -shared -Wl,-soname,`basename $@` -o $@'
|
||||
MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-soname,`basename $@` -o $@'
|
||||
fi
|
||||
cf_cv_rm_so_locs=yes
|
||||
;;
|
||||
@ -9760,7 +9760,7 @@ CF_EOF
|
||||
|
||||
MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname' -o $@'
|
||||
else
|
||||
MK_SHARED_LIB='${CC} ${LDFLAGS} -Wl,-shared -Wl,-Bshareable -o $@'
|
||||
MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -Wl,-shared -Wl,-Bshareable -o $@'
|
||||
fi
|
||||
;;
|
||||
(osf*|mls+*)
|
||||
@ -9858,9 +9858,9 @@ rm -f conftest.$ac_objext conftest.$ac_ext
|
||||
done
|
||||
CFLAGS="$cf_save_CFLAGS"
|
||||
CC_SHARED_OPTS=$cf_shared_opts
|
||||
MK_SHARED_LIB='${CC} ${LDFLAGS} -dy -G -h '$cf_cv_shared_soname' -o $@'
|
||||
MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dy -G -h '$cf_cv_shared_soname' -o $@'
|
||||
else
|
||||
MK_SHARED_LIB='${CC} ${LDFLAGS} -shared -dy -G -h '$cf_cv_shared_soname' -o $@'
|
||||
MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -dy -G -h '$cf_cv_shared_soname' -o $@'
|
||||
fi
|
||||
;;
|
||||
(sysv5uw7*|unix_sv*)
|
||||
|
||||
14
NEWS
14
NEWS
@ -25,7 +25,7 @@
|
||||
-- sale, use or other dealings in this Software without prior written --
|
||||
-- authorization. --
|
||||
-------------------------------------------------------------------------------
|
||||
-- $Id: NEWS,v 1.3030 2017/12/23 21:44:36 tom Exp $
|
||||
-- $Id: NEWS,v 1.3035 2017/12/30 23:12:52 tom Exp $
|
||||
-------------------------------------------------------------------------------
|
||||
|
||||
This is a log of changes that ncurses has gone through since Zeyd started
|
||||
@ -45,6 +45,18 @@ 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.
|
||||
|
||||
20171230
|
||||
+ build-fix for ncurses-examples with Fedora27, adding check for
|
||||
reset_color_pairs() -- not yet in Fedora's package.
|
||||
+ consistently add $CFLAGS to $MK_SHARED_LIB symbol in configure
|
||||
script when the latter happens to use the C compiler rather than
|
||||
directly using the loader (report by Jeffrey Walton).
|
||||
+ set ABI for upcoming 6.1 release in "*.map" files. While there are
|
||||
some remaining internals to apply, no ABI-related changes are
|
||||
anticipated.
|
||||
+ add configure --with-config-suffix option to work around filename
|
||||
conflict with Redhat packages versus test-packages.
|
||||
|
||||
20171223
|
||||
+ modify ncurses-examples to quiet const-warnings when building with
|
||||
PDCurses.
|
||||
|
||||
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.818 2017/12/02 23:46:25 tom Exp $
|
||||
dnl $Id: aclocal.m4,v 1.820 2017/12/30 23:07:48 tom Exp $
|
||||
dnl Macros used in NCURSES auto-configuration script.
|
||||
dnl
|
||||
dnl These macros are maintained separately from NCURSES. The copyright on
|
||||
@ -5778,7 +5778,7 @@ CF_VERBOSE(...checked $1 [$]$1)
|
||||
AC_SUBST(EXTRA_LDFLAGS)
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_SHARED_OPTS version: 91 updated: 2017/12/02 18:43:13
|
||||
dnl CF_SHARED_OPTS version: 92 updated: 2017/12/30 17:26:05
|
||||
dnl --------------
|
||||
dnl --------------
|
||||
dnl Attempt to determine the appropriate CC/LD options for creating a shared
|
||||
@ -5879,11 +5879,11 @@ AC_DEFUN([CF_SHARED_OPTS],
|
||||
(aix4.[3-9]*|aix[[5-7]]*)
|
||||
if test "$GCC" = yes; then
|
||||
CC_SHARED_OPTS='-Wl,-brtl'
|
||||
MK_SHARED_LIB='${CC} ${LDFLAGS} -shared -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o [$]@'
|
||||
MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o [$]@'
|
||||
else
|
||||
CC_SHARED_OPTS='-brtl'
|
||||
# as well as '-qpic=large -G' or perhaps "-bM:SRE -bnoentry -bexpall"
|
||||
MK_SHARED_LIB='${CC} ${LDFLAGS} -G -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o [$]@'
|
||||
MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -G -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o [$]@'
|
||||
fi
|
||||
;;
|
||||
(beos*)
|
||||
@ -5977,7 +5977,7 @@ CF_EOF
|
||||
cf_shared_soname='`basename $[@]`'
|
||||
fi
|
||||
CC_SHARED_OPTS=
|
||||
MK_SHARED_LIB='${CC} ${LDFLAGS} -shared -Wl,-rpath,${RPATH_LIST} -Wl,-h,'$cf_shared_soname' -o $[@]'
|
||||
MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-rpath,${RPATH_LIST} -Wl,-h,'$cf_shared_soname' -o $[@]'
|
||||
;;
|
||||
(irix*)
|
||||
if test "$cf_cv_enable_rpath" = yes ; then
|
||||
@ -5986,9 +5986,9 @@ CF_EOF
|
||||
# tested with IRIX 5.2 and 'cc'.
|
||||
if test "$GCC" != yes; then
|
||||
CC_SHARED_OPTS='-KPIC'
|
||||
MK_SHARED_LIB='${CC} ${LDFLAGS} -shared -rdata_shared -soname `basename $[@]` -o $[@]'
|
||||
MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -rdata_shared -soname `basename $[@]` -o $[@]'
|
||||
else
|
||||
MK_SHARED_LIB='${CC} ${LDFLAGS} -shared -Wl,-soname,`basename $[@]` -o $[@]'
|
||||
MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-soname,`basename $[@]` -o $[@]'
|
||||
fi
|
||||
cf_cv_rm_so_locs=yes
|
||||
;;
|
||||
@ -6073,7 +6073,7 @@ CF_EOF
|
||||
CF_SHARED_SONAME
|
||||
MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname' -o $[@]'
|
||||
else
|
||||
MK_SHARED_LIB='${CC} ${LDFLAGS} -Wl,-shared -Wl,-Bshareable -o $[@]'
|
||||
MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -Wl,-shared -Wl,-Bshareable -o $[@]'
|
||||
fi
|
||||
;;
|
||||
(osf*|mls+*)
|
||||
@ -6135,9 +6135,9 @@ CF_EOF
|
||||
done
|
||||
CFLAGS="$cf_save_CFLAGS"
|
||||
CC_SHARED_OPTS=$cf_shared_opts
|
||||
MK_SHARED_LIB='${CC} ${LDFLAGS} -dy -G -h '$cf_cv_shared_soname' -o $[@]'
|
||||
MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dy -G -h '$cf_cv_shared_soname' -o $[@]'
|
||||
else
|
||||
MK_SHARED_LIB='${CC} ${LDFLAGS} -shared -dy -G -h '$cf_cv_shared_soname' -o $[@]'
|
||||
MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -dy -G -h '$cf_cv_shared_soname' -o $[@]'
|
||||
fi
|
||||
;;
|
||||
(sysv5uw7*|unix_sv*)
|
||||
|
||||
21
configure.in
21
configure.in
@ -28,14 +28,14 @@ dnl***************************************************************************
|
||||
dnl
|
||||
dnl Author: Thomas E. Dickey 1995-on
|
||||
dnl
|
||||
dnl $Id: configure.in,v 1.647 2017/11/25 21:07:54 tom Exp $
|
||||
dnl $Id: configure.in,v 1.649 2017/12/26 22:23:59 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.52.20170501)
|
||||
AC_REVISION($Revision: 1.647 $)
|
||||
AC_REVISION($Revision: 1.649 $)
|
||||
AC_INIT(ncurses/base/lib_initscr.c)
|
||||
AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
|
||||
|
||||
@ -223,7 +223,21 @@ CF_PROG_LN_S
|
||||
|
||||
AC_SYS_LONG_FILE_NAMES
|
||||
|
||||
# if we find pkg-config, check if we should install the ".pc" files.
|
||||
# Provide for renaming "ncurses5-config" to "ncurses5X-config", etc., in case
|
||||
# of package conflict.
|
||||
cf_config_suffix=
|
||||
AC_ARG_WITH(config-suffix,
|
||||
[ --with-config-suffix=X suffixes pc-files],
|
||||
[case "x$withval" in
|
||||
(xyes|xno)
|
||||
AC_MSG_WARN(expected a value for config-suffix option)
|
||||
;;
|
||||
(*) cf_config_suffix="$withval"
|
||||
;;
|
||||
esac])
|
||||
AC_SUBST(cf_config_suffix)
|
||||
|
||||
# If we find pkg-config, check if we should install the ".pc" files.
|
||||
CF_PKG_CONFIG
|
||||
CF_WITH_PKG_CONFIG_LIBDIR
|
||||
CF_ENABLE_PC_FILES
|
||||
@ -1129,6 +1143,7 @@ if test "x$with_ext_colors" = xyes ; then
|
||||
AC_DEFINE(NCURSES_EXT_COLORS,1,[Define to 1 to compile for 256-color support])
|
||||
AC_DEFINE(HAVE_ALLOC_PAIR,1,[Define to 1 to enable alloc_pair() function])
|
||||
AC_DEFINE(HAVE_INIT_EXTENDED_COLOR,1,[Define to 1 to enable init_extended_color() function in test-programs])
|
||||
AC_DEFINE(HAVE_RESET_COLOR_PAIRS,1,[Define to 1 to enable reset_color_pairs() function in test-programs])
|
||||
fi
|
||||
fi
|
||||
AC_SUBST(NCURSES_EXT_COLORS)
|
||||
|
||||
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.1197 2017/12/17 20:03:11 tom Exp $
|
||||
# $Id: dist.mk,v 1.1198 2017/12/24 16:49:26 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 = 0
|
||||
NCURSES_PATCH = 20171223
|
||||
NCURSES_PATCH = 20171230
|
||||
|
||||
# We don't append the patch to the version, since this only applies to releases
|
||||
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $Id: ncurses_defs,v 1.83 2017/10/22 23:53:00 tom Exp $
|
||||
# $Id: ncurses_defs,v 1.84 2017/12/26 22:43:14 tom Exp $
|
||||
##############################################################################
|
||||
# Copyright (c) 2000-2016,2017 Free Software Foundation, Inc. #
|
||||
# #
|
||||
@ -125,6 +125,7 @@ HAVE_REGEXPR_H_FUNCS
|
||||
HAVE_REGEXP_H_FUNCS
|
||||
HAVE_REGEX_H_FUNCS
|
||||
HAVE_REMOVE
|
||||
HAVE_RESET_COLOR_PAIRS
|
||||
HAVE_RESIZETERM
|
||||
HAVE_RESIZE_TERM
|
||||
HAVE_RESTARTTERM 1
|
||||
@ -163,6 +164,7 @@ HAVE_TCGETPGRP
|
||||
HAVE_TDESTROY
|
||||
HAVE_TELL
|
||||
HAVE_TERMATTRS 1
|
||||
HAVE_TERMCAP_H 1
|
||||
HAVE_TERMIOS_H
|
||||
HAVE_TERMIO_H
|
||||
HAVE_TERMNAME 1
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# $Id: Makefile.in,v 1.66 2016/09/03 00:07:54 tom Exp $
|
||||
# $Id: Makefile.in,v 1.67 2017/12/26 19:13:24 tom Exp $
|
||||
##############################################################################
|
||||
# Copyright (c) 1998-2015,2016 Free Software Foundation, Inc. #
|
||||
# Copyright (c) 1998-2016,2017 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"), #
|
||||
@ -105,7 +105,7 @@ install.data : terminfo.tmp \
|
||||
$(INSTALL_DATA) $$i $(DESTDIR)$(tabsetdir)/$$i; \
|
||||
fi; done'
|
||||
|
||||
NCURSES_CONFIG = ncurses@DFT_ARG_SUFFIX@@cf_cv_abi_version@-config
|
||||
NCURSES_CONFIG = ncurses@DFT_ARG_SUFFIX@@cf_cv_abi_version@@cf_config_suffix@-config
|
||||
|
||||
install.libs :: $(DESTDIR)$(bindir) ncurses-config
|
||||
$(INSTALL_SCRIPT) ncurses-config $(DESTDIR)$(bindir)/$(NCURSES_CONFIG)
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
ncurses6 (6.0+20171223) unstable; urgency=low
|
||||
ncurses6 (6.0+20171230) unstable; urgency=low
|
||||
|
||||
* latest weekly patch
|
||||
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sun, 17 Dec 2017 15:03:11 -0500
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sun, 24 Dec 2017 11:49:26 -0500
|
||||
|
||||
ncurses6 (5.9-20131005) unstable; urgency=low
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
ncurses6 (6.0+20171223) unstable; urgency=low
|
||||
ncurses6 (6.0+20171230) unstable; urgency=low
|
||||
|
||||
* latest weekly patch
|
||||
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sun, 17 Dec 2017 15:03:11 -0500
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sun, 24 Dec 2017 11:49:26 -0500
|
||||
|
||||
ncurses6 (5.9-20131005) unstable; urgency=low
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
ncurses6 (6.0+20171223) unstable; urgency=low
|
||||
ncurses6 (6.0+20171230) unstable; urgency=low
|
||||
|
||||
* latest weekly patch
|
||||
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sun, 17 Dec 2017 15:03:11 -0500
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sun, 24 Dec 2017 11:49:26 -0500
|
||||
|
||||
ncurses6 (5.9-20120608) unstable; urgency=low
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; $Id: mingw-ncurses.nsi,v 1.245 2017/12/17 20:03:11 tom Exp $
|
||||
; $Id: mingw-ncurses.nsi,v 1.246 2017/12/24 16:49:26 tom Exp $
|
||||
|
||||
; TODO add examples
|
||||
; TODO bump ABI to 6
|
||||
@ -10,7 +10,7 @@
|
||||
!define VERSION_MAJOR "6"
|
||||
!define VERSION_MINOR "0"
|
||||
!define VERSION_YYYY "2017"
|
||||
!define VERSION_MMDD "1223"
|
||||
!define VERSION_MMDD "1230"
|
||||
!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.0
|
||||
Release: 20171223
|
||||
Release: 20171230
|
||||
License: X11
|
||||
Group: Development/Libraries
|
||||
Source: ncurses-%{version}-%{release}.tgz
|
||||
@ -42,6 +42,7 @@ This package is used for testing ABI 6 with cross-compiles to MinGW.
|
||||
%prep
|
||||
|
||||
%define CFG_OPTS \\\
|
||||
--with-config-suffix=dev \\\
|
||||
--disable-echo \\\
|
||||
--disable-db-install \\\
|
||||
--disable-getcap \\\
|
||||
@ -136,6 +137,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%changelog
|
||||
|
||||
* Tue Dec 26 2017 Thomas E. Dickey
|
||||
- add --with-config-suffix option
|
||||
|
||||
* Sat Sep 20 2014 Thomas E. Dickey
|
||||
- adjust install-rules for ncurses*-config
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $Id: ncurses.map,v 1.43 2017/08/12 21:33:04 tom Exp $
|
||||
# $Id: ncurses.map,v 1.44 2017/12/30 20:51:38 tom Exp $
|
||||
# script for shared library symbol-versioning using ld
|
||||
#
|
||||
# This file was generated by ncu-mapsyms
|
||||
@ -745,7 +745,7 @@ NCURSES_5.9.20150530 {
|
||||
_nc_trace_mmask_t;
|
||||
} NCURSES_5.8.20110226;
|
||||
|
||||
NCURSES_6.0.current {
|
||||
NCURSES_6.1.20171230 {
|
||||
global:
|
||||
alloc_pair;
|
||||
alloc_pair_sp;
|
||||
@ -835,7 +835,7 @@ NCURSES_TIC_5.9.20150530 {
|
||||
_nc_strict_bsd;
|
||||
} NCURSES_TIC_5.7.20081102;
|
||||
|
||||
NCURSES_TIC_6.0.current {
|
||||
NCURSES_TIC_6.1.20171230 {
|
||||
global:
|
||||
_nc_read_entry2;
|
||||
_nc_write_object;
|
||||
@ -1185,7 +1185,7 @@ NCURSES_TINFO_5.9.20150530 {
|
||||
_nc_setenv_num;
|
||||
} NCURSES_TINFO_5.8.20110226;
|
||||
|
||||
NCURSES_TINFO_6.0.current {
|
||||
NCURSES_TINFO_6.1.20171230 {
|
||||
global:
|
||||
_nc_copy_termtype2;
|
||||
_nc_export_termtype2;
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
Summary: shared libraries for terminal handling
|
||||
Name: ncurses6
|
||||
Version: 6.0
|
||||
Release: 20171223
|
||||
Release: 20171230
|
||||
License: X11
|
||||
Group: Development/Libraries
|
||||
Source: ncurses-%{version}-%{release}.tgz
|
||||
@ -42,6 +42,7 @@ RPATH_LIST=../lib:%{_prefix}/lib \
|
||||
--with-default-terminfo-dir=%{MYDATA} \
|
||||
--with-install-prefix=$RPM_BUILD_ROOT \
|
||||
--with-terminfo-dirs=%{MYDATA}:/usr/share/terminfo \
|
||||
--with-config-suffix=dev \
|
||||
--disable-echo \
|
||||
--disable-getcap \
|
||||
--disable-leaks \
|
||||
@ -92,6 +93,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%changelog
|
||||
|
||||
* Tue Dec 26 2017 Thomas E. Dickey
|
||||
- add --with-config-suffix option
|
||||
|
||||
* Sun Apr 26 2015 Thomas E. Dickey
|
||||
- move package to /usr
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $Id: ncursest.map,v 1.40 2017/08/12 21:33:04 tom Exp $
|
||||
# $Id: ncursest.map,v 1.41 2017/12/30 20:51:38 tom Exp $
|
||||
# script for shared library symbol-versioning using ld
|
||||
#
|
||||
# This file was generated by ncu-mapsyms
|
||||
@ -105,7 +105,7 @@ NCURSES_TIC_5.9.20150530 {
|
||||
_nc_strict_bsd;
|
||||
} NCURSES_TIC_5.7.20081102;
|
||||
|
||||
NCURSES_TIC_6.0.current {
|
||||
NCURSES_TIC_6.1.20171230 {
|
||||
global:
|
||||
_nc_read_entry2;
|
||||
_nc_write_object;
|
||||
@ -466,7 +466,7 @@ NCURSES_TINFO_5.9.20150530 {
|
||||
_nc_setenv_num;
|
||||
} NCURSES_TINFO_5.8.20110226;
|
||||
|
||||
NCURSES_TINFO_6.0.current {
|
||||
NCURSES_TINFO_6.1.20171230 {
|
||||
global:
|
||||
_nc_copy_termtype2;
|
||||
_nc_export_termtype2;
|
||||
@ -1128,7 +1128,7 @@ NCURSEST_5.9.20150530 {
|
||||
_nc_trace_mmask_t;
|
||||
} NCURSEST_5.8.20110226;
|
||||
|
||||
NCURSEST_6.0.current {
|
||||
NCURSEST_6.1.20171230 {
|
||||
global:
|
||||
alloc_pair;
|
||||
alloc_pair_sp;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $Id: ncursestw.map,v 1.41 2017/08/12 21:33:04 tom Exp $
|
||||
# $Id: ncursestw.map,v 1.42 2017/12/30 20:51:38 tom Exp $
|
||||
# script for shared library symbol-versioning using ld
|
||||
#
|
||||
# This file was generated by ncu-mapsyms
|
||||
@ -105,7 +105,7 @@ NCURSES_TIC_5.9.20150530 {
|
||||
_nc_strict_bsd;
|
||||
} NCURSES_TIC_5.7.20081102;
|
||||
|
||||
NCURSES_TIC_6.0.current {
|
||||
NCURSES_TIC_6.1.20171230 {
|
||||
global:
|
||||
_nc_read_entry2;
|
||||
_nc_write_object;
|
||||
@ -472,7 +472,7 @@ NCURSES_TINFO_5.9.20150530 {
|
||||
_nc_setenv_num;
|
||||
} NCURSES_TINFO_5.8.20110226;
|
||||
|
||||
NCURSES_TINFO_6.0.current {
|
||||
NCURSES_TINFO_6.1.20171230 {
|
||||
global:
|
||||
_nc_copy_termtype2;
|
||||
_nc_export_termtype2;
|
||||
@ -1247,7 +1247,7 @@ NCURSESTW_5.9.20150530 {
|
||||
_nc_trace_mmask_t;
|
||||
} NCURSESTW_5.8.20110226;
|
||||
|
||||
NCURSESTW_6.0.current {
|
||||
NCURSESTW_6.1.20171230 {
|
||||
global:
|
||||
alloc_pair;
|
||||
alloc_pair_sp;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $Id: ncursesw.map,v 1.45 2017/08/11 17:34:19 tom Exp $
|
||||
# $Id: ncursesw.map,v 1.46 2017/12/30 20:51:38 tom Exp $
|
||||
# script for shared library symbol-versioning using ld
|
||||
#
|
||||
# This file was generated by ncu-mapsyms
|
||||
@ -114,7 +114,7 @@ NCURSES_TIC_5.9.20150530 {
|
||||
_nc_strict_bsd;
|
||||
} NCURSES_TIC_5.7.20081102;
|
||||
|
||||
NCURSES_TIC_6.0.current {
|
||||
NCURSES_TIC_6.1.20171230 {
|
||||
global:
|
||||
_nc_read_entry2;
|
||||
_nc_write_object;
|
||||
@ -470,7 +470,7 @@ NCURSES_TINFO_5.9.20150530 {
|
||||
_nc_setenv_num;
|
||||
} NCURSES_TINFO_5.8.20110226;
|
||||
|
||||
NCURSES_TINFO_6.0.current {
|
||||
NCURSES_TINFO_6.1.20171230 {
|
||||
global:
|
||||
_nc_copy_termtype2;
|
||||
_nc_export_termtype2;
|
||||
@ -1270,7 +1270,7 @@ NCURSESW_5.9.20150530 {
|
||||
_nc_trace_mmask_t;
|
||||
} NCURSESW_5.8.20110226;
|
||||
|
||||
NCURSESW_6.0.current {
|
||||
NCURSESW_6.1.20171230 {
|
||||
global:
|
||||
alloc_pair;
|
||||
alloc_pair_sp;
|
||||
|
||||
8
test/aclocal.m4
vendored
8
test/aclocal.m4
vendored
@ -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.148 2017/11/25 22:34:41 tom Exp $
|
||||
dnl $Id: aclocal.m4,v 1.149 2017/12/26 22:17:17 tom Exp $
|
||||
dnl
|
||||
dnl Author: Thomas E. Dickey
|
||||
dnl
|
||||
@ -2116,11 +2116,11 @@ else
|
||||
fi
|
||||
|
||||
if test "x$cf_have_ncuconfig" = "xno"; then
|
||||
echo "Looking for ${cf_ncuconfig_root}-config"
|
||||
cf_ncurses_config="${cf_ncuconfig_root}${NCURSES_CONFIG_SUFFIX}-config"; echo "Looking for ${cf_ncurses_config}"
|
||||
|
||||
CF_ACVERSION_CHECK(2.52,
|
||||
[AC_CHECK_TOOLS(NCURSES_CONFIG, ${cf_ncuconfig_root}-config ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config, none)],
|
||||
[AC_PATH_PROGS(NCURSES_CONFIG, ${cf_ncuconfig_root}-config ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config, none)])
|
||||
[AC_CHECK_TOOLS(NCURSES_CONFIG, ${cf_ncurses_config} ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config, none)],
|
||||
[AC_PATH_PROGS(NCURSES_CONFIG, ${cf_ncurses_config} ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config, none)])
|
||||
|
||||
if test "$NCURSES_CONFIG" != none ; then
|
||||
|
||||
|
||||
757
test/configure
vendored
757
test/configure
vendored
File diff suppressed because it is too large
Load Diff
@ -28,7 +28,7 @@ dnl***************************************************************************
|
||||
dnl
|
||||
dnl Author: Thomas E. Dickey 1996-on
|
||||
dnl
|
||||
dnl $Id: configure.in,v 1.144 2017/11/25 21:24:23 tom Exp $
|
||||
dnl $Id: configure.in,v 1.145 2017/12/26 22:55:15 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)
|
||||
@ -252,6 +252,17 @@ tdestroy \
|
||||
tsearch \
|
||||
)
|
||||
|
||||
# use a compile-check to work with ncurses*-config and subdirectory includes
|
||||
AC_CACHE_CHECK(if we can use termcap.h,cf_cv_have_termcap_h,[
|
||||
AC_TRY_COMPILE([
|
||||
#include <curses.h>
|
||||
#include <termcap.h>
|
||||
],
|
||||
[return 0;],
|
||||
[cf_cv_have_termcap_h=yes],
|
||||
[cf_cv_have_termcap_h=no])])
|
||||
test "x$cf_cv_have_termcap_h" = xyes && AC_DEFINE(HAVE_TERMCAP_H)
|
||||
|
||||
if test "x$ac_cv_func_getopt" = xno; then
|
||||
AC_MSG_ERROR(getopt is required for building programs)
|
||||
fi
|
||||
@ -294,6 +305,7 @@ mvwvline \
|
||||
napms \
|
||||
newpad \
|
||||
putwin \
|
||||
reset_color_pairs \
|
||||
resize_term \
|
||||
resizeterm \
|
||||
restartterm \
|
||||
|
||||
@ -29,7 +29,7 @@
|
||||
/*
|
||||
* Author: Thomas E. Dickey
|
||||
*
|
||||
* $Id: demo_termcap.c,v 1.55 2017/09/04 13:28:44 tom Exp $
|
||||
* $Id: demo_termcap.c,v 1.56 2017/12/26 22:41:47 tom Exp $
|
||||
*
|
||||
* A simple demo of the termcap interface.
|
||||
*/
|
||||
@ -46,7 +46,7 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef NCURSES_VERSION
|
||||
#if defined(NCURSES_VERSION) && HAVE_TERMCAP_H
|
||||
#include <termcap.h>
|
||||
#endif
|
||||
|
||||
|
||||
@ -4,7 +4,7 @@ Summary: ncurses-examples - example/test programs from ncurses
|
||||
%define AppProgram ncurses-examples
|
||||
%define AppVersion MAJOR.MINOR
|
||||
%define AppRelease YYYYMMDD
|
||||
# $Id: mingw-ncurses-examples.spec,v 1.3 2013/10/26 23:30:21 tom Exp $
|
||||
# $Id: mingw-ncurses-examples.spec,v 1.4 2017/12/26 22:19:12 tom Exp $
|
||||
Name: mingw32-ncurses6-examples
|
||||
Version: %{AppVersion}
|
||||
Release: %{AppRelease}
|
||||
@ -66,8 +66,9 @@ mkdir BUILD-W32
|
||||
pushd BUILD-W32
|
||||
CFLAGS="%{CC_NORMAL}" \
|
||||
CC=%{mingw32_cc} \
|
||||
NCURSES_CONFIG_SUFFIX=dev \
|
||||
%mingw32_configure %{CFG_OPTS}
|
||||
cp config.status /tmp/ming32-config.status
|
||||
# cp config.status /tmp/ming32-config.status
|
||||
make
|
||||
popd
|
||||
|
||||
@ -76,7 +77,7 @@ pushd BUILD-W64
|
||||
CFLAGS="%{CC_NORMAL}" \
|
||||
CC=%{mingw64_cc} \
|
||||
%mingw64_configure %{CFG_OPTS}
|
||||
cp config.status /tmp/ming64-config.status
|
||||
# cp config.status /tmp/ming64-config.status
|
||||
make
|
||||
popd
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@ Summary: ncurses-examples - example/test programs from ncurses
|
||||
%define AppProgram ncurses-examples
|
||||
%define AppVersion MAJOR.MINOR
|
||||
%define AppRelease YYYYMMDD
|
||||
# $Id: ncurses-examples.spec,v 1.9 2017/12/17 00:12:42 tom Exp $
|
||||
# $Id: ncurses-examples.spec,v 1.10 2017/12/26 23:54:06 tom Exp $
|
||||
Name: %{AppProgram}
|
||||
Version: %{AppVersion}
|
||||
Release: %{AppRelease}
|
||||
@ -27,6 +27,7 @@ packages.
|
||||
%build
|
||||
|
||||
INSTALL_PROGRAM='${INSTALL}' \
|
||||
NCURSES_CONFIG_SUFFIX=dev \
|
||||
%configure \
|
||||
--target %{_target_platform} \
|
||||
--prefix=%{_prefix} \
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
* authorization. *
|
||||
****************************************************************************/
|
||||
/*
|
||||
* $Id: picsmap.c,v 1.114 2017/12/16 23:49:40 tom Exp $
|
||||
* $Id: picsmap.c,v 1.115 2017/12/26 22:20:11 tom Exp $
|
||||
*
|
||||
* Author: Thomas E. Dickey
|
||||
*
|
||||
@ -1475,7 +1475,7 @@ show_picture(PICS_HEAD * pics)
|
||||
|
||||
debugmsg("called show_picture");
|
||||
logmsg("...using %dx%d screen", LINES, COLS);
|
||||
#if USE_EXTENDED_COLORS
|
||||
#if HAVE_RESET_COLOR_PAIRS
|
||||
reset_color_pairs();
|
||||
#elif HAVE_CURSCR
|
||||
wclear(curscr);
|
||||
|
||||
@ -29,7 +29,7 @@
|
||||
/****************************************************************************
|
||||
* Author: Thomas E. Dickey 1996-on *
|
||||
****************************************************************************/
|
||||
/* $Id: test.priv.h,v 1.161 2017/12/23 21:40:21 tom Exp $ */
|
||||
/* $Id: test.priv.h,v 1.162 2017/12/26 22:20:42 tom Exp $ */
|
||||
|
||||
#ifndef __TEST_PRIV_H
|
||||
#define __TEST_PRIV_H 1
|
||||
@ -206,6 +206,10 @@
|
||||
#define HAVE_PUTWIN 0
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_RESET_COLOR_PAIRS
|
||||
#define HAVE_RESET_COLOR_PAIRS 0
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_RESIZE_TERM
|
||||
#define HAVE_RESIZE_TERM 0
|
||||
#endif
|
||||
|
||||
Loading…
Reference in New Issue
Block a user