diff --git a/ncurses-5.9-ibm327x.dif b/ncurses-5.9-ibm327x.dif index 6537d28..7cc2236 100644 --- a/ncurses-5.9-ibm327x.dif +++ b/ncurses-5.9-ibm327x.dif @@ -3,8 +3,8 @@ 1 file changed, 2 insertions(+), 2 deletions(-) --- misc/terminfo.src -+++ misc/terminfo.src 2018-04-09 09:36:58.372082389 +0000 -@@ -16481,8 +16481,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv ++++ misc/terminfo.src 2018-07-22 09:00:18.872965895 +0000 +@@ -16498,8 +16498,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv # ibm327x|line mode IBM 3270 style, diff --git a/ncurses-6.1-patches.tar.bz2 b/ncurses-6.1-patches.tar.bz2 index 369252c..74bb52e 100644 --- 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:95c32f44b7368f3155457bb83e7019c49ac6035d92bd4fdacc8ea2d6c7a08996 -size 137017 +oid sha256:8d3cafe4ff8c020b79da5d3124beeca5454dffdda079cf34f7c7c5e5d331ecc7 +size 805039 diff --git a/ncurses-6.1.dif b/ncurses-6.1.dif index afd1f48..5595834 100644 --- a/ncurses-6.1.dif +++ b/ncurses-6.1.dif @@ -22,7 +22,7 @@ 20 files changed, 248 insertions(+), 81 deletions(-) --- aclocal.m4 -+++ aclocal.m4 2018-04-09 09:37:20.983663432 +0000 ++++ aclocal.m4 2018-09-03 11:10:47.463968995 +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 @@ -32,7 +32,7 @@ #include #if defined(__cplusplus) -@@ -4813,12 +4813,15 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <\$TMP CF_EOF if test -n "$cf_compress" ; then -@@ -4943,9 +4946,9 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <\$TMP CF_EOF if test -n "$cf_compress" ; then -@@ -12594,9 +12597,9 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man </dev/null ; then reqs="$PANEL_LIBRARY${suffix}, $MENU_LIBRARY${suffix}, $FORM_LIBRARY${suffix}, $MAIN_LIBRARY${suffix}" @@ -389,7 +389,7 @@ desc="$desc add-on library" fi -@@ -120,6 +123,8 @@ do +@@ -121,6 +124,8 @@ do test $NEED_TINFO != yes ; then test -n "$reqs" && reqs="$reqs, " reqs="${reqs}${SUB_LIBRARY}${suffix}" @@ -397,9 +397,9 @@ + deps="${deps}-l${SUB_LIBRARY}" fi - echo "** creating ${name}${suffix}.pc" + if test $name = $MAIN_LIBRARY --- misc/ncurses-config.in -+++ misc/ncurses-config.in 2018-04-09 09:37:20.991663283 +0000 ++++ misc/ncurses-config.in 2018-09-03 11:10:47.467968924 +0000 @@ -100,7 +100,7 @@ while test $# -gt 0; do # compile/link --cflags) @@ -410,7 +410,7 @@ fi if test "${includedir}" != /usr/include ; then --- misc/terminfo.src -+++ misc/terminfo.src 2018-04-09 09:37:20.999663135 +0000 ++++ misc/terminfo.src 2018-09-03 11:10:47.479968708 +0000 @@ -301,7 +301,9 @@ dumb|80-column dumb tty, am, cols#80, @@ -422,7 +422,7 @@ gn, use=dumb, lpr|printer|line printer, OTbs, hc, os, -@@ -1859,9 +1861,15 @@ linux-c|linux console 1.3.6+ for older n +@@ -1863,9 +1865,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 . @@ -439,7 +439,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 -@@ -1876,6 +1884,7 @@ linux2.6|linux 2.6.x console, +@@ -1880,6 +1888,7 @@ linux2.6|linux 2.6.x console, acsc=++\,\,--..00__``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwx xyyzz{{||}c~~, enacs=\E)0, rmacs=^O, @@ -447,7 +447,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, -@@ -3333,6 +3342,7 @@ vt132|DEC vt132, +@@ -3337,6 +3346,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. @@ -455,7 +455,7 @@ # # added msgr -TD vt220-old|vt200-old|DEC VT220 in vt100 emulation mode, -@@ -3343,7 +3353,7 @@ vt220-old|vt200-old|DEC VT220 in vt100 e +@@ -3347,7 +3357,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, @@ -464,7 +464,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, -@@ -3504,6 +3514,7 @@ vt320nam|v320n|DEC VT320 in vt100 emul. +@@ -3508,6 +3518,7 @@ vt320nam|v320n|DEC VT320 in vt100 emul. # to SMASH the 1k-barrier... # From: Adam Thompson Sept 10 1995 # (vt320: uncommented --esr) @@ -472,7 +472,7 @@ vt320|vt300|dec vt320 7 bit terminal, am, hs, mir, msgr, xenl, cols#80, lines#24, wsl#80, -@@ -3513,7 +3524,7 @@ vt320|vt300|dec vt320 7 bit terminal, +@@ -3517,7 +3528,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, @@ -481,7 +481,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, -@@ -3987,6 +3998,7 @@ putty+fnkeys+sco|SCO fn-keys for PuTTY, +@@ -3991,6 +4002,7 @@ putty+fnkeys+sco|SCO fn-keys for PuTTY, # 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. @@ -489,7 +489,7 @@ teraterm2.3|Tera Term Pro, km, ncv#43, vt@, -@@ -3995,7 +4007,7 @@ teraterm2.3|Tera Term Pro, +@@ -3999,7 +4011,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, @@ -498,7 +498,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~, -@@ -4229,6 +4241,7 @@ xterm-old|antique xterm version, +@@ -4233,6 +4245,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. @@ -506,7 +506,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@, -@@ -4238,7 +4251,7 @@ xterm-xf86-v32|xterm terminal emulator ( +@@ -4242,7 +4255,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, @@ -515,7 +515,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, -@@ -4835,8 +4848,26 @@ xterm-noapp|xterm with cursor keys in no +@@ -4839,8 +4852,26 @@ xterm-noapp|xterm with cursor keys in no xterm-24|vs100|xterms|xterm terminal emulator (X Window System), lines#24, use=xterm-old, @@ -542,7 +542,7 @@ use=xterm-new, # This entry assumes that xterm's handling of VT100 SI/SO is disabled by -@@ -5180,7 +5211,7 @@ xterms-sun|small (80x24) xterm with sunF +@@ -5184,7 +5215,7 @@ xterms-sun|small (80x24) xterm with sunF #### GNOME (VTE) # this describes the alpha-version of Gnome terminal shipped with Redhat 6.0 @@ -551,7 +551,7 @@ bce, kdch1=^?, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, use=xterm-color, -@@ -5422,10 +5453,14 @@ mgt|Multi GNOME Terminal, +@@ -5426,10 +5457,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). @@ -567,7 +567,7 @@ # Konsole 1.0.1 (2001/11/25) # (formerly known as kvt) # -@@ -5634,14 +5669,14 @@ mlterm3|multi lingual terminal emulator, +@@ -5638,14 +5673,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, @@ -585,7 +585,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=^?, -@@ -5697,6 +5732,7 @@ mlterm-256color|mlterm 3.0 with xterm 25 +@@ -5701,6 +5736,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". @@ -593,7 +593,7 @@ # # removed dch/dch1 because they are inconsistent with bce/ech -TD # remove km as per tack test -TD -@@ -5708,13 +5744,14 @@ rxvt-basic|rxvt terminal base (X Window +@@ -5712,13 +5748,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, @@ -611,7 +611,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, -@@ -5725,7 +5762,7 @@ rxvt-basic|rxvt terminal base (X Window +@@ -5729,7 +5766,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, @@ -620,7 +620,7 @@ # Key Codes from rxvt reference: # # Note: Shift + F1-F10 generates F11-F20 -@@ -5808,8 +5845,8 @@ rxvt-basic|rxvt terminal base (X Window +@@ -5812,8 +5849,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, @@ -631,7 +631,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~, -@@ -5900,6 +5937,38 @@ rxvt-cygwin-native|rxvt terminal emulato +@@ -5904,6 +5941,38 @@ rxvt-cygwin-native|rxvt terminal emulato \302x\263y\363z\362{\343|\330~\376, use=rxvt-cygwin, @@ -670,7 +670,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, -@@ -5946,7 +6015,7 @@ mrxvt-256color|multitabbed rxvt with 256 +@@ -5950,7 +6019,7 @@ mrxvt-256color|multitabbed rxvt with 256 # Eterm 0.9.3 # # removed kf0 which conflicts with kf10 -TD @@ -679,7 +679,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 -@@ -5960,13 +6029,13 @@ Eterm|Eterm-color|Eterm with xterm-style +@@ -5964,13 +6033,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, @@ -695,7 +695,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=, -@@ -6624,7 +6693,7 @@ pty|4bsd pseudo teletype, +@@ -6628,7 +6697,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 @@ -704,7 +704,7 @@ am, mir, xenl, cols#80, lines#24, bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=\r, -@@ -6637,6 +6706,13 @@ eterm|gnu emacs term.el terminal emulati +@@ -6641,6 +6710,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, @@ -718,7 +718,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, -@@ -6759,7 +6835,7 @@ screen|VT 100/ANSI X3.64 virtual termina +@@ -6763,7 +6839,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, @@ -727,7 +727,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, -@@ -6880,6 +6956,13 @@ screen.xterm-xfree86|screen.xterm-new|sc +@@ -6884,6 +6960,13 @@ screen.xterm-xfree86|screen.xterm-new|sc use=xterm+x11mouse, use=xterm-new, #:screen.xterm|screen for modern xterm, #: use=screen.xterm-new, @@ -741,7 +741,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, -@@ -6967,7 +7050,7 @@ screen2|old VT 100/ANSI X3.64 virtual te +@@ -6971,7 +7054,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, @@ -750,7 +750,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, -@@ -8847,7 +8930,7 @@ hp700-wy|HP700/41 emulating wyse30, +@@ -8850,7 +8933,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, @@ -759,7 +759,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, -@@ -12068,6 +12151,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit +@@ -12081,6 +12164,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 / based on the init string -- esr) @@ -767,7 +767,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, -@@ -12077,7 +12161,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio +@@ -12090,7 +12174,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, @@ -776,7 +776,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, -@@ -16491,7 +16575,7 @@ ibm3101|i3101|IBM 3101-10, +@@ -16508,7 +16592,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, @@ -785,7 +785,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 -@@ -16749,7 +16833,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De +@@ -16766,7 +16850,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. @@ -795,7 +795,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 2018-04-09 09:37:20.999663135 +0000 ++++ ncurses/Makefile.in 2018-09-03 11:10:47.479968708 +0000 @@ -219,7 +219,7 @@ $(DESTDIR)$(libdir) : ../lib : ; mkdir $@ @@ -806,8 +806,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 2018-04-09 09:37:20.999663135 +0000 -@@ -2169,6 +2169,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec ++++ ncurses/curses.priv.h 2018-09-03 11:10:47.479968708 +0000 +@@ -2184,6 +2184,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); @@ -817,7 +817,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 2018-04-09 09:37:20.999663135 +0000 ++++ ncurses/run_cmd.sh 2018-09-03 11:10:47.479968708 +0000 @@ -0,0 +1,11 @@ +#!/bin/sh + @@ -831,7 +831,7 @@ + +exec ${1+"$@"} --- ncurses/tinfo/MKfallback.sh -+++ ncurses/tinfo/MKfallback.sh 2018-04-09 09:37:20.999663135 +0000 ++++ ncurses/tinfo/MKfallback.sh 2018-09-03 11:10:47.479968708 +0000 @@ -68,6 +68,12 @@ else tmp_info= fi @@ -864,7 +864,7 @@ done --- ncurses/tinfo/access.c -+++ ncurses/tinfo/access.c 2018-04-09 09:37:20.999663135 +0000 ++++ ncurses/tinfo/access.c 2018-09-03 11:10:47.479968708 +0000 @@ -35,6 +35,9 @@ #include @@ -907,7 +907,7 @@ _nc_access(const char *path, int mode) { --- ncurses/tinfo/lib_setup.c -+++ ncurses/tinfo/lib_setup.c 2018-04-09 09:37:20.999663135 +0000 ++++ ncurses/tinfo/lib_setup.c 2018-09-03 11:10:47.479968708 +0000 @@ -599,6 +599,9 @@ _nc_locale_breaks_acs(TERMINAL *termp) } else if ((value = tigetnum("U8")) >= 0) { result = value; /* use extension feature */ @@ -919,7 +919,7 @@ result = 1; /* always broken */ } else if (strstr(env, "screen") != 0 --- ncurses/tinfo/read_entry.c -+++ ncurses/tinfo/read_entry.c 2018-04-09 09:37:20.999663135 +0000 ++++ ncurses/tinfo/read_entry.c 2018-09-03 11:10:47.479968708 +0000 @@ -551,6 +551,7 @@ _nc_read_file_entry(const char *const fi FILE *fp = 0; int code; @@ -937,7 +937,7 @@ return (code); } --- ncurses/tinfo/read_termcap.c -+++ ncurses/tinfo/read_termcap.c 2018-04-09 09:37:20.999663135 +0000 ++++ ncurses/tinfo/read_termcap.c 2018-09-03 11:10:47.479968708 +0000 @@ -322,14 +322,18 @@ _nc_getent( */ if (fd >= 0) { @@ -984,7 +984,7 @@ } if (copied != 0) --- progs/Makefile.in -+++ progs/Makefile.in 2018-04-09 09:37:20.999663135 +0000 ++++ progs/Makefile.in 2018-09-03 11:10:47.479968708 +0000 @@ -100,7 +100,7 @@ CFLAGS_LIBTOOL = $(CCFLAGS) CFLAGS_NORMAL = $(CCFLAGS) CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE @@ -1004,7 +1004,7 @@ LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@) --- test/test.priv.h -+++ test/test.priv.h 2018-04-09 09:37:20.999663135 +0000 ++++ test/test.priv.h 2018-09-03 11:10:47.479968708 +0000 @@ -910,12 +910,12 @@ extern char *strnames[], *strcodes[], *s #endif diff --git a/ncurses.changes b/ncurses.changes index 7b41d70..239bed2 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,256 @@ +------------------------------------------------------------------- +Wed Oct 10 16:10:48 UTC 2018 - schwab@suse.de + +- Use -rpath-link when building the test suite to use the just built + libraries + +------------------------------------------------------------------- +Mon Oct 8 07:05:41 UTC 2018 - Dr. Werner Fink + +- Add ncurses patch 6.1-20181006 + + improve a configure check to work with newer optimizers (report by + Denis Pronin, Gentoo #606142). + + fix typo in tput.c (Sven Joachim, cf: 20180825). + +------------------------------------------------------------------- +Mon Oct 1 06:43:30 UTC 2018 - Dr. Werner Fink + +- Add ncurses patch 6.1-20180929 + + fix typo in tvi955 -TD + + corrected acsc for regent60 -TD + + add alias n7900 -TD + + corrected acsc for tvi950 -TD + + remove bogus kf0 from tvi950 -TD + + added function-key definitions to agree with Televideo 950 manual -TD + + add bel to tvi950 -TD + + add shifted function-keys to regent60 -TD + + renumber regent40 function-keys to match manual -TD + + add cd (clr_eos) to adds200 -TD + +------------------------------------------------------------------- +Mon Sep 24 06:48:45 UTC 2018 - Dr. Werner Fink + +- Add ncurses patch 6.1-20180923 + + build-fix: remove a _tracef call which was used for debugging (report + by Chris Clayton). +- Add ncurses patch 6.1-20180922 + + ignore interrupted system-call in test/ncurses's command-line, e.g., + if the terminal were resized. + + add shift/control/alt logic for decoding xterm's 1006 mode (Redhat + #1610681, cf: 20141011). + + modify rpm test-packages to not use --disable-relink with Redhat, + since Fedora 28's tools do not work with that feature. + +------------------------------------------------------------------- +Mon Sep 10 09:18:20 UTC 2018 - Dr. Werner Fink + +- Add ncurses patch 6.1-20180908 + + document --with-pcre2 configure option in INSTALL. + + improve workaround for special case in PutAttrChar() where a cell is + marked as alternate-character set, to handle a case where the + character in the cell does not correspond to any of the ASCII + fallbacks (report by Leon Winter, cf: 20180505). + + amend change to form library which attempted to avoid unnecessary + update of cursor position in non-public fields, to simply disable + output in this case (patch by Leon Winter, cf: 20180414). + + improve check for LINE_MAX runtime limit, to accommodate broken + implementations of sysconf(). + +------------------------------------------------------------------- +Mon Sep 3 11:10:11 UTC 2018 - Dr. Werner Fink + +- Add ncurses patch 6.1-20180901 + + improve manual page for wgetnstr, giving background for the length + parameter. + + define a limit for wgetnstr, wgetn_wstr when length is negative or + "too large". + + update configure script to autoconf 2.52.20180819 (Debian #887390). + +------------------------------------------------------------------- +Mon Aug 27 07:56:48 UTC 2018 - werner@suse.de + +- Add ncurses patch 6.1-20180825 + + add a section to tput manual page clarifying how it determines the + terminal size (prompted by discussion with Grant Jenks). + + add "--disable-relink" to rpm test-packages, for consistency with the + deb test-packages. + + split spec-file into ncurses6.spec and ncursest6.spec to work around + toolset breakage in Fedora 28. + + drop mention of "--disable-touching", which was not in the final + 20180818 updates. +- Add ncurses patch 6.1-20180818 + + build-fix for PDCurses with ncurses-examples. + + improved CF_CC_ENV_FLAGS. + + modify configure scripts to reduce relinking/ranlib during library + install (Debian #903790): + + use "install -p" when available, to avoid need for ranlib of + static libraries. + + modify scripts which use "--disable-relink" to add a 1-second + sleep to work around tools which use whole-second timestamps, e.g., + in utime() rather than the actual file system resolution. + + add "--disable-touching" option for using "install -p" option during + the install, e.g., so that header-files have a predictable timestamp. + +------------------------------------------------------------------- +Thu Aug 9 11:26:52 UTC 2018 - tchvatal@suse.com + +- Fix typo screeen -> screen bsc#1104264 + +------------------------------------------------------------------- +Mon Aug 6 08:10:14 UTC 2018 - werner@suse.de + +- Add ncurses patch 6.1-20180804 + + improve logic for clear with E3 extension, in case the terminal + scrolls content onto its saved-lines before actually clearing + the display, by clearing the saved-lines after clearing the + display (report/patch by Nicholas Marriott). + +------------------------------------------------------------------- +Mon Jul 30 07:38:03 UTC 2018 - werner@suse.de + +- Add ncurses patch 6.1-20180728 + + improve documentation regarding feature-test macros in curses.h + + improve documentation regarding the virtual and physical screens. + + formatting fixes for manpages, regenerate man-html documentation. + +------------------------------------------------------------------- +Sun Jul 22 08:58:39 UTC 2018 - werner@suse.de + +- Add ncurses patch 6.1-20180721 + + build-fixes for gcc8. + + corrected acsc for wy50 -TD + + add wy50 and wy60 shifted function-keys as kF1 to kF16 -TD + + remove ansi+rep mis-added to interix in 2018-02-23 -TD + +------------------------------------------------------------------- +Fri Jul 20 10:42:17 UTC 2018 - werner@suse.de + +- Add ncurses patch 6.1-20180714 + + add enum, regex examples to test/demo_forms + + add configure check for pcre-posix library to help with MinGW port. + +------------------------------------------------------------------- +Mon Jul 9 06:30:27 UTC 2018 - werner@suse.de + +- Add ncurses patch 6.1-20180707 + + build-fixes for gcc8. + + correct order of WINDOW._ttytype versus WINDOW._windowlist in + report_offsets. + + fix a case where tiparm could return null if the format-string was + empty (Debian #902630). + +------------------------------------------------------------------- +Tue Jul 3 07:38:11 UTC 2018 - werner@suse.de + +- Add ncurses patch 6.1-20180630 + + add acsc string to vi200 (Nibby Nebbulous) + add right/down-arrow to vi200's acsc -TD + + add "x" to tput's getopt string so that "tput -x clear" works + (Nicholas Marriott). + + minor fixes prompted by anonymous report on stack overflow: + + correct order of checks in _nc_get_locale(), for systems lacking + locale support. + + add "#error" in a few places to flag unsupported configurations + +------------------------------------------------------------------- +Mon Jun 25 09:26:44 UTC 2018 - werner@suse.de + +- Add ncurses patch 6.1-20180623 + + use _WIN32/_WIN64 in preference to __MINGW32__/__MINGW64__ symbols + to simplify building with MSVC, since the former are defined in both + compiler configurations (report by Ali Abdulkadir). + + further improvements to configure-checks from work on dialog, i.e., + updated CF_ADD_INCDIR, CF_FIND_LINKAGE, CF_GCC_WARNINGS, + CF_GNU_SOURCE, CF_LARGEFILE, CF_POSIX_C_SOURCE, CF_SIZECHANGE, and + CF_TRY_XOPEN_SOURCE. + + update config.guess, config.sub from + http://git.savannah.gnu.org/cgit/config.git + +------------------------------------------------------------------- +Mon Jun 18 08:51:13 UTC 2018 - werner@suse.de + +- Add ncurses patch 6.1-20180616 + + build-fix for ncurses-examples related to gcc8-fixes (cf: 20180526). + + reduce use of _GNU_SOURCE for current glibc where _DEFAULT_SOURCE + combines with _XOPEN_SOURCE (Debian #900987). + + change target configure level for _XOPEN_SOURCE to 600 to address + use of vsscanf and setenv. + + improved configure-checks CF_SIZECHANGE and CF_STRUCT_TERMIOS from + work on dialog. + +------------------------------------------------------------------- +Tue Jun 12 09:08:16 UTC 2018 - werner@suse.de + +- Add ncurses patch 6.1-20180609 + + modify generated ncurses*config and ncurses.pc, ncursesw.pc, etc., + to list helper libraries such as gpm for static linking (Debian + #900839). + + marked vwprintw and vwscanw as deprecated; recommend using vw_printw + and vw_scanw, respectively. + +------------------------------------------------------------------- +Mon Jun 4 07:13:17 UTC 2018 - werner@suse.de + +- Add ncurses patch 6.1-20180602 + + add RPM test-package "ncursest-examples". + + modified RPM test-package to work with Mageia6. + +------------------------------------------------------------------- +Mon May 28 15:01:00 UTC 2018 - werner@suse.de + +- Add ncurses patch 6.1-20180526 + + add note in curs_util.3x about unctrl.h + + review/improve header files to ensure that those include necessary + files except for the previously-documented cases (report by Isaac + Pascual Monells). + + improved test-package scripts, adapted from byacc 1.9 20180525. + + fix some gcc8 warnings seen in Redhat package build, but + work around bug in gcc8 compiler warnings in comp_parse.c +- Add ncurses patch 6.1-20180519 + + formatting fixes for manpages, regenerate man-html documentation. + + trim spurious whitespace from tmux in 2018-02-24 changes; + fix some inconsistencies in/between tmux- and iterm2-entries for SGR + (report by C Anthony Risinger) + + improve iterm2 using some xterm features which it has adapted -TD + + add check in pair_content() to handle the case where caller asks + for an uninitialized pair (Debian #898658). + +------------------------------------------------------------------- +Mon May 14 10:20:26 UTC 2018 - werner@suse.de + +- Add ncurses patch 6.1-20180512 + + remove trailing ';' from GCC_DEPRECATED definition. + + repair a change from 20110730 which left an error-check/warning dead. + + fix several minor Coverity warnings. + +------------------------------------------------------------------- +Mon May 7 09:52:38 UTC 2018 - werner@suse.de + +- Add ncurses patch 6.1-20180505 + + add deprecation warnings for internal functions called by older + versions of tack. + + fix a special case in PutAttrChar() where a cell is marked as + alternate-character set, but the terminal does not actually support + the given graphic character. This would happen in an older terminal + such as vt52, which lacks most line-drawing capability. + + use configure --with-config-suffix option to work around filename + conflict with Debian packages versus test-packages. + + update tracemunch to work with perl 5.26.2, which changed the rules + for escaping regular expressions. + +------------------------------------------------------------------- +Wed May 2 07:11:07 UTC 2018 - werner@suse.de + +- Add ncurses patch 6.1-20180428 + + document new form-extension O_EDGE_INSERT_STAY (report by Leon + Winter). + + correct error-returns listed in manual pages for a few form functions + (report by Leon Winter). + + add a check in form-library for null-pointer dereference: + unfocus_current_field (form); + form_driver (form, REQ_VALIDATION); + (patch by Leon Winter). + ------------------------------------------------------------------- Sun Apr 15 07:53:41 UTC 2018 - werner@suse.de @@ -3105,7 +3358,7 @@ Wed Jan 16 13:50:48 UTC 2013 - werner@suse.de so it is ifdef'd out for the moment (prompted by report by Erwin Waterlander regarding screen flicker). - Add ncurses patch 5.9.20121229 - + fix coverity warnings regarding copying into fixed-size buffers. + + fix Coverity warnings regarding copying into fixed-size buffers. + add throw-declarations in the c++ binding per Coverity warning. + minor changes to new-items for consistent reference to bug-report numbers. diff --git a/ncurses.spec b/ncurses.spec index 6e75d2a..eb9bf71 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -59,9 +59,9 @@ Obsoletes: ncurses-64bit Version: 6.1 Release: 0 Summary: Terminal control library -#Git: http://ncurses.scripts.mit.edu License: MIT Group: System/Base +#Git: http://ncurses.scripts.mit.edu Url: http://www.invisible-island.net/ncurses/ncurses.html Source0: ftp://ftp.invisible-island.net/ncurses/ncurses-6.1.tar.gz Source1: ncurses-6.1-patches.tar.bz2 @@ -113,7 +113,7 @@ Summary: A terminal descriptions database License: MIT Group: System/Base Requires: ncurses >= %{version} -Recommends: terminfo-screeen = %{version} +Recommends: terminfo-screen = %{version} Provides: ncurses:%{_datadir}/tabset %description -n terminfo-base @@ -250,6 +250,7 @@ set +x for patch in patches/ncurses*.patch do test -e "$patch" || continue + echo Apply patch: $patch patch -f -T -p1 -s < $patch done set -x @@ -570,7 +571,7 @@ mv tack-* tack # Make the test suite for ncursesw6 # pushd test - CFLAGS="$CFLAGS -I%{root}%{_incdir}" LDFLAGS="$LDFLAGS -L%{root}%{_libdir}" \ + CFLAGS="$CFLAGS -I%{root}%{_incdir}" LDFLAGS="$LDFLAGS -Wl,-rpath-link=%{root}%{_libdir} -L%{root}%{_libdir}" \ ./configure --with-ncursesw --enable-widec --prefix=$PWD LD_LIBRARY_PATH=%{root}%{_libdir} \ make %{?_smp_mflags} TEST_ARGS='-lformw -lmenuw -lpanelw -lncursesw -lticw -l%{soname_tinfo} -Wl,--as-needed' @@ -697,7 +698,7 @@ mv tack-* tack # Make the test suite for ncurses6 # pushd test - CFLAGS="$CFLAGS -I%{root}%{_incdir}" LDFLAGS="$LDFLAGS -L%{root}%{_libdir}" \ + CFLAGS="$CFLAGS -I%{root}%{_incdir}" LDFLAGS="$LDFLAGS -Wl,-rpath-link=%{root}%{_libdir} -L%{root}%{_libdir}" \ ./configure --with-ncurses --disable-widec --prefix=$PWD LD_LIBRARY_PATH=%{root}%{_libdir} \ make %{?_smp_mflags} TEST_ARGS='-lform -lmenu -lpanel -lncurses -ltic -ltinfo -Wl,--as-needed'