diff --git a/ncurses-5.9-ibm327x.dif b/ncurses-5.9-ibm327x.dif index bebe80c..819c91e 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 2017-07-31 12:13:00.613650108 +0000 -@@ -15986,8 +15986,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv ++++ misc/terminfo.src 2017-08-27 13:31:59.993779178 +0000 +@@ -16086,8 +16086,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv # ibm327x|line mode IBM 3270 style, diff --git a/ncurses-6.0-patches.tar.bz2 b/ncurses-6.0-patches.tar.bz2 index 45d7f5a..64182f0 100644 --- a/ncurses-6.0-patches.tar.bz2 +++ b/ncurses-6.0-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:238b9088bf081def91b0343ac3af1b0d952aec53fb7140b051893f89d8faa66d -size 2795469 +oid sha256:6eb9617fbe5492de5d9423d422f15e8e08c1339b17d97e7d50e867f4ee508307 +size 2930820 diff --git a/ncurses-6.0.dif b/ncurses-6.0.dif index 15dfba5..84ceb80 100644 --- a/ncurses-6.0.dif +++ b/ncurses-6.0.dif @@ -22,7 +22,7 @@ 20 files changed, 249 insertions(+), 82 deletions(-) --- aclocal.m4 -+++ aclocal.m4 2017-08-14 08:26:48.310624291 +0000 ++++ aclocal.m4 2017-09-11 09:50:30.547698975 +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 @@ -151,7 +151,7 @@ esac done --- configure -+++ configure 2017-08-14 08:26:48.314624217 +0000 ++++ configure 2017-09-11 09:50:30.551698903 +0000 @@ -5950,7 +5950,7 @@ case $cf_cv_system_name in fi ;; @@ -288,7 +288,7 @@ # the next lines are needed for linking libtic over libncurses TINFO_NAME=${LIB_NAME} --- include/curses.h.in -+++ include/curses.h.in 2017-08-14 08:26:48.314624217 +0000 ++++ include/curses.h.in 2017-09-11 09:50:30.551698903 +0000 @@ -177,6 +177,9 @@ typedef @cf_cv_typeof_chtype@ chtype; typedef @cf_cv_typeof_mmask_t@ mmask_t; #endif @@ -300,7 +300,7 @@ * We need FILE, etc. Include this before checking any feature symbols. */ --- include/termcap.h.in -+++ include/termcap.h.in 2017-08-14 08:26:48.314624217 +0000 ++++ include/termcap.h.in 2017-09-11 09:50:30.551698903 +0000 @@ -46,6 +46,8 @@ extern "C" { #endif /* __cplusplus */ @@ -311,7 +311,7 @@ #undef NCURSES_CONST --- include/tic.h -+++ include/tic.h 2017-08-14 08:26:48.314624217 +0000 ++++ include/tic.h 2017-09-11 09:50:30.551698903 +0000 @@ -207,12 +207,12 @@ struct alias */ @@ -328,7 +328,7 @@ #define CANCELLED_STRING (char *)(-1) --- man/man_db.renames -+++ man/man_db.renames 2017-08-14 08:26:48.314624217 +0000 ++++ man/man_db.renames 2017-09-11 09:50:30.551698903 +0000 @@ -163,6 +163,7 @@ term.7 term.7 term_variables.3x terminfo_variables.3ncurses terminfo.5 terminfo.5 @@ -346,7 +346,7 @@ # getty.1 getty.8 --- man/ncurses.3x -+++ man/ncurses.3x 2017-08-14 08:26:48.318624143 +0000 ++++ man/ncurses.3x 2017-09-11 09:50:30.551698903 +0000 @@ -137,6 +137,10 @@ after the shell environment variable \fB [See \fBterminfo\fR(\*n) for further details.] .SS Datatypes @@ -359,7 +359,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 2017-08-14 08:26:48.318624143 +0000 ++++ misc/gen-pkgconfig.in 2017-09-11 09:50:30.551698903 +0000 @@ -76,7 +76,7 @@ if test "$includedir" != "/usr/include" fi @@ -399,7 +399,7 @@ echo "** creating ${name}${suffix}.pc" --- misc/ncurses-config.in -+++ misc/ncurses-config.in 2017-08-14 08:26:48.318624143 +0000 ++++ misc/ncurses-config.in 2017-09-11 09:50:30.551698903 +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 2017-08-14 08:26:48.390622807 +0000 ++++ misc/terminfo.src 2017-09-11 09:50:30.631697446 +0000 @@ -301,7 +301,9 @@ dumb|80-column dumb tty, am, cols#80, @@ -422,16 +422,7 @@ gn, use=dumb, lpr|printer|line printer, OTbs, hc, os, -@@ -1351,7 +1353,7 @@ nsterm|Apple_Terminal|AppKit Terminal.ap - # - # NOTE: When tack tests (csr) + (nel) iTerm.app crashes, so (csr) is - # disabled. --iTerm.app|iterm|iTerm.app terminal emulator for Mac OS X, -+iTerm.app|iTerm.app terminal emulator for Mac OS X, - bce, bw@, - csr@, dim@, kend=\EOF, khome=\EOH, - sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%? -@@ -1741,9 +1743,15 @@ linux-c|linux console 1.3.6+ for older n +@@ -1844,9 +1846,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 . @@ -448,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 -@@ -1758,6 +1766,7 @@ linux2.6|linux 2.6.x console, +@@ -1861,6 +1869,7 @@ linux2.6|linux 2.6.x console, acsc=++\,\,--..00__``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwx xyyzz{{||}c~~, enacs=\E)0, rmacs=^O, @@ -456,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, -@@ -3216,6 +3225,7 @@ vt132|DEC vt132, +@@ -3318,6 +3327,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. @@ -464,7 +455,7 @@ # # added msgr -TD vt220-old|vt200-old|DEC VT220 in vt100 emulation mode, -@@ -3226,7 +3236,7 @@ vt220-old|vt200-old|DEC VT220 in vt100 e +@@ -3328,7 +3338,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, @@ -473,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, -@@ -3387,6 +3397,7 @@ vt320nam|v320n|DEC VT320 in vt100 emul. +@@ -3489,6 +3499,7 @@ vt320nam|v320n|DEC VT320 in vt100 emul. # to SMASH the 1k-barrier... # From: Adam Thompson Sept 10 1995 # (vt320: uncommented --esr) @@ -481,7 +472,7 @@ vt320|vt300|dec vt320 7 bit terminal, am, hs, mir, msgr, xenl, cols#80, lines#24, wsl#80, -@@ -3396,7 +3407,7 @@ vt320|vt300|dec vt320 7 bit terminal, +@@ -3498,7 +3509,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, @@ -490,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, -@@ -3867,6 +3878,7 @@ putty+fnkeys+sco|SCO fn-keys for PuTTY, +@@ -3969,6 +3980,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. @@ -498,7 +489,7 @@ teraterm2.3|Tera Term Pro, km, xon@, ncv#43, vt@, -@@ -3875,7 +3887,7 @@ teraterm2.3|Tera Term Pro, +@@ -3977,7 +3989,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, @@ -507,7 +498,7 @@ dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, flash=\E[?5h\E[?5l$<200/>, hpa=\E[%i%p1%dG, il=\E[%p1%dL, il1=\E[L, kdch1=\E[3~, kf1=\E[11~, -@@ -4081,6 +4093,7 @@ xterm-old|antique xterm version, +@@ -4183,6 +4195,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. @@ -515,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@, -@@ -4090,7 +4103,7 @@ xterm-xf86-v32|xterm terminal emulator ( +@@ -4192,7 +4205,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, @@ -524,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, -@@ -4585,8 +4598,26 @@ xterm-noapp|xterm with cursor keys in no +@@ -4687,8 +4700,26 @@ xterm-noapp|xterm with cursor keys in no xterm-24|vs100|xterms|xterm terminal emulator (X Window System), lines#24, use=xterm-old, @@ -551,7 +542,7 @@ use=xterm-new, # This entry assumes that xterm's handling of VT100 SI/SO is disabled by -@@ -4929,7 +4960,7 @@ xterms-sun|small (80x24) xterm with sunF +@@ -5031,7 +5062,7 @@ xterms-sun|small (80x24) xterm with sunF #### GNOME (VTE) # this describes the alpha-version of Gnome terminal shipped with Redhat 6.0 @@ -560,7 +551,7 @@ bce, kdch1=^?, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, use=xterm-color, -@@ -5105,10 +5136,14 @@ mgt|Multi GNOME Terminal, +@@ -5206,10 +5237,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). @@ -576,7 +567,7 @@ # Konsole 1.0.1 # (formerly known as kvt) # -@@ -5239,14 +5274,14 @@ mlterm3|multi lingual terminal emulator, +@@ -5340,14 +5375,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, @@ -594,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=^?, -@@ -5302,6 +5337,7 @@ mlterm-256color|mlterm 3.0 with xterm 25 +@@ -5403,6 +5438,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". @@ -602,7 +593,7 @@ # # removed dch/dch1 because they are inconsistent with bce/ech -TD # remove km as per tack test -TD -@@ -5313,13 +5349,14 @@ rxvt-basic|rxvt terminal base (X Window +@@ -5414,13 +5450,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, @@ -620,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, -@@ -5330,7 +5367,7 @@ rxvt-basic|rxvt terminal base (X Window +@@ -5431,7 +5468,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, @@ -629,7 +620,7 @@ # Key Codes from rxvt reference: # # Note: Shift + F1-F10 generates F11-F20 -@@ -5413,8 +5450,8 @@ rxvt-basic|rxvt terminal base (X Window +@@ -5514,8 +5551,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, @@ -640,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~, -@@ -5475,6 +5512,38 @@ rxvt-cygwin-native|rxvt terminal emulato +@@ -5576,6 +5613,38 @@ rxvt-cygwin-native|rxvt terminal emulato \302x\263y\363z\362{\343|\330~\376, use=rxvt-cygwin, @@ -679,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, -@@ -5521,7 +5590,7 @@ mrxvt-256color|multitabbed rxvt with 256 +@@ -5622,7 +5691,7 @@ mrxvt-256color|multitabbed rxvt with 256 # Eterm 0.9.3 # # removed kf0 which conflicts with kf10 -TD @@ -688,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 -@@ -5535,13 +5604,13 @@ Eterm|Eterm-color|Eterm with xterm-style +@@ -5636,13 +5705,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, @@ -704,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=, -@@ -6145,7 +6214,7 @@ pty|4bsd pseudo teletype, +@@ -6245,7 +6314,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 @@ -713,7 +704,7 @@ am, mir, xenl, cols#80, lines#24, bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=\r, -@@ -6158,6 +6227,13 @@ eterm|gnu emacs term.el terminal emulati +@@ -6258,6 +6327,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, @@ -727,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, -@@ -6280,7 +6356,7 @@ screen|VT 100/ANSI X3.64 virtual termina +@@ -6380,7 +6456,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, ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=\n, is2=\E)0, @@ -736,7 +727,7 @@ 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, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, -@@ -6399,6 +6475,13 @@ screen.xterm-xfree86|screen.xterm-new|sc +@@ -6499,6 +6575,13 @@ screen.xterm-xfree86|screen.xterm-new|sc E3@, use=screen+italics, use=screen+fkeys, use=xterm-new, #:screen.xterm|screen for modern xterm, #: use=screen.xterm-new, @@ -750,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, -@@ -6481,7 +6564,7 @@ screen2|old VT 100/ANSI X3.64 virtual te +@@ -6581,7 +6664,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, @@ -759,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, -@@ -8352,7 +8435,7 @@ hp700-wy|HP700/41 emulating wyse30, +@@ -8452,7 +8535,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, @@ -768,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, -@@ -11573,6 +11656,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit +@@ -11673,6 +11756,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) @@ -776,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, -@@ -11582,7 +11666,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio +@@ -11682,7 +11766,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, @@ -785,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, -@@ -15996,7 +16080,7 @@ ibm3101|i3101|IBM 3101-10, +@@ -16096,7 +16180,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, @@ -794,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 -@@ -16254,7 +16338,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De +@@ -16354,7 +16438,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. @@ -804,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 2017-08-14 08:26:48.318624143 +0000 ++++ ncurses/Makefile.in 2017-09-11 09:50:30.559698757 +0000 @@ -219,7 +219,7 @@ $(DESTDIR)$(libdir) : ../lib : ; mkdir $@ @@ -815,7 +806,7 @@ ./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 2017-08-14 08:26:48.322624069 +0000 ++++ ncurses/curses.priv.h 2017-09-11 09:50:30.559698757 +0000 @@ -2145,6 +2145,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); @@ -826,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 2017-08-14 08:26:48.322624069 +0000 ++++ ncurses/run_cmd.sh 2017-09-11 09:50:30.559698757 +0000 @@ -0,0 +1,11 @@ +#!/bin/sh + @@ -840,7 +831,7 @@ + +exec ${1+"$@"} --- ncurses/tinfo/MKfallback.sh -+++ ncurses/tinfo/MKfallback.sh 2017-08-14 08:26:48.322624069 +0000 ++++ ncurses/tinfo/MKfallback.sh 2017-09-11 09:50:30.559698757 +0000 @@ -68,6 +68,12 @@ else tmp_info= fi @@ -873,7 +864,7 @@ done --- ncurses/tinfo/access.c -+++ ncurses/tinfo/access.c 2017-08-14 08:26:48.322624069 +0000 ++++ ncurses/tinfo/access.c 2017-09-11 09:50:30.559698757 +0000 @@ -35,6 +35,9 @@ #include @@ -916,7 +907,7 @@ _nc_access(const char *path, int mode) { --- ncurses/tinfo/lib_setup.c -+++ ncurses/tinfo/lib_setup.c 2017-08-14 08:26:48.322624069 +0000 ++++ ncurses/tinfo/lib_setup.c 2017-09-11 09:50:30.559698757 +0000 @@ -599,6 +599,9 @@ _nc_locale_breaks_acs(TERMINAL *termp) } else if ((value = tigetnum("U8")) >= 0) { result = value; /* use extension feature */ @@ -928,7 +919,7 @@ result = 1; /* always broken */ } else if (strstr(env, "screen") != 0 --- ncurses/tinfo/read_entry.c -+++ ncurses/tinfo/read_entry.c 2017-08-14 08:26:48.322624069 +0000 ++++ ncurses/tinfo/read_entry.c 2017-09-11 09:50:30.559698757 +0000 @@ -431,6 +431,7 @@ _nc_read_file_entry(const char *const fi FILE *fp = 0; int code; @@ -946,7 +937,7 @@ return (code); } --- ncurses/tinfo/read_termcap.c -+++ ncurses/tinfo/read_termcap.c 2017-08-14 08:26:48.322624069 +0000 ++++ ncurses/tinfo/read_termcap.c 2017-09-11 09:50:30.559698757 +0000 @@ -322,14 +322,18 @@ _nc_getent( */ if (fd >= 0) { @@ -993,7 +984,7 @@ } if (copied != 0) --- progs/Makefile.in -+++ progs/Makefile.in 2017-08-14 08:26:48.322624069 +0000 ++++ progs/Makefile.in 2017-09-11 09:50:30.559698757 +0000 @@ -100,7 +100,7 @@ CFLAGS_LIBTOOL = $(CCFLAGS) CFLAGS_NORMAL = $(CCFLAGS) CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE @@ -1013,8 +1004,8 @@ LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@) --- test/test.priv.h -+++ test/test.priv.h 2017-08-14 08:26:48.322624069 +0000 -@@ -813,12 +813,12 @@ extern char *strnames[], *strcodes[], *s ++++ test/test.priv.h 2017-09-11 09:50:30.559698757 +0000 +@@ -875,12 +875,12 @@ extern char *strnames[], *strcodes[], *s #endif /* out-of-band values for representing absent capabilities */ diff --git a/ncurses.changes b/ncurses.changes index f8e3c34..fb9eb26 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,80 @@ +------------------------------------------------------------------- +Mon Sep 11 09:49:02 UTC 2017 - werner@suse.de + +- Add ncurses patch 20170827 + + fix a bug in repeat_char logic (cf: 20170729, report by Chris Clayton). +- Add ncurses patch 20170902 + + amend change for endwin-state for better consistency with the older + logic (report/patch by Jeb Rosen, cf: 20170722). + + modify check in fmt_entry() to handle a cancelled reset string + (Debian #873746). Make similar fixes in other parts of dump_entry.c + and tput.c +- Add ncurses patch 20170909 + + improve wide-character implementation of myADDNSTR() in frm_driver.c, + which was inconsistent with the normal implementation. + + save/restore cursor position in Undo_Justification(), matching + behavior of Buffer_To_Window() (report by Leon Winter). + + modify test/knight to provide the "slow" solution for small screens + using "R", noting that Warnsdorf's method is easily done with "a". + + modify several test-programs which call use_default_colors() to + consistently do this only if "-d" option is given. + + additional changes to test with non-standard variants of curses: + + modify a loop limit in firework.c to work around absense of limit + checks in some libraries. + + fill the last row of a window with "?" in firstlast if waddch does + not return ERR on the lower-right corner. + + add checks in test/configure for some functions not in 4.3BSD curses. + + fix a regression in test/configure (cf: 20170826). +- Split off terminfo-iterm to avoid conflict with package libiterm1 + +------------------------------------------------------------------- +Sun Aug 27 13:25:52 UTC 2017 - werner@suse.de + +- Add ncurses patch 20170826 + + fixes for "iterm2" (report by Leonardo Brondani Schenkel) -TD + + corrected a warning from tic about keys which are the same, to skip + over missing/cancelled values. + + add check in tic for unnecessary use of "2" to denote a shifted + special key. + + improve checks in trim_sgr0, comp_parse.c and parse_entry.c, for + cancelled string capabilities. + + add check in _nc_parse_entry() for invalid entry name, setting the + name to "invalid" to avoid problems storing entries. + + add/improve checks in tic's parser to address invalid input + + add a check in comp_scan.c to handle the special case where a + nontext file ending with a NUL rather than newline is given to tic + as input (Redhat #1484274). + + allow for cancelled capabilities in _nc_save_str (Redhat #1484276). + + add validity checks for "use=" target in _nc_parse_entry (Redhat + #1484284). + + check for invalid strings in postprocess_termcap (Redhat #1484285) + + reset secondary pointers on EOF in next_char() (Redhat #1484287). + + guard _nc_safe_strcpy() and _nc_safe_strcat() against calls using + cancelled strings (Redhat #1484291). + + correct typo in curs_memleaks.3x (Sven Joachim). + + improve test/configure checks for some curses variants not based on + X/Open Curses. + + add options for test/configure to disable checks for form, menu and + panel libraries. + +------------------------------------------------------------------- +Mon Aug 21 05:16:17 UTC 2017 - werner@suse.de + +- Add ncurses patch 20170819 + + update "iterm" entry -TD + + add "iterm2" entry (report by Leonardo Brondani Schenkel) -TD + + regenerate llib-* files. + + regenerate HTML manpages. + + improve picsmap test-program: + + reduce memory used for tsearch + + add report in log file showing cumulative color coverage. + + add -x option to clear/tput to make the E3 extension optional + (cf: 20130622). + + add options -T and -V to clear command for compatibility with tput. + + add usage message to clear command (Debian #371855). + + improve usage messages for tset and tput. + + minor fixes to "RDGB" extension and reset_color_pairs(). + ------------------------------------------------------------------- Mon Aug 14 08:25:49 UTC 2017 - werner@suse.de diff --git a/ncurses.spec b/ncurses.spec index e3a6959..bdd66b1 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -113,7 +113,7 @@ contains information about any known terminal. The ncurses library makes use of this database to use terminals correctly. %package -n terminfo-screen -Summary: A terminal descriptions database +Summary: A terminal descriptions database for screen License: MIT Group: System/Base Requires: terminfo-base @@ -125,6 +125,19 @@ terminfo database, which might introduce trouble if used over network connections like ssh or slogin onto systems without those terminfo database entries. +%package -n terminfo-iterm +Summary: A terminal descriptions database for iterm +License: MIT +Group: System/Base +Requires: terminfo-base +Provides: terminfo:%{_datadir}/terminfo/i/iTerm.app + +%description -n terminfo-iterm +This package includes some useful entries for the iterm utility in the +terminfo database, which might introduce trouble if used over network +connections like ssh or slogin onto systems without those terminfo database +entries. + %package -n libncurses5 Summary: Terminal control library License: MIT @@ -244,8 +257,6 @@ rm -vf include/ncurses_dll.h rm -vf mkdirs.sh rm -vf tar-copy.sh rm -vf mk-dlls.sh -# Remove iterm link to iTerm.app -sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src %build # @@ -863,10 +874,16 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src %{terminfo s/screen.linux} %{terminfo s/screen.xterm} EOF + (cat > iterm.list) <<-EOF + %{terminfo i/iTerm.app} + %{terminfo i/iTerm2.app} + %{terminfo i/iterm} + %{terminfo i/iterm2} + EOF find %{buildroot}%{tabset ""} %{buildroot}%{terminfo ""} \ \( -type f -or -type l \) | \ sed "s@^%{buildroot}@@g" | \ - grep -v -F -x -f default.list -f screen.list \ + grep -v -F -x -f default.list -f screen.list -f iterm.list \ > extension.list rm -f %{buildroot}%{_prefix}/lib/terminfo mv pc/*.pc %{buildroot}%{_libdir}/pkgconfig/ @@ -892,6 +909,10 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src %defattr(-,root,root) %dir %{_datadir}/terminfo/ +%files -n terminfo-iterm -f iterm.list +%defattr(-,root,root) +%dir %{_datadir}/terminfo/ + %files -n ncurses-utils %defattr(-,root,root) %{_bindir}/clear