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-06-16 18:19:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ncurses (Old) and /work/SRC/openSUSE:Factory/.ncurses.new.1548 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ncurses" Thu Jun 16 18:19:34 2022 rev:217 rq:982383 version:6.3.MACRO Changes: -------- --- /work/SRC/openSUSE:Factory/ncurses/ncurses.changes 2022-06-09 14:10:04.844390323 +0200 +++ /work/SRC/openSUSE:Factory/.ncurses.new.1548/ncurses.changes 2022-06-16 18:19:36.708028739 +0200 @@ -1,0 +2,8 @@ +Mon Jun 13 08:13:13 UTC 2022 - Dr. Werner Fink <wer...@suse.de> + +- Add ncurses patch 20220612 + + modify waddch_literal() to allow for double-width base character when + merging a combining character (report by Gavin Troy). + + improve _tracecchar_t2() formatting of base+combining character. + +------------------------------------------------------------------- @@ -4 +12 @@ -- Add ncurses patch +20220604 +- Add ncurses patch 20220604 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ncurses.spec ++++++ --- /var/tmp/diff_new_pack.4WLwSC/_old 2022-06-16 18:19:37.700030150 +0200 +++ /var/tmp/diff_new_pack.4WLwSC/_new 2022-06-16 18:19:37.712030167 +0200 @@ -27,7 +27,6 @@ %bcond_with ada %bcond_with libbsd %bcond_with usepcre2 -%bcond_with xtermdsl %if %{with onlytinfo} %global soname_tinfo tinfo @@ -352,9 +351,6 @@ %patch2 -p0 -b .hs %patch0 -p0 -b .p0 %patch3 -p1 -%if ! %{with xtermdsl} -sed -ri '/^xterm-suse/,/use=/{s/use=xterm-new/use=xterm-p370/;}' misc/terminfo.src -%endif %build # ++++++ ncurses-6.3-patches.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/ncurses-6.3-20220612.patch new/patches/ncurses-6.3-20220612.patch --- old/patches/ncurses-6.3-20220612.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/ncurses-6.3-20220612.patch 2022-06-13 10:08:21.696468077 +0200 @@ -0,0 +1,347 @@ +# ncurses 6.3 - patch 20220612 - 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-20220612.patch.gz +# patch by Thomas E. Dickey <dic...@invisible-island.net> +# created Sun Jun 12 18:14:27 UTC 2022 +# ------------------------------------------------------------------------------ +# NEWS | 7 ++++++- +# VERSION | 2 +- +# dist.mk | 4 ++-- +# ncurses/base/lib_addch.c | 33 +++++++++++++++++++++------------ +# ncurses/base/lib_addstr.c | 14 ++++++++------ +# ncurses/trace/lib_traceatr.c | 21 +++++++++++---------- +# 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 +- +# 13 files changed, 60 insertions(+), 43 deletions(-) +# ------------------------------------------------------------------------------ +Index: NEWS +Prereq: 1.3815 +--- ncurses-6.3-20220604+/NEWS 2022-06-04 23:17:01.000000000 +0000 ++++ ncurses-6.3-20220612/NEWS 2022-06-12 10:22:30.000000000 +0000 +@@ -26,7 +26,7 @@ + -- sale, use or other dealings in this Software without prior written -- + -- authorization. -- + ------------------------------------------------------------------------------- +--- $Id: NEWS,v 1.3815 2022/06/04 23:17:01 tom Exp $ ++-- $Id: NEWS,v 1.3818 2022/06/12 10:22:30 tom Exp $ + ------------------------------------------------------------------------------- + + This is a log of changes that ncurses has gone through since Zeyd started +@@ -46,6 +46,11 @@ + Changes through 1.9.9e did not credit all contributions; + it is not possible to add this information. + ++20220612 ++ + modify waddch_literal() to allow for double-width base character when ++ merging a combining character (report by Gavin Troy). ++ + improve _tracecchar_t2() formatting of base+combining character. ++ + 20220604 + + add note on portable memory-leak checking in man/curs_memleaks.3x + + remove u6-u9 from teken-2018 -TD +Index: VERSION +--- ncurses-6.3-20220604+/VERSION 2022-06-04 10:24:10.000000000 +0000 ++++ ncurses-6.3-20220612/VERSION 2022-06-12 10:22:30.000000000 +0000 +@@ -1 +1 @@ +-5:0:10 6.3 20220604 ++5:0:10 6.3 20220612 +Index: dist.mk +Prereq: 1.1484 +--- ncurses-6.3-20220604+/dist.mk 2022-06-04 10:24:10.000000000 +0000 ++++ ncurses-6.3-20220612/dist.mk 2022-06-12 10:22:30.000000000 +0000 +@@ -26,7 +26,7 @@ + # use or other dealings in this Software without prior written # + # authorization. # + ############################################################################## +-# $Id: dist.mk,v 1.1484 2022/06/04 10:24:10 tom Exp $ ++# $Id: dist.mk,v 1.1486 2022/06/12 10:22:30 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 = 20220604 ++NCURSES_PATCH = 20220612 + + # We don't append the patch to the version, since this only applies to releases + VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) +Index: ncurses/base/lib_addch.c +Prereq: 1.138 +--- ncurses-6.3-20220604+/ncurses/base/lib_addch.c 2021-06-17 21:11:08.000000000 +0000 ++++ ncurses-6.3-20220612/ncurses/base/lib_addch.c 2022-06-12 15:16:41.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright 2019-2020,2021 Thomas E. Dickey * ++ * Copyright 2019-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 * +@@ -37,7 +37,7 @@ + #include <curses.priv.h> + #include <ctype.h> + +-MODULE_ID("$Id: lib_addch.c,v 1.138 2021/06/17 21:11:08 tom Exp $") ++MODULE_ID("$Id: lib_addch.c,v 1.141 2022/06/12 15:16:41 tom Exp $") + + static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT); + +@@ -321,20 +321,29 @@ + int len = _nc_wacs_width(CharOf(ch)); + int i; + int j; +- wchar_t *chars; + + if (len == 0) { /* non-spacing */ + if ((x > 0 && y >= 0) + || (win->_maxx >= 0 && win->_cury >= 1)) { +- if (x > 0 && y >= 0) +- chars = (win->_line[y].text[x - 1].chars); +- else +- chars = (win->_line[y - 1].text[win->_maxx].chars); ++ NCURSES_CH_T *dst; ++ wchar_t *chars; ++ if (x > 0 && y >= 0) { ++ for (j = x - 1; j >= 0; --j) { ++ if (!isWidecExt(win->_line[y].text[j])) { ++ win->_curx = (NCURSES_SIZE_T) j; ++ break; ++ } ++ } ++ dst = &(win->_line[y].text[j]); ++ } else { ++ dst = &(win->_line[y - 1].text[win->_maxx]); ++ } ++ chars = dst->chars; + for (i = 0; i < CCHARW_MAX; ++i) { + if (chars[i] == 0) { + TR(TRACE_VIRTPUT, +- ("added non-spacing %d: %x", +- x, (int) CharOf(ch))); ++ ("adding non-spacing %s (level %d)", ++ _tracech_t(CHREF(ch)), i)); + chars[i] = CharOf(ch); + break; + } +@@ -410,9 +419,9 @@ + testwrapping: + ); + +- TR(TRACE_VIRTPUT, ("cell (%ld, %ld..%d) = %s", +- (long) win->_cury, (long) win->_curx, x - 1, +- _tracech_t(CHREF(ch)))); ++ TR(TRACE_VIRTPUT, ("cell (%d, %d..%d) = %s", ++ win->_cury, win->_curx, x - 1, ++ _tracech_t(CHREF(line->text[win->_curx])))); + + if (x > win->_maxx) { + return wrap_to_next_line(win); +Index: ncurses/base/lib_addstr.c +Prereq: 1.57 +--- ncurses-6.3-20220604+/ncurses/base/lib_addstr.c 2020-12-05 20:06:19.000000000 +0000 ++++ ncurses-6.3-20220612/ncurses/base/lib_addstr.c 2022-06-11 20:12:04.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright 2019,2020 Thomas E. Dickey * ++ * Copyright 2019-2020,2022 Thomas E. Dickey * + * Copyright 1998-2016,2017 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * +@@ -45,7 +45,7 @@ + + #include <curses.priv.h> + +-MODULE_ID("$Id: lib_addstr.c,v 1.57 2020/12/05 20:06:19 tom Exp $") ++MODULE_ID("$Id: lib_addstr.c,v 1.58 2022/06/11 20:12:04 tom Exp $") + + NCURSES_EXPORT(int) + waddnstr(WINDOW *win, const char *astr, int n) +@@ -59,10 +59,11 @@ + TR(TRACE_VIRTPUT | TRACE_ATTRS, + ("... current %s", _traceattr(WINDOW_ATTRS(win)))); + code = OK; ++ ++ TR(TRACE_VIRTPUT, ("str is not null, length = %d", ++ ((n > 0) ? n : (int) strlen(str)))); + if (n < 0) + n = INT_MAX; +- +- TR(TRACE_VIRTPUT, ("str is not null, length = %d", n)); + while ((*str != '\0') && (n-- > 0)) { + NCURSES_CH_T ch; + TR(TRACE_VIRTPUT, ("*str = %#o", UChar(*str))); +@@ -231,10 +232,11 @@ + TR(TRACE_VIRTPUT | TRACE_ATTRS, + ("... current %s", _traceattr(WINDOW_ATTRS(win)))); + code = OK; ++ ++ TR(TRACE_VIRTPUT, ("str is not null, length = %d", ++ ((n > 0) ? n : (int) wcslen(str)))); + if (n < 0) + n = INT_MAX; +- +- TR(TRACE_VIRTPUT, ("str is not null, length = %d", n)); + while ((*str != L('\0')) && (n-- > 0)) { + NCURSES_CH_T ch; + TR(TRACE_VIRTPUT, ("*str[0] = %#lx", (unsigned long) *str)); +Index: ncurses/trace/lib_traceatr.c +Prereq: 1.94 +--- ncurses-6.3-20220604+/ncurses/trace/lib_traceatr.c 2020-02-02 23:34:34.000000000 +0000 ++++ ncurses-6.3-20220612/ncurses/trace/lib_traceatr.c 2022-06-11 22:40:56.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright 2018-2019,2020 Thomas E. Dickey * ++ * Copyright 2018-2020,2022 Thomas E. Dickey * + * Copyright 1998-2017,2018 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * +@@ -44,7 +44,7 @@ + #define CUR SP_TERMTYPE + #endif + +-MODULE_ID("$Id: lib_traceatr.c,v 1.94 2020/02/02 23:34:34 tom Exp $") ++MODULE_ID("$Id: lib_traceatr.c,v 1.95 2022/06/11 22:40:56 tom Exp $") + + #define COLOR_OF(c) ((c < 0) ? "default" : (c > 7 ? color_of(c) : colors[c].name)) + +@@ -369,14 +369,15 @@ + _nc_wacs_width(ch->chars[PUTC_i]), + (unsigned long) ch->chars[PUTC_i]); + (void) _nc_trace_bufcat(bufnum, temp); +- break; +- } +- for (n = 0; n < PUTC_n; n++) { +- if (n) +- (void) _nc_trace_bufcat(bufnum, ", "); +- (void) _nc_trace_bufcat(bufnum, +- _nc_tracechar(CURRENT_SCREEN, +- UChar(PUTC_buf[n]))); ++ attr &= ~A_CHARTEXT; /* ignore WidecExt(ch) */ ++ } else { ++ for (n = 0; n < PUTC_n; n++) { ++ if (n) ++ (void) _nc_trace_bufcat(bufnum, ", "); ++ (void) _nc_trace_bufcat(bufnum, ++ _nc_tracechar(CURRENT_SCREEN, ++ UChar(PUTC_buf[n]))); ++ } + } + } + (void) _nc_trace_bufcat(bufnum, " }"); +Index: package/debian-mingw/changelog +--- ncurses-6.3-20220604+/package/debian-mingw/changelog 2022-06-04 10:24:10.000000000 +0000 ++++ ncurses-6.3-20220612/package/debian-mingw/changelog 2022-06-12 10:22:30.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.3+20220604) unstable; urgency=low ++ncurses6 (6.3+20220612) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey <dic...@invisible-island.net> Sat, 04 Jun 2022 06:24:10 -0400 ++ -- Thomas E. Dickey <dic...@invisible-island.net> Sun, 12 Jun 2022 06:22:30 -0400 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian-mingw64/changelog +--- ncurses-6.3-20220604+/package/debian-mingw64/changelog 2022-06-04 10:24:10.000000000 +0000 ++++ ncurses-6.3-20220612/package/debian-mingw64/changelog 2022-06-12 10:22:30.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.3+20220604) unstable; urgency=low ++ncurses6 (6.3+20220612) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey <dic...@invisible-island.net> Sat, 04 Jun 2022 06:24:10 -0400 ++ -- Thomas E. Dickey <dic...@invisible-island.net> Sun, 12 Jun 2022 06:22:30 -0400 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian/changelog +--- ncurses-6.3-20220604+/package/debian/changelog 2022-06-04 10:24:10.000000000 +0000 ++++ ncurses-6.3-20220612/package/debian/changelog 2022-06-12 10:22:30.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.3+20220604) unstable; urgency=low ++ncurses6 (6.3+20220612) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey <dic...@invisible-island.net> Sat, 04 Jun 2022 06:24:10 -0400 ++ -- Thomas E. Dickey <dic...@invisible-island.net> Sun, 12 Jun 2022 06:22:30 -0400 + + ncurses6 (5.9-20120608) unstable; urgency=low + +Index: package/mingw-ncurses.nsi +Prereq: 1.524 +--- ncurses-6.3-20220604+/package/mingw-ncurses.nsi 2022-06-04 10:24:10.000000000 +0000 ++++ ncurses-6.3-20220612/package/mingw-ncurses.nsi 2022-06-12 10:22:30.000000000 +0000 +@@ -1,4 +1,4 @@ +-; $Id: mingw-ncurses.nsi,v 1.524 2022/06/04 10:24:10 tom Exp $ ++; $Id: mingw-ncurses.nsi,v 1.526 2022/06/12 10:22:30 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 "0604" ++!define VERSION_MMDD "0612" + !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} + + !define MY_ABI "5" +Index: package/mingw-ncurses.spec +--- ncurses-6.3-20220604+/package/mingw-ncurses.spec 2022-06-04 10:24:10.000000000 +0000 ++++ ncurses-6.3-20220612/package/mingw-ncurses.spec 2022-06-12 10:22:30.000000000 +0000 +@@ -3,7 +3,7 @@ + Summary: shared libraries for terminal handling + Name: mingw32-ncurses6 + Version: 6.3 +-Release: 20220604 ++Release: 20220612 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: package/ncurses.spec +--- ncurses-6.3-20220604+/package/ncurses.spec 2022-06-04 10:24:10.000000000 +0000 ++++ ncurses-6.3-20220612/package/ncurses.spec 2022-06-12 10:22:30.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: shared libraries for terminal handling + Name: ncurses6 + Version: 6.3 +-Release: 20220604 ++Release: 20220612 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: package/ncursest.spec +--- ncurses-6.3-20220604+/package/ncursest.spec 2022-06-04 10:24:10.000000000 +0000 ++++ ncurses-6.3-20220612/package/ncursest.spec 2022-06-12 10:22:30.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: Curses library with POSIX thread support. + Name: ncursest6 + Version: 6.3 +-Release: 20220604 ++Release: 20220612 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz