mirror of
https://github.com/Aigor44/ncursesw-morphos.git
synced 2024-12-15 07:30:12 +08:00
ncurses 5.9 - patch 20140209
+ modify CF_XOPEN_SOURCE macro to omit followup check to determine if _XOPEN_SOURCE can/should be defined. g++ 4.7.2 built on Solaris 10 has some header breakage due to its own predefinition of this symbol (report by Jean-Pierre Flori, Sage #15796).
This commit is contained in:
parent
4f84dbbd02
commit
44be23e277
7
Ada95/aclocal.m4
vendored
7
Ada95/aclocal.m4
vendored
@ -1,5 +1,5 @@
|
|||||||
dnl***************************************************************************
|
dnl***************************************************************************
|
||||||
dnl Copyright (c) 2010-2012,2013 Free Software Foundation, Inc. *
|
dnl Copyright (c) 2010-2013,2014 Free Software Foundation, Inc. *
|
||||||
dnl *
|
dnl *
|
||||||
dnl Permission is hereby granted, free of charge, to any person obtaining a *
|
dnl Permission is hereby granted, free of charge, to any person obtaining a *
|
||||||
dnl copy of this software and associated documentation files (the *
|
dnl copy of this software and associated documentation files (the *
|
||||||
@ -28,7 +28,7 @@ dnl***************************************************************************
|
|||||||
dnl
|
dnl
|
||||||
dnl Author: Thomas E. Dickey
|
dnl Author: Thomas E. Dickey
|
||||||
dnl
|
dnl
|
||||||
dnl $Id: aclocal.m4,v 1.77 2013/11/23 18:31:02 tom Exp $
|
dnl $Id: aclocal.m4,v 1.78 2014/02/10 00:41:59 tom Exp $
|
||||||
dnl Macros used in NCURSES Ada95 auto-configuration script.
|
dnl Macros used in NCURSES Ada95 auto-configuration script.
|
||||||
dnl
|
dnl
|
||||||
dnl These macros are maintained separately from NCURSES. The copyright on
|
dnl These macros are maintained separately from NCURSES. The copyright on
|
||||||
@ -3718,7 +3718,7 @@ AC_ARG_WITH(system-type,
|
|||||||
])
|
])
|
||||||
])dnl
|
])dnl
|
||||||
dnl ---------------------------------------------------------------------------
|
dnl ---------------------------------------------------------------------------
|
||||||
dnl CF_XOPEN_SOURCE version: 45 updated: 2013/09/07 14:06:25
|
dnl CF_XOPEN_SOURCE version: 46 updated: 2014/02/09 19:30:15
|
||||||
dnl ---------------
|
dnl ---------------
|
||||||
dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
|
dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
|
||||||
dnl or adapt to the vendor's definitions to get equivalent functionality,
|
dnl or adapt to the vendor's definitions to get equivalent functionality,
|
||||||
@ -3796,6 +3796,7 @@ sco*) #(vi
|
|||||||
;;
|
;;
|
||||||
solaris2.*) #(vi
|
solaris2.*) #(vi
|
||||||
cf_xopen_source="-D__EXTENSIONS__"
|
cf_xopen_source="-D__EXTENSIONS__"
|
||||||
|
cf_cv_xopen_source=broken
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
CF_TRY_XOPEN_SOURCE
|
CF_TRY_XOPEN_SOURCE
|
||||||
|
691
Ada95/configure
vendored
691
Ada95/configure
vendored
File diff suppressed because it is too large
Load Diff
8
NEWS
8
NEWS
@ -25,7 +25,7 @@
|
|||||||
-- sale, use or other dealings in this Software without prior written --
|
-- sale, use or other dealings in this Software without prior written --
|
||||||
-- authorization. --
|
-- authorization. --
|
||||||
-------------------------------------------------------------------------------
|
-------------------------------------------------------------------------------
|
||||||
-- $Id: NEWS,v 1.2161 2014/02/01 22:30:45 tom Exp $
|
-- $Id: NEWS,v 1.2164 2014/02/10 00:39:46 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;
|
Changes through 1.9.9e did not credit all contributions;
|
||||||
it is not possible to add this information.
|
it is not possible to add this information.
|
||||||
|
|
||||||
|
20140209
|
||||||
|
+ modify CF_XOPEN_SOURCE macro to omit followup check to determine if
|
||||||
|
_XOPEN_SOURCE can/should be defined. g++ 4.7.2 built on Solaris 10
|
||||||
|
has some header breakage due to its own predefinition of this symbol
|
||||||
|
(report by Jean-Pierre Flori, Sage #15796).
|
||||||
|
|
||||||
20140201
|
20140201
|
||||||
+ add/use symbol NCURSES_PAIRS_T like NCURSES_COLOR_T, to illustrate
|
+ add/use symbol NCURSES_PAIRS_T like NCURSES_COLOR_T, to illustrate
|
||||||
which "short" types are for color pairs and which are color values.
|
which "short" types are for color pairs and which are color values.
|
||||||
|
7
aclocal.m4
vendored
7
aclocal.m4
vendored
@ -1,5 +1,5 @@
|
|||||||
dnl***************************************************************************
|
dnl***************************************************************************
|
||||||
dnl Copyright (c) 1998-2012,2013 Free Software Foundation, Inc. *
|
dnl Copyright (c) 1998-2013,2014 Free Software Foundation, Inc. *
|
||||||
dnl *
|
dnl *
|
||||||
dnl Permission is hereby granted, free of charge, to any person obtaining a *
|
dnl Permission is hereby granted, free of charge, to any person obtaining a *
|
||||||
dnl copy of this software and associated documentation files (the *
|
dnl copy of this software and associated documentation files (the *
|
||||||
@ -28,7 +28,7 @@ dnl***************************************************************************
|
|||||||
dnl
|
dnl
|
||||||
dnl Author: Thomas E. Dickey 1995-on
|
dnl Author: Thomas E. Dickey 1995-on
|
||||||
dnl
|
dnl
|
||||||
dnl $Id: aclocal.m4,v 1.685 2013/11/23 18:20:50 tom Exp $
|
dnl $Id: aclocal.m4,v 1.686 2014/02/10 00:37:02 tom Exp $
|
||||||
dnl Macros used in NCURSES auto-configuration script.
|
dnl Macros used in NCURSES auto-configuration script.
|
||||||
dnl
|
dnl
|
||||||
dnl These macros are maintained separately from NCURSES. The copyright on
|
dnl These macros are maintained separately from NCURSES. The copyright on
|
||||||
@ -7109,7 +7109,7 @@ CF_NO_LEAKS_OPTION(valgrind,
|
|||||||
[USE_VALGRIND])
|
[USE_VALGRIND])
|
||||||
])dnl
|
])dnl
|
||||||
dnl ---------------------------------------------------------------------------
|
dnl ---------------------------------------------------------------------------
|
||||||
dnl CF_XOPEN_SOURCE version: 45 updated: 2013/09/07 14:06:25
|
dnl CF_XOPEN_SOURCE version: 46 updated: 2014/02/09 19:30:15
|
||||||
dnl ---------------
|
dnl ---------------
|
||||||
dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
|
dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
|
||||||
dnl or adapt to the vendor's definitions to get equivalent functionality,
|
dnl or adapt to the vendor's definitions to get equivalent functionality,
|
||||||
@ -7187,6 +7187,7 @@ sco*) #(vi
|
|||||||
;;
|
;;
|
||||||
solaris2.*) #(vi
|
solaris2.*) #(vi
|
||||||
cf_xopen_source="-D__EXTENSIONS__"
|
cf_xopen_source="-D__EXTENSIONS__"
|
||||||
|
cf_cv_xopen_source=broken
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
CF_TRY_XOPEN_SOURCE
|
CF_TRY_XOPEN_SOURCE
|
||||||
|
4
dist.mk
4
dist.mk
@ -25,7 +25,7 @@
|
|||||||
# use or other dealings in this Software without prior written #
|
# use or other dealings in this Software without prior written #
|
||||||
# authorization. #
|
# authorization. #
|
||||||
##############################################################################
|
##############################################################################
|
||||||
# $Id: dist.mk,v 1.969 2014/02/01 17:10:27 tom Exp $
|
# $Id: dist.mk,v 1.971 2014/02/09 20:15:08 tom Exp $
|
||||||
# Makefile for creating ncurses distributions.
|
# Makefile for creating ncurses distributions.
|
||||||
#
|
#
|
||||||
# This only needs to be used directly as a makefile by developers, but
|
# 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.
|
# These define the major/minor/patch versions of ncurses.
|
||||||
NCURSES_MAJOR = 5
|
NCURSES_MAJOR = 5
|
||||||
NCURSES_MINOR = 9
|
NCURSES_MINOR = 9
|
||||||
NCURSES_PATCH = 20140201
|
NCURSES_PATCH = 20140209
|
||||||
|
|
||||||
# We don't append the patch to the version, since this only applies to releases
|
# We don't append the patch to the version, since this only applies to releases
|
||||||
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
|
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* Copyright (c) 1998-2012,2013 Free Software Foundation, Inc. *
|
* Copyright (c) 1998-2013,2014 Free Software Foundation, Inc. *
|
||||||
* *
|
* *
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a *
|
* Permission is hereby granted, free of charge, to any person obtaining a *
|
||||||
* copy of this software and associated documentation files (the *
|
* copy of this software and associated documentation files (the *
|
||||||
@ -32,7 +32,7 @@
|
|||||||
|
|
||||||
#include "form.priv.h"
|
#include "form.priv.h"
|
||||||
|
|
||||||
MODULE_ID("$Id: frm_driver.c,v 1.109 2013/12/08 01:06:41 tom Exp $")
|
MODULE_ID("$Id: frm_driver.c,v 1.110 2014/02/10 00:42:48 tom Exp $")
|
||||||
|
|
||||||
/*----------------------------------------------------------------------------
|
/*----------------------------------------------------------------------------
|
||||||
This is the core module of the form library. It contains the majority
|
This is the core module of the form library. It contains the majority
|
||||||
@ -4493,7 +4493,7 @@ form_driver_w(FORM *form, int type, wchar_t c)
|
|||||||
const Binding_Info *BI = (Binding_Info *) 0;
|
const Binding_Info *BI = (Binding_Info *) 0;
|
||||||
int res = E_UNKNOWN_COMMAND;
|
int res = E_UNKNOWN_COMMAND;
|
||||||
|
|
||||||
T((T_CALLED("form_driver(%p,%d)"), (void *)form, c));
|
T((T_CALLED("form_driver(%p,%d)"), (void *)form, (int) c));
|
||||||
|
|
||||||
if (!form)
|
if (!form)
|
||||||
RETURN(E_BAD_ARGUMENT);
|
RETURN(E_BAD_ARGUMENT);
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
ncurses6 (5.9-20140201) unstable; urgency=low
|
ncurses6 (5.9-20140209) unstable; urgency=low
|
||||||
|
|
||||||
* latest weekly patch
|
* latest weekly patch
|
||||||
|
|
||||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 01 Feb 2014 12:10:27 -0500
|
-- Thomas E. Dickey <dickey@invisible-island.net> Sun, 09 Feb 2014 15:15:08 -0500
|
||||||
|
|
||||||
ncurses6 (5.9-20131005) unstable; urgency=low
|
ncurses6 (5.9-20131005) unstable; urgency=low
|
||||||
|
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
ncurses6 (5.9-20140201) unstable; urgency=low
|
ncurses6 (5.9-20140209) unstable; urgency=low
|
||||||
|
|
||||||
* latest weekly patch
|
* latest weekly patch
|
||||||
|
|
||||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 01 Feb 2014 12:10:27 -0500
|
-- Thomas E. Dickey <dickey@invisible-island.net> Sun, 09 Feb 2014 15:15:08 -0500
|
||||||
|
|
||||||
ncurses6 (5.9-20131005) unstable; urgency=low
|
ncurses6 (5.9-20131005) unstable; urgency=low
|
||||||
|
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
ncurses6 (5.9-20140201) unstable; urgency=low
|
ncurses6 (5.9-20140209) unstable; urgency=low
|
||||||
|
|
||||||
* latest weekly patch
|
* latest weekly patch
|
||||||
|
|
||||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 01 Feb 2014 12:10:27 -0500
|
-- Thomas E. Dickey <dickey@invisible-island.net> Sun, 09 Feb 2014 15:15:08 -0500
|
||||||
|
|
||||||
ncurses6 (5.9-20120608) unstable; urgency=low
|
ncurses6 (5.9-20120608) unstable; urgency=low
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
; $Id: mingw-ncurses.nsi,v 1.23 2014/02/01 17:10:27 tom Exp $
|
; $Id: mingw-ncurses.nsi,v 1.25 2014/02/09 20:15:08 tom Exp $
|
||||||
|
|
||||||
; TODO add examples
|
; TODO add examples
|
||||||
; TODO bump ABI to 6
|
; TODO bump ABI to 6
|
||||||
@ -10,7 +10,7 @@
|
|||||||
!define VERSION_MAJOR "5"
|
!define VERSION_MAJOR "5"
|
||||||
!define VERSION_MINOR "9"
|
!define VERSION_MINOR "9"
|
||||||
!define VERSION_YYYY "2014"
|
!define VERSION_YYYY "2014"
|
||||||
!define VERSION_MMDD "201"
|
!define VERSION_MMDD "209"
|
||||||
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
|
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
|
||||||
|
|
||||||
!define MY_ABI "5"
|
!define MY_ABI "5"
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
Summary: shared libraries for terminal handling
|
Summary: shared libraries for terminal handling
|
||||||
Name: mingw32-ncurses6
|
Name: mingw32-ncurses6
|
||||||
Version: 5.9
|
Version: 5.9
|
||||||
Release: 20140201
|
Release: 20140209
|
||||||
License: X11
|
License: X11
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
Source: ncurses-%{version}-%{release}.tgz
|
Source: ncurses-%{version}-%{release}.tgz
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
Summary: shared libraries for terminal handling
|
Summary: shared libraries for terminal handling
|
||||||
Name: ncurses6
|
Name: ncurses6
|
||||||
Version: 5.9
|
Version: 5.9
|
||||||
Release: 20140201
|
Release: 20140209
|
||||||
License: X11
|
License: X11
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
Source: ncurses-%{version}-%{release}.tgz
|
Source: ncurses-%{version}-%{release}.tgz
|
||||||
|
7
test/aclocal.m4
vendored
7
test/aclocal.m4
vendored
@ -1,5 +1,5 @@
|
|||||||
dnl***************************************************************************
|
dnl***************************************************************************
|
||||||
dnl Copyright (c) 2003-2012,2013 Free Software Foundation, Inc. *
|
dnl Copyright (c) 2003-2013,2014 Free Software Foundation, Inc. *
|
||||||
dnl *
|
dnl *
|
||||||
dnl Permission is hereby granted, free of charge, to any person obtaining a *
|
dnl Permission is hereby granted, free of charge, to any person obtaining a *
|
||||||
dnl copy of this software and associated documentation files (the *
|
dnl copy of this software and associated documentation files (the *
|
||||||
@ -26,7 +26,7 @@ dnl sale, use or other dealings in this Software without prior written *
|
|||||||
dnl authorization. *
|
dnl authorization. *
|
||||||
dnl***************************************************************************
|
dnl***************************************************************************
|
||||||
dnl
|
dnl
|
||||||
dnl $Id: aclocal.m4,v 1.93 2013/11/23 18:30:06 tom Exp $
|
dnl $Id: aclocal.m4,v 1.94 2014/02/10 00:43:27 tom Exp $
|
||||||
dnl
|
dnl
|
||||||
dnl Author: Thomas E. Dickey
|
dnl Author: Thomas E. Dickey
|
||||||
dnl
|
dnl
|
||||||
@ -3175,7 +3175,7 @@ AC_TRY_LINK([
|
|||||||
test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
|
test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
|
||||||
])dnl
|
])dnl
|
||||||
dnl ---------------------------------------------------------------------------
|
dnl ---------------------------------------------------------------------------
|
||||||
dnl CF_XOPEN_SOURCE version: 45 updated: 2013/09/07 14:06:25
|
dnl CF_XOPEN_SOURCE version: 46 updated: 2014/02/09 19:30:15
|
||||||
dnl ---------------
|
dnl ---------------
|
||||||
dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
|
dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
|
||||||
dnl or adapt to the vendor's definitions to get equivalent functionality,
|
dnl or adapt to the vendor's definitions to get equivalent functionality,
|
||||||
@ -3253,6 +3253,7 @@ sco*) #(vi
|
|||||||
;;
|
;;
|
||||||
solaris2.*) #(vi
|
solaris2.*) #(vi
|
||||||
cf_xopen_source="-D__EXTENSIONS__"
|
cf_xopen_source="-D__EXTENSIONS__"
|
||||||
|
cf_cv_xopen_source=broken
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
CF_TRY_XOPEN_SOURCE
|
CF_TRY_XOPEN_SOURCE
|
||||||
|
2393
test/configure
vendored
2393
test/configure
vendored
File diff suppressed because it is too large
Load Diff
@ -31,7 +31,7 @@
|
|||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* $Id: form_driver_w.c,v 1.10 2014/02/01 20:49:39 Gaute.Hope Exp $
|
* $Id: form_driver_w.c,v 1.11 2014/02/09 22:20:27 tom Exp $
|
||||||
*
|
*
|
||||||
* Test form_driver_w (int, int, wchar_t), a wide char aware
|
* Test form_driver_w (int, int, wchar_t), a wide char aware
|
||||||
* replacement of form_driver.
|
* replacement of form_driver.
|
||||||
@ -86,7 +86,7 @@ main(void)
|
|||||||
wint_t ch;
|
wint_t ch;
|
||||||
int ret = get_wch(&ch);
|
int ret = get_wch(&ch);
|
||||||
|
|
||||||
mvprintw(8, 10, "Got %d (%#x), type: %s", ch, ch,
|
mvprintw(8, 10, "Got %d (%#x), type: %s", (int) ch, (int) ch,
|
||||||
(ret == KEY_CODE_YES)
|
(ret == KEY_CODE_YES)
|
||||||
? "KEY_CODE_YES"
|
? "KEY_CODE_YES"
|
||||||
: ((ret == OK)
|
: ((ret == OK)
|
||||||
|
Loading…
Reference in New Issue
Block a user