Accepting request 1099048 from Base:System

- Add ncurses patch 20230715
  + correct wadd_wch_literal() when adding a non-spacing character to a
    double-width character.
  + improve manual page for curs_util.
  + improve manual page for wadd_wch().

- Add ncurses 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).
- Port the patch ncurses-6.4.dif

OBS-URL: https://build.opensuse.org/request/show/1099048
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ncurses?expand=0&rev=244
This commit is contained in:
Dominique Leuenberger 2023-07-29 18:09:45 +00:00 committed by Git OBS Bridge
commit d97dc3c081
5 changed files with 52 additions and 30 deletions

View File

@ -4,7 +4,7 @@
--- misc/terminfo.src
+++ misc/terminfo.src 2018-10-29 10:23:47.271511864 +0000
@@ -18072,8 +18072,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv
@@ -18081,8 +18081,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv
#
ibm327x|line mode IBM 3270 style,

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:267ecc41bbee74974fdfc0f9bd59a35168e38f8742bd576709895a7c111044d4
size 867179
oid sha256:edff0348c7ddd30f86dd56db0cc132d349e114352f7a3792fbfd50d2f62d6264
size 914761

View File

@ -452,7 +452,7 @@
if [ $name = $MAIN_LIBRARY ]
--- misc/terminfo.src
+++ misc/terminfo.src 2023-01-23 13:00:47.043268809 +0000
+++ misc/terminfo.src 2023-07-11 06:28:14.087199913 +0000
@@ -305,7 +305,9 @@ dumb|80-column dumb tty,
am,
cols#80,
@ -489,16 +489,16 @@
sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5
%t;2%;%?%p6%t;1%;m%?%p9%t\016%e\017%;,
sgr0=\E[m\017, smacs=^N, use=linux2.2,
@@ -5020,7 +5029,7 @@ xterm-new|modern xterm terminal emulator
# This fragment is for people who cannot agree on what the backspace key
# should send.
@@ -5024,7 +5033,7 @@ xterm-new|modern xterm terminal emulator
# 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,
+ kbs=^?,
#
# This fragment describes as much of XFree86 xterm's "pc-style" function
# keys as will fit into terminfo's 60 function keys.
@@ -5402,7 +5411,7 @@ xterm+88color2|xterm 88-color feature,
# Use this fragment for terminals that always use DEL for "backspace".
linux+kbs|fragment for "backspace" key,
@@ -5410,7 +5419,7 @@ xterm+88color2|xterm 88-color feature,
# These variants of XFree86 3.9.16 xterm are built as a configure option.
xterm-256color|xterm with 256 colors,
@ -507,7 +507,7 @@
xterm-88color|xterm with 88 colors,
use=xterm+osc104, use=xterm+88color,
use=xterm-256color,
@@ -5680,9 +5689,25 @@ xterm-noapp|xterm with cursor keys in no
@@ -5688,9 +5697,25 @@ xterm-noapp|xterm with cursor keys in no
xterm-24|vs100|xterms|xterm terminal emulator 24-line (X Window System),
lines#24, use=xterm-old,
@ -534,7 +534,7 @@
# This entry assumes that xterm's handling of VT100 SI/SO is disabled by
# setting the vt100Graphics resource to false.
@@ -6111,7 +6136,7 @@ xterms-sun|small (80x24) xterm with sunF
@@ -6119,7 +6144,7 @@ xterms-sun|small (80x24) xterm with sunF
#### GNOME (VTE)
# this describes the alpha-version of GNOME terminal shipped with Redhat 6.0
@ -542,15 +542,16 @@
+gnome-rh62|GNOME terminal on Red Hat,
bce,
kdch1=^?, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
use=xterm-color,
@@ -6400,10 +6425,14 @@ mgt|Multi GNOME Terminal,
use=linux+kbs, use=xterm-color,
@@ -6408,11 +6433,15 @@ 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).
-kvt|KDE terminal,
+kvt-rh|KDE terminal,
+kvt-rh|KDE terminal on Red Hat,
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,
+# This is kvt for SuSE because we do not support BrokenByDesign[tm].
+kvt|KDE terminal,
@ -559,7 +560,7 @@
# Konsole 1.0.1 (2001/11/25)
# (formerly known as kvt)
#
@@ -6657,7 +6686,7 @@ mlterm3|multi lingual terminal emulator
@@ -6666,7 +6695,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,
@ -568,7 +569,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,
@@ -6733,7 +6762,7 @@ rxvt-basic|rxvt terminal base (X Window
@@ -6742,7 +6771,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,
@ -577,7 +578,7 @@
kcbt=\E[Z, kmous=\E[M, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O,
rmir=\E[4l, rmkx=\E>, rmso=\E[27m, rmul=\E[24m,
rs1=\E>\E[1;3;4;5;6l\E[?7h\E[m\E[r\E[2J\E[H,
@@ -6827,8 +6856,8 @@ rxvt-basic|rxvt terminal base (X Window
@@ -6836,8 +6865,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,
@ -588,7 +589,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~,
@@ -6916,6 +6945,38 @@ rxvt-cygwin-native|rxvt terminal emulato
@@ -6925,6 +6954,38 @@ rxvt-cygwin-native|rxvt terminal emulato
\302x\263y\363z\362{\343|\330~\376,
use=rxvt-cygwin,
@ -627,7 +628,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,
@@ -6980,7 +7041,7 @@ Eterm|Eterm-color|Eterm with xterm-style
@@ -6989,7 +7050,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@,
@ -636,7 +637,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, rmir=\E[4l, rmkx=, rmso=\E[27m, rmul=\E[24m,
@@ -8096,7 +8157,7 @@ pty|4bsd pseudo teletype,
@@ -8105,7 +8166,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
@ -645,7 +646,7 @@
am, mir, xenl,
cols#80, lines#24,
bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=\r,
@@ -8108,6 +8169,13 @@ eterm|GNU Emacs term.el terminal emulati
@@ -8117,6 +8178,13 @@ eterm|GNU Emacs term.el terminal emulati
il=\E[%p1%dL, il1=\E[L, ind=\n, rev=\E[7m, rmir=\E[4l,
rmso=\E[m, rmul=\E[m, sgr0=\E[m, smir=\E[4h, smso=\E[7m,
smul=\E[4m, use=xterm+alt47, use=ansi+cpr,
@ -659,7 +660,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,
@@ -8356,11 +8424,18 @@ screen.xterm-xfree86|screen.xterm-new|sc
@@ -8365,11 +8433,18 @@ screen.xterm-xfree86|screen.xterm-new|sc
E3@, use=screen+italics, use=screen+fkeys,
use=xterm+x11mouse, use=ecma+index, use=ansi+rep,
use=ecma+strikeout, use=xterm+pcfkeys,
@ -679,7 +680,7 @@
# xterm-r6 does not really support khome/kend unless it is propped up by
# the translations resource.
@@ -8451,7 +8526,7 @@ screen2|VT 100/ANSI X3.64 virtual termin
@@ -8460,7 +8535,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,
@ -688,7 +689,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,
@@ -10428,7 +10503,7 @@ hp700-wy|HP 700/41 emulating Wyse30,
@@ -10437,7 +10512,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,
@ -697,7 +698,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,
@@ -18082,7 +18157,7 @@ ibm3101|i3101|IBM 3101-10,
@@ -18091,7 +18166,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,
@ -706,7 +707,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
@@ -18340,7 +18415,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De
@@ -18349,7 +18424,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.

View File

@ -1,7 +1,6 @@
addFilter(".*files-duplicate.*")
addFilter(".*non-etc-or-var-file-marked-as-conffile.*")
addFilter(".*macro-in-comment.*jobs.*")
addFilter(".*E:.*shared-lib.*-without-dependency-information.*/libtinfow\.so\..*")
addFilter(".*E:.*no-library-dependency-for.*/usr/lib.*/ncurses5/\.\./libform\.so\.5.*")
addFilter(".*E:.*obsolete-suse-version-check.*")
addFilter(".*terminfo.*E:.no-binary.*")

View File

@ -1,3 +1,25 @@
-------------------------------------------------------------------
Mon Jul 17 06:12:22 UTC 2023 - Dr. Werner Fink <werner@suse.de>
- Add ncurses patch 20230715
+ correct wadd_wch_literal() when adding a non-spacing character to a
double-width character.
+ improve manual page for curs_util.
+ improve manual page for wadd_wch().
-------------------------------------------------------------------
Mon Jul 10 14:08:50 UTC 2023 - Dr. Werner Fink <werner@suse.de>
- Add ncurses 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).
- Port the patch ncurses-6.4.dif
-------------------------------------------------------------------
Mon Jul 3 07:27:16 UTC 2023 - Dr. Werner Fink <werner@suse.de>