From 32f1c9b1a0fdad8ac997c7a8ac9cb92c610b4336 Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Sun, 14 Apr 2013 00:01:10 +0000 Subject: [PATCH] ncurses 5.9 - patch 20130413 + add MinGW to cases where ncurses installs by default into /usr (prompted by discussion with Daniel Silva Ferreira). + add -D option to infocmp's usage-message (patch by Miroslav Lichvar). + add a missing 'int' type for main function in configure check for type of bool variable, to work with clang 3.2 (report by Dmitri Gribenko). + improve configure check for static_cast, to work with clang 3.2 (report by Dmitri Gribenko). + re-order rule for demo.o and macros defining header dependencies in c++/Makefile.in to accommodate gmake (report by Dmitri Gribenko). --- Ada95/aclocal.m4 | 6 +++--- Ada95/configure | 2 +- NEWS | 14 +++++++++++++- aclocal.m4 | 14 +++++++------- c++/Makefile.in | 42 +++++++++++++++++++++------------------- configure | 8 ++++---- dist.mk | 4 ++-- package/debian/changelog | 4 ++-- package/ncurses.spec | 2 +- progs/infocmp.c | 5 +++-- 10 files changed, 58 insertions(+), 43 deletions(-) diff --git a/Ada95/aclocal.m4 b/Ada95/aclocal.m4 index b2ca4143..3f7ad84e 100644 --- a/Ada95/aclocal.m4 +++ b/Ada95/aclocal.m4 @@ -28,7 +28,7 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey dnl -dnl $Id: aclocal.m4,v 1.65 2013/03/09 21:39:08 tom Exp $ +dnl $Id: aclocal.m4,v 1.66 2013/04/13 23:00:18 tom Exp $ dnl Macros used in NCURSES Ada95 auto-configuration script. dnl dnl These macros are maintained separately from NCURSES. The copyright on @@ -516,7 +516,7 @@ case "$CC" in #(vi esac ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CFG_DEFAULTS version: 8 updated: 2011/06/04 20:09:13 +dnl CF_CFG_DEFAULTS version: 9 updated: 2013/04/13 18:58:32 dnl --------------- dnl Determine the default configuration into which we'll install ncurses. This dnl can be overridden by the user's command-line options. There's two items to @@ -534,7 +534,7 @@ AC_MSG_CHECKING(for prefix) if test "x$prefix" = "xNONE" ; then case "$cf_cv_system_name" in # non-vendor systems don't have a conflict - openbsd*|freebsd*|mirbsd*|linux*|cygwin*|k*bsd*-gnu) + openbsd*|freebsd*|mirbsd*|linux*|cygwin*|k*bsd*-gnu|mingw*) prefix=/usr ;; *) prefix=$ac_default_prefix diff --git a/Ada95/configure b/Ada95/configure index c298e45e..f2a17e4c 100644 --- a/Ada95/configure +++ b/Ada95/configure @@ -1154,7 +1154,7 @@ echo $ECHO_N "checking for prefix... $ECHO_C" >&6 if test "x$prefix" = "xNONE" ; then case "$cf_cv_system_name" in # non-vendor systems don't have a conflict - openbsd*|freebsd*|mirbsd*|linux*|cygwin*|k*bsd*-gnu) + openbsd*|freebsd*|mirbsd*|linux*|cygwin*|k*bsd*-gnu|mingw*) prefix=/usr ;; *) prefix=$ac_default_prefix diff --git a/NEWS b/NEWS index 7b255403..e03eb4a2 100644 --- a/NEWS +++ b/NEWS @@ -25,7 +25,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: NEWS,v 1.2043 2013/04/06 23:48:25 tom Exp $ +-- $Id: NEWS,v 1.2046 2013/04/13 22:51:41 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. +20130413 + + add MinGW to cases where ncurses installs by default into /usr + (prompted by discussion with Daniel Silva Ferreira). + + add -D option to infocmp's usage-message (patch by Miroslav Lichvar). + + add a missing 'int' type for main function in configure check for + type of bool variable, to work with clang 3.2 (report by Dmitri + Gribenko). + + improve configure check for static_cast, to work with clang 3.2 + (report by Dmitri Gribenko). + + re-order rule for demo.o and macros defining header dependencies in + c++/Makefile.in to accommodate gmake (report by Dmitri Gribenko). + 20130406 + improve parameter checking in copywin(). + modify configure script to work around OS X's "libtool" program, to diff --git a/aclocal.m4 b/aclocal.m4 index bd1700c7..9a8c65ec 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -28,7 +28,7 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey 1995-on dnl -dnl $Id: aclocal.m4,v 1.662 2013/04/06 22:06:57 tom Exp $ +dnl $Id: aclocal.m4,v 1.666 2013/04/13 22:59:35 tom Exp $ dnl Macros used in NCURSES auto-configuration script. dnl dnl These macros are maintained separately from NCURSES. The copyright on @@ -492,7 +492,7 @@ else AC_MSG_RESULT(no) fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_BOOL_SIZE version: 12 updated: 2006/12/16 12:33:30 +dnl CF_BOOL_SIZE version: 13 updated: 2013/04/13 18:03:21 dnl ------------ dnl Test for the size of 'bool' in the configured C++ compiler (e.g., a type). dnl Don't bother looking for bool.h, since it's been deprecated. @@ -526,7 +526,7 @@ AC_CACHE_VAL(cf_cv_type_of_bool,[ #endif -main() +int main() { FILE *fp = fopen("cf_test.out", "w"); if (fp != 0) { @@ -678,7 +678,7 @@ case "$CC" in #(vi esac ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CFG_DEFAULTS version: 8 updated: 2011/06/04 20:09:13 +dnl CF_CFG_DEFAULTS version: 9 updated: 2013/04/13 18:58:32 dnl --------------- dnl Determine the default configuration into which we'll install ncurses. This dnl can be overridden by the user's command-line options. There's two items to @@ -696,7 +696,7 @@ AC_MSG_CHECKING(for prefix) if test "x$prefix" = "xNONE" ; then case "$cf_cv_system_name" in # non-vendor systems don't have a conflict - openbsd*|freebsd*|mirbsd*|linux*|cygwin*|k*bsd*-gnu) + openbsd*|freebsd*|mirbsd*|linux*|cygwin*|k*bsd*-gnu|mingw*) prefix=/usr ;; *) prefix=$ac_default_prefix @@ -1022,7 +1022,7 @@ fi test "$cf_cv_cpp_param_init" = yes && AC_DEFINE(CPP_HAS_PARAM_INIT,1,[Define to 1 if C++ has parameter initialization]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CPP_STATIC_CAST version: 2 updated: 2012/10/06 17:56:13 +dnl CF_CPP_STATIC_CAST version: 3 updated: 2013/04/13 18:03:21 dnl ------------------ dnl Check if the C++ compiler accepts static_cast in generics. This appears to dnl not be supported in g++ before 3.0 @@ -1044,7 +1044,7 @@ public: int begin_x = 0) { } - + NCursesPanel(); ~NCursesPanel(); }; diff --git a/c++/Makefile.in b/c++/Makefile.in index 04a7bf8c..62fd4fab 100644 --- a/c++/Makefile.in +++ b/c++/Makefile.in @@ -1,4 +1,4 @@ -# $Id: Makefile.in,v 1.103 2013/03/30 21:03:33 tom Exp $ +# $Id: Makefile.in,v 1.104 2013/04/13 18:24:43 tom Exp $ ############################################################################## # Copyright (c) 1998-2012,2013 Free Software Foundation, Inc. # # # @@ -157,25 +157,6 @@ depend : tags: $(CTAGS) *.[h] *.cc -OBJS_DEMO = $(MODEL)/demo$o - -$(MODEL)/demo$o : $(srcdir)/demo.cc \ - $(internal_h) \ - $(cursesf_h) \ - $(cursesm_h) \ - $(cursesapp_h) - @echo 'compiling demo (obj_s)' - @$(LIBTOOL_COMPILE) $(CXX) $(CFLAGS_DEFAULT) -c $(srcdir)/demo.cc -o $@ - -demo$x: $(OBJS_DEMO) \ - $(LIBRARIES) \ - @TEST_DEPS@ - @ECHO_LD@ $(LINK) -o $@ $(OBJS_DEMO) $(LDFLAGS_DEFAULT) - -etip.h: $(srcdir)/etip.h.in $(srcdir)/edit_cfg.sh - cp $(srcdir)/etip.h.in $@ - sh $(srcdir)/edit_cfg.sh ../include/ncurses_cfg.h $@ - $(DESTDIR)$(libdir) : mkdir -p $@ @@ -234,6 +215,27 @@ $(INCDIR)/menu.h : $(INCDIR)/panel.h : cd ../panel && $(MAKE) $@ +############################################################################### + +OBJS_DEMO = $(MODEL)/demo$o + +$(MODEL)/demo$o : $(srcdir)/demo.cc \ + $(internal_h) \ + $(cursesf_h) \ + $(cursesm_h) \ + $(cursesapp_h) + @echo 'compiling demo (obj_s)' + @$(LIBTOOL_COMPILE) $(CXX) $(CFLAGS_DEFAULT) -c $(srcdir)/demo.cc -o $@ + +demo$x: $(OBJS_DEMO) \ + $(LIBRARIES) \ + @TEST_DEPS@ + @ECHO_LD@ $(LINK) -o $@ $(OBJS_DEMO) $(LDFLAGS_DEFAULT) + +etip.h: $(srcdir)/etip.h.in $(srcdir)/edit_cfg.sh + cp $(srcdir)/etip.h.in $@ + sh $(srcdir)/edit_cfg.sh ../include/ncurses_cfg.h $@ + ############################################################################### # The remainder of this file is automatically generated during configuration ############################################################################### diff --git a/configure b/configure index 70575220..6be66d43 100755 --- a/configure +++ b/configure @@ -1382,7 +1382,7 @@ echo $ECHO_N "checking for prefix... $ECHO_C" >&6 if test "x$prefix" = "xNONE" ; then case "$cf_cv_system_name" in # non-vendor systems don't have a conflict - openbsd*|freebsd*|mirbsd*|linux*|cygwin*|k*bsd*-gnu) + openbsd*|freebsd*|mirbsd*|linux*|cygwin*|k*bsd*-gnu|mingw*) prefix=/usr ;; *) prefix=$ac_default_prefix @@ -18840,7 +18840,7 @@ else #endif -main() +int main() { FILE *fp = fopen("cf_test.out", "w"); if (fp != 0) { @@ -19061,7 +19061,7 @@ public: int begin_x = 0) { } - + NCursesPanel(); ~NCursesPanel(); }; @@ -19204,7 +19204,7 @@ else #endif -main() +int main() { FILE *fp = fopen("cf_test.out", "w"); if (fp != 0) { diff --git a/dist.mk b/dist.mk index 94d865e5..57b3b9f6 100644 --- a/dist.mk +++ b/dist.mk @@ -25,7 +25,7 @@ # use or other dealings in this Software without prior written # # authorization. # ############################################################################## -# $Id: dist.mk,v 1.923 2013/04/06 16:40:39 tom Exp $ +# $Id: dist.mk,v 1.924 2013/04/13 14:36:35 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 = 20130406 +NCURSES_PATCH = 20130413 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) diff --git a/package/debian/changelog b/package/debian/changelog index ee204f40..f217b6ae 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,8 +1,8 @@ -ncurses6 (5.9-20130406) unstable; urgency=low +ncurses6 (5.9-20130413) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 30 Mar 2013 09:50:26 -0400 + -- Thomas E. Dickey Sat, 13 Apr 2013 10:20:54 -0400 ncurses6 (5.9-20120608) unstable; urgency=low diff --git a/package/ncurses.spec b/package/ncurses.spec index 5c4be7b6..13d4ead7 100644 --- a/package/ncurses.spec +++ b/package/ncurses.spec @@ -1,7 +1,7 @@ Summary: shared libraries for terminal handling Name: ncurses6 Release: 5.9 -Version: 20130406 +Version: 20130413 License: X11 Group: Development/Libraries Source: ncurses-%{release}-%{version}.tgz diff --git a/progs/infocmp.c b/progs/infocmp.c index 506a374e..e58d691e 100644 --- a/progs/infocmp.c +++ b/progs/infocmp.c @@ -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 * @@ -42,7 +42,7 @@ #include -MODULE_ID("$Id: infocmp.c,v 1.123 2012/11/17 23:15:10 tom Exp $") +MODULE_ID("$Id: infocmp.c,v 1.124 2013/04/13 22:15:14 Miroslav.Lichvar Exp $") #define L_CURL "{" #define R_CURL "}" @@ -1165,6 +1165,7 @@ usage(void) ," -R subset (see manpage)" ," -T eliminate size limits (test)" ," -U eliminate post-processing of entries" + ," -D print database locations" ," -V print version" #if NCURSES_XNAMES ," -a with -F, list commented-out caps" -- 2.44.0