Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ncurses for openSUSE:Factory checked in at 2022-05-13 23:03:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ncurses (Old) and /work/SRC/openSUSE:Factory/.ncurses.new.1538 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ncurses" Fri May 13 23:03:00 2022 rev:214 rq:975718 version:6.3.MACRO Changes: -------- --- /work/SRC/openSUSE:Factory/ncurses/ncurses.changes 2022-05-01 18:53:18.835147668 +0200 +++ /work/SRC/openSUSE:Factory/.ncurses.new.1538/ncurses.changes 2022-05-13 23:03:01.771115265 +0200 @@ -1,0 +2,22 @@ +Mon May 2 06:22:03 UTC 2022 - Dr. Werner Fink <wer...@suse.de> + +- Add ncurses patch 20220501 + + build-fix for debug-traces (report/patch by Chris Clayton). +- Add ncurses patch 20220430 + + modify samples for xterm mouse 1002/1003 modes to use 1006 mode, and + also provide for focus in/out responses -TD + + modify default case in handle_wheel() to always report button-release + events, e.g., for xterm mouse mode 1003 (patch by Leonid S Usov). + + improve valid_entryname() to disallow characters used in terminfo + syntax: '#', '=', '|', '\'. + + alter copy_termtype() to allocate new str_table and ext_str_table + data rather than relying upon its callers. + + use calloc in _nc_init_entry() when allocating stringbuf, to ensure + it is initialized. + + add library-level TYPE_CALLOC for consistency with TYPE_MALLOC. + + add some debug-traces for tic/infocmp. +- Correct offsets of patches + * ncurses-5.9-ibm327x.dif + * ncurses-6.3.dif + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ncurses-5.9-ibm327x.dif ++++++ --- /var/tmp/diff_new_pack.cg9Cfj/_old 2022-05-13 23:03:02.851116259 +0200 +++ /var/tmp/diff_new_pack.cg9Cfj/_new 2022-05-13 23:03:02.851116259 +0200 @@ -4,7 +4,7 @@ --- misc/terminfo.src +++ misc/terminfo.src 2018-10-29 10:23:47.271511864 +0000 -@@ -17860,8 +17860,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv +@@ -17871,8 +17871,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv # ibm327x|line mode IBM 3270 style, ++++++ ncurses-6.3-patches.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/ncurses-6.3-20220430.patch new/patches/ncurses-6.3-20220430.patch --- old/patches/ncurses-6.3-20220430.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/ncurses-6.3-20220430.patch 2022-05-02 08:16:58.071848863 +0200 @@ -0,0 +1,989 @@ +# ncurses 6.3 - patch 20220430 - Thomas E. Dickey +# +# ------------------------------------------------------------------------------ +# +# Ncurses 6.3 is at +# https://invisible-island.net/archives/ncurses/ +# https://invisible-mirror.net/archives/ncurses/ +# ftp://ftp.invisible-island.net/ncurses/ +# https://ftp.gnu.org/gnu/ncurses/ +# +# Patches for ncurses 6.3 can be found at +# https://invisible-island.net/archives/ncurses/6.3 +# https://invisible-mirror.net/archives/ncurses/6.3 +# ftp://ftp.invisible-island.net/ncurses/6.3 +# +# ------------------------------------------------------------------------------ +# ftp://ftp.invisible-island.net/ncurses/6.3/ncurses-6.3-20220430.patch.gz +# patch by Thomas E. Dickey <dic...@invisible-island.net> +# created Sun May 1 00:03:53 UTC 2022 +# ------------------------------------------------------------------------------ +# NEWS | 16 +++++++- +# VERSION | 2 - +# dist.mk | 4 +- +# misc/terminfo.src | 33 ++++++++++++----- +# ncurses/base/lib_color.c | 10 ++--- +# ncurses/base/lib_mouse.c | 13 ++++++ +# ncurses/curses.priv.h | 13 +++++- +# ncurses/tinfo/alloc_entry.c | 17 ++++++-- +# ncurses/tinfo/alloc_ttype.c | 71 ++++++++++++++++++++++++++++++------- +# ncurses/tinfo/comp_parse.c | 25 +++++++++---- +# ncurses/tinfo/comp_scan.c | 16 ++++++-- +# ncurses/tinfo/parse_entry.c | 51 ++++++++++++++++++++++---- +# ncurses/tinfo/read_entry.c | 25 +++++-------- +# 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 - +# 20 files changed, 237 insertions(+), 81 deletions(-) +# ------------------------------------------------------------------------------ +Index: NEWS +Prereq: 1.3798 +--- ncurses-6.3-20220423+/NEWS 2022-04-23 23:26:44.000000000 +0000 ++++ ncurses-6.3-20220430/NEWS 2022-04-30 23:27:43.000000000 +0000 +@@ -26,7 +26,7 @@ + -- sale, use or other dealings in this Software without prior written -- + -- authorization. -- + ------------------------------------------------------------------------------- +--- $Id: NEWS,v 1.3798 2022/04/23 23:26:44 tom Exp $ ++-- $Id: NEWS,v 1.3801 2022/04/30 23:27:43 tom Exp $ + ------------------------------------------------------------------------------- + + This is a log of changes that ncurses has gone through since Zeyd started +@@ -46,6 +46,20 @@ + Changes through 1.9.9e did not credit all contributions; + it is not possible to add this information. + ++20220430 ++ + modify samples for xterm mouse 1002/1003 modes to use 1006 mode, and ++ also provide for focus in/out responses -TD ++ + modify default case in handle_wheel() to always report button-release ++ events, e.g., for xterm mouse mode 1003 (patch by Leonid S Usov). ++ + improve valid_entryname() to disallow characters used in terminfo ++ syntax: '#', '=', '|', '\'. ++ + alter copy_termtype() to allocate new str_table and ext_str_table ++ data rather than relying upon its callers. ++ + use calloc in _nc_init_entry() when allocating stringbuf, to ensure ++ it is initialized. ++ + add library-level TYPE_CALLOC for consistency with TYPE_MALLOC. ++ + add some debug-traces for tic/infocmp. ++ + 20220423 + + in-progress work on invalid_merge(), disable it (cf: 20220402). + + fix memory leak in _nc_tic_dir() when called from _nc_set_writedir(). +Index: VERSION +--- ncurses-6.3-20220423+/VERSION 2022-04-23 12:44:18.000000000 +0000 ++++ ncurses-6.3-20220430/VERSION 2022-04-30 12:58:59.000000000 +0000 +@@ -1 +1 @@ +-5:0:10 6.3 20220423 ++5:0:10 6.3 20220430 +Index: dist.mk +Prereq: 1.1476 +--- ncurses-6.3-20220423+/dist.mk 2022-04-23 12:44:18.000000000 +0000 ++++ ncurses-6.3-20220430/dist.mk 2022-04-30 12:58:59.000000000 +0000 +@@ -26,7 +26,7 @@ + # use or other dealings in this Software without prior written # + # authorization. # + ############################################################################## +-# $Id: dist.mk,v 1.1476 2022/04/23 12:44:18 tom Exp $ ++# $Id: dist.mk,v 1.1477 2022/04/30 12:58:59 tom Exp $ + # Makefile for creating ncurses distributions. + # + # This only needs to be used directly as a makefile by developers, but +@@ -38,7 +38,7 @@ + # These define the major/minor/patch versions of ncurses. + NCURSES_MAJOR = 6 + NCURSES_MINOR = 3 +-NCURSES_PATCH = 20220423 ++NCURSES_PATCH = 20220430 + + # We don't append the patch to the version, since this only applies to releases + VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) +Index: misc/terminfo.src +--- ncurses-6.3-20220423+/misc/terminfo.src 2022-03-27 19:32:34.000000000 +0000 ++++ ncurses-6.3-20220430/misc/terminfo.src 2022-04-30 23:24:59.000000000 +0000 +@@ -6,8 +6,8 @@ + # Report bugs and new terminal descriptions to + # bug-ncur...@gnu.org + # +-# $Revision: 1.1001 $ +-# $Date: 2022/03/27 19:32:34 $ ++# $Revision: 1.1002 $ ++# $Date: 2022/04/30 23:24:59 $ + # + # The original header is preserved below for reference. It is noted that there + # is a "newer" version which differs in some cosmetic details (but actually +@@ -5724,17 +5724,28 @@ + + # xterm patch #83 (1998/10/7), added Jason Bacon's changes to provide an + # "any-event" mouse mode. +-xterm+sm+1002|xterm any-event mouse (building-block), +- kmous=\E[M, XM=\E[?1002%?%p1%{1}%=%th%el%;, +-xterm-1002|xterm any-event mouse, +- use=xterm+sm+1002, use=xterm, ++# ++# These building blocks incorporate later features as well: ++# xterm patch #224 (2007/2/11 added private mode 1004, for enabling/disabling ++# focus in/out event reporting. ++# xterm patch #277 (2012/01/07 added private mode 1006 + +-xterm+sm+1003|xterm any-button mouse (building-block), +- kmous=\E[M, XM=\E[?1003%?%p1%{1}%=%th%el%;, ++xterm+sm+1002|xterm any-button mouse, ++ kmous=\E[<, XM=\E[?1006;1004;1002%?%p1%{1}%=%th%el%;, ++ xm=\E[<%i%p3%d;%p1%d;%p2%d;%?%p4%tM%em%;, ++ use=xterm+focus, ++xterm-1002|example of xterm any-button mouse, ++ use=xterm+sm+1002, use=xterm, + +-xterm-1003|xterm any-button mouse, ++xterm+sm+1003|xterm any-event mouse, ++ XM=\E[?1006;1004;1003%?%p1%{1}%=%th%el%;, ++ use=xterm+sm+1002, ++xterm-1003|example of xterm any-event mouse, + use=xterm+sm+1003, use=xterm, + ++xterm+focus|xterm focus-in/out event "keys", ++ kxIN=\E[I, kxOUT=\E[O, ++ + # xterm patch #116 (1999/9/25) added Stephen P Wall's changes to support DEC + # locator mode. + +@@ -27501,4 +27512,8 @@ + # 2022-03-27 + # + make description-fields distinct -TD + # ++# 2022-04-30 ++# + modify samples for xterm mouse 1002/1003 modes to use 1006 mode, and ++# also provide for focus in/out responses -TD ++# + ######## SHANTIH! SHANTIH! SHANTIH! +Index: ncurses/base/lib_color.c +Prereq: 1.148 +--- ncurses-6.3-20220423+/ncurses/base/lib_color.c 2021-10-02 22:55:48.000000000 +0000 ++++ ncurses-6.3-20220430/ncurses/base/lib_color.c 2022-04-30 18:36:54.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright 2018-2020,2021 Thomas E. Dickey * ++ * Copyright 2018-2021,2022 Thomas E. Dickey * + * Copyright 1998-2016,2017 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * +@@ -49,7 +49,7 @@ + #define CUR SP_TERMTYPE + #endif + +-MODULE_ID("$Id: lib_color.c,v 1.148 2021/10/02 22:55:48 tom Exp $") ++MODULE_ID("$Id: lib_color.c,v 1.149 2022/04/30 18:36:54 tom Exp $") + + #ifdef USE_TERM_DRIVER + #define CanChange InfoOf(SP_PARM).canchange +@@ -94,8 +94,6 @@ + + #define DATA(r,g,b) {r,g,b, 0,0,0, 0} + +-#define TYPE_CALLOC(type,elts) typeCalloc(type, (unsigned)(elts)) +- + #define MAX_PALETTE 8 + + #define OkColorHi(n) (((n) < COLORS) && ((n) < maxcolors)) +@@ -412,7 +410,7 @@ + if (init_direct_colors(NCURSES_SP_ARG)) { + result = OK; + } else { +- SP_PARM->_color_table = TYPE_CALLOC(color_t, maxcolors); ++ TYPE_CALLOC(color_t, maxcolors, SP_PARM->_color_table); + if (SP_PARM->_color_table != 0) { + MakeColorPair(SP_PARM->_color_pairs[0], + default_fg(NCURSES_SP_ARG), +@@ -529,7 +527,7 @@ + have = sp->_pair_limit; + + if (sp->_color_pairs == 0) { +- sp->_color_pairs = TYPE_CALLOC(colorpair_t, have); ++ TYPE_CALLOC(colorpair_t, have, sp->_color_pairs); + } else if (have > sp->_pair_alloc) { + #if NCURSES_EXT_COLORS + colorpair_t *next; +Index: ncurses/base/lib_mouse.c +Prereq: 1.194 +--- ncurses-6.3-20220423+/ncurses/base/lib_mouse.c 2022-01-16 01:15:47.000000000 +0000 ++++ ncurses-6.3-20220430/ncurses/base/lib_mouse.c 2022-04-30 23:21:34.000000000 +0000 +@@ -85,7 +85,7 @@ + #define CUR SP_TERMTYPE + #endif + +-MODULE_ID("$Id: lib_mouse.c,v 1.194 2022/01/16 01:15:47 tom Exp $") ++MODULE_ID("$Id: lib_mouse.c,v 1.196 2022/04/30 23:21:34 tom Exp $") + + #include <tic.h> + +@@ -969,6 +969,17 @@ + PRESS_POSITION(3); + break; + default: ++ /* ++ * case 3 is sent when the mouse buttons are released. ++ * ++ * If the terminal uses xterm mode 1003, a continuous series of ++ * button-release events is sent as the mouse moves around the screen, ++ * or as the wheel mouse is rotated. ++ * ++ * Return false in this case, so that when running in X10 mode, we will ++ * recalculate bstate. ++ */ ++ eventp->bstate = REPORT_MOUSE_POSITION; + result = FALSE; + break; + } +Index: ncurses/curses.priv.h +Prereq: 1.647 +--- ncurses-6.3-20220423+/ncurses/curses.priv.h 2021-10-23 16:13:16.000000000 +0000 ++++ ncurses-6.3-20220430/ncurses/curses.priv.h 2022-04-30 18:32:29.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright 2018-2020,2021 Thomas E. Dickey * ++ * Copyright 2018-2021,2022 Thomas E. Dickey * + * Copyright 1998-2017,2018 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * +@@ -35,7 +35,7 @@ + ****************************************************************************/ + + /* +- * $Id: curses.priv.h,v 1.647 2021/10/23 16:13:16 tom Exp $ ++ * $Id: curses.priv.h,v 1.649 2022/04/30 18:32:29 tom Exp $ + * + * curses.priv.h + * +@@ -1506,6 +1506,13 @@ + _nc_err_abort(MSG_NO_MEMORY); \ + } while (0) + ++#define TYPE_CALLOC(type, size, name) \ ++ do { \ ++ name = typeCalloc(type, size); \ ++ if (name == 0) \ ++ _nc_err_abort(MSG_NO_MEMORY); \ ++ } while (0) ++ + #define TYPE_REALLOC(type, size, name) \ + do { \ + name = typeRealloc(type, size, name); \ +@@ -1619,6 +1626,8 @@ + #define returnWin(code) TRACE_RETURN1(code,win) + + #define returnDB(rc) do { TR(TRACE_DATABASE,(T_RETURN("code %d"), (rc))); return (rc); } while (0) ++#define returnPtrDB(rc) do { TR(TRACE_DATABASE,(T_RETURN("%p"), (rc))); return (rc); } while (0) ++#define returnVoidDB do { TR(TRACE_DATABASE,(T_RETURN(""))); return; } while (0) + + extern NCURSES_EXPORT(NCURSES_BOOL) _nc_retrace_bool (int); + extern NCURSES_EXPORT(NCURSES_CONST void *) _nc_retrace_cvoid_ptr (NCURSES_CONST void *); +Index: ncurses/tinfo/alloc_entry.c +Prereq: 1.69 +--- ncurses-6.3-20220423+/ncurses/tinfo/alloc_entry.c 2022-04-16 22:46:53.000000000 +0000 ++++ ncurses-6.3-20220430/ncurses/tinfo/alloc_entry.c 2022-04-30 18:36:01.000000000 +0000 +@@ -48,7 +48,7 @@ + + #include <tic.h> + +-MODULE_ID("$Id: alloc_entry.c,v 1.69 2022/04/16 22:46:53 tom Exp $") ++MODULE_ID("$Id: alloc_entry.c,v 1.71 2022/04/30 18:36:01 tom Exp $") + + #define ABSENT_OFFSET -1 + #define CANCELLED_OFFSET -2 +@@ -60,6 +60,8 @@ + _nc_init_entry(ENTRY * const tp) + /* initialize a terminal type data block */ + { ++ DEBUG(2, (T_CALLED("_nc_init_entry(tp=%p)"), tp)); ++ + if (tp == NULL) { + #if NO_LEAKS + if (stringbuf != NULL) { +@@ -72,23 +74,30 @@ + } + + if (stringbuf == NULL) +- TYPE_MALLOC(char, (size_t) MAX_ENTRY_SIZE, stringbuf); ++ TYPE_CALLOC(char, (size_t) MAX_ENTRY_SIZE, stringbuf); + + next_free = 0; + + _nc_init_termtype(&(tp->tterm)); ++ ++ DEBUG(2, (T_RETURN(""))); + } + + NCURSES_EXPORT(ENTRY *) + _nc_copy_entry(ENTRY * oldp) + { +- ENTRY *newp = typeCalloc(ENTRY, 1); ++ ENTRY *newp; + ++ DEBUG(2, (T_CALLED("_nc_copy_entry(oldp=%p)"), oldp)); ++ ++ newp = typeCalloc(ENTRY, 1); + if (newp != NULL) { + *newp = *oldp; + _nc_copy_termtype2(&(newp->tterm), &(oldp->tterm)); + } +- return newp; ++ ++ DEBUG(2, (T_RETURN("%p"), newp)); ++ return (newp); + } + + /* save a copy of string in the string buffer */ +Index: ncurses/tinfo/alloc_ttype.c +Prereq: 1.35 +--- ncurses-6.3-20220423+/ncurses/tinfo/alloc_ttype.c 2021-06-17 21:11:08.000000000 +0000 ++++ ncurses-6.3-20220430/ncurses/tinfo/alloc_ttype.c 2022-04-30 17:00:05.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright 2018-2020,2021 Thomas E. Dickey * ++ * Copyright 2018-2021,2022 Thomas E. Dickey * + * Copyright 1999-2016,2017 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * +@@ -43,7 +43,7 @@ + + #include <tic.h> + +-MODULE_ID("$Id: alloc_ttype.c,v 1.35 2021/06/17 21:11:08 tom Exp $") ++MODULE_ID("$Id: alloc_ttype.c,v 1.37 2022/04/30 17:00:05 tom Exp $") + + #if NCURSES_XNAMES + /* +@@ -377,6 +377,9 @@ + int last = first + to->ext_Strings; + int j, k; + ++ DEBUG(3, (T_CALLED("adjust_cancels(%s), from(%s)"), ++ to ? NonNull(to->term_names) : "?", ++ from ? NonNull(from->term_names) : "?")); + for (j = first; j < last;) { + char *name = to->ext_Names[j]; + int j_str = to->num_Strings - first - to->ext_Strings; +@@ -413,6 +416,7 @@ + j++; + } + } ++ DEBUG(3, (T_RETURN(""))); + } + + NCURSES_EXPORT(void) +@@ -425,7 +429,7 @@ + na = to ? ((int) NUM_EXT_NAMES(to)) : 0; + nb = from ? ((int) NUM_EXT_NAMES(from)) : 0; + +- DEBUG(2, ("align_termtype to(%d:%s), from(%d:%s)", ++ DEBUG(2, (T_CALLED("align_termtype to(%d:%s), from(%d:%s)"), + na, to ? NonNull(to->term_names) : "?", + nb, from ? NonNull(from->term_names) : "?")); + +@@ -507,6 +511,7 @@ + if (!used_ext_Names) + free(ext_Names); + } ++ DEBUG(2, (T_RETURN(""))); + } + #endif + +@@ -520,15 +525,15 @@ + static void + copy_termtype(TERMTYPE2 *dst, const TERMTYPE2 *src, int mode) + { +-#if NCURSES_XNAMES || NCURSES_EXT_NUMBERS + unsigned i; +-#endif ++ int pass; ++ char *new_table; + #if NCURSES_EXT_NUMBERS + short *oldptr = 0; + int *newptr = 0; + #endif + +- DEBUG(2, ("copy_termtype")); ++ DEBUG(2, (T_CALLED("copy_termtype(dst=%p, src=%p, mode=%d)"), dst, src, mode)); + *dst = *src; /* ...to copy the sizes and string-tables */ + + TYPE_MALLOC(NCURSES_SBOOL, NUM_BOOLEANS(dst), dst->Booleans); +@@ -541,6 +546,26 @@ + src->Strings, + NUM_STRINGS(dst) * sizeof(dst->Strings[0])); + ++ new_table = NULL; ++ for (pass = 0; pass < 2; ++pass) { ++ size_t str_size = 0; ++ for (i = 0; i < NUM_STRINGS(dst); ++i) { ++ if (VALID_STRING(src->Strings[i])) { ++ if (pass) { ++ strcpy(new_table + str_size, src->Strings[i]); ++ dst->Strings[i] = new_table + str_size; ++ } ++ str_size += strlen(src->Strings[i]) + 1; ++ } ++ } ++ if (pass) { ++ dst->str_table = new_table; ++ } else { ++ ++str_size; ++ new_table = malloc(str_size); ++ } ++ } ++ + #if NCURSES_EXT_NUMBERS + if ((mode & dstINT) == 0) { + DEBUG(2, ("...convert int ->short")); +@@ -584,18 +609,35 @@ + NUM_NUMBERS(dst) * sizeof(dst->Numbers[0])); + #endif + +- /* FIXME: we probably should also copy str_table and ext_str_table, +- * but tic and infocmp are not written to exploit that (yet). +- */ +- + #if NCURSES_XNAMES + if ((i = NUM_EXT_NAMES(src)) != 0) { + TYPE_MALLOC(char *, i, dst->ext_Names); + memcpy(dst->ext_Names, src->ext_Names, i * sizeof(char *)); ++ ++ new_table = NULL; ++ for (pass = 0; pass < 2; ++pass) { ++ size_t str_size = 0; ++ for (i = 0; i < NUM_EXT_NAMES(dst); ++i) { ++ if (VALID_STRING(src->ext_Names[i])) { ++ if (pass) { ++ strcpy(new_table + str_size, src->ext_Names[i]); ++ dst->ext_Names[i] = new_table + str_size; ++ } ++ str_size += strlen(src->ext_Names[i]) + 1; ++ } ++ } ++ if (pass) { ++ dst->ext_str_table = new_table; ++ } else { ++ ++str_size; ++ new_table = malloc(str_size); ++ } ++ } + } else { + dst->ext_Names = 0; + } + #endif ++ DEBUG(2, (T_RETURN(""))); + } + + /* +@@ -604,16 +646,18 @@ + NCURSES_EXPORT(void) + _nc_copy_termtype(TERMTYPE *dst, const TERMTYPE *src) + { +- DEBUG(2, ("_nc_copy_termtype...")); ++ DEBUG(2, (T_CALLED("_nc_copy_termtype(dst=%p, src=%p)"), dst, src)); + copy_termtype((TERMTYPE2 *) dst, (const TERMTYPE2 *) src, 0); ++ DEBUG(2, (T_RETURN(""))); + } + + #if NCURSES_EXT_NUMBERS + NCURSES_EXPORT(void) + _nc_copy_termtype2(TERMTYPE2 *dst, const TERMTYPE2 *src) + { +- DEBUG(2, ("_nc_copy_termtype2...")); ++ DEBUG(2, (T_CALLED("_nc_copy_termtype2(dst=%p, src=%p)"), dst, src)); + copy_termtype(dst, src, srcINT | dstINT); ++ DEBUG(2, (T_RETURN(""))); + } + + /* +@@ -623,7 +667,8 @@ + NCURSES_EXPORT(void) + _nc_export_termtype2(TERMTYPE *dst, const TERMTYPE2 *src) + { +- DEBUG(2, ("_nc_export_termtype2...")); ++ DEBUG(2, (T_CALLED("_nc_export_termtype2(dst=%p, src=%p)"), dst, src)); + copy_termtype((TERMTYPE2 *) dst, src, srcINT); ++ DEBUG(2, (T_RETURN(""))); + } + #endif /* NCURSES_EXT_NUMBERS */ +Index: ncurses/tinfo/comp_parse.c +Prereq: 1.116 +--- ncurses-6.3-20220423+/ncurses/tinfo/comp_parse.c 2022-04-23 23:23:38.000000000 +0000 ++++ ncurses-6.3-20220430/ncurses/tinfo/comp_parse.c 2022-04-30 15:57:27.000000000 +0000 +@@ -48,7 +48,7 @@ + + #include <tic.h> + +-MODULE_ID("$Id: comp_parse.c,v 1.116 2022/04/23 23:23:38 tom Exp $") ++MODULE_ID("$Id: comp_parse.c,v 1.117 2022/04/30 15:57:27 tom Exp $") + + static void sanity_check2(TERMTYPE2 *, bool); + NCURSES_IMPEXP void (NCURSES_API *_nc_check_termtype2) (TERMTYPE2 *, bool) = sanity_check2; +@@ -59,8 +59,11 @@ + enqueue(ENTRY * ep) + /* add an entry to the in-core list */ + { +- ENTRY *newp = _nc_copy_entry(ep); ++ ENTRY *newp; + ++ DEBUG(1, (T_CALLED("enqueue(ep=%p)"), ep)); ++ ++ newp = _nc_copy_entry(ep); + if (newp == 0) + _nc_err_abort(MSG_NO_MEMORY); + +@@ -217,6 +220,10 @@ + bool oldsuppress = _nc_suppress_warnings; + int immediate = 0; + ++ DEBUG(1, ++ (T_CALLED("_nc_read_entry_source(file=%p, buf=%p, literal=%d, silent=%d, hook=%p)"), ++ fp, buf, literal, silent, hook)); ++ + if (silent) + _nc_suppress_warnings = TRUE; /* shut the lexer up, too */ + +@@ -255,12 +262,12 @@ + for (_nc_head = _nc_tail; _nc_head->last; _nc_head = _nc_head->last) + continue; + +- DEBUG(1, ("head = %s", _nc_head->tterm.term_names)); +- DEBUG(1, ("tail = %s", _nc_tail->tterm.term_names)); ++ DEBUG(2, ("head = %s", _nc_head->tterm.term_names)); ++ DEBUG(2, ("tail = %s", _nc_tail->tterm.term_names)); + } + #ifdef TRACE + else if (!immediate) +- DEBUG(1, ("no entries parsed")); ++ DEBUG(2, ("no entries parsed")); + #endif + + _nc_suppress_warnings = oldsuppress; +@@ -392,7 +399,7 @@ + unsigned i, j; + int unresolved, total_unresolved, multiples; + +- DEBUG(2, ("RESOLUTION BEGINNING")); ++ DEBUG(2, (T_CALLED("_nc_resolve_uses2"))); + + /* + * Check for multiple occurrences of the same name. +@@ -417,8 +424,10 @@ + } + } + } +- if (multiples > 0) ++ if (multiples > 0) { ++ DEBUG(2, (T_RETURN("false"))); + return (FALSE); ++ } + + DEBUG(2, ("NO MULTIPLE NAME OCCURRENCES")); + +@@ -509,6 +518,7 @@ + if (total_unresolved) { + /* free entries read in off disk */ + _nc_free_entries(lastread); ++ DEBUG(2, (T_RETURN("false"))); + return (FALSE); + } + +@@ -648,6 +658,7 @@ + DEBUG(2, ("SANITY CHECK FINISHED")); + } + ++ DEBUG(2, (T_RETURN("true"))); + return (TRUE); + } + +Index: ncurses/tinfo/comp_scan.c +Prereq: 1.112 +--- ncurses-6.3-20220423+/ncurses/tinfo/comp_scan.c 2021-10-04 23:56:28.000000000 +0000 ++++ ncurses-6.3-20220430/ncurses/tinfo/comp_scan.c 2022-04-30 16:21:01.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright 2020,2021 Thomas E. Dickey * ++,* Copyright 2020-2021,2022 Thomas E. Dickey * + * Copyright 1998-2016,2017 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * +@@ -51,7 +51,7 @@ + #include <ctype.h> + #include <tic.h> + +-MODULE_ID("$Id: comp_scan.c,v 1.112 2021/10/04 23:56:28 tom Exp $") ++MODULE_ID("$Id: comp_scan.c,v 1.115 2022/04/30 16:21:01 tom Exp $") + + /* + * Maximum length of string capability we'll accept before raising an error. +@@ -112,6 +112,9 @@ + NCURSES_EXPORT(void) + _nc_reset_input(FILE *fp, char *buf) + { ++ TR(TRACE_DATABASE, ++ (T_CALLED("_nc_reset_input(fp=%p, buf=%p)"), fp, buf)); ++ + pushtype = NO_PUSHBACK; + if (pushname != 0) + pushname[0] = '\0'; +@@ -121,6 +124,8 @@ + if (fp != 0) + _nc_curr_line = 0; + _nc_curr_col = 0; ++ ++ returnVoidDB; + } + + /* +@@ -367,6 +372,8 @@ + int old_col; + #endif + ++ DEBUG(3, (T_CALLED("_nc_get_token(silent=%d)"), silent)); ++ + if (pushtype != NO_PUSHBACK) { + int retval = pushtype; + +@@ -379,6 +386,7 @@ + pushname[0] = '\0'; + + /* currtok wasn't altered by _nc_push_token() */ ++ DEBUG(3, (T_RETURN("%d"), retval)); + return (retval); + } + +@@ -389,6 +397,7 @@ + if (_nc_curr_token.tk_name == tok_buf) + _nc_curr_token.tk_name = 0; + } ++ DEBUG(3, (T_RETURN("%d"), EOF)); + return (EOF); + } + +@@ -595,7 +604,7 @@ + } + } else { + after_list = tok_buf + strlen(tok_buf); +- DEBUG(1, ("missing description")); ++ DEBUG(2, ("missing description")); + } + + /* +@@ -770,6 +779,7 @@ + : "<null>"), + type)); + ++ DEBUG(3, (T_RETURN("%d"), type)); + return (type); + } + +Index: ncurses/tinfo/parse_entry.c +Prereq: 1.102 +--- ncurses-6.3-20220423+/ncurses/tinfo/parse_entry.c 2021-09-04 10:54:35.000000000 +0000 ++++ ncurses-6.3-20220430/ncurses/tinfo/parse_entry.c 2022-04-30 20:50:06.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright 2018-2020,2021 Thomas E. Dickey * ++ * Copyright 2018-2021,2022 Thomas E. Dickey * + * Copyright 1998-2016,2017 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * +@@ -48,7 +48,7 @@ + #include <ctype.h> + #include <tic.h> + +-MODULE_ID("$Id: parse_entry.c,v 1.102 2021/09/04 10:54:35 tom Exp $") ++MODULE_ID("$Id: parse_entry.c,v 1.106 2022/04/30 20:50:06 tom Exp $") + + #ifdef LINT + static short const parametrized[] = +@@ -214,16 +214,39 @@ + } + #endif /* NCURSES_XNAMES */ + ++/* ++ * A valid entry name uses characters from the "portable character set" ++ * (more commonly referred to as US-ASCII), and disallows some of the ++ * punctuation characters: ++ * ++ * '/' is a pathname separator ++ * '\' may be a pathname separator, but more important, is an escape ++ * '|' delimits names and description ++ * '#' denotes a numeric value ++ * '=' denotes a string value ++ * '@' denotes a cancelled symbol ++ * ',' separates terminfo capabilities ++ * ':' separates termcap capabilities ++ * ++ * Termcap capability names may begin with a '#' or '@' (since they have ++ * exactly two characters). ++ */ + static bool + valid_entryname(const char *name) + { + bool result = TRUE; ++ bool first = TRUE; + int ch; + while ((ch = UChar(*name++)) != '\0') { +- if (ch <= ' ' || ch > '~' || ch == '/') { ++ if (ch <= ' ' || ch > '~' || strchr("/\\|=,:", ch) != NULL) { ++ result = FALSE; ++ break; ++ } ++ if (!first && strchr("#@", ch) != NULL) { + result = FALSE; + break; + } ++ first = FALSE; + } + return result; + } +@@ -262,10 +285,14 @@ + const char *name; + bool bad_tc_usage = FALSE; + ++ TR(TRACE_DATABASE, ++ (T_CALLED("_nc_parse_entry(entry=%p, literal=%d, silent=%d)"), ++ entryp, literal, silent)); ++ + token_type = _nc_get_token(silent); + + if (token_type == EOF) +- return (EOF); ++ returnDB(EOF); + if (token_type != NAMES) + _nc_err_abort("Entry does not start with terminal names in column one"); + +@@ -301,9 +328,9 @@ + entryp->tterm.str_table = entryp->tterm.term_names = _nc_save_str(ptr); + + if (entryp->tterm.str_table == 0) +- return (ERR); ++ returnDB(ERR); + +- DEBUG(1, ("Starting '%s'", ptr)); ++ DEBUG(2, ("Starting '%s'", ptr)); + + /* + * We do this because the one-token lookahead in the parse loop +@@ -605,7 +632,7 @@ + } + _nc_wrap_entry(entryp, FALSE); + +- return (OK); ++ returnDB(OK); + } + + NCURSES_EXPORT(int) +@@ -737,6 +764,10 @@ + char buf[MAX_LINE * 2 + 2]; + string_desc result; + ++ TR(TRACE_DATABASE, ++ (T_CALLED("postprocess_termcap(tp=%p, has_base=%d)"), ++ tp, has_base)); ++ + /* + * TERMCAP DEFAULTS AND OBSOLETE-CAPABILITY TRANSLATIONS + * +@@ -1023,11 +1054,16 @@ + && PRESENT(exit_alt_charset_mode)) { + acs_chars = _nc_save_str(VT_ACSC); + } ++ returnVoidDB; + } + + static void + postprocess_terminfo(TERMTYPE2 *tp) + { ++ TR(TRACE_DATABASE, ++ (T_CALLED("postprocess_terminfo(tp=%p)"), ++ tp)); ++ + /* + * TERMINFO-TO-TERMINFO MAPPINGS FOR SOURCE TRANSLATION + * ---------------------------------------------------------------------- +@@ -1064,6 +1100,7 @@ + /* + * ---------------------------------------------------------------------- + */ ++ returnVoidDB; + } + + /* +Index: ncurses/tinfo/read_entry.c +Prereq: 1.162 +--- ncurses-6.3-20220423+/ncurses/tinfo/read_entry.c 2022-04-16 21:00:00.000000000 +0000 ++++ ncurses-6.3-20220430/ncurses/tinfo/read_entry.c 2022-04-30 18:35:46.000000000 +0000 +@@ -42,9 +42,7 @@ + + #include <tic.h> + +-MODULE_ID("$Id: read_entry.c,v 1.162 2022/04/16 21:00:00 tom Exp $") +- +-#define TYPE_CALLOC(type,elts) typeCalloc(type, (unsigned)(elts)) ++MODULE_ID("$Id: read_entry.c,v 1.163 2022/04/30 18:35:46 tom Exp $") + + #define MyNumber(n) (short) LOW_MSB(n) + +@@ -216,6 +214,8 @@ + { + unsigned i; + ++ DEBUG(2, (T_CALLED("_nc_init_termtype(tp=%p)"), tp)); ++ + #if NCURSES_XNAMES + tp->num_Booleans = BOOLCOUNT; + tp->num_Numbers = NUMCOUNT; +@@ -239,6 +239,8 @@ + + for_each_string(i, tp) + tp->Strings[i] = ABSENT_STRING; ++ ++ DEBUG(2, (T_RETURN(""))); + } + + #if NCURSES_USE_DATABASE +@@ -346,9 +348,8 @@ + offset = (int) (have - MAX_NAME_SIZE); + + /* grab the booleans */ +- if ((ptr->Booleans = TYPE_CALLOC(NCURSES_SBOOL, +- max(BOOLCOUNT, bool_count))) == 0 +- || Read(ptr->Booleans, (unsigned) bool_count) < bool_count) { ++ TYPE_CALLOC(NCURSES_SBOOL, max(BOOLCOUNT, bool_count), ptr->Booleans); ++ if (Read(ptr->Booleans, (unsigned) bool_count) < bool_count) { + returnDB(TGETENT_NO); + } + +@@ -361,15 +362,13 @@ + even_boundary(name_size + bool_count); + + /* grab the numbers */ +- if (!(ptr->Numbers = TYPE_CALLOC(NCURSES_INT2, max(NUMCOUNT, num_count))) +- || !read_numbers(buf, num_count)) { ++ TYPE_CALLOC(NCURSES_INT2, max(NUMCOUNT, num_count), ptr->Numbers); ++ if (!read_numbers(buf, num_count)) { + returnDB(TGETENT_NO); + } + convert_numbers(buf, ptr->Numbers, num_count); + +- if ((ptr->Strings = TYPE_CALLOC(char *, max(STRCOUNT, str_count))) == 0) { +- returnDB(TGETENT_NO); +- } ++ TYPE_CALLOC(char *, max(STRCOUNT, str_count), ptr->Strings); + + if (str_count) { + /* grab the string offsets */ +@@ -510,9 +509,7 @@ + if (ext_str_count >= (max_entry_size / 2)) { + returnDB(TGETENT_NO); + } +- if ((ptr->ext_Names = TYPE_CALLOC(char *, need)) == 0) { +- returnDB(TGETENT_NO); +- } ++ TYPE_CALLOC(char *, need, ptr->ext_Names); + TR(TRACE_DATABASE, + ("ext_NAMES starting @%d in extended_strings, first = %s", + base, _nc_visbuf(ptr->ext_str_table + base))); +Index: package/debian-mingw/changelog +--- ncurses-6.3-20220423+/package/debian-mingw/changelog 2022-04-23 12:44:18.000000000 +0000 ++++ ncurses-6.3-20220430/package/debian-mingw/changelog 2022-04-30 12:58:59.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.3+20220423) unstable; urgency=low ++ncurses6 (6.3+20220430) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey <dic...@invisible-island.net> Sat, 23 Apr 2022 08:44:18 -0400 ++ -- Thomas E. Dickey <dic...@invisible-island.net> Sat, 30 Apr 2022 08:58:59 -0400 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian-mingw64/changelog +--- ncurses-6.3-20220423+/package/debian-mingw64/changelog 2022-04-23 12:44:18.000000000 +0000 ++++ ncurses-6.3-20220430/package/debian-mingw64/changelog 2022-04-30 12:58:59.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.3+20220423) unstable; urgency=low ++ncurses6 (6.3+20220430) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey <dic...@invisible-island.net> Sat, 23 Apr 2022 08:44:18 -0400 ++ -- Thomas E. Dickey <dic...@invisible-island.net> Sat, 30 Apr 2022 08:58:59 -0400 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian/changelog +--- ncurses-6.3-20220423+/package/debian/changelog 2022-04-23 12:44:18.000000000 +0000 ++++ ncurses-6.3-20220430/package/debian/changelog 2022-04-30 12:58:59.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.3+20220423) unstable; urgency=low ++ncurses6 (6.3+20220430) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey <dic...@invisible-island.net> Sat, 23 Apr 2022 08:44:18 -0400 ++ -- Thomas E. Dickey <dic...@invisible-island.net> Sat, 30 Apr 2022 08:58:59 -0400 + + ncurses6 (5.9-20120608) unstable; urgency=low + +Index: package/mingw-ncurses.nsi +Prereq: 1.516 +--- ncurses-6.3-20220423+/package/mingw-ncurses.nsi 2022-04-23 12:44:18.000000000 +0000 ++++ ncurses-6.3-20220430/package/mingw-ncurses.nsi 2022-04-30 12:58:59.000000000 +0000 +@@ -1,4 +1,4 @@ +-; $Id: mingw-ncurses.nsi,v 1.516 2022/04/23 12:44:18 tom Exp $ ++; $Id: mingw-ncurses.nsi,v 1.517 2022/04/30 12:58:59 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 "0423" ++!define VERSION_MMDD "0430" + !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} + + !define MY_ABI "5" +Index: package/mingw-ncurses.spec +--- ncurses-6.3-20220423+/package/mingw-ncurses.spec 2022-04-23 12:44:18.000000000 +0000 ++++ ncurses-6.3-20220430/package/mingw-ncurses.spec 2022-04-30 12:58:59.000000000 +0000 +@@ -3,7 +3,7 @@ + Summary: shared libraries for terminal handling + Name: mingw32-ncurses6 + Version: 6.3 +-Release: 20220423 ++Release: 20220430 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: package/ncurses.spec +--- ncurses-6.3-20220423+/package/ncurses.spec 2022-04-23 12:44:18.000000000 +0000 ++++ ncurses-6.3-20220430/package/ncurses.spec 2022-04-30 12:58:59.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: shared libraries for terminal handling + Name: ncurses6 + Version: 6.3 +-Release: 20220423 ++Release: 20220430 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: package/ncursest.spec +--- ncurses-6.3-20220423+/package/ncursest.spec 2022-04-23 12:44:18.000000000 +0000 ++++ ncurses-6.3-20220430/package/ncursest.spec 2022-04-30 12:58:59.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: Curses library with POSIX thread support. + Name: ncursest6 + Version: 6.3 +-Release: 20220423 ++Release: 20220430 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/ncurses-6.3-20220501.patch new/patches/ncurses-6.3-20220501.patch --- old/patches/ncurses-6.3-20220501.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/ncurses-6.3-20220501.patch 2022-05-02 08:17:29.347270206 +0200 @@ -0,0 +1,203 @@ +# ncurses 6.3 - patch 20220501 - Thomas E. Dickey +# +# ------------------------------------------------------------------------------ +# +# Ncurses 6.3 is at +# https://invisible-island.net/archives/ncurses/ +# https://invisible-mirror.net/archives/ncurses/ +# ftp://ftp.invisible-island.net/ncurses/ +# https://ftp.gnu.org/gnu/ncurses/ +# +# Patches for ncurses 6.3 can be found at +# https://invisible-island.net/archives/ncurses/6.3 +# https://invisible-mirror.net/archives/ncurses/6.3 +# ftp://ftp.invisible-island.net/ncurses/6.3 +# +# ------------------------------------------------------------------------------ +# ftp://ftp.invisible-island.net/ncurses/6.3/ncurses-6.3-20220501.patch.gz +# patch by Thomas E. Dickey <dic...@invisible-island.net> +# created Sun May 1 18:51:43 UTC 2022 +# ------------------------------------------------------------------------------ +# 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(-) +# ------------------------------------------------------------------------------ +Index: NEWS +Prereq: 1.3801 +--- ncurses-6.3-20220430+/NEWS 2022-04-30 23:27:43.000000000 +0000 ++++ ncurses-6.3-20220501/NEWS 2022-05-01 15:16:36.000000000 +0000 +@@ -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 @@ + 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 +Index: VERSION +--- ncurses-6.3-20220430+/VERSION 2022-04-30 12:58:59.000000000 +0000 ++++ ncurses-6.3-20220501/VERSION 2022-05-01 10:28:56.000000000 +0000 +@@ -1 +1 @@ +-5:0:10 6.3 20220430 ++5:0:10 6.3 20220501 +Index: dist.mk +Prereq: 1.1477 +--- ncurses-6.3-20220430+/dist.mk 2022-04-30 12:58:59.000000000 +0000 ++++ ncurses-6.3-20220501/dist.mk 2022-05-01 10:28:56.000000000 +0000 +@@ -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 @@ + # 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) +Index: ncurses/curses.priv.h +Prereq: 1.649 +--- ncurses-6.3-20220430+/ncurses/curses.priv.h 2022-04-30 18:32:29.000000000 +0000 ++++ ncurses-6.3-20220501/ncurses/curses.priv.h 2022-05-01 14:41:33.000000000 +0000 +@@ -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 @@ + #define returnWin(code) return code + + #define returnDB(code) return code ++#define returnPtrDB(rc) return rc ++#define returnVoidDB return + + #endif /* TRACE/!TRACE */ + +Index: package/debian-mingw/changelog +--- ncurses-6.3-20220430+/package/debian-mingw/changelog 2022-04-30 12:58:59.000000000 +0000 ++++ ncurses-6.3-20220501/package/debian-mingw/changelog 2022-05-01 10:28:56.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.3+20220430) unstable; urgency=low ++ncurses6 (6.3+20220501) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey <dic...@invisible-island.net> Sat, 30 Apr 2022 08:58:59 -0400 ++ -- Thomas E. Dickey <dic...@invisible-island.net> Sun, 01 May 2022 06:28:56 -0400 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian-mingw64/changelog +--- ncurses-6.3-20220430+/package/debian-mingw64/changelog 2022-04-30 12:58:59.000000000 +0000 ++++ ncurses-6.3-20220501/package/debian-mingw64/changelog 2022-05-01 10:28:56.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.3+20220430) unstable; urgency=low ++ncurses6 (6.3+20220501) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey <dic...@invisible-island.net> Sat, 30 Apr 2022 08:58:59 -0400 ++ -- Thomas E. Dickey <dic...@invisible-island.net> Sun, 01 May 2022 06:28:56 -0400 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian/changelog +--- ncurses-6.3-20220430+/package/debian/changelog 2022-04-30 12:58:59.000000000 +0000 ++++ ncurses-6.3-20220501/package/debian/changelog 2022-05-01 10:28:56.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.3+20220430) unstable; urgency=low ++ncurses6 (6.3+20220501) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey <dic...@invisible-island.net> Sat, 30 Apr 2022 08:58:59 -0400 ++ -- Thomas E. Dickey <dic...@invisible-island.net> Sun, 01 May 2022 06:28:56 -0400 + + ncurses6 (5.9-20120608) unstable; urgency=low + +Index: package/mingw-ncurses.nsi +Prereq: 1.517 +--- ncurses-6.3-20220430+/package/mingw-ncurses.nsi 2022-04-30 12:58:59.000000000 +0000 ++++ ncurses-6.3-20220501/package/mingw-ncurses.nsi 2022-05-01 10:28:56.000000000 +0000 +@@ -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" +Index: package/mingw-ncurses.spec +--- ncurses-6.3-20220430+/package/mingw-ncurses.spec 2022-04-30 12:58:59.000000000 +0000 ++++ ncurses-6.3-20220501/package/mingw-ncurses.spec 2022-05-01 10:28:56.000000000 +0000 +@@ -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 +Index: package/ncurses.spec +--- ncurses-6.3-20220430+/package/ncurses.spec 2022-04-30 12:58:59.000000000 +0000 ++++ ncurses-6.3-20220501/package/ncurses.spec 2022-05-01 10:28:56.000000000 +0000 +@@ -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 +Index: package/ncursest.spec +--- ncurses-6.3-20220430+/package/ncursest.spec 2022-04-30 12:58:59.000000000 +0000 ++++ ncurses-6.3-20220501/package/ncursest.spec 2022-05-01 10:28:56.000000000 +0000 +@@ -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 ++++++ ncurses-6.3.dif ++++++ --- /var/tmp/diff_new_pack.cg9Cfj/_old 2022-05-13 23:03:04.427117708 +0200 +++ /var/tmp/diff_new_pack.cg9Cfj/_new 2022-05-13 23:03:04.431117711 +0200 @@ -520,7 +520,7 @@ use=xterm-new, # This entry assumes that xterm's handling of VT100 SI/SO is disabled by -@@ -5939,7 +5966,7 @@ xterms-sun|small (80x24) xterm with sunF +@@ -5950,7 +5977,7 @@ xterms-sun|small (80x24) xterm with sunF #### GNOME (VTE) # this describes the alpha-version of GNOME terminal shipped with Redhat 6.0 @@ -529,7 +529,7 @@ bce, kdch1=^?, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, use=xterm-color, -@@ -6226,10 +6253,14 @@ mgt|Multi GNOME Terminal, +@@ -6237,10 +6264,14 @@ mgt|Multi GNOME Terminal, #### KDE # This is kvt 0-18.7, shipped with Redhat 6.0 (though whether it supports bce # or not is debatable). @@ -545,7 +545,7 @@ # Konsole 1.0.1 (2001/11/25) # (formerly known as kvt) # -@@ -6481,7 +6512,7 @@ mlterm3|multi lingual terminal emulator +@@ -6492,7 +6523,7 @@ mlterm3|multi lingual terminal emulator mlterm2|multi lingual terminal emulator 2.x, am, eslok, km, mc5i, mir, msgr, npc, xenl, XT, colors#8, cols#80, it#8, lines#24, pairs#64, @@ -554,7 +554,7 @@ bel=^G, bold=\E[1m, cbt=\E[Z, clear=\E[H\E[2J, cr=\r, csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, -@@ -6558,7 +6589,7 @@ rxvt-basic|rxvt terminal base (X Window +@@ -6569,7 +6600,7 @@ rxvt-basic|rxvt terminal base (X Window enacs=\E(B\E)0, flash=\E[?5h$<100/>\E[?5l, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=\n, is1=\E[?47l\E=\E[?1l, @@ -563,7 +563,7 @@ kcbt=\E[Z, kmous=\E[M, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O, rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=\E>, rmso=\E[27m, rmul=\E[24m, -@@ -6653,8 +6684,8 @@ rxvt-basic|rxvt terminal base (X Window +@@ -6664,8 +6695,8 @@ rxvt-basic|rxvt terminal base (X Window # Removed kDN6, etc (control+shift) since rxvt does not implement this -TD rxvt+pcfkeys|rxvt fragment for PC-style fkeys, kDC=\E[3$, kEND=\E[8$, kHOM=\E[7$, kIC=\E[2$, kLFT=\E[d, @@ -574,7 +574,7 @@ kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, kf2=\E[12~, kf20=\E[34~, -@@ -6742,6 +6773,38 @@ rxvt-cygwin-native|rxvt terminal emulato +@@ -6753,6 +6784,38 @@ rxvt-cygwin-native|rxvt terminal emulato \302x\263y\363z\362{\343|\330~\376, use=rxvt-cygwin, @@ -613,7 +613,7 @@ # This variant is supposed to work with rxvt 2.7.7 when compiled with # NO_BRIGHTCOLOR defined. rxvt needs more work... rxvt-16color|rxvt with 16 colors like aixterm, -@@ -6806,7 +6869,7 @@ Eterm|Eterm-color|Eterm with xterm-style +@@ -6817,7 +6880,7 @@ Eterm|Eterm-color|Eterm with xterm-style home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=\n, is1=\E[?47l\E>\E[?1l, is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, kNXT@, @@ -622,7 +622,7 @@ kc1=\E[8~, kc3=\E[6~, kent=\EOM, khlp=\E[28~, kmous=\E[M, mc4=\E[4i, mc5=\E[5i, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O, rmam=\E[?7l, rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=, -@@ -7920,7 +7983,7 @@ pty|4bsd pseudo teletype, +@@ -7931,7 +7994,7 @@ pty|4bsd pseudo teletype, # https://github.com/emacs-mirror/emacs/blob/master/lisp/term.el # # The codes supported by the term.el terminal emulation in GNU Emacs 19.30 @@ -631,7 +631,7 @@ am, mir, xenl, cols#80, lines#24, bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=\r, -@@ -7933,6 +7996,13 @@ eterm|GNU Emacs term.el terminal emulati +@@ -7944,6 +8007,13 @@ eterm|GNU Emacs term.el terminal emulati rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmso=\E[m, rmul=\E[m, sgr0=\E[m, smcup=\E7\E[?47h, smir=\E[4h, smso=\E[7m, smul=\E[4m, @@ -645,7 +645,7 @@ # The codes supported by the term.el terminal emulation in GNU Emacs 22.2 eterm-color|Emacs term.el terminal emulator term-protocol-version 0.96, -@@ -8060,7 +8130,7 @@ screen|VT 100/ANSI X3.64 virtual termina +@@ -8071,7 +8141,7 @@ screen|VT 100/ANSI X3.64 virtual termina dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E(B\E)0, flash=\Eg, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, @@ -654,7 +654,7 @@ kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf1=\EOP, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, -@@ -8177,9 +8247,16 @@ screen.xterm-xfree86|screen.xterm-new|sc +@@ -8188,9 +8258,16 @@ screen.xterm-xfree86|screen.xterm-new|sc sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%| %t;7%;%?%p4%t;5%;%?%p5%t;2%;m, E3@, use=screen+italics, use=screen+fkeys, @@ -672,7 +672,7 @@ # xterm-r6 does not really support khome/kend unless it is propped up by # the translations resource. screen.xterm-r6|screen customized for X11R6 xterm, -@@ -8267,7 +8344,7 @@ screen2|VT 100/ANSI X3.64 virtual termin +@@ -8278,7 +8355,7 @@ screen2|VT 100/ANSI X3.64 virtual termin cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=, il=\E[%p1%dL, @@ -681,7 +681,7 @@ kcuu1=\EA, kf0=\E~, kf1=\ES, kf2=\ET, kf3=\EU, kf4=\EV, kf5=\EW, kf6=\EP, kf7=\EQ, kf8=\ER, kf9=\E0I, khome=\EH, nel=\r\n, rc=\E8, ri=\EM, rmir=\E[4l, rmso=\E[23m, -@@ -10224,7 +10301,7 @@ hp700-wy|HP 700/41 emulating Wyse30, +@@ -10235,7 +10312,7 @@ hp700-wy|HP 700/41 emulating Wyse30, ri=\Ej, rmir=\Er, rmso=\EG0$<10/>, rmul=\EG0$<10/>, sgr0=\EG0$<10/>, smir=\Eq, smso=\EG4$<10/>, smul=\EG8$<10/>, tbc=\E0, vpa=\E[%p1%{32}%+%c, @@ -690,7 +690,7 @@ am, da, db, xhp, cols#80, lh#2, lines#24, lm#0, lw#8, nlab#8, acsc=0cjgktlrmfn/q\,t5u6v8w7x., bel=^G, blink=\E&dA, -@@ -17870,7 +17947,7 @@ ibm3101|i3101|IBM 3101-10, +@@ -17881,7 +17958,7 @@ ibm3101|i3101|IBM 3101-10, cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, ed=\EJ, el=\EI, home=\EH, hts=\E0, ind=\n, kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, nel=\r\n, tbc=\EH, @@ -699,7 +699,7 @@ is2=\E S, rmacs=\E>B, rmcup=\E>B, rs2=\E S, s0ds=\E>B, sgr=\E4%{64}%?%p1%t%{65}%|%;%?%p2%t%{66}%|%;%?%p3%t%{65}%|%; %?%p4%t%{68}%|%;%?%p5%t%{64}%|%;%?%p6%t%{72}%|%;%?%p7%t -@@ -18128,7 +18205,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De +@@ -18139,7 +18216,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De tbc=\E[3g, use=ecma+index, # "Megapel" refers to the display adapter, which was used with the IBM RT # aka IBM 6150.
