diff --git a/ncurses-6.3-patches.tar.bz2 b/ncurses-6.3-patches.tar.bz2 index 12d96e8..647bf72 100644 --- a/ncurses-6.3-patches.tar.bz2 +++ b/ncurses-6.3-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:163ae56687dd15e1515e7efd57e575af52c7519b4a2bd2f3551fdd0a16c41593 -size 868948 +oid sha256:8a76f02e0dfccf86be9b0f05199f0f25ab78f4191574c07a5f66df35e4b0b4a6 +size 870892 diff --git a/ncurses-6.3.dif b/ncurses-6.3.dif index 9f30364..774c30f 100644 --- a/ncurses-6.3.dif +++ b/ncurses-6.3.dif @@ -484,7 +484,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, -@@ -5487,8 +5496,26 @@ xterm-noapp|xterm with cursor keys in no +@@ -5208,7 +5217,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, +- use=xterm+osc104, use=xterm+256color, use=xterm-new, ++ use=xterm+osc104, use=xterm+256color, use=xterm-suse, + xterm-88color|xterm with 88 colors, + use=xterm+osc104, use=xterm+88color, + use=xterm-256color, +@@ -5486,8 +5495,26 @@ xterm-noapp|xterm with cursor keys in no xterm-24|vs100|xterms|xterm terminal emulator (X Window System), lines#24, use=xterm-old, @@ -511,7 +520,7 @@ use=xterm-new, # This entry assumes that xterm's handling of VT100 SI/SO is disabled by -@@ -5854,7 +5881,7 @@ xterms-sun|small (80x24) xterm with sunF +@@ -5877,7 +5904,7 @@ xterms-sun|small (80x24) xterm with sunF #### GNOME (VTE) # this describes the alpha-version of GNOME terminal shipped with Redhat 6.0 @@ -520,7 +529,7 @@ bce, kdch1=^?, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, use=xterm-color, -@@ -6126,10 +6153,14 @@ mgt|Multi GNOME Terminal, +@@ -6152,10 +6179,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). @@ -536,7 +545,7 @@ # Konsole 1.0.1 (2001/11/25) # (formerly known as kvt) # -@@ -6381,7 +6412,7 @@ mlterm3|multi lingual terminal emulator, +@@ -6407,7 +6438,7 @@ mlterm3|multi lingual terminal emulator, mlterm2|multi lingual terminal emulator, am, eslok, km, mc5i, mir, msgr, npc, xenl, XT, colors#8, cols#80, it#8, lines#24, pairs#64, @@ -545,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, -@@ -6458,7 +6489,7 @@ rxvt-basic|rxvt terminal base (X Window +@@ -6484,7 +6515,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, @@ -554,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, -@@ -6553,8 +6584,8 @@ rxvt-basic|rxvt terminal base (X Window +@@ -6579,8 +6610,8 @@ rxvt-basic|rxvt terminal base (X Window # Removed kDN6, etc (control+shift) since rxvt does not implement this -TD rxvt+pcfkeys|fragment for PC-style fkeys, kDC=\E[3$, kEND=\E[8$, kHOM=\E[7$, kIC=\E[2$, kLFT=\E[d, @@ -565,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~, -@@ -6644,6 +6675,38 @@ rxvt-cygwin-native|rxvt terminal emulato +@@ -6670,6 +6701,38 @@ rxvt-cygwin-native|rxvt terminal emulato \302x\263y\363z\362{\343|\330~\376, use=rxvt-cygwin, @@ -604,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, -@@ -6708,7 +6771,7 @@ Eterm|Eterm-color|Eterm with xterm-style +@@ -6734,7 +6797,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@, @@ -613,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=, -@@ -7818,7 +7881,7 @@ pty|4bsd pseudo teletype, +@@ -7848,7 +7911,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 @@ -622,7 +631,7 @@ am, mir, xenl, cols#80, lines#24, bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=\r, -@@ -7831,6 +7894,13 @@ eterm|GNU Emacs term.el terminal emulati +@@ -7861,6 +7924,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, @@ -636,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, -@@ -7958,7 +8028,7 @@ screen|VT 100/ANSI X3.64 virtual termina +@@ -7988,7 +8058,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, @@ -645,8 +654,12 @@ 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~, -@@ -8078,6 +8148,13 @@ screen.xterm-xfree86|screen.xterm-new|sc - use=xterm+x11mouse, use=xterm-p370, +@@ -8105,9 +8175,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, +- use=xterm+x11mouse, use=xterm-p370, ++ use=xterm+x11mouse, use=xterm-suse, #:screen.xterm|screen for modern xterm, #: use=screen.xterm-new, +screen.xterm|screen customized for modern xterm, @@ -659,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, -@@ -8165,7 +8242,7 @@ screen2|VT 100/ANSI X3.64 virtual termin +@@ -8195,7 +8272,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, @@ -668,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, -@@ -10140,7 +10217,7 @@ hp700-wy|HP 700/41 emulating Wyse30, +@@ -10168,7 +10245,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, @@ -677,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, -@@ -17786,7 +17863,7 @@ ibm3101|i3101|IBM 3101-10, +@@ -17814,7 +17891,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, @@ -686,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 -@@ -18044,7 +18121,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De +@@ -18072,7 +18149,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. diff --git a/ncurses.changes b/ncurses.changes index 9a9fccb..ff2ed7e 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Mon Mar 21 13:52:37 UTC 2022 - Dr. Werner Fink + +- Make extended status line support of xterm a switch (boo#1197313) + +------------------------------------------------------------------- +Mon Mar 21 07:42:20 UTC 2022 - Dr. Werner Fink + +- Add ncurses patch 20220319 + + add xgterm -TD + + correct setal in mintty/tmux entries, add to vte-2018 (report by + Robert Lange) + + add blink to vte-2018 (report by Robert Lange) + + improve tic warning about XT versus redundant tsl, etc. + ------------------------------------------------------------------- Mon Mar 14 07:21:10 UTC 2022 - Dr. Werner Fink diff --git a/ncurses.spec b/ncurses.spec index e23b408..361e01b 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -27,6 +27,7 @@ %bcond_with ada %bcond_with libbsd %bcond_with usepcre2 +%bcond_with xtermdsl %if %{with onlytinfo} %global soname_tinfo tinfo @@ -349,6 +350,9 @@ mv tack-* tack %patch1 -p0 -b .327x %patch2 -p0 -b .hs %patch0 -p0 -b .p0 +%if ! %{with xtermdsl} +sed -ri '/^xterm-suse/,/use=/{s/use=xterm-new/use=xterm-p370/;}' misc/terminfo.src +%endif %build #