From a0c6d9cb65b77a62ca49e88f6b49e2e5f052407f Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Sun, 1 May 2022 18:51:43 +0000 Subject: [PATCH 1/1] ncurses 6.3 - patch 20220501 + build-fix for debug-traces (report/patch by Chris Clayton). --- NEWS | 5 ++++- VERSION | 2 +- dist.mk | 4 ++-- ncurses/curses.priv.h | 4 +++- package/debian-mingw/changelog | 4 ++-- package/debian-mingw64/changelog | 4 ++-- package/debian/changelog | 4 ++-- package/mingw-ncurses.nsi | 4 ++-- package/mingw-ncurses.spec | 2 +- package/ncurses.spec | 2 +- package/ncursest.spec | 2 +- 11 files changed, 21 insertions(+), 16 deletions(-) diff --git a/NEWS b/NEWS index f9eb4d02..aad5f0d4 100644 --- a/NEWS +++ b/NEWS @@ -26,7 +26,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: NEWS,v 1.3801 2022/04/30 23:27:43 tom Exp $ +-- $Id: NEWS,v 1.3803 2022/05/01 15:16:36 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -46,6 +46,9 @@ 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. +20220501 + + build-fix for debug-traces (report/patch by Chris Clayton). + 20220430 + modify samples for xterm mouse 1002/1003 modes to use 1006 mode, and also provide for focus in/out responses -TD diff --git a/VERSION b/VERSION index a099cae9..7996e30d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5:0:10 6.3 20220430 +5:0:10 6.3 20220501 diff --git a/dist.mk b/dist.mk index 2c7e1874..85c204db 100644 --- a/dist.mk +++ b/dist.mk @@ -26,7 +26,7 @@ # use or other dealings in this Software without prior written # # authorization. # ############################################################################## -# $Id: dist.mk,v 1.1477 2022/04/30 12:58:59 tom Exp $ +# $Id: dist.mk,v 1.1478 2022/05/01 10:28:56 tom Exp $ # Makefile for creating ncurses distributions. # # This only needs to be used directly as a makefile by developers, but @@ -38,7 +38,7 @@ SHELL = /bin/sh # These define the major/minor/patch versions of ncurses. NCURSES_MAJOR = 6 NCURSES_MINOR = 3 -NCURSES_PATCH = 20220430 +NCURSES_PATCH = 20220501 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h index 72847bc9..60199f90 100644 --- a/ncurses/curses.priv.h +++ b/ncurses/curses.priv.h @@ -35,7 +35,7 @@ ****************************************************************************/ /* - * $Id: curses.priv.h,v 1.649 2022/04/30 18:32:29 tom Exp $ + * $Id: curses.priv.h,v 1.650 2022/05/01 14:41:33 tom Exp $ * * curses.priv.h * @@ -1702,6 +1702,8 @@ extern NCURSES_EXPORT(const char *) _nc_viscbuf (const NCURSES_CH_T *, int); #define returnWin(code) return code #define returnDB(code) return code +#define returnPtrDB(rc) return rc +#define returnVoidDB return #endif /* TRACE/!TRACE */ diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog index b7f2d584..ad22e9c4 100644 --- a/package/debian-mingw/changelog +++ b/package/debian-mingw/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.3+20220430) unstable; urgency=low +ncurses6 (6.3+20220501) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 30 Apr 2022 08:58:59 -0400 + -- Thomas E. Dickey Sun, 01 May 2022 06:28:56 -0400 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog index b7f2d584..ad22e9c4 100644 --- a/package/debian-mingw64/changelog +++ b/package/debian-mingw64/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.3+20220430) unstable; urgency=low +ncurses6 (6.3+20220501) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 30 Apr 2022 08:58:59 -0400 + -- Thomas E. Dickey Sun, 01 May 2022 06:28:56 -0400 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian/changelog b/package/debian/changelog index 511d023c..b023fe12 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.3+20220430) unstable; urgency=low +ncurses6 (6.3+20220501) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 30 Apr 2022 08:58:59 -0400 + -- Thomas E. Dickey Sun, 01 May 2022 06:28:56 -0400 ncurses6 (5.9-20120608) unstable; urgency=low diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi index 65965bce..2fd68b92 100644 --- a/package/mingw-ncurses.nsi +++ b/package/mingw-ncurses.nsi @@ -1,4 +1,4 @@ -; $Id: mingw-ncurses.nsi,v 1.517 2022/04/30 12:58:59 tom Exp $ +; $Id: mingw-ncurses.nsi,v 1.518 2022/05/01 10:28:56 tom Exp $ ; TODO add examples ; TODO bump ABI to 6 @@ -10,7 +10,7 @@ !define VERSION_MAJOR "6" !define VERSION_MINOR "3" !define VERSION_YYYY "2022" -!define VERSION_MMDD "0430" +!define VERSION_MMDD "0501" !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} !define MY_ABI "5" diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec index 038dc1d5..51cb8e61 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: 6.3 -Release: 20220430 +Release: 20220501 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncurses.spec b/package/ncurses.spec index c6fee503..66263223 100644 --- a/package/ncurses.spec +++ b/package/ncurses.spec @@ -1,7 +1,7 @@ Summary: shared libraries for terminal handling Name: ncurses6 Version: 6.3 -Release: 20220430 +Release: 20220501 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncursest.spec b/package/ncursest.spec index 9bdc2d1c..e7d42057 100644 --- a/package/ncursest.spec +++ b/package/ncursest.spec @@ -1,7 +1,7 @@ Summary: Curses library with POSIX thread support. Name: ncursest6 Version: 6.3 -Release: 20220430 +Release: 20220501 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz -- 2.45.0