Update to 6.1-20191026

OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=449
2019-10-28 10:05:20 +00:00 · 2019-10-28 10:05:20 +00:00 · ed0ebf424c
commit ed0ebf424c
parent eee3264944
3 changed files with 43 additions and 31 deletions
--- a/ncurses-6.1-patches.tar.bz2
+++ b/ncurses-6.1-patches.tar.bz2
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b400fba7133897bd151f9f3eac34fc35148232347c7fc9f09ddd6e9c371e1476
-size 1895002
+oid sha256:512162e3b7d6ed1b8a5d452f3311c91bb61befa38c9c1e9c6699f6b943625960
+size 1899740
--- a/ncurses-6.1.dif
+++ b/ncurses-6.1.dif
@ -426,7 +426,7 @@
 	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,
-@@ -2484,6 +2493,7 @@ vt132|DEC vt132,
+@@ -2490,6 +2499,7 @@ vt132|DEC vt132,
 # at the top of the keyboard.  The "DO" key is used as F10 to avoid conflict
 # with the key marked (ESC) on the vt220.  See vt220d for an alternate mapping.
 # PF1--PF4 are used as F1--F4.
@ -434,7 +434,7 @@
 #
 # added msgr -TD
 vt220-old|vt200-old|DEC VT220 in vt100 emulation mode,
-@@ -2494,7 +2504,7 @@ vt220-old|vt200-old|DEC VT220 in vt100 e
+@@ -2500,7 +2510,7 @@ vt220-old|vt200-old|DEC VT220 in vt100 e
 	bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>, civis=\E[?25l,
 	clear=\E[H\E[2J$<50>, cnorm=\E[?25h, cr=\r,
 	csr=\E[%i%p1%d;%p2%dr, cub1=^H, cud1=\E[B, cuf1=\E[C,
@ -443,7 +443,7 @@
 	dl1=\E[M, ed=\E[J$<50>, el=\E[K$<3>, home=\E[H, ht=^I,
 	if=/usr/share/tabset/vt100, il1=\E[L, ind=\ED$<20/>,
 	is2=\E[1;24r\E[24;1H, kbs=^H, kcub1=\E[D, kcud1=\E[B,
-@@ -2655,6 +2665,7 @@ vt320nam|v320n|DEC VT320 in vt100 emul.
+@@ -2661,6 +2671,7 @@ vt320nam|v320n|DEC VT320 in vt100 emul.
 # to SMASH the 1k-barrier...
 # From: Adam Thompson <athompso@pangea.ca> Sept 10 1995
 # (vt320: uncommented <fsl> --esr)
@ -451,7 +451,7 @@
 vt320|vt300|dec vt320 7 bit terminal,
 	am, hs, mir, msgr, xenl,
 	cols#80, lines#24, wsl#80,
-@@ -2664,7 +2675,7 @@ vt320|vt300|dec vt320 7 bit terminal,
+@@ -2670,7 +2681,7 @@ vt320|vt300|dec vt320 7 bit terminal,
 	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,
 	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
@ -460,7 +460,7 @@
 	ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, home=\E[H, ht=^I,
 	hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=\ED,
 	is2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r\E[24;1H,
-@@ -4084,6 +4095,7 @@ mintty+common|shared capabilities for mi
+@@ -4090,6 +4101,7 @@ mintty+common|shared capabilities for mi
 # retrieving the window title, and for setting the window size (i.e., using
 # "resize -s"), though it does not pass SIGWINCH to the application if the
 # user resizes the window with the mouse.
@ -468,7 +468,7 @@
 teraterm2.3|Tera Term Pro,
 	km,
 	ncv#43, vt@,
-@@ -4092,7 +4104,7 @@ teraterm2.3|Tera Term Pro,
+@@ -4098,7 +4110,7 @@ teraterm2.3|Tera Term Pro,
 	     \264v\301w\302x\263y\363z\362{\343|\330}\234~\376,
 	blink=\E[5m, bold=\E[1m, civis=\E[?25l, clear=\E[H\E[J,
 	cnorm=\E[?25h, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
@ -477,7 +477,7 @@
 	dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
 	flash=\E[?5h$<200/>\E[?5l, hpa=\E[%i%p1%dG,
 	il=\E[%p1%dL, il1=\E[L, kdch1=\E[3~, kf1=\E[11~,
-@@ -4400,6 +4412,7 @@ xterm-old|antique xterm version,
+@@ -4406,6 +4418,7 @@ xterm-old|antique xterm version,
 	use=xterm-r6,
 # This is the base xterm entry for the xterm supplied with XFree86 3.2 & up.
 # The name has been changed and some aliases have been removed.
@ -485,7 +485,7 @@
 xterm-xf86-v32|xterm terminal emulator (XFree86 3.2 Window System),
 	OTbs, am, bce, km, mir, msgr, xenl, XT,
 	cols#80, it#8, lines#24, ncv@,
-@@ -4409,7 +4422,7 @@ xterm-xf86-v32|xterm terminal emulator (
+@@ -4415,7 +4428,7 @@ xterm-xf86-v32|xterm terminal emulator (
 	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,
 	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
@ -494,7 +494,7 @@
 	ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E(B\E)0,
 	flash=\E[?5h$<100/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG,
 	ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL,
-@@ -5046,8 +5059,26 @@ xterm-noapp|xterm with cursor keys in no
+@@ -5052,8 +5065,26 @@ xterm-noapp|xterm with cursor keys in no
 xterm-24|vs100|xterms|xterm terminal emulator (X Window System),
 	lines#24, use=xterm-old,
 
@ -521,7 +521,7 @@
 	use=xterm-new,
 
 # This entry assumes that xterm's handling of VT100 SI/SO is disabled by
-@@ -5391,7 +5422,7 @@ xterms-sun|small (80x24) xterm with sunF
+@@ -5397,7 +5428,7 @@ xterms-sun|small (80x24) xterm with sunF
 
 #### GNOME (VTE)
 # this describes the alpha-version of Gnome terminal shipped with Redhat 6.0
@ -530,7 +530,7 @@
 	bce,
 	kdch1=^?, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
 	use=xterm-color,
-@@ -5642,10 +5673,14 @@ mgt|Multi GNOME Terminal,
+@@ -5648,10 +5679,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).
@ -546,7 +546,7 @@
 # Konsole 1.0.1 (2001/11/25)
 # (formerly known as kvt)
 #
-@@ -5857,14 +5892,14 @@ mlterm3|multi lingual terminal emulator,
+@@ -5863,14 +5898,14 @@ 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,
@ -564,7 +564,7 @@
 	home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@,
 	ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\n,
 	is2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>, kbs=^?,
-@@ -5921,6 +5956,7 @@ mlterm-256color|mlterm 3.0 with xterm 25
+@@ -5927,6 +5962,7 @@ mlterm-256color|mlterm 3.0 with xterm 25
 # rxvt is normally configured to look for "xterm" or "xterm-color" as $TERM.
 # Since rxvt is not really compatible with xterm, it should be configured as
 # "rxvt" or "rxvt-color".
@ -572,7 +572,7 @@
 #
 # removed dch/dch1 because they are inconsistent with bce/ech -TD
 # remove km as per tack test -TD
-@@ -5932,13 +5968,14 @@ rxvt-basic|rxvt terminal base (X Window
+@@ -5938,13 +5974,14 @@ rxvt-basic|rxvt terminal base (X Window
 	clear=\E[H\E[2J, cnorm=\E[?25h, 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,
@ -590,7 +590,7 @@
 	rmcup=\E[2J\E[?47l\E8, 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,
-@@ -5949,7 +5986,7 @@ rxvt-basic|rxvt terminal base (X Window
+@@ -5955,7 +5992,7 @@ rxvt-basic|rxvt terminal base (X Window
 	    %p9%t\016%e\017%;,
 	sgr0=\E[0m\017, smacs=^N, smcup=\E7\E[?47h, smir=\E[4h,
 	smkx=\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g, use=vt100+enq,
@ -599,7 +599,7 @@
 # Key Codes from rxvt reference:
 #
 # Note: Shift + F1-F10 generates F11-F20
-@@ -6032,8 +6069,8 @@ rxvt-basic|rxvt terminal base (X Window
+@@ -6038,8 +6075,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,
@ -610,7 +610,7 @@
 	kend=\E[8~, kf1=\E[11~, 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~,
-@@ -6124,6 +6161,38 @@ rxvt-cygwin-native|rxvt terminal emulato
+@@ -6130,6 +6167,38 @@ rxvt-cygwin-native|rxvt terminal emulato
 	     \302x\263y\363z\362{\343|\330~\376,
 	use=rxvt-cygwin,
 
@ -649,7 +649,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,
-@@ -6170,7 +6239,7 @@ mrxvt-256color|multitabbed rxvt with 256
+@@ -6176,7 +6245,7 @@ mrxvt-256color|multitabbed rxvt with 256
 # Eterm 0.9.3
 #
 # removed kf0 which conflicts with kf10 -TD
@ -658,7 +658,7 @@
 # Eterm does not implement control/shift cursor keys such as kDN6, or kPRV/kNXT
 # but does otherwise follow the rxvt+pcfkeys model -TD
 # remove nonworking flash -TD
-@@ -6184,13 +6253,13 @@ Eterm|Eterm-color|Eterm with xterm-style
+@@ -6190,13 +6259,13 @@ Eterm|Eterm-color|Eterm with xterm-style
 	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
 	cud=\E[%p1%dB, cud1=\E[B, cuf=\E[%p1%dC, cuf1=\E[C,
 	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
@ -674,7 +674,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=,
-@@ -7114,7 +7183,7 @@ pty|4bsd pseudo teletype,
+@@ -7120,7 +7189,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
@ -683,7 +683,7 @@
 	am, mir, xenl,
 	cols#80, lines#24,
 	bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=\r,
-@@ -7127,6 +7196,13 @@ eterm|gnu emacs term.el terminal emulati
+@@ -7133,6 +7202,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,
@ -697,7 +697,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,
-@@ -7255,7 +7331,7 @@ screen|VT 100/ANSI X3.64 virtual termina
+@@ -7261,7 +7337,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,
@ -706,7 +706,7 @@
 	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
 	kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~,
 	kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
-@@ -7376,6 +7452,13 @@ screen.xterm-xfree86|screen.xterm-new|sc
+@@ -7382,6 +7458,13 @@ screen.xterm-xfree86|screen.xterm-new|sc
 	use=xterm+x11mouse, use=xterm-new,
 #:screen.xterm|screen for modern xterm,
 #:	use=screen.xterm-new,
@ -720,7 +720,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,
-@@ -7463,7 +7546,7 @@ screen2|old VT 100/ANSI X3.64 virtual te
+@@ -7469,7 +7552,7 @@ screen2|old VT 100/ANSI X3.64 virtual te
 	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,
@ -729,7 +729,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,
-@@ -9366,7 +9449,7 @@ hp700-wy|HP700/41 emulating wyse30,
+@@ -9372,7 +9455,7 @@ hp700-wy|HP700/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,
@ -738,7 +738,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,
-@@ -12596,6 +12679,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit
+@@ -12602,6 +12685,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit
 # at support for the VT320 itself.
 # Please send changes with explanations to bug-gnu-emacs@prep.ai.mit.edu.
 # (vt320-k3: I added <rmam>/<smam> based on the init string -- esr)
@ -746,7 +746,7 @@
 vt320-k3|MS-Kermit 3.00's vt320 emulation,
 	am, eslok, hs, km, mir, msgr, xenl,
 	cols#80, it#8, lines#49, pb#9600, vt#3,
-@@ -12605,7 +12689,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio
+@@ -12611,7 +12695,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio
 	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,
 	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
@ -755,7 +755,7 @@
 	dsl=\E[0$~, ech=\E[%p1%dX, ed=\E[J, el=\E[K,
 	flash=\E[?5h$<100/>\E[?5l\E[?5h$<100/>\E[?5l\E[?5h$<100/>\E[
 	      ?5l,
-@@ -17021,7 +17105,7 @@ ibm3101|i3101|IBM 3101-10,
+@@ -17027,7 +17111,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,
@ -764,7 +764,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
-@@ -17279,7 +17363,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De
+@@ -17285,7 +17369,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.
--- a/ncurses.changes
+++ b/ncurses.changes
@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Mon Oct 28 09:05:18 UTC 2019 - Dr. Werner Fink <werner@suse.de>
+
+- Add ncurses patch 20191026
+  + add a note in man/curs_add_wch.3x about Unicode terminology for the
+    line-drawing characters (report by Nick Black).
+  + improve comment in lib_tgoto.c regarding the use of \200 where a
+    \0 would be intended by the caller (report by "64 bit", cf: 20000923).
+  + modify linux-16color to accommodate Linux console driver change in
+    early 2018 (report by Dino Petrucci).
+- Correct offsets of hunks of patch ncurses-6.1.dif for misc/terminfo.src
+
 -------------------------------------------------------------------
 Mon Oct 21 09:33:41 UTC 2019 - Dr. Werner Fink <werner@suse.de>