From 96b07cbedc39c97eca2f93e2d6a33e6cdb07b5656aa9a65b7a1ab8c070ea164c Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 23 Jun 2022 08:22:02 +0000 Subject: [PATCH] Updating link to change in openSUSE:Factory/ncurses revision 218.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=b5e3014ca2c6b96892246f925b835290 --- ncurses-5.9-ibm327x.dif | 2 +- ncurses-6.3-patches.tar.bz2 | 4 ++-- ncurses-6.3.dif | 44 ++++++++++++++++++------------------- ncurses-rpmlintrc | 1 + ncurses.changes | 11 ++++++++++ 5 files changed, 37 insertions(+), 25 deletions(-) diff --git a/ncurses-5.9-ibm327x.dif b/ncurses-5.9-ibm327x.dif index 726ca20..5409bf2 100644 --- a/ncurses-5.9-ibm327x.dif +++ b/ncurses-5.9-ibm327x.dif @@ -4,7 +4,7 @@ --- misc/terminfo.src +++ misc/terminfo.src 2018-10-29 10:23:47.271511864 +0000 -@@ -17905,8 +17905,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv +@@ -17947,8 +17947,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv # ibm327x|line mode IBM 3270 style, diff --git a/ncurses-6.3-patches.tar.bz2 b/ncurses-6.3-patches.tar.bz2 index ed2af46..e7774b8 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:08eb06a6fcfc421c79d9e9d9df0f1d965d8f371bb97e11e19c4be4612c713088 -size 978080 +oid sha256:74b1b003c9520e5a96745ba8e9a8ce57dda20640460bf21a1088f8925440c411 +size 981431 diff --git a/ncurses-6.3.dif b/ncurses-6.3.dif index 3acd54d..dcd7ad8 100644 --- a/ncurses-6.3.dif +++ b/ncurses-6.3.dif @@ -459,7 +459,7 @@ gn, use=dumb, lpr|printer|line printer, OTbs, hc, os, -@@ -1018,9 +1020,15 @@ linux-c|Linux console 1.3.6+ for older n +@@ -1024,9 +1026,15 @@ linux-c|Linux console 1.3.6+ for older n # The 2.2.x kernels add a private mode that sets the cursor type; use that to # get a block cursor for cvvis. # reported by Frank Heckenbach . @@ -474,17 +474,17 @@ - cvvis=\E[?25h\E[?8c, use=linux-c-nc, + cvvis=\E[?25h\E[?0c, use=linux-c-nc, - # Linux 2.6.x has a fix for SI/SO to work with UTF-8 encoding added here: - # http://lkml.iu.edu/hypermail/linux/kernel/0602.2/0738.html -@@ -1053,6 +1061,7 @@ linux2.6|Linux 2.6.x console, + # release 2.6: 2003/12 - 2004/12 + # +@@ -1061,6 +1069,7 @@ linux2.6|Linux 2.6.x console, acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy yzz{{||}}~~, enacs=\E)0, rmacs=^O, -+ cvvis=\E[?25h\E[?8c, ++ cvvis=\E[?25h\E[?0c, 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, -@@ -5304,7 +5313,7 @@ xterm+88color2|xterm 88-color feature, +@@ -5346,7 +5355,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, @@ -493,7 +493,7 @@ xterm-88color|xterm with 88 colors, use=xterm+osc104, use=xterm+88color, use=xterm-256color, -@@ -5582,8 +5591,26 @@ xterm-noapp|xterm with cursor keys in no +@@ -5624,8 +5633,26 @@ 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, @@ -520,7 +520,7 @@ use=xterm-new, # This entry assumes that xterm's handling of VT100 SI/SO is disabled by -@@ -5984,7 +6011,7 @@ xterms-sun|small (80x24) xterm with sunF +@@ -6026,7 +6053,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, -@@ -6271,10 +6298,14 @@ mgt|Multi GNOME Terminal, +@@ -6313,10 +6340,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) # -@@ -6526,7 +6557,7 @@ mlterm3|multi lingual terminal emulator +@@ -6568,7 +6599,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, -@@ -6603,7 +6634,7 @@ rxvt-basic|rxvt terminal base (X Window +@@ -6645,7 +6676,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, -@@ -6698,8 +6729,8 @@ rxvt-basic|rxvt terminal base (X Window +@@ -6740,8 +6771,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~, -@@ -6787,6 +6818,38 @@ rxvt-cygwin-native|rxvt terminal emulato +@@ -6829,6 +6860,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, -@@ -6851,7 +6914,7 @@ Eterm|Eterm-color|Eterm with xterm-style +@@ -6893,7 +6956,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=, -@@ -7965,7 +8028,7 @@ pty|4bsd pseudo teletype, +@@ -8007,7 +8070,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, -@@ -7978,6 +8041,13 @@ eterm|GNU Emacs term.el terminal emulati +@@ -8020,6 +8083,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, -@@ -8105,7 +8175,7 @@ screen|VT 100/ANSI X3.64 virtual termina +@@ -8147,7 +8217,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~, -@@ -8222,9 +8292,16 @@ screen.xterm-xfree86|screen.xterm-new|sc +@@ -8264,9 +8334,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, -@@ -8312,7 +8389,7 @@ screen2|VT 100/ANSI X3.64 virtual termin +@@ -8354,7 +8431,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, -@@ -10269,7 +10346,7 @@ hp700-wy|HP 700/41 emulating Wyse30, +@@ -10311,7 +10388,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, -@@ -17915,7 +17992,7 @@ ibm3101|i3101|IBM 3101-10, +@@ -17957,7 +18034,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 -@@ -18173,7 +18250,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De +@@ -18215,7 +18292,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-rpmlintrc b/ncurses-rpmlintrc index bc5e25f..f22d503 100644 --- a/ncurses-rpmlintrc +++ b/ncurses-rpmlintrc @@ -4,3 +4,4 @@ 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.*") diff --git a/ncurses.changes b/ncurses.changes index 479b8f9..ebf2c18 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Jun 20 07:21:22 UTC 2022 - Dr. Werner Fink + +- Add ncurses patch 20220618 + + add a null-pointer check for term_names field in copy_termtype(), + needed for MinGW port (report by Peiyuan Song, cf: 20220521). + + revise kon/kon2/jfbterm to undo "linux2.6" change to + smacs/rmacs/enacs (Debian #1012800) -TD + + amended note for att610+cvis0, as per documentation for att610, + att620, att730 -TD + ------------------------------------------------------------------- Mon Jun 13 08:13:13 UTC 2022 - Dr. Werner Fink