From: Thomas E. Dickey Date: Sun, 11 May 2014 00:01:10 +0000 (+0000) Subject: ncurses 5.9 - patch 20140510 X-Git-Tag: v6.0~59 X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=commitdiff_plain;h=c9c32236e27689a61c794b714c6b86c460866e35 ncurses 5.9 - patch 20140510 + cleanup recently introduced compiler warnings for MingW port. + workaround for ${MAKEFLAGS} configure check versus GNU make 4.0, which introduces more than one gratuitous incompatibility. --- diff --git a/Ada95/aclocal.m4 b/Ada95/aclocal.m4 index 16773e03..c107052a 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.79 2014/04/12 22:30:34 tom Exp $ +dnl $Id: aclocal.m4,v 1.80 2014/05/10 21:08:22 tom Exp $ dnl Macros used in NCURSES Ada95 auto-configuration script. dnl dnl These macros are maintained separately from NCURSES. The copyright on @@ -1900,7 +1900,7 @@ fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_MAKEFLAGS version: 14 updated: 2011/03/31 19:29:46 +dnl CF_MAKEFLAGS version: 15 updated: 2014/05/10 16:43:23 dnl ------------ dnl Some 'make' programs support ${MAKEFLAGS}, some ${MFLAGS}, to pass 'make' dnl options to lower-levels. It's very useful for "make -n" -- if we have it. @@ -1919,7 +1919,7 @@ all : CF_EOF cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp 2>/dev/null | fgrep -v "ing directory" | sed -e 's,[[ ]]*$,,'` case "$cf_result" in - .*k) + .*k|.*kw) cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null` case "$cf_result" in .*CC=*) cf_cv_makeflags= diff --git a/Ada95/configure b/Ada95/configure index 429918e1..a21bbc9f 100644 --- a/Ada95/configure +++ b/Ada95/configure @@ -2912,7 +2912,7 @@ all : CF_EOF cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp 2>/dev/null | fgrep -v "ing directory" | sed -e 's,[ ]*$,,'` case "$cf_result" in - .*k) + .*k|.*kw) cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null` case "$cf_result" in .*CC=*) cf_cv_makeflags= diff --git a/NEWS b/NEWS index eaafe6f2..4cae0e2c 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.2199 2014/05/03 23:22:01 tom Exp $ +-- $Id: NEWS,v 1.2201 2014/05/10 21:07:15 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -45,6 +45,11 @@ 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. +20140510 + + cleanup recently introduced compiler warnings for MingW port. + + workaround for ${MAKEFLAGS} configure check versus GNU make 4.0, + which introduces more than one gratuitous incompatibility. + 20140503 + add vt520ansi terminfo entry (patch by Mike Gran) + further improve MinGW support for the scenario where there is an diff --git a/aclocal.m4 b/aclocal.m4 index 69f1e12e..e45bace6 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.688 2014/04/12 22:28:53 tom Exp $ +dnl $Id: aclocal.m4,v 1.690 2014/05/10 21:07:38 tom Exp $ dnl Macros used in NCURSES auto-configuration script. dnl dnl These macros are maintained separately from NCURSES. The copyright on @@ -3930,7 +3930,7 @@ int main() fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_MAKEFLAGS version: 14 updated: 2011/03/31 19:29:46 +dnl CF_MAKEFLAGS version: 15 updated: 2014/05/10 16:43:23 dnl ------------ dnl Some 'make' programs support ${MAKEFLAGS}, some ${MFLAGS}, to pass 'make' dnl options to lower-levels. It's very useful for "make -n" -- if we have it. @@ -3949,7 +3949,7 @@ all : CF_EOF cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp 2>/dev/null | fgrep -v "ing directory" | sed -e 's,[[ ]]*$,,'` case "$cf_result" in - .*k) + .*k|.*kw) cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null` case "$cf_result" in .*CC=*) cf_cv_makeflags= diff --git a/configure b/configure index 0b466077..d7e18069 100755 --- a/configure +++ b/configure @@ -3709,7 +3709,7 @@ all : CF_EOF cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp 2>/dev/null | fgrep -v "ing directory" | sed -e 's,[ ]*$,,'` case "$cf_result" in - .*k) + .*k|.*kw) cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null` case "$cf_result" in .*CC=*) cf_cv_makeflags= diff --git a/dist.mk b/dist.mk index 58eeca02..afddfc27 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.984 2014/05/03 15:27:36 tom Exp $ +# $Id: dist.mk,v 1.985 2014/05/10 14:37: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 = 20140503 +NCURSES_PATCH = 20140510 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) diff --git a/ncurses/base/lib_getch.c b/ncurses/base/lib_getch.c index 53e2c056..ff2c5bdf 100644 --- a/ncurses/base/lib_getch.c +++ b/ncurses/base/lib_getch.c @@ -42,7 +42,7 @@ #include -MODULE_ID("$Id: lib_getch.c,v 1.130 2014/05/03 20:49:50 tom Exp $") +MODULE_ID("$Id: lib_getch.c,v 1.131 2014/05/10 20:36:57 tom Exp $") #include @@ -124,6 +124,17 @@ _nc_use_meta(WINDOW *win) return (sp ? sp->_use_meta : 0); } +#ifdef USE_TERM_DRIVER +# ifdef __MINGW32__ +static HANDLE +_nc_get_handle(int fd) +{ + intptr_t value = _get_osfhandle(fd); + return (HANDLE) value; +} +# endif +#endif + /* * Check for mouse activity, returning nonzero if we find any. */ @@ -138,7 +149,7 @@ check_mouse_activity(SCREEN *sp, int delay EVENTLIST_2nd(_nc_eventlist * evl)) # ifdef __MINGW32__ /* if we emulate terminfo on console, we have to use the console routine */ if (IsTermInfoOnConsole(sp)) { - HANDLE fd = (HANDLE) _get_osfhandle(sp->_ifd); + HANDLE fd = _nc_get_handle(sp->_ifd); rc = _nc_mingw_testmouse(sp, fd, delay EVENTLIST_2nd(evl)); } else # endif @@ -280,7 +291,7 @@ fifo_push(SCREEN *sp EVENTLIST_2nd(_nc_eventlist * evl)) #ifdef __MINGW32__ if (NC_ISATTY(sp->_ifd) && IsTermInfoOnConsole(sp) && sp->_cbreak) n = _nc_mingw_console_read(sp, - (HANDLE) _get_osfhandle(sp->_ifd), + _nc_get_handle(sp->_ifd), &buf); else #endif diff --git a/ncurses/win32con/win_driver.c b/ncurses/win32con/win_driver.c index fa1c3909..44347646 100644 --- a/ncurses/win32con/win_driver.c +++ b/ncurses/win32con/win_driver.c @@ -45,7 +45,7 @@ #define CUR my_term.type. -MODULE_ID("$Id: win_driver.c,v 1.36 2014/05/03 20:48:51 tom Exp $") +MODULE_ID("$Id: win_driver.c,v 1.38 2014/05/10 21:50:00 tom Exp $") #ifndef __GNUC__ # error We need GCC to compile for MinGW @@ -1758,6 +1758,7 @@ int _nc_mingw_tcflush(int fd, int queue) { TC_PROLOGUE(fd); + (void) term; if (_nc_mingw_isconsole(fd)) { if (queue == TCIFLUSH) { @@ -1877,7 +1878,7 @@ __attribute__((constructor)) rkeycompare); if (GetNumberOfConsoleMouseButtons(&num_buttons)) { - CON.numButtons = num_buttons; + CON.numButtons = (int) num_buttons; } else { CON.numButtons = 1; } diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog index 71763fdb..9ff697a4 100644 --- a/package/debian-mingw/changelog +++ b/package/debian-mingw/changelog @@ -1,8 +1,8 @@ -ncurses6 (5.9-20140503) unstable; urgency=low +ncurses6 (5.9-20140510) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 03 May 2014 11:27:36 -0400 + -- Thomas E. Dickey Sat, 10 May 2014 10:37:35 -0400 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog index 71763fdb..9ff697a4 100644 --- a/package/debian-mingw64/changelog +++ b/package/debian-mingw64/changelog @@ -1,8 +1,8 @@ -ncurses6 (5.9-20140503) unstable; urgency=low +ncurses6 (5.9-20140510) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 03 May 2014 11:27:36 -0400 + -- Thomas E. Dickey Sat, 10 May 2014 10:37:35 -0400 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian/changelog b/package/debian/changelog index 9bda581d..adca77dc 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,8 +1,8 @@ -ncurses6 (5.9-20140503) unstable; urgency=low +ncurses6 (5.9-20140510) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 03 May 2014 11:27:36 -0400 + -- Thomas E. Dickey Sat, 10 May 2014 10:37:35 -0400 ncurses6 (5.9-20120608) unstable; urgency=low diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi index 4b53a687..8a4ae5fb 100644 --- a/package/mingw-ncurses.nsi +++ b/package/mingw-ncurses.nsi @@ -1,4 +1,4 @@ -; $Id: mingw-ncurses.nsi,v 1.39 2014/05/03 15:27:36 tom Exp $ +; $Id: mingw-ncurses.nsi,v 1.40 2014/05/10 14:37:35 tom Exp $ ; TODO add examples ; TODO bump ABI to 6 @@ -10,7 +10,7 @@ !define VERSION_MAJOR "5" !define VERSION_MINOR "9" !define VERSION_YYYY "2014" -!define VERSION_MMDD "0503" +!define VERSION_MMDD "0510" !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} !define MY_ABI "5" diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec index 1224eca9..5bbf4021 100644 --- a/package/mingw-ncurses.spec +++ b/package/mingw-ncurses.spec @@ -3,7 +3,7 @@ Summary: shared libraries for terminal handling Name: mingw32-ncurses6 Version: 5.9 -Release: 20140503 +Release: 20140510 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncurses.spec b/package/ncurses.spec index 913b3a2e..3e11caaa 100644 --- a/package/ncurses.spec +++ b/package/ncurses.spec @@ -1,7 +1,7 @@ Summary: shared libraries for terminal handling Name: ncurses6 Version: 5.9 -Release: 20140503 +Release: 20140510 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz