From 03458b9d8a76a97247cff021a2af649a853b41ee Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Sun, 9 Jul 2023 00:33:36 +0000 Subject: [PATCH] ncurses 6.4 - patch 20230708 + add linux+kbs for terminals which imitate xterm's behavior with Linux -TD + modify MinGW driver to return KEY_BACKSPACE when an unmodified VK_BACK virtual key is entered (prompted by patch by Pavel Fedin, Savannah #64292). + disallow using $TERMINFO or $HOME/.terminfo when tic "-o" option is used (report by Sven Joachim, Debian #1040048). --- NEWS | 11 ++++- VERSION | 2 +- c++/demo.cc | 5 ++- dist.mk | 4 +- misc/terminfo.src | 69 +++++++++++++++++++------------- ncurses/tinfo/write_entry.c | 46 ++++++++++++--------- ncurses/win32con/win_driver.c | 50 +++++++++++++---------- 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 +- 14 files changed, 124 insertions(+), 85 deletions(-) diff --git a/NEWS b/NEWS index 6b10b50c..7965543c 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.3973 2023/07/01 17:55:50 tom Exp $ +-- $Id: NEWS,v 1.3975 2023/07/09 00:08:03 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -46,6 +46,15 @@ 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. +20230708 + + add linux+kbs for terminals which imitate xterm's behavior with + Linux -TD + + modify MinGW driver to return KEY_BACKSPACE when an unmodified + VK_BACK virtual key is entered (prompted by patch by Pavel Fedin, + Savannah #64292). + + disallow using $TERMINFO or $HOME/.terminfo when tic "-o" option is + used (report by Sven Joachim, Debian #1040048). + 20230701 + fix mandoc warnings about unnecessary markup. + improve parameter check in tparm_setup() diff --git a/VERSION b/VERSION index 07ef1d27..932e170e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5:0:10 6.4 20230701 +5:0:10 6.4 20230708 diff --git a/c++/demo.cc b/c++/demo.cc index 195e98a0..e184e954 100644 --- a/c++/demo.cc +++ b/c++/demo.cc @@ -1,6 +1,6 @@ // * This makes emacs happy -*-Mode: C++;-*- /**************************************************************************** - * Copyright 2018-2020,2021 Thomas E. Dickey * + * Copyright 2018-2021,2023 Thomas E. Dickey * * Copyright 1998-2012,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -36,7 +36,7 @@ * Demo code for NCursesMenu and NCursesForm written by * Juergen Pfeifer * - * $Id: demo.cc,v 1.50 2021/09/04 10:52:55 tom Exp $ + * $Id: demo.cc,v 1.51 2023/07/08 12:46:45 tom Exp $ */ #include "internal.h" @@ -46,6 +46,7 @@ #if (defined(_WIN32) || defined(_WIN64)) #undef KEY_EVENT +#undef sleep #define sleep(n) Sleep(n) #else extern "C" unsigned int sleep(unsigned int); diff --git a/dist.mk b/dist.mk index 430cf4a4..d2453689 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.1553 2023/07/01 09:47:16 tom Exp $ +# $Id: dist.mk,v 1.1554 2023/07/08 12:03:11 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 = 4 -NCURSES_PATCH = 20230701 +NCURSES_PATCH = 20230708 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) diff --git a/misc/terminfo.src b/misc/terminfo.src index c11f98f5..611fe27a 100644 --- a/misc/terminfo.src +++ b/misc/terminfo.src @@ -6,8 +6,8 @@ # Report bugs and new terminal descriptions to # bug-ncurses@gnu.org # -# $Revision: 1.1059 $ -# $Date: 2023/06/05 21:40:20 $ +# $Revision: 1.1060 $ +# $Date: 2023/07/09 00:05:04 $ # # 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 @@ -4155,9 +4155,10 @@ crt|crt-vt220|CRT 2.3 emulating VT220, # resize.pl gets no reply, resize.sh needs fix for no reply. scrt|securecrt|SecureCRT emulating xterm-256color, bce@, km@, npc, - bel@, cvvis@, kcbt=\E[Z, kent=\EOM, use=vt220+pcedit, - use=xterm+256setaf, use=ecma+index, use=ansi+rep, - use=xterm+keypad, use=xterm+pcfkeys, use=xterm-basic, + bel@, cvvis@, kcbt=\E[Z, kent=\EOM, use=linux+kbs, + use=vt220+pcedit, use=xterm+256setaf, use=ecma+index, + use=ansi+rep, use=xterm+keypad, use=xterm+pcfkeys, + use=xterm-basic, # Absolute Telnet # (eval 2021/02/20) @@ -4205,7 +4206,7 @@ scrt|securecrt|SecureCRT emulating xterm-256color, # supports 256-colors, including changing palette (ncurses menu d works) # supports UTF-8, but honors VT100 line-drawing absolute|Absolute Telnet emulating xterm, - kcbt=\E[Z, use=ecma+index, use=ansi+rep, + kcbt=\E[Z, use=ecma+index, use=linux+kbs, use=ansi+rep, use=vt220+pcedit, use=xterm+keypad, use=xterm+app, use=xterm+pcf0, use=xterm+256color, use=xterm+x11mouse, use=xterm-basic, @@ -4417,7 +4418,7 @@ mintty+common|shared capabilities for mintty, rsupm=\E[75m, smm@, smpch=\E[11m, sshm=\E[1:2m, ssubm=\E[74m, ssupm=\E[73m, Rmol=\E[55m, Smol=\E[53m, Smulx=\E[4:%p1%dm, blink2=\E[6m, norm=\E[22m, - opaq=\E[28m, smul2=\E[21m, use=ansi+rep, + opaq=\E[28m, smul2=\E[21m, use=linux+kbs, use=ansi+rep, use=ecma+strikeout, use=ecma+index, use=vt420+lrmm, use=xterm+sm+1006, use=xterm+pcfkeys, use=xterm+tmux, use=ecma+italics, use=xterm-basic, use=bracketed+paste, @@ -4722,10 +4723,10 @@ ms-vt-utf8|vt-utf8|UTF-8 flavor of VT100+, ms-terminal|Windows10 terminal, npc, cud1=\E[B, kcbt=\E[Z, rmkx=\E[?1l, rmm@, smkx=\E[?1h, smm@, - Cr@, Ms@, use=xterm+256color, use=xterm+pcfkeys, - use=ansi+rep, use=xterm+sm+1006, use=ecma+index, - use=ecma+italics, use=ecma+strikeout, use=xterm-basic, - use=xterm+tmux, + Cr@, Ms@, use=linux+kbs, use=xterm+256color, + use=xterm+pcfkeys, use=ansi+rep, use=xterm+sm+1006, + use=ecma+index, use=ecma+italics, use=ecma+strikeout, + use=xterm-basic, use=xterm+tmux, #### Visual Studio # Visual Studio Code 1.45.0 uses xterm.js 12.8.1 (see https://xtermjs.org/). @@ -4774,9 +4775,10 @@ ms-terminal|Windows10 terminal, # - color-palette cannot be changed vscode|xterm.js|Visual Studio Code terminal using xterm.js, npc, - kcbt=\E[Z, rmkx=\E[?1l, smkx=\E[?1h, use=xterm+256setaf, - use=ecma+index, use=xterm+sm+1006, use=xterm+pcfkeys, - use=ecma+italics, use=xterm-basic, use=bracketed+paste, + kcbt=\E[Z, rmkx=\E[?1l, smkx=\E[?1h, use=linux+kbs, + use=xterm+256setaf, use=ecma+index, use=xterm+sm+1006, + use=xterm+pcfkeys, use=ecma+italics, use=xterm-basic, + use=bracketed+paste, vscode-direct|Visual Studio Code with direct-colors, use=xterm+indirect, use=vscode, @@ -5018,9 +5020,15 @@ xterm-new|modern xterm terminal emulator, use=xterm-p370, # This fragment is for people who cannot agree on what the backspace key -# should send. +# should send. The ncurses configure script option "--with-xterm-kbs" can +# set it to BS (standard) or DEL (Linux's notion of "vt220"). xterm provides +# either, depending on how the pseudoterminals are configured. xterm+kbs|fragment for backspace key, kbs=^H, + +# Use this fragment for terminals that always use DEL for "backspace". +linux+kbs|fragment for "backspace" key, + kbs=^?, # # This fragment describes as much of XFree86 xterm's "pc-style" function # keys as will fit into terminfo's 60 function keys. @@ -6114,7 +6122,7 @@ xterms-sun|small (80x24) xterm with sunFunctionKeys true, gnome-rh62|GNOME terminal, bce, kdch1=^?, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, - use=xterm-color, + use=linux+kbs, use=xterm-color, # GNOME Terminal 1.4.0.4 (Redhat 7.2) # @@ -6141,7 +6149,7 @@ gnome-rh72|GNOME Terminal in RedHat 7, sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m%?%p9%t\016%e \017%;, sgr0=\E[0m\017, smam=\E[?7h, tbc@, use=vt220+cvis, - use=xterm-color, + use=linux+kbs, use=xterm-color, # GNOME Terminal 2.0.1 (Redhat 8.0) # @@ -6336,11 +6344,11 @@ xfce|Xfce Terminal, hterm|Chromium hterm, npc, U8#1, - kcbt=\E[Z, kent=\EOM, nel=\EE, use=xterm+osc104, - use=ecma+index, use=ansi+rep, use=ecma+strikeout, - use=vt420+lrmm, use=xterm+sm+1006, use=xterm+tmux, - use=ecma+italics, use=xterm+pcfkeys, use=xterm-basic, - use=bracketed+paste, + kcbt=\E[Z, kent=\EOM, nel=\EE, use=linux+kbs, + use=xterm+osc104, use=ecma+index, use=ansi+rep, + use=ecma+strikeout, use=vt420+lrmm, use=xterm+sm+1006, + use=xterm+tmux, use=ecma+italics, use=xterm+pcfkeys, + use=xterm-basic, use=bracketed+paste, hterm-256color|Chromium hterm with xterm 256-colors, use=xterm+256color2, use=hterm, @@ -6402,7 +6410,8 @@ mgt|Multi GNOME Terminal, # or not is debatable). kvt|KDE terminal, bce, km@, - kdch1=^?, kend=\E[F, khome=\E[H, use=xterm-color, + kdch1=^?, kend=\E[F, khome=\E[H, use=linux+kbs, + use=xterm-color, # Konsole 1.0.1 (2001/11/25) # (formerly known as kvt) @@ -7715,8 +7724,8 @@ terminology-1.0.0|EFL-based terminal emulator (1.0.0), terminology-1.8.1|EFL-based terminal emulator (1.8.1), km@, cvvis@, flash@, initc@, kcbt=\E[Z, rmm@, smm@, Ms@, - use=ecma+index, use=xterm+256setaf, use=ansi+rep, - use=ecma+strikeout, use=xterm+sm+1006, + use=linux+kbs, use=ecma+index, use=xterm+256setaf, + use=ansi+rep, use=ecma+strikeout, use=xterm+sm+1006, use=xterm+pcfkeys, use=xterm+tmux, use=vt220+cvis, use=ecma+italics, use=xterm-basic, use=report+version, @@ -8063,9 +8072,9 @@ domterm|DomTerm web client, bel@, blink@, dim@, invis@, kcbt=\E[Z, ritm@, rmkx=\E[?1l, sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%| %t;7%;m, - sitm@, smkx=\E[?1h, use=xterm+256setaf, use=ecma+index, - use=xterm+sm+1006, use=xterm+pcfkeys, use=xterm-basic, - use=bracketed+paste, + sitm@, smkx=\E[?1h, use=linux+kbs, use=xterm+256setaf, + use=ecma+index, use=xterm+sm+1006, use=xterm+pcfkeys, + use=xterm-basic, use=bracketed+paste, ######## UNIX VIRTUAL TERMINALS, VIRTUAL CONSOLES, AND TELNET CLIENTS # @@ -27816,4 +27825,8 @@ v3220|LANPAR Vision II model 3220/3221/3222, # 2023-06-05 # + add xterm+focus to foot+base (patch by Daniel Ekloef). # +# 2023-07-08 +# + add linux+kbs for terminals which imitate xterm's behavior with +# Linux -TD +# ######## SHANTIH! SHANTIH! SHANTIH! diff --git a/ncurses/tinfo/write_entry.c b/ncurses/tinfo/write_entry.c index 9de73364..586b1dde 100644 --- a/ncurses/tinfo/write_entry.c +++ b/ncurses/tinfo/write_entry.c @@ -42,7 +42,7 @@ #include -MODULE_ID("$Id: write_entry.c,v 1.127 2023/05/27 20:13:10 tom Exp $") +MODULE_ID("$Id: write_entry.c,v 1.130 2023/07/08 14:00:24 tom Exp $") #if 1 #define TRACE_OUT(p) DEBUG(2, p) @@ -95,12 +95,12 @@ write_file(char *filename, TERMTYPE2 *tp) int myerr = ferror(fp) ? errno : 0; if (myerr) { _nc_syserr_abort("error writing %s/%s: %s", - _nc_tic_dir(0), + _nc_tic_dir(NULL), filename, strerror(myerr)); } else { _nc_syserr_abort("error writing %s/%s: %u bytes vs actual %lu", - _nc_tic_dir(0), + _nc_tic_dir(NULL), filename, offset, (unsigned long) actual); @@ -133,7 +133,7 @@ check_writeable(int code) } else if (!verified[s - dirnames]) { _nc_SPRINTF(dir, _nc_SLIMIT(sizeof(dir)) LEAF_FMT, code); if (make_db_root(dir) < 0) { - _nc_err_abort("%s/%s: permission denied", _nc_tic_dir(0), dir); + _nc_err_abort("%s/%s: permission denied", _nc_tic_dir(NULL), dir); } else { verified[s - dirnames] = TRUE; } @@ -145,7 +145,7 @@ static int make_db_path(char *dst, const char *src, size_t limit) { int rc = -1; - const char *top = _nc_tic_dir(0); + const char *top = _nc_tic_dir(NULL); if (src == top || _nc_is_abs_path(src)) { if (strlen(src) + 1 <= limit) { @@ -222,22 +222,30 @@ _nc_set_writedir(const char *dir) { const char *destination; char actual[PATH_MAX]; + bool specific = (dir != NULL); - if (dir == 0 && use_terminfo_vars()) + if (!specific && use_terminfo_vars()) dir = getenv("TERMINFO"); - if (dir != 0) + if (dir != NULL) (void) _nc_tic_dir(dir); - destination = _nc_tic_dir(0); + destination = _nc_tic_dir(NULL); if (make_db_root(destination) < 0) { - char *home = _nc_home_terminfo(); + bool success = FALSE; - if (home != 0) { - destination = home; - if (make_db_root(destination) < 0) - _nc_err_abort("%s: permission denied (errno %d)", - destination, errno); + if (!specific) { + char *home = _nc_home_terminfo(); + + if (home != NULL) { + destination = home; + if (make_db_root(destination) == 0) + success = TRUE; + } + } + if (!success) { + _nc_err_abort("%s: permission denied (errno %d)", + destination, errno); } } @@ -249,7 +257,7 @@ _nc_set_writedir(const char *dir) make_db_path(actual, destination, sizeof(actual)); #else if (chdir(_nc_tic_dir(destination)) < 0 - || getcwd(actual, sizeof(actual)) == 0) + || getcwd(actual, sizeof(actual)) == NULL) _nc_err_abort("%s: not a directory", destination); #endif _nc_keep_tic_dir(actual); @@ -350,10 +358,10 @@ _nc_write_entry(TERMTYPE2 *const tp) #if USE_HASHED_DB if (_nc_write_object(tp, buffer + 1, &offset, limit - 1) != ERR) { - DB *capdb = _nc_db_open(_nc_tic_dir(0), TRUE); + DB *capdb = _nc_db_open(_nc_tic_dir(NULL), TRUE); DBT key, data; - if (capdb != 0) { + if (capdb != NULL) { buffer[0] = 0; memset(&key, 0, sizeof(key)); @@ -450,7 +458,7 @@ _nc_write_entry(TERMTYPE2 *const tp) if (stat(filename, &statbuf) == -1 || (start_time = statbuf.st_mtime) == 0) { _nc_syserr_abort("error obtaining time from %s/%s", - _nc_tic_dir(0), filename); + _nc_tic_dir(NULL), filename); } } while (*other_names != '\0') { @@ -465,7 +473,7 @@ _nc_write_entry(TERMTYPE2 *const tp) _nc_warning("terminal alias %s too long.", ptr); continue; } - if (strchr(ptr, '/') != 0) { + if (strchr(ptr, '/') != NULL) { _nc_warning("cannot link alias %s.", ptr); continue; } diff --git a/ncurses/win32con/win_driver.c b/ncurses/win32con/win_driver.c index 9822f125..59da0e86 100644 --- a/ncurses/win32con/win_driver.c +++ b/ncurses/win32con/win_driver.c @@ -55,7 +55,9 @@ #define CUR TerminalType(my_term). -MODULE_ID("$Id: win_driver.c,v 1.70 2023/02/12 00:31:33 tom Exp $") +#define CONTROL_PRESSED (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED) + +MODULE_ID("$Id: win_driver.c,v 1.71 2023/07/08 19:53:51 tom Exp $") #define TypeAlloca(type,count) (type*) _alloca(sizeof(type) * (size_t) (count)) @@ -82,33 +84,34 @@ static bool okConsoleHandle(TERMINAL_CONTROL_BLOCK *); #define write_screen WriteConsoleOutput #define read_screen ReadConsoleOutput #endif - +/* *INDENT-OFF* */ static const LONG keylist[] = { - GenMap(VK_PRIOR, KEY_PPAGE), - GenMap(VK_NEXT, KEY_NPAGE), - GenMap(VK_END, KEY_END), - GenMap(VK_HOME, KEY_HOME), - GenMap(VK_LEFT, KEY_LEFT), - GenMap(VK_UP, KEY_UP), - GenMap(VK_RIGHT, KEY_RIGHT), - GenMap(VK_DOWN, KEY_DOWN), + GenMap(VK_PRIOR, KEY_PPAGE), + GenMap(VK_NEXT, KEY_NPAGE), + GenMap(VK_END, KEY_END), + GenMap(VK_HOME, KEY_HOME), + GenMap(VK_LEFT, KEY_LEFT), + GenMap(VK_UP, KEY_UP), + GenMap(VK_RIGHT, KEY_RIGHT), + GenMap(VK_DOWN, KEY_DOWN), GenMap(VK_DELETE, KEY_DC), GenMap(VK_INSERT, KEY_IC) }; static const LONG ansi_keys[] = { - GenMap(VK_PRIOR, 'I'), - GenMap(VK_NEXT, 'Q'), - GenMap(VK_END, 'O'), - GenMap(VK_HOME, 'H'), - GenMap(VK_LEFT, 'K'), - GenMap(VK_UP, 'H'), - GenMap(VK_RIGHT, 'M'), - GenMap(VK_DOWN, 'P'), + GenMap(VK_PRIOR, 'I'), + GenMap(VK_NEXT, 'Q'), + GenMap(VK_END, 'O'), + GenMap(VK_HOME, 'H'), + GenMap(VK_LEFT, 'K'), + GenMap(VK_UP, 'H'), + GenMap(VK_RIGHT, 'M'), + GenMap(VK_DOWN, 'P'), GenMap(VK_DELETE, 'S'), GenMap(VK_INSERT, 'R') }; +/* *INDENT-ON* */ #define N_INI ((int)array_length(keylist)) #define FKEYS 24 #define MAPSIZE (FKEYS + N_INI) @@ -2126,9 +2129,9 @@ _nc_mingw_console_read( *buf = (int) inp_rec.Event.KeyEvent.uChar.AsciiChar; vk = inp_rec.Event.KeyEvent.wVirtualKeyCode; /* - * There are 24 virtual function-keys, and typically - * 12 function-keys on a keyboard. Use the shift-modifier - * to provide the remaining 12 keys. + * There are 24 virtual function-keys (defined in winuser.h), + * and typically 12 function-keys on a keyboard. Use the + * shift-modifier to provide the remaining keys. */ if (vk >= VK_F1 && vk <= VK_F12) { if (inp_rec.Event.KeyEvent.dwControlKeyState & SHIFT_PRESSED) { @@ -2145,6 +2148,11 @@ _nc_mingw_console_read( ungetch('\0'); *buf = AnsiKey(vk); } + } else if (vk == VK_BACK) { + if (!(inp_rec.Event.KeyEvent.dwControlKeyState + & (SHIFT_PRESSED | CONTROL_PRESSED))) { + *buf = KEY_BACKSPACE; + } } break; } else if (inp_rec.EventType == MOUSE_EVENT) { diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog index 72cab5b3..fc1907b5 100644 --- a/package/debian-mingw/changelog +++ b/package/debian-mingw/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.4+20230701) unstable; urgency=low +ncurses6 (6.4+20230708) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 01 Jul 2023 05:47:16 -0400 + -- Thomas E. Dickey Sat, 08 Jul 2023 08:03:11 -0400 ncurses6 (5.9+20131005) unstable; urgency=low diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog index 72cab5b3..fc1907b5 100644 --- a/package/debian-mingw64/changelog +++ b/package/debian-mingw64/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.4+20230701) unstable; urgency=low +ncurses6 (6.4+20230708) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 01 Jul 2023 05:47:16 -0400 + -- Thomas E. Dickey Sat, 08 Jul 2023 08:03:11 -0400 ncurses6 (5.9+20131005) unstable; urgency=low diff --git a/package/debian/changelog b/package/debian/changelog index b346442d..a98efd07 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.4+20230701) unstable; urgency=low +ncurses6 (6.4+20230708) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 01 Jul 2023 05:47:16 -0400 + -- Thomas E. Dickey Sat, 08 Jul 2023 08:03:11 -0400 ncurses6 (5.9+20120608) unstable; urgency=low diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi index 46521d3d..e35dd5a1 100644 --- a/package/mingw-ncurses.nsi +++ b/package/mingw-ncurses.nsi @@ -1,4 +1,4 @@ -; $Id: mingw-ncurses.nsi,v 1.593 2023/07/01 09:47:16 tom Exp $ +; $Id: mingw-ncurses.nsi,v 1.594 2023/07/08 12:03:11 tom Exp $ ; TODO add examples ; TODO bump ABI to 6 @@ -10,7 +10,7 @@ !define VERSION_MAJOR "6" !define VERSION_MINOR "4" !define VERSION_YYYY "2023" -!define VERSION_MMDD "0701" +!define VERSION_MMDD "0708" !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} !define MY_ABI "5" diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec index 66724d7f..0156a443 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.4 -Release: 20230701 +Release: 20230708 License: X11 Group: Development/Libraries URL: https://invisible-island.net/ncurses/ diff --git a/package/ncurses.spec b/package/ncurses.spec index 5455e0df..8baf53b8 100644 --- a/package/ncurses.spec +++ b/package/ncurses.spec @@ -1,7 +1,7 @@ Summary: shared libraries for terminal handling Name: ncurses6 Version: 6.4 -Release: 20230701 +Release: 20230708 License: X11 Group: Development/Libraries URL: https://invisible-island.net/ncurses/ diff --git a/package/ncursest.spec b/package/ncursest.spec index fc20818b..c6b6485c 100644 --- a/package/ncursest.spec +++ b/package/ncursest.spec @@ -1,7 +1,7 @@ Summary: Curses library with POSIX thread support. Name: ncursest6 Version: 6.4 -Release: 20230701 +Release: 20230708 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz -- 2.45.0