rpm/ncurses
SHA256
1
0
Fork 0
forked from pool/ncurses
Code Pull Requests Activity

Accepting request 527053 from Base:System

Browse Source 
- Add ncurses patch +20170916
 + minor fix to test/filter.c to avoid clearing the command in one case.
 + modify filter() to discard clr_eos if back_color_erase is set.

- Do not remove ticw.pc as well as tinfow.pc for wide character
  ncurses ABI 6 (boo#1056171)

- 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.

OBS-URL: https://build.opensuse.org/request/show/527053
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ncurses?expand=0&rev=135
This commit is contained in:
Dominique Leuenberger 2017-09-20 15:06:07 +00:00 committed by Git OBS Bridge
commit 5d2166fdec
5 changed files with 209 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ncurses-5.9-ibm327x.dif
View File

@ -3,8 +3,8 @@
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
--- misc/terminfo.src --- misc/terminfo.src
+++ misc/terminfo.src 2017-07-31 12:13:00.613650108 +0000 +++ misc/terminfo.src 2017-08-27 13:31:59.993779178 +0000
@@ -15986,8 +15986,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv @@ -16086,8 +16086,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv
# #
ibm327x|line mode IBM 3270 style, ibm327x|line mode IBM 3270 style,

4
ncurses-6.0-patches.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:62578e06a2297bfe5a142964a4a10349c83fbc384734c72fc2b1ac5583bb55fd oid sha256:f68a10599401b16daa2863dbea754de997b52728c63b7fa6882f00ea9bb6a406
size 2711478 size 2934285

117
ncurses-6.0.dif
View File

@ -22,7 +22,7 @@
20 files changed, 249 insertions(+), 82 deletions(-) 20 files changed, 249 insertions(+), 82 deletions(-)
--- aclocal.m4 --- aclocal.m4
+++ aclocal.m4 2017-08-01 08:37:09.362094788 +0000 +++ aclocal.m4 2017-09-11 09:50:30.547698975 +0000
@@ -580,7 +580,7 @@ AC_MSG_CHECKING([for size of bool]) @@ -580,7 +580,7 @@ AC_MSG_CHECKING([for size of bool])
AC_CACHE_VAL(cf_cv_type_of_bool,[ AC_CACHE_VAL(cf_cv_type_of_bool,[
rm -f cf_test.out rm -f cf_test.out
@ -151,7 +151,7 @@
esac esac
done done
--- configure --- configure
+++ configure 2017-08-01 08:37:09.362094788 +0000 +++ configure 2017-09-11 09:50:30.551698903 +0000
@@ -5950,7 +5950,7 @@ case $cf_cv_system_name in @@ -5950,7 +5950,7 @@ case $cf_cv_system_name in
fi fi
;; ;;
@ -279,7 +279,7 @@
;; ;;
esac esac
done done
@@ -22771,6 +22775,7 @@ if test "$with_termlib" != no ; then @@ -22773,6 +22777,7 @@ if test "$with_termlib" != no ; then
TINFO_LDFLAGS="-L${LIB_DIR}" TINFO_LDFLAGS="-L${LIB_DIR}"
SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}" SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
fi fi
@ -288,7 +288,7 @@
# the next lines are needed for linking libtic over libncurses # the next lines are needed for linking libtic over libncurses
TINFO_NAME=${LIB_NAME} TINFO_NAME=${LIB_NAME}
--- include/curses.h.in --- include/curses.h.in
+++ include/curses.h.in 2017-08-01 08:37:09.366094714 +0000 +++ include/curses.h.in 2017-09-11 09:50:30.551698903 +0000
@@ -177,6 +177,9 @@ typedef @cf_cv_typeof_chtype@ chtype; @@ -177,6 +177,9 @@ typedef @cf_cv_typeof_chtype@ chtype;
typedef @cf_cv_typeof_mmask_t@ mmask_t; typedef @cf_cv_typeof_mmask_t@ mmask_t;
#endif #endif
@ -300,7 +300,7 @@
* We need FILE, etc. Include this before checking any feature symbols. * We need FILE, etc. Include this before checking any feature symbols.
*/ */
--- include/termcap.h.in --- include/termcap.h.in
+++ include/termcap.h.in 2017-08-01 08:37:09.366094714 +0000 +++ include/termcap.h.in 2017-09-11 09:50:30.551698903 +0000
@@ -46,6 +46,8 @@ extern "C" @@ -46,6 +46,8 @@ extern "C"
{ {
#endif /* __cplusplus */ #endif /* __cplusplus */
@ -311,7 +311,7 @@
#undef NCURSES_CONST #undef NCURSES_CONST
--- include/tic.h --- include/tic.h
+++ include/tic.h 2017-08-01 08:37:09.366094714 +0000 +++ include/tic.h 2017-09-11 09:50:30.551698903 +0000
@@ -207,12 +207,12 @@ struct alias @@ -207,12 +207,12 @@ struct alias
*/ */
@ -328,7 +328,7 @@
#define CANCELLED_STRING (char *)(-1) #define CANCELLED_STRING (char *)(-1)
--- man/man_db.renames --- man/man_db.renames
+++ man/man_db.renames 2017-08-01 08:37:09.366094714 +0000 +++ man/man_db.renames 2017-09-11 09:50:30.551698903 +0000
@@ -163,6 +163,7 @@ term.7 term.7 @@ -163,6 +163,7 @@ term.7 term.7
term_variables.3x terminfo_variables.3ncurses term_variables.3x terminfo_variables.3ncurses
terminfo.5 terminfo.5 terminfo.5 terminfo.5
@ -346,7 +346,7 @@
# #
getty.1 getty.8 getty.1 getty.8
--- man/ncurses.3x --- man/ncurses.3x
+++ man/ncurses.3x 2017-08-01 08:37:09.366094714 +0000 +++ man/ncurses.3x 2017-09-11 09:50:30.551698903 +0000
@@ -137,6 +137,10 @@ after the shell environment variable \fB @@ -137,6 +137,10 @@ after the shell environment variable \fB
[See \fBterminfo\fR(\*n) for further details.] [See \fBterminfo\fR(\*n) for further details.]
.SS Datatypes .SS Datatypes
@ -359,7 +359,7 @@
called \fIwindows\fR, which can be thought of as two-dimensional called \fIwindows\fR, which can be thought of as two-dimensional
arrays of characters representing all or part of a CRT screen. arrays of characters representing all or part of a CRT screen.
--- misc/gen-pkgconfig.in --- misc/gen-pkgconfig.in
+++ misc/gen-pkgconfig.in 2017-08-01 08:37:09.366094714 +0000 +++ misc/gen-pkgconfig.in 2017-09-11 09:50:30.551698903 +0000
@@ -76,7 +76,7 @@ if test "$includedir" != "/usr/include" @@ -76,7 +76,7 @@ if test "$includedir" != "/usr/include"
fi fi
@ -399,7 +399,7 @@
echo "** creating ${name}${suffix}.pc" echo "** creating ${name}${suffix}.pc"
--- misc/ncurses-config.in --- misc/ncurses-config.in
+++ misc/ncurses-config.in 2017-08-01 08:37:09.366094714 +0000 +++ misc/ncurses-config.in 2017-09-11 09:50:30.551698903 +0000
@@ -100,7 +100,7 @@ while test $# -gt 0; do @@ -100,7 +100,7 @@ while test $# -gt 0; do
# compile/link # compile/link
--cflags) --cflags)
@ -410,7 +410,7 @@
fi fi
if test "${includedir}" != /usr/include ; then if test "${includedir}" != /usr/include ; then
--- misc/terminfo.src --- misc/terminfo.src
+++ misc/terminfo.src 2017-08-01 08:37:09.370094642 +0000 +++ misc/terminfo.src 2017-09-11 09:50:30.631697446 +0000
@@ -301,7 +301,9 @@ dumb|80-column dumb tty, @@ -301,7 +301,9 @@ dumb|80-column dumb tty,
am, am,
cols#80, cols#80,
@ -422,16 +422,7 @@
gn, use=dumb, gn, use=dumb,
lpr|printer|line printer, lpr|printer|line printer,
OTbs, hc, os, OTbs, hc, os,
@@ -1351,7 +1353,7 @@ nsterm|Apple_Terminal|AppKit Terminal.ap @@ -1844,9 +1846,15 @@ linux-c|linux console 1.3.6+ for older n
#
# 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
# The 2.2.x kernels add a private mode that sets the cursor type; use that to # The 2.2.x kernels add a private mode that sets the cursor type; use that to
# get a block cursor for cvvis. # get a block cursor for cvvis.
# reported by Frank Heckenbach <frank@g-n-u.de>. # reported by Frank Heckenbach <frank@g-n-u.de>.
@ -448,7 +439,7 @@
# Linux 2.6.x has a fix for SI/SO to work with UTF-8 encoding added here: # 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 # 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 acsc=++\,\,--..00__``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwx
xyyzz{{||}c~~, xyyzz{{||}c~~,
enacs=\E)0, rmacs=^O, 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 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%;, %t;2%;%?%p6%t;1%;m%?%p9%t\016%e\017%;,
sgr0=\E[m\017, smacs=^N, use=linux2.2, 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 # 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. # with the key marked (ESC) on the vt220. See vt220d for an alternate mapping.
# PF1--PF4 are used as F1--F4. # PF1--PF4 are used as F1--F4.
@ -464,7 +455,7 @@
# #
# added msgr -TD # added msgr -TD
vt220-old|vt200-old|DEC VT220 in vt100 emulation mode, 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, bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>, civis=\E[?25l,
clear=\E[H\E[2J$<50>, cnorm=\E[?25h, cr=\r, 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, 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, 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/>, 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, 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... # to SMASH the 1k-barrier...
# From: Adam Thompson <athompso@pangea.ca> Sept 10 1995 # From: Adam Thompson <athompso@pangea.ca> Sept 10 1995
# (vt320: uncommented <fsl> --esr) # (vt320: uncommented <fsl> --esr)
@ -481,7 +472,7 @@
vt320|vt300|dec vt320 7 bit terminal, vt320|vt300|dec vt320 7 bit terminal,
am, hs, mir, msgr, xenl, am, hs, mir, msgr, xenl,
cols#80, lines#24, wsl#80, 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, 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, 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, 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, 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, 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, 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 # 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 # "resize -s"), though it does not pass SIGWINCH to the application if the
# user resizes the window with the mouse. # user resizes the window with the mouse.
@ -498,7 +489,7 @@
teraterm2.3|Tera Term Pro, teraterm2.3|Tera Term Pro,
km, xon@, km, xon@,
ncv#43, vt@, 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, \264v\301w\302x\263y\363z\362{\343|\330}\234~\376,
blink=\E[5m, bold=\E[1m, civis=\E[?25l, clear=\E[H\E[J, 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, 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, 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, flash=\E[?5h\E[?5l$<200/>, hpa=\E[%i%p1%dG,
il=\E[%p1%dL, il1=\E[L, kdch1=\E[3~, kf1=\E[11~, 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, use=xterm-r6,
# This is the base xterm entry for the xterm supplied with XFree86 3.2 & up. # 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. # 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), xterm-xf86-v32|xterm terminal emulator (XFree86 3.2 Window System),
OTbs, am, bce, km, mir, msgr, xenl, XT, OTbs, am, bce, km, mir, msgr, xenl, XT,
cols#80, it#8, lines#24, ncv@, 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, 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, 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, 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, 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, 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, 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), xterm-24|vs100|xterms|xterm terminal emulator (X Window System),
lines#24, use=xterm-old, lines#24, use=xterm-old,
@ -551,7 +542,7 @@
use=xterm-new, use=xterm-new,
# This entry assumes that xterm's handling of VT100 SI/SO is disabled by # 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) #### GNOME (VTE)
# this describes the alpha-version of Gnome terminal shipped with Redhat 6.0 # this describes the alpha-version of Gnome terminal shipped with Redhat 6.0
@ -560,7 +551,7 @@
bce, bce,
kdch1=^?, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kdch1=^?, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
use=xterm-color, use=xterm-color,
@@ -5105,10 +5136,14 @@ mgt|Multi GNOME Terminal, @@ -5206,10 +5237,14 @@ mgt|Multi GNOME Terminal,
#### KDE #### KDE
# This is kvt 0-18.7, shipped with Redhat 6.0 (though whether it supports bce # This is kvt 0-18.7, shipped with Redhat 6.0 (though whether it supports bce
# or not is debatable). # or not is debatable).
@ -576,7 +567,7 @@
# Konsole 1.0.1 # Konsole 1.0.1
# (formerly known as kvt) # (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, mlterm2|multi lingual terminal emulator,
am, eslok, km, mc5i, mir, msgr, npc, xenl, XT, am, eslok, km, mc5i, mir, msgr, npc, xenl, XT,
colors#8, cols#80, it#8, lines#24, pairs#64, 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@, 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, 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=^?, 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. # 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 # Since rxvt is not really compatible with xterm, it should be configured as
# "rxvt" or "rxvt-color". # "rxvt" or "rxvt-color".
@ -602,7 +593,7 @@
# #
# removed dch/dch1 because they are inconsistent with bce/ech -TD # removed dch/dch1 because they are inconsistent with bce/ech -TD
# remove km as per tack test -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, clear=\E[H\E[2J, cnorm=\E[?25h, cr=\r,
csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, 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, 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, rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=\E>, rmso=\E[27m,
rmul=\E[24m, rmul=\E[24m,
rs1=\E>\E[1;3;4;5;6l\E[?7h\E[m\E[r\E[2J\E[H, 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%;, %p9%t\016%e\017%;,
sgr0=\E[0m\017, smacs=^N, smcup=\E7\E[?47h, smir=\E[4h, 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, smkx=\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g, use=vt100+enq,
@ -629,7 +620,7 @@
# Key Codes from rxvt reference: # Key Codes from rxvt reference:
# #
# Note: Shift + F1-F10 generates F11-F20 # 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 # Removed kDN6, etc (control+shift) since rxvt does not implement this -TD
rxvt+pcfkeys|fragment for PC-style fkeys, rxvt+pcfkeys|fragment for PC-style fkeys,
kDC=\E[3$, kEND=\E[8$, kHOM=\E[7$, kIC=\E[2$, kLFT=\E[d, 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~, kend=\E[8~, kf1=\E[11~, kf10=\E[21~, kf11=\E[23~,
kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, kf15=\E[28~,
kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, 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, \302x\263y\363z\362{\343|\330~\376,
use=rxvt-cygwin, use=rxvt-cygwin,
@ -679,7 +670,7 @@
# This variant is supposed to work with rxvt 2.7.7 when compiled with # This variant is supposed to work with rxvt 2.7.7 when compiled with
# NO_BRIGHTCOLOR defined. rxvt needs more work... # NO_BRIGHTCOLOR defined. rxvt needs more work...
rxvt-16color|rxvt with 16 colors like aixterm, 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 # Eterm 0.9.3
# #
# removed kf0 which conflicts with kf10 -TD # 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 # Eterm does not implement control/shift cursor keys such as kDN6, or kPRV/kNXT
# but does otherwise follow the rxvt+pcfkeys model -TD # but does otherwise follow the rxvt+pcfkeys model -TD
# remove nonworking flash -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, 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, 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, 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, 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, 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=, 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 # 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 # The codes supported by the term.el terminal emulation in GNU Emacs 19.30
@ -713,7 +704,7 @@
am, mir, xenl, am, mir, xenl,
cols#80, lines#24, cols#80, lines#24,
bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=\r, 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, 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, sgr0=\E[m, smcup=\E7\E[?47h, smir=\E[4h, smso=\E[7m,
smul=\E[4m, smul=\E[4m,
@ -727,7 +718,7 @@
# The codes supported by the term.el terminal emulation in GNU Emacs 22.2 # 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, 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, 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, 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, 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~, 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, 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~, 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, E3@, use=screen+italics, use=screen+fkeys, use=xterm-new,
#:screen.xterm|screen for modern xterm, #:screen.xterm|screen for modern xterm,
#: use=screen.xterm-new, #: use=screen.xterm-new,
@ -750,7 +741,7 @@
# xterm-r6 does not really support khome/kend unless it is propped up by # xterm-r6 does not really support khome/kend unless it is propped up by
# the translations resource. # the translations resource.
screen.xterm-r6|screen customized for X11R6 xterm, 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, 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, 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, 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, kcuu1=\EA, kf0=\E~, kf1=\ES, kf2=\ET, kf3=\EU, kf4=\EV,
kf5=\EW, kf6=\EP, kf7=\EQ, kf8=\ER, kf9=\E0I, khome=\EH, 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, 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/>, ri=\Ej, rmir=\Er, rmso=\EG0$<10/>, rmul=\EG0$<10/>,
sgr0=\EG0$<10/>, smir=\Eq, smso=\EG4$<10/>, sgr0=\EG0$<10/>, smir=\Eq, smso=\EG4$<10/>,
smul=\EG8$<10/>, tbc=\E0, vpa=\E[%p1%{32}%+%c, smul=\EG8$<10/>, tbc=\E0, vpa=\E[%p1%{32}%+%c,
@ -768,7 +759,7 @@
am, da, db, xhp, am, da, db, xhp,
cols#80, lh#2, lines#24, lm#0, lw#8, nlab#8, cols#80, lh#2, lines#24, lm#0, lw#8, nlab#8,
acsc=0cjgktlrmfn/q\,t5u6v8w7x., bel=^G, blink=\E&dA, 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. # at support for the VT320 itself.
# Please send changes with explanations to bug-gnu-emacs@prep.ai.mit.edu. # 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) # (vt320-k3: I added <rmam>/<smam> based on the init string -- esr)
@ -776,7 +767,7 @@
vt320-k3|MS-Kermit 3.00's vt320 emulation, vt320-k3|MS-Kermit 3.00's vt320 emulation,
am, eslok, hs, km, mir, msgr, xenl, am, eslok, hs, km, mir, msgr, xenl,
cols#80, it#8, lines#49, pb#9600, vt#3, 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, 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, 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, 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, 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[ flash=\E[?5h$<100/>\E[?5l\E[?5h$<100/>\E[?5l\E[?5h$<100/>\E[
?5l, ?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, cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, ed=\EJ,
el=\EI, home=\EH, hts=\E0, ind=\n, kcub1=\ED, kcud1=\EB, el=\EI, home=\EH, hts=\E0, ind=\n, kcub1=\ED, kcud1=\EB,
kcuf1=\EC, kcuu1=\EA, nel=\r\n, tbc=\EH, 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, 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}%|%; sgr=\E4%{64}%?%p1%t%{65}%|%;%?%p2%t%{66}%|%;%?%p3%t%{65}%|%;
%?%p4%t%{68}%|%;%?%p5%t%{64}%|%;%?%p6%t%{72}%|%;%?%p7%t %?%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, tbc=\E[3g,
# "Megapel" refers to the display adapter, which was used with the IBM RT # "Megapel" refers to the display adapter, which was used with the IBM RT
# aka IBM 6150. # aka IBM 6150.
@ -804,7 +795,7 @@
s1ds=\E(0, sgr0=\E[0m\E(B, use=ibm5154, s1ds=\E(0, sgr0=\E[0m\E(B, use=ibm5154,
ibm5081-c|ibmmpel-c|IBM 5081 1024x1024 256/4096 Megapel enhanced color display, ibm5081-c|ibmmpel-c|IBM 5081 1024x1024 256/4096 Megapel enhanced color display,
--- ncurses/Makefile.in --- ncurses/Makefile.in
+++ ncurses/Makefile.in 2017-08-01 08:37:09.370094642 +0000 +++ ncurses/Makefile.in 2017-09-11 09:50:30.559698757 +0000
@@ -219,7 +219,7 @@ $(DESTDIR)$(libdir) : @@ -219,7 +219,7 @@ $(DESTDIR)$(libdir) :
../lib : ; mkdir $@ ../lib : ; mkdir $@
@ -815,8 +806,8 @@
./lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h ./lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h
$(SHELL) -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@ $(SHELL) -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@
--- ncurses/curses.priv.h --- ncurses/curses.priv.h
+++ ncurses/curses.priv.h 2017-08-01 08:37:09.370094642 +0000 +++ ncurses/curses.priv.h 2017-09-11 09:50:30.559698757 +0000
@@ -2130,6 +2130,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec @@ -2145,6 +2145,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec
extern NCURSES_EXPORT(char *) _nc_tracemouse (SCREEN *, MEVENT const *); extern NCURSES_EXPORT(char *) _nc_tracemouse (SCREEN *, MEVENT const *);
extern NCURSES_EXPORT(char *) _nc_trace_mmask_t (SCREEN *, mmask_t); extern NCURSES_EXPORT(char *) _nc_trace_mmask_t (SCREEN *, mmask_t);
extern NCURSES_EXPORT(int) _nc_access (const char *, int); extern NCURSES_EXPORT(int) _nc_access (const char *, int);
@ -826,7 +817,7 @@
extern NCURSES_EXPORT(int) _nc_freewin (WINDOW *); extern NCURSES_EXPORT(int) _nc_freewin (WINDOW *);
extern NCURSES_EXPORT(int) _nc_getenv_num (const char *); extern NCURSES_EXPORT(int) _nc_getenv_num (const char *);
--- ncurses/run_cmd.sh --- ncurses/run_cmd.sh
+++ ncurses/run_cmd.sh 2017-08-01 08:37:09.370094642 +0000 +++ ncurses/run_cmd.sh 2017-09-11 09:50:30.559698757 +0000
@@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
+#!/bin/sh +#!/bin/sh
+ +
@ -840,7 +831,7 @@
+ +
+exec ${1+"$@"} +exec ${1+"$@"}
--- ncurses/tinfo/MKfallback.sh --- ncurses/tinfo/MKfallback.sh
+++ ncurses/tinfo/MKfallback.sh 2017-08-01 08:37:09.370094642 +0000 +++ ncurses/tinfo/MKfallback.sh 2017-09-11 09:50:30.559698757 +0000
@@ -68,6 +68,12 @@ else @@ -68,6 +68,12 @@ else
tmp_info= tmp_info=
fi fi
@ -873,7 +864,7 @@
done done
--- ncurses/tinfo/access.c --- ncurses/tinfo/access.c
+++ ncurses/tinfo/access.c 2017-08-01 08:37:09.370094642 +0000 +++ ncurses/tinfo/access.c 2017-09-11 09:50:30.559698757 +0000
@@ -35,6 +35,9 @@ @@ -35,6 +35,9 @@
#include <ctype.h> #include <ctype.h>
@ -916,7 +907,7 @@
_nc_access(const char *path, int mode) _nc_access(const char *path, int mode)
{ {
--- ncurses/tinfo/lib_setup.c --- ncurses/tinfo/lib_setup.c
+++ ncurses/tinfo/lib_setup.c 2017-08-01 08:37:09.370094642 +0000 +++ ncurses/tinfo/lib_setup.c 2017-09-11 09:50:30.559698757 +0000
@@ -599,6 +599,9 @@ _nc_locale_breaks_acs(TERMINAL *termp) @@ -599,6 +599,9 @@ _nc_locale_breaks_acs(TERMINAL *termp)
} else if ((value = tigetnum("U8")) >= 0) { } else if ((value = tigetnum("U8")) >= 0) {
result = value; /* use extension feature */ result = value; /* use extension feature */
@ -928,7 +919,7 @@
result = 1; /* always broken */ result = 1; /* always broken */
} else if (strstr(env, "screen") != 0 } else if (strstr(env, "screen") != 0
--- ncurses/tinfo/read_entry.c --- ncurses/tinfo/read_entry.c
+++ ncurses/tinfo/read_entry.c 2017-08-01 08:37:09.370094642 +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 @@ -431,6 +431,7 @@ _nc_read_file_entry(const char *const fi
FILE *fp = 0; FILE *fp = 0;
int code; int code;
@ -946,7 +937,7 @@
return (code); return (code);
} }
--- ncurses/tinfo/read_termcap.c --- ncurses/tinfo/read_termcap.c
+++ ncurses/tinfo/read_termcap.c 2017-08-01 08:37:09.370094642 +0000 +++ ncurses/tinfo/read_termcap.c 2017-09-11 09:50:30.559698757 +0000
@@ -322,14 +322,18 @@ _nc_getent( @@ -322,14 +322,18 @@ _nc_getent(
*/ */
if (fd >= 0) { if (fd >= 0) {
@ -993,7 +984,7 @@
} }
if (copied != 0) if (copied != 0)
--- progs/Makefile.in --- progs/Makefile.in
+++ progs/Makefile.in 2017-08-01 08:37:41.133514443 +0000 +++ progs/Makefile.in 2017-09-11 09:50:30.559698757 +0000
@@ -100,7 +100,7 @@ CFLAGS_LIBTOOL = $(CCFLAGS) @@ -100,7 +100,7 @@ CFLAGS_LIBTOOL = $(CCFLAGS)
CFLAGS_NORMAL = $(CCFLAGS) CFLAGS_NORMAL = $(CCFLAGS)
CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE
@ -1013,8 +1004,8 @@
LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@) LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@)
--- test/test.priv.h --- test/test.priv.h
+++ test/test.priv.h 2017-08-01 08:37:09.370094642 +0000 +++ test/test.priv.h 2017-09-11 09:50:30.559698757 +0000
@@ -805,12 +805,12 @@ extern char *strnames[], *strcodes[], *s @@ -875,12 +875,12 @@ extern char *strnames[], *strcodes[], *s
#endif #endif
/* out-of-band values for representing absent capabilities */ /* out-of-band values for representing absent capabilities */

126
ncurses.changes
View File

@ -1,3 +1,129 @@
-------------------------------------------------------------------
Mon Sep 18 15:03:22 UTC 2017 - werner@suse.de
- Add ncurses patch +20170916
+ minor fix to test/filter.c to avoid clearing the command in one case.
+ modify filter() to discard clr_eos if back_color_erase is set.
-------------------------------------------------------------------
Mon Sep 18 14:58:55 UTC 2017 - werner@suse.de
- Do not remove ticw.pc as well as tinfow.pc for wide character
ncurses ABI 6 (boo#1056171)
-------------------------------------------------------------------
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
- Add ncurses patch 20170812
+ improve description of -R option in infocmp manual page (report by
Stephane Chazelas).
+ add reset_color_pairs() function.
+ add user_caps.5 manual page to document the terminfo extensions used
by ncurses.
+ improve build scripts, using SIGQUIT vs SIGTRAP; add other configure
script fixes from work on xterm, lynx and tack.
+ modify install-rule for ncurses-examples to put the data files in
/usr/share/ncurses-examples
+ improve tracemunch, by changing address-parameters of add_wch(),
color_content() and pair_content() to dummy parameters.
+ minor optimization to _nc_change_pair, to return quickly when the
current screen is marked for clearing.
+ in-progress changes to improve performance of test/picsmap.c for
loading image files.
+ modify allocation for SCREEN's color-pair table to start small, grow
on demand up to the existing limit.
+ add "RGB" extension capability for direct-color support, use this to
improve color_content().
+ improve picsmap test-program:
+ if no palette file is needed, attempt to load one based on $TERM,
checking first in the current directory, then by adding ".dat"
suffix, and finally in the data-directory, e.g.,
/usr/share/ncurses-examples
+ add "-l" option for logging
+ add "-d" option for debugging
+ add "-s" option for stepping automatically through list of images,
with time delay.
+ use tsearch to improve time for loading color table for images.
+ update config.guess, config.sub from
http://git.savannah.gnu.org/cgit/config.git
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jul 31 12:14:36 UTC 2017 - werner@suse.de Mon Jul 31 12:14:36 UTC 2017 - werner@suse.de

30
ncurses.spec
View File

@ -113,7 +113,7 @@ contains information about any known terminal. The ncurses library
makes use of this database to use terminals correctly. makes use of this database to use terminals correctly.
%package -n terminfo-screen %package -n terminfo-screen
Summary: A terminal descriptions database Summary: A terminal descriptions database for screen
License: MIT License: MIT
Group: System/Base Group: System/Base
Requires: terminfo-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 connections like ssh or slogin onto systems without those terminfo database
entries. 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 %package -n libncurses5
Summary: Terminal control library Summary: Terminal control library
License: MIT License: MIT
@ -244,8 +257,6 @@ rm -vf include/ncurses_dll.h
rm -vf mkdirs.sh rm -vf mkdirs.sh
rm -vf tar-copy.sh rm -vf tar-copy.sh
rm -vf mk-dlls.sh rm -vf mk-dlls.sh
# Remove iterm link to iTerm.app
sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
%build %build
# #
@ -608,7 +619,6 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
pushd man pushd man
sh ../edit_man.sh normal installing %{root}%{_mandir} . ncursesw6-config.1 sh ../edit_man.sh normal installing %{root}%{_mandir} . ncursesw6-config.1
popd popd
rm -f %{root}%{_libdir}/pkgconfig/ti*.pc
mv -f %{root}%{_libdir}/pkgconfig/*.pc pc/ mv -f %{root}%{_libdir}/pkgconfig/*.pc pc/
# #
@ -863,10 +873,16 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
%{terminfo s/screen.linux} %{terminfo s/screen.linux}
%{terminfo s/screen.xterm} %{terminfo s/screen.xterm}
EOF 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 ""} \ find %{buildroot}%{tabset ""} %{buildroot}%{terminfo ""} \
\( -type f -or -type l \) | \ \( -type f -or -type l \) | \
sed "s@^%{buildroot}@@g" | \ 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 > extension.list
rm -f %{buildroot}%{_prefix}/lib/terminfo rm -f %{buildroot}%{_prefix}/lib/terminfo
mv pc/*.pc %{buildroot}%{_libdir}/pkgconfig/ mv pc/*.pc %{buildroot}%{_libdir}/pkgconfig/
@ -892,6 +908,10 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
%defattr(-,root,root) %defattr(-,root,root)
%dir %{_datadir}/terminfo/ %dir %{_datadir}/terminfo/
%files -n terminfo-iterm -f iterm.list
%defattr(-,root,root)
%dir %{_datadir}/terminfo/
%files -n ncurses-utils %files -n ncurses-utils
%defattr(-,root,root) %defattr(-,root,root)
%{_bindir}/clear %{_bindir}/clear