ncurses 6.0 - patch 20160206

+ define WIN32_LEAN_AND_MEAN for MinGW port, making builds faster.
+ modify test/ditto.c to allow $XTERM_PROG environment variable to
  override "xterm" as the name of the program to run in the threaded
  configuration.

diff --git a/NEWS b/NEWS
index 3e8744e5a8c6d9ea20eb1249c29d0c9161d1f5fd..16beb211688fa7fc4411c3f35bf9d14768aeab59 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -25,7 +25,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------

--- $Id: NEWS,v 1.2566 2016/01/30 19:38:41 tom Exp $
+-- $Id: NEWS,v 1.2568 2016/02/06 22:10:53 tom Exp $

 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started


@@ -45,6 +45,12 @@ 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.
 
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 

+20160206
+       + define WIN32_LEAN_AND_MEAN for MinGW port, making builds faster.
+       + modify test/ditto.c to allow $XTERM_PROG environment variable to
+         override "xterm" as the name of the program to run in the threaded
+         configuration.
+

 20160130
        + improve formatting of man/curs_refresh.3x and man/tset.1 manpages
        + regenerate HTML manpages using newer man2html to eliminate some
 20160130
        + improve formatting of man/curs_refresh.3x and man/tset.1 manpages
        + regenerate HTML manpages using newer man2html to eliminate some

diff --git a/VERSION b/VERSION
index c77f4a4cfea37bf63f785948219f12cd4ddbb7e2..62dd440acf8a703b0457fa01cb911eba9873de7d 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:9  6.0     20160130
+5:0:9  6.0     20160206

diff --git a/configure b/configure
index d4236c2c856cf2972d97663ec8cbd6ee2f777d5c..360879908a3ddbe2431582d33f6b153ca5c3434d 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
 #! /bin/sh

-# From configure.in Revision: 1.625 .
+# From configure.in Revision: 1.626 .

 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20150926.
 #
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20150926.
 #


@@ -14499,7 +14499,7 @@ echo "${ECHO_T}$enable_gnat_projects" >&6
 ###    Checks for libraries.
 case $cf_cv_system_name in
 (*mingw32*|*mingw64*)
 ###    Checks for libraries.
 case $cf_cv_system_name in
 (*mingw32*|*mingw64*)

-       CPPFLAGS="$CPPFLAGS -DWINVER=0x0501"
+       CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"

        LIBS=" -lpsapi $LIBS"
        ;;
 (*)
        LIBS=" -lpsapi $LIBS"
        ;;
 (*)

diff --git a/configure.in b/configure.in
index 5bd0bdf95c2803af9ebeba208bf098f19019b0b3..86eab0691a48ab654e74b82892b618d2a1201eb3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl***************************************************************************
 dnl***************************************************************************

-dnl Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.              *
+dnl Copyright (c) 1998-2015,2016 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            *
 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,14 +28,14 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl

-dnl $Id: configure.in,v 1.625 2015/12/20 02:07:23 tom Exp $
+dnl $Id: configure.in,v 1.626 2016/02/06 21:59:17 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.20030208)
 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.20030208)

-AC_REVISION($Revision: 1.625 $)
+AC_REVISION($Revision: 1.626 $)

 AC_INIT(ncurses/base/lib_initscr.c)
 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
 
 AC_INIT(ncurses/base/lib_initscr.c)
 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
 


@@ -1449,7 +1449,7 @@ CF_DISABLE_GNAT_PROJECTS
 ###    Checks for libraries.
 case $cf_cv_system_name in
 (*mingw32*|*mingw64*)
 ###    Checks for libraries.
 case $cf_cv_system_name in
 (*mingw32*|*mingw64*)

-       CPPFLAGS="$CPPFLAGS -DWINVER=0x0501"
+       CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"

        LIBS=" -lpsapi $LIBS"
        ;;
 (*)
        LIBS=" -lpsapi $LIBS"
        ;;
 (*)

diff --git a/dist.mk b/dist.mk
index 443dbb5f425efb2c0cb3e80331eec351d4e12aee..f210844a837b97c0d9c7dd7dc44c81af48b74f16 100644 (file)
--- a/dist.mk
+++ b/dist.mk
@@ -25,7 +25,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################

-# $Id: dist.mk,v 1.1091 2016/01/30 15:30:48 tom Exp $
+# $Id: dist.mk,v 1.1092 2016/02/06 17:26:30 tom Exp $

 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
 # 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
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 0

-NCURSES_PATCH = 20160130
+NCURSES_PATCH = 20160206

 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
 
 # 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-mingw/changelog b/package/debian-mingw/changelog
index 7b38a46943dafb1e456e7d5c20f5cd1fef4c4682..cfb21013ed15eb7a2da7aa112e9a113d20a97b02 100644 (file)
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20160130) unstable; urgency=low
+ncurses6 (6.0+20160206) unstable; urgency=low

 
   * latest weekly patch
 
 
   * latest weekly patch
 

- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 30 Jan 2016 10:30:48 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 06 Feb 2016 12:26:30 -0500

 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 

diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 7b38a46943dafb1e456e7d5c20f5cd1fef4c4682..cfb21013ed15eb7a2da7aa112e9a113d20a97b02 100644 (file)
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20160130) unstable; urgency=low
+ncurses6 (6.0+20160206) unstable; urgency=low

 
   * latest weekly patch
 
 
   * latest weekly patch
 

- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 30 Jan 2016 10:30:48 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 06 Feb 2016 12:26:30 -0500

 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 

diff --git a/package/debian/changelog b/package/debian/changelog
index 33704b2a6d6e4ff6e7a69369108401df617ae3dd..a7cfa0e6c2073f31fadd0674a0cd41b71f1daf2b 100644 (file)
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20160130) unstable; urgency=low
+ncurses6 (6.0+20160206) unstable; urgency=low

 
   * latest weekly patch
 
 
   * latest weekly patch
 

- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 30 Jan 2016 10:30:48 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 06 Feb 2016 12:26:30 -0500

 
 ncurses6 (5.9-20120608) unstable; urgency=low
 
 
 ncurses6 (5.9-20120608) unstable; urgency=low
 

diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 659a0c016cd50a9e460d1159b745d153bccd0cea..716fc2bd06c811b2a61f7241f4f35fa4dfadcaef 100644 (file)
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.143 2016/01/30 15:30:48 tom Exp $\r
+; $Id: mingw-ncurses.nsi,v 1.144 2016/02/06 17:26:30 tom Exp $\r

 \r
 ; TODO add examples\r
 ; TODO bump ABI to 6\r
 \r
 ; TODO add examples\r
 ; TODO bump ABI to 6\r


@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"\r
 !define VERSION_MINOR "0"\r
 !define VERSION_YYYY  "2016"\r
 !define VERSION_MAJOR "6"\r
 !define VERSION_MINOR "0"\r
 !define VERSION_YYYY  "2016"\r

-!define VERSION_MMDD  "0130"\r
+!define VERSION_MMDD  "0206"\r

 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}\r
 \r
 !define MY_ABI   "5"\r
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}\r
 \r
 !define MY_ABI   "5"\r

diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 094ff5abf78484aa1206848a85caa5a18b3e5c24..09127a1148ea5bf4c1e9d04ba01a8cdba2052564 100644 (file)
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.0
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.0

-Release: 20160130
+Release: 20160206

 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

diff --git a/package/ncurses.spec b/package/ncurses.spec
index 8b2f09d46e5e1e2ef4b40124fdb3772039200b21..2e1cddcdb643ab59545fb1080201a5d794d75ee7 100644 (file)
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.0
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.0

-Release: 20160130
+Release: 20160206

 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

diff --git a/test/ditto.c b/test/ditto.c
index 921f216bb56157d733c8bc877ff38a0e9a457aaf..627cf84e5ad7e95d5f9bf00aee70cf0ec6a81ffc 100644 (file)
--- a/test/ditto.c
+++ b/test/ditto.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2012,2016 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            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -29,7 +29,7 @@
 /*
  * Author: Thomas E. Dickey (1998-on)
  *
 /*
  * Author: Thomas E. Dickey (1998-on)
  *

- * $Id: ditto.c,v 1.42 2012/11/24 20:16:18 tom Exp $
+ * $Id: ditto.c,v 1.43 2016/02/06 21:19:28 tom Exp $

  *
  * The program illustrates how to set up multiple screens from a single
  * program.
  *
  * The program illustrates how to set up multiple screens from a single
  * program.


@@ -155,6 +155,10 @@ open_tty(char *path)
     int aslave;
     char slave_name[1024];
     char s_option[sizeof(slave_name) + 80];
     int aslave;
     char slave_name[1024];
     char s_option[sizeof(slave_name) + 80];

+    const char *xterm_prog = 0;
+
+    if ((xterm_prog = getenv("XTERM_PROG")) == 0)
+       xterm_prog = "xterm";

 
     if (openpty(&amaster, &aslave, slave_name, 0, 0) != 0
        || strlen(slave_name) > sizeof(slave_name) - 1)
 
     if (openpty(&amaster, &aslave, slave_name, 0, 0) != 0
        || strlen(slave_name) > sizeof(slave_name) - 1)


@@ -165,7 +169,7 @@ open_tty(char *path)
     }
     sprintf(s_option, "-S%s/%d", slave_name, aslave);
     if (fork()) {
     }
     sprintf(s_option, "-S%s/%d", slave_name, aslave);
     if (fork()) {

-       execlp("xterm", "xterm", s_option, "-title", path, (char *) 0);
+       execlp(xterm_prog, xterm_prog, s_option, "-title", path, (char *) 0);

        _exit(0);
     }
     fp = fdopen(amaster, "r+");
        _exit(0);
     }
     fp = fdopen(amaster, "r+");