Accepting request 710543 from Base:System

Automatic submission by obs-autosubmit OBS-URL: https://build.opensuse.org/request/show/710543 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ncurses?expand=0&rev=156
2019-06-26 14:01:42 +00:00 · 2019-06-26 14:01:42 +00:00 · 3f92ca2430
commit 3f92ca2430
parent a85e38dc84 9660876d2b
4 changed files with 95 additions and 55 deletions
--- 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
-@@ -16714,8 +16714,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv
+@@ -16864,8 +16864,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv
 #
 
 ibm327x|line mode IBM 3270 style,
--- 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:dbc0a08f023e71a98d10fec35cd0da19d63886f925d3aa7af9708a2397f076db
-size 1463006
+oid sha256:d8c3d5b6ce1dc546e86c9dd8e5fff5352145c360b5c8b718022c70712c99c774
+size 1482259
--- a/ncurses-6.1.dif
+++ b/ncurses-6.1.dif
@ -21,7 +21,7 @@
 19 files changed, 248 insertions(+), 80 deletions(-)

 --- aclocal.m4
-+++ aclocal.m4	2019-04-01 07:18:56.549107037 +0000
+++ aclocal.m4	2019-05-20 13:40:39.388245916 +0000
@@ -580,7 +580,7 @@ AC_MSG_CHECKING([for size of bool])
 AC_CACHE_VAL(cf_cv_type_of_bool,[
 	rm -f cf_test.out
@ -150,7 +150,7 @@
 esac
 done
 --- configure
-+++ configure	2019-04-01 07:18:56.549107037 +0000
+++ configure	2019-05-20 13:40:39.388245916 +0000
@@ -5485,7 +5485,7 @@ echo $ECHO_N "checking for an rpath opti
 		fi
 		;;
@ -287,7 +287,7 @@
 	# the next lines are needed for linking libtic over libncurses
 	TINFO_NAME=${LIB_NAME}
 --- include/curses.h.in
-+++ include/curses.h.in	2019-04-01 07:18:56.549107037 +0000
+++ include/curses.h.in	2019-05-20 13:40:39.388245916 +0000
@@ -177,6 +177,9 @@ typedef @cf_cv_typeof_chtype@ chtype;
 typedef @cf_cv_typeof_mmask_t@ mmask_t;
 #endif
@ -299,7 +299,7 @@
  * We need FILE, etc.  Include this before checking any feature symbols.
  */
 --- include/termcap.h.in
-+++ include/termcap.h.in	2019-04-01 07:18:56.549107037 +0000
+++ include/termcap.h.in	2019-05-20 13:40:39.388245916 +0000
@@ -46,6 +46,8 @@ extern "C"
 {
 #endif /* __cplusplus */
@ -310,7 +310,7 @@
 
 #undef  NCURSES_OSPEED 
 --- include/tic.h
-+++ include/tic.h	2019-04-01 07:18:56.549107037 +0000
+++ include/tic.h	2019-05-20 13:40:39.388245916 +0000
@@ -236,12 +236,12 @@ struct user_table_entry
  */
 
@ -327,7 +327,7 @@
 #define CANCELLED_STRING	(char *)(-1)
 
 --- man/man_db.renames
-+++ man/man_db.renames	2019-04-01 07:18:56.549107037 +0000
+++ man/man_db.renames	2019-05-20 13:40:39.388245916 +0000
@@ -163,6 +163,7 @@ term.7				term.7
 term_variables.3x		terminfo_variables.3ncurses
 terminfo.5			terminfo.5
@ -345,7 +345,7 @@
 #
 getty.1				getty.8
 --- man/ncurses.3x
-+++ man/ncurses.3x	2019-04-01 07:18:56.553106962 +0000
+++ man/ncurses.3x	2019-05-20 13:40:39.388245916 +0000
@@ -139,6 +139,10 @@ after the shell environment variable \fB
 [See \fBterminfo\fR(\*n) for further details.]
 .SS Datatypes
@ -358,7 +358,7 @@
 called \fIwindows\fR, which can be thought of as two-dimensional
 arrays of characters representing all or part of a CRT screen.
 --- misc/gen-pkgconfig.in
-+++ misc/gen-pkgconfig.in	2019-04-01 07:18:56.553106962 +0000
+++ misc/gen-pkgconfig.in	2019-05-20 13:40:39.388245916 +0000
@@ -77,7 +77,7 @@ if test "$includedir" != "/usr/include"
 fi
 
@ -398,8 +398,8 @@
 
 	if test $name = $MAIN_LIBRARY
 --- misc/terminfo.src
-+++ misc/terminfo.src	2019-04-01 07:18:56.553106962 +0000
-@@ -301,7 +301,9 @@ dumb|80-column dumb tty,
+++ misc/terminfo.src	2019-06-11 08:27:43.912247894 +0000
+@@ -305,7 +305,9 @@ dumb|80-column dumb tty,
 	am,
 	cols#80,
 	bel=^G, cr=\r, cud1=\n, ind=\n,
@ -410,7 +410,7 @@
 	gn, use=dumb,
 lpr|printer|line printer,
 	OTbs, hc, os,
-@@ -1000,9 +1002,15 @@ linux-c|linux console 1.3.6+ for older n
+@@ -1012,9 +1014,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 <frank@g-n-u.de>.
@ -427,7 +427,7 @@
 
 # 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
-@@ -1017,6 +1025,7 @@ linux2.6|linux 2.6.x console,
+@@ -1029,6 +1037,7 @@ linux2.6|linux 2.6.x console,
 	acsc=++\,\,--..00__``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwx
 	     xyyzz{{||}c~~,
 	enacs=\E)0, rmacs=^O,
@ -435,7 +435,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,
-@@ -2474,6 +2483,7 @@ vt132|DEC vt132,
+@@ -2486,6 +2495,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.
@ -443,7 +443,7 @@
 #
 # added msgr -TD
 vt220-old|vt200-old|DEC VT220 in vt100 emulation mode,
-@@ -2484,7 +2494,7 @@ vt220-old|vt200-old|DEC VT220 in vt100 e
+@@ -2496,7 +2506,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,
@ -452,7 +452,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,
-@@ -2645,6 +2655,7 @@ vt320nam|v320n|DEC VT320 in vt100 emul.
+@@ -2657,6 +2667,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)
@ -460,7 +460,7 @@
 vt320|vt300|dec vt320 7 bit terminal,
 	am, hs, mir, msgr, xenl,
 	cols#80, lines#24, wsl#80,
-@@ -2654,7 +2665,7 @@ vt320|vt300|dec vt320 7 bit terminal,
+@@ -2666,7 +2677,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,
@ -469,7 +469,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,
-@@ -4007,6 +4018,7 @@ putty+fnkeys+sco|SCO fn-keys for PuTTY,
+@@ -4087,6 +4098,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.
@ -477,7 +477,7 @@
 teraterm2.3|Tera Term Pro,
 	km,
 	ncv#43, vt@,
-@@ -4015,7 +4027,7 @@ teraterm2.3|Tera Term Pro,
+@@ -4095,7 +4107,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,
@ -486,7 +486,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~,
-@@ -4239,6 +4251,7 @@ xterm-old|antique xterm version,
+@@ -4319,6 +4331,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.
@ -494,7 +494,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@,
-@@ -4248,7 +4261,7 @@ xterm-xf86-v32|xterm terminal emulator (
+@@ -4328,7 +4341,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,
@ -503,7 +503,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,
-@@ -4848,8 +4861,26 @@ xterm-noapp|xterm with cursor keys in no
+@@ -4965,8 +4978,26 @@ xterm-noapp|xterm with cursor keys in no
 xterm-24|vs100|xterms|xterm terminal emulator (X Window System),
 	lines#24, use=xterm-old,
 
@ -530,7 +530,7 @@
 	use=xterm-new,
 
 # This entry assumes that xterm's handling of VT100 SI/SO is disabled by
-@@ -5193,7 +5224,7 @@ xterms-sun|small (80x24) xterm with sunF
+@@ -5310,7 +5341,7 @@ xterms-sun|small (80x24) xterm with sunF
 
 #### GNOME (VTE)
 # this describes the alpha-version of Gnome terminal shipped with Redhat 6.0
@ -539,7 +539,7 @@
 	bce,
 	kdch1=^?, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
 	use=xterm-color,
-@@ -5442,10 +5473,14 @@ mgt|Multi GNOME Terminal,
+@@ -5561,10 +5592,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).
@ -555,7 +555,7 @@
 # Konsole 1.0.1 (2001/11/25)
 # (formerly known as kvt)
 #
-@@ -5657,14 +5692,14 @@ mlterm3|multi lingual terminal emulator,
+@@ -5776,14 +5811,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,
@ -573,7 +573,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, indn=\E[%p1%dS,
 	is2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>, kbs=^?,
-@@ -5720,6 +5755,7 @@ mlterm-256color|mlterm 3.0 with xterm 25
+@@ -5839,6 +5874,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".
@ -581,7 +581,7 @@
 #
 # removed dch/dch1 because they are inconsistent with bce/ech -TD
 # remove km as per tack test -TD
-@@ -5731,13 +5767,14 @@ rxvt-basic|rxvt terminal base (X Window
+@@ -5850,13 +5886,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,
@ -599,7 +599,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,
-@@ -5748,7 +5785,7 @@ rxvt-basic|rxvt terminal base (X Window
+@@ -5867,7 +5904,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,
@ -608,7 +608,7 @@
 # Key Codes from rxvt reference:
 #
 # Note: Shift + F1-F10 generates F11-F20
-@@ -5831,8 +5868,8 @@ rxvt-basic|rxvt terminal base (X Window
+@@ -5950,8 +5987,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,
@ -619,7 +619,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~,
-@@ -5923,6 +5960,38 @@ rxvt-cygwin-native|rxvt terminal emulato
+@@ -6042,6 +6079,38 @@ rxvt-cygwin-native|rxvt terminal emulato
 	     \302x\263y\363z\362{\343|\330~\376,
 	use=rxvt-cygwin,
 
@ -658,7 +658,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,
-@@ -5969,7 +6038,7 @@ mrxvt-256color|multitabbed rxvt with 256
+@@ -6088,7 +6157,7 @@ mrxvt-256color|multitabbed rxvt with 256
 # Eterm 0.9.3
 #
 # removed kf0 which conflicts with kf10 -TD
@ -667,7 +667,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
-@@ -5983,13 +6052,13 @@ Eterm|Eterm-color|Eterm with xterm-style
+@@ -6102,13 +6171,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,
@ -683,7 +683,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=,
-@@ -6819,7 +6888,7 @@ pty|4bsd pseudo teletype,
+@@ -6969,7 +7038,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
@ -692,7 +692,7 @@
 	am, mir, xenl,
 	cols#80, lines#24,
 	bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=\r,
-@@ -6832,6 +6901,13 @@ eterm|gnu emacs term.el terminal emulati
+@@ -6982,6 +7051,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,
@ -706,7 +706,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,
-@@ -6954,7 +7030,7 @@ screen|VT 100/ANSI X3.64 virtual termina
+@@ -7104,7 +7180,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,
@ -715,7 +715,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,
-@@ -7075,6 +7151,13 @@ screen.xterm-xfree86|screen.xterm-new|sc
+@@ -7225,6 +7301,13 @@ screen.xterm-xfree86|screen.xterm-new|sc
 	use=xterm+x11mouse, use=xterm-new,
 #:screen.xterm|screen for modern xterm,
 #:	use=screen.xterm-new,
@ -729,7 +729,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,
-@@ -7162,7 +7245,7 @@ screen2|old VT 100/ANSI X3.64 virtual te
+@@ -7312,7 +7395,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,
@ -738,7 +738,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,
-@@ -9066,7 +9149,7 @@ hp700-wy|HP700/41 emulating wyse30,
+@@ -9216,7 +9299,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,
@ -747,7 +747,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,
-@@ -12297,6 +12380,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit
+@@ -12447,6 +12530,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)
@ -755,7 +755,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,
-@@ -12306,7 +12390,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio
+@@ -12456,7 +12540,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,
@ -764,7 +764,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,
-@@ -16724,7 +16808,7 @@ ibm3101|i3101|IBM 3101-10,
+@@ -16874,7 +16958,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,
@ -773,7 +773,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
-@@ -16982,7 +17066,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De
+@@ -17132,7 +17216,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De
 	tbc=\E[3g,
 # "Megapel" refers to the display adapter, which was used with the IBM RT
 # aka IBM 6150.
@ -783,7 +783,7 @@
 	s1ds=\E(0, sgr0=\E[0m\E(B, use=ibm5154,
 ibm5081-c|ibmmpel-c|IBM 5081 1024x1024 256/4096 Megapel enhanced color display,
 --- ncurses/Makefile.in
-+++ ncurses/Makefile.in	2019-04-01 07:18:56.553106962 +0000
+++ ncurses/Makefile.in	2019-05-20 13:40:39.392245841 +0000
@@ -221,7 +221,7 @@ $(DESTDIR)$(libdir) :
 ../lib : ; mkdir $@
 
@ -794,8 +794,8 @@
 ./lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h
 	$(SHELL) -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@
 --- ncurses/curses.priv.h
-+++ ncurses/curses.priv.h	2019-04-01 07:18:56.553106962 +0000
-@@ -2235,6 +2235,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec
+++ ncurses/curses.priv.h	2019-05-20 13:40:39.392245841 +0000
+@@ -2242,6 +2242,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec
 extern NCURSES_EXPORT(char *) _nc_tracemouse (SCREEN *, MEVENT const *);
 extern NCURSES_EXPORT(char *) _nc_trace_mmask_t (SCREEN *, mmask_t);
 extern NCURSES_EXPORT(int) _nc_access (const char *, int);
@ -805,7 +805,7 @@
 extern NCURSES_EXPORT(int) _nc_freewin (WINDOW *);
 extern NCURSES_EXPORT(int) _nc_getenv_num (const char *);
 --- ncurses/run_cmd.sh
-+++ ncurses/run_cmd.sh	2019-04-01 07:18:56.553106962 +0000
+++ ncurses/run_cmd.sh	2019-05-20 13:40:39.392245841 +0000
@@ -0,0 +1,11 @@
 +#!/bin/sh
 +
@ -819,7 +819,7 @@
 +
 +exec ${1+"$@"}
 --- ncurses/tinfo/MKfallback.sh
-+++ ncurses/tinfo/MKfallback.sh	2019-04-01 07:18:56.553106962 +0000
+++ ncurses/tinfo/MKfallback.sh	2019-05-20 13:40:39.392245841 +0000
@@ -68,6 +68,12 @@ else
 	tmp_info=
 fi
@ -852,7 +852,7 @@
 	done
 
 --- ncurses/tinfo/access.c
-+++ ncurses/tinfo/access.c	2019-04-01 07:18:56.553106962 +0000
+++ ncurses/tinfo/access.c	2019-05-20 13:40:39.392245841 +0000
@@ -30,6 +30,10 @@
  *  Author: Thomas E. Dickey                                                *
  ****************************************************************************/
@ -896,7 +896,7 @@
 _nc_access(const char *path, int mode)
 {
 --- ncurses/tinfo/lib_setup.c
-+++ ncurses/tinfo/lib_setup.c	2019-04-01 07:18:56.557106886 +0000
+++ ncurses/tinfo/lib_setup.c	2019-05-20 13:40:39.392245841 +0000
@@ -599,6 +599,9 @@ _nc_locale_breaks_acs(TERMINAL *termp)
     } else if ((value = tigetnum("U8")) >= 0) {
 	result = value;		/* use extension feature */
@ -908,7 +908,7 @@
 	    result = 1;		/* always broken */
 	} else if (strstr(env, "screen") != 0
 --- ncurses/tinfo/read_entry.c
-+++ ncurses/tinfo/read_entry.c	2019-04-01 07:18:56.557106886 +0000
+++ ncurses/tinfo/read_entry.c	2019-05-20 13:40:39.392245841 +0000
@@ -551,6 +551,7 @@ _nc_read_file_entry(const char *const fi
     FILE *fp = 0;
     int code;
@ -926,7 +926,7 @@
     return (code);
 }
 --- ncurses/tinfo/read_termcap.c
-+++ ncurses/tinfo/read_termcap.c	2019-04-01 07:18:56.557106886 +0000
+++ ncurses/tinfo/read_termcap.c	2019-05-20 13:40:39.392245841 +0000
@@ -322,14 +322,18 @@ _nc_getent(
 	     */
 	    if (fd >= 0) {
@ -973,7 +973,7 @@
     }
     if (copied != 0)
 --- progs/Makefile.in
-+++ progs/Makefile.in	2019-04-01 07:18:56.557106886 +0000
+++ progs/Makefile.in	2019-05-20 13:40:39.392245841 +0000
@@ -100,7 +100,7 @@ CFLAGS_LIBTOOL	= $(CCFLAGS)
 CFLAGS_NORMAL	= $(CCFLAGS)
 CFLAGS_DEBUG	= $(CCFLAGS) @CC_G_OPT@ -DTRACE
@ -993,7 +993,7 @@
 LDFLAGS_DEFAULT	= $(LDFLAGS_@DFT_UPR_MODEL@)
 
 --- test/test.priv.h
-+++ test/test.priv.h	2019-04-01 07:18:56.557106886 +0000
+++ test/test.priv.h	2019-05-20 13:40:39.392245841 +0000
@@ -993,12 +993,12 @@ extern char * _nc_strstr (const char *,
 #endif
 
--- a/ncurses.changes
+++ b/ncurses.changes
@ -1,3 +1,43 @@
+-------------------------------------------------------------------
+Tue Jun 11 08:27:10 UTC 2019 - Dr. Werner Fink <werner@suse.de>
+
+- Add ncurses patch 20190609
+  + add mintty, mintty-direct (adapted from patch by Thomas Wolff).
+    Some of the suggested user-defined capabilities are commented-out,
+    to allow builds with ncurses 5.9 and 6.0
+  + add Smol/Rmol for tmux, vte-2018 (patch by Nicholas Marriott).
+  + add rs1 to konsole, mlterm -TD
+  + modify _nc_merge_entry() to make a copy of the data which it merges,
+    to avoid modifying the source-data when aligning extended names.
+
+-------------------------------------------------------------------
+Mon Jun  3 07:08:38 UTC 2019 - Dr. Werner Fink <werner@suse.de>
+
+- Add ncurses patch 20190601
+  + modify an internal call to vid_puts to pass extended color pairs
+    e.g., from tty_update.c and lib_mvcur.c (report by Niegodziwy Beru).
+  + improve manual page description of init_tabs capability and TABSIZE
+    variable.
+
+-------------------------------------------------------------------
+Mon May 27 08:29:05 UTC 2019 - Dr. Werner Fink <werner@suse.de>
+
+- Add ncurses patch 20190525
+  + modify reset_cmd.c to allow for tabstops at intervals other than 8
+    (report by Vincent Huisman).
+
+-------------------------------------------------------------------
+Mon May 20 13:39:27 UTC 2019 - Dr. Werner Fink <werner@suse.de>
+
+- Add ncurses patch 20190518
+  + update xterm-new to xterm patch #345 -TD
+  + add/use xterm+keypad in xterm-new (report by Alain D D Williams) -TD
+  + update terminator entry -TD
+  + remove hard-tabs from ti703 (report by Robert Clausecker)
+  + mention meml/memu/box1 in user_caps manual page.
+  + mention user_caps.5 in tic and infocmp manual pages.
+- Adopt the patches ncurses-5.9-ibm327x.dif and ncurses-6.1.dif
+
 -------------------------------------------------------------------
 Wed May 15 11:43:33 UTC 2019 - Dr. Werner Fink <werner@suse.de>