pool/ncurses
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libtic(w) now depends on normal/wide character API of libtinfo(w)

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=299
This commit is contained in:
Dr. Werner Fink 2017-04-24 08:26:33 +00:00 committed by Git OBS Bridge
parent 8ea4efa20d
commit 040254b2ae
6 changed files with 148 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ncurses-5.7-tack.dif
View File

@ -9,3 +9,14 @@
LDFLAGS = @EXTRA_LDFLAGS@ @TICS_LDFLAGS@ @TINFO_LDFLAGS@ \
@LDFLAGS@ @LD_MODEL@ @TICS_LIBS@ @TINFO_LIBS@ @LIBS@
--- ncurses/tinfo/read_entry.c
+++ ncurses/tinfo/read_entry.c 2017-04-24 07:47:15.533617238 +0000
@@ -754,7 +754,7 @@ _nc_read_entry2(const char *const name,
return code;
}
-#if NCURSES_EXT_NUMBERS
+#if !NCURSES_EXT_NUMBERS
/*
* This entrypoint is used by tack.
*/

8
ncurses-5.9-ibm327x.dif
View File

@ -3,15 +3,15 @@
1 file changed, 2 insertions(+), 2 deletions(-)
--- misc/terminfo.src
+++ misc/terminfo.src 2017-04-03 08:34:23.454879003 +0000
@@ -15976,8 +15976,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv
+++ misc/terminfo.src 2017-04-24 06:51:39.870170103 +0000
@@ -15971,8 +15971,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv
#
ibm327x|line mode IBM 3270 style,
- gn,
- clear=^M^J, el=^M, home=^M,
- clear=\r\n, el=\r, home=\r,
+ cols#80,
+ clear=^M^J, cr=^M, cud1=^J, el=^M, home=^M, ind=^J,
+ clear=\r\n, cr=\r, cud1=\n, el=\r, home=\r, ind=\n,
ibm3101|i3101|IBM 3101-10,
OTbs, am, xon,

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

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c30cb12d4cc3d19b0bc34c58e44cadd208e97b49f7597fe4dc795255cd89845a
size 2043761
oid sha256:8ade8bed120df0e88cacfa6d9f19a2900473615191706ec2bc33536f6518d0a5
size 2187413

154
ncurses-6.0.dif
View File

@ -21,7 +21,7 @@
19 files changed, 240 insertions(+), 80 deletions(-)
--- aclocal.m4
+++ aclocal.m4 2017-04-03 08:35:03.190142388 +0000
+++ aclocal.m4 2017-04-24 06:53:27.176085343 +0000
@@ -580,7 +580,7 @@ AC_MSG_CHECKING([for size of bool])
AC_CACHE_VAL(cf_cv_type_of_bool,[
rm -f cf_test.out
@ -150,7 +150,7 @@
esac
done
--- configure
+++ configure 2017-04-03 08:35:03.194142314 +0000
+++ configure 2017-04-24 06:53:27.184085187 +0000
@@ -5925,7 +5925,7 @@ case $cf_cv_system_name in
fi
;;
@ -287,7 +287,7 @@
# the next lines are needed for linking libtic over libncurses
TINFO_NAME=${LIB_NAME}
--- include/curses.h.in
+++ include/curses.h.in 2017-04-03 08:35:03.194142314 +0000
+++ include/curses.h.in 2017-04-24 06:53:27.184085187 +0000
@@ -177,6 +177,9 @@ typedef @cf_cv_typeof_chtype@ chtype;
typedef @cf_cv_typeof_mmask_t@ mmask_t;
#endif
@ -299,7 +299,7 @@
* We need FILE, etc. Include this before checking any feature symbols.
*/
--- include/termcap.h.in
+++ include/termcap.h.in 2017-04-03 08:35:03.194142314 +0000
+++ include/termcap.h.in 2017-04-24 06:53:27.184085187 +0000
@@ -46,6 +46,8 @@ extern "C"
{
#endif /* __cplusplus */
@ -310,7 +310,7 @@
#undef NCURSES_CONST
--- include/tic.h
+++ include/tic.h 2017-04-03 08:35:03.194142314 +0000
+++ include/tic.h 2017-04-24 06:53:27.184085187 +0000
@@ -205,12 +205,12 @@ struct alias
*/
@ -327,8 +327,8 @@
#define CANCELLED_STRING (char *)(-1)
--- man/man_db.renames
+++ man/man_db.renames 2017-04-03 08:35:03.194142314 +0000
@@ -162,6 +162,7 @@ term.7 term.7
+++ man/man_db.renames 2017-04-24 06:53:27.184085187 +0000
@@ -163,6 +163,7 @@ term.7 term.7
term_variables.3x terminfo_variables.3ncurses
terminfo.5 terminfo.5
terminfo.\\\*n terminfo.5
@ -336,7 +336,7 @@
tic.1m tic.1
toe.1m toe.1
tput.1 tput.1
@@ -170,6 +171,7 @@ vprintf.3 vprintf.3
@@ -170,6 +171,7 @@ tset.1 tset.1
wresize.3x wresize.3ncurses
#
# Other:
@ -345,7 +345,7 @@
#
getty.1 getty.8
--- man/ncurses.3x
+++ man/ncurses.3x 2017-04-03 08:35:03.194142314 +0000
+++ man/ncurses.3x 2017-04-24 06:53:27.184085187 +0000
@@ -134,6 +134,10 @@ after the shell environment variable \fB
[See \fBterminfo\fR(\*n) for further details.]
.SS Datatypes
@ -358,7 +358,7 @@
called \fIwindows\fR, which can be thought of as two-dimensional
arrays of characters representing all or part of a CRT screen.
--- misc/gen-pkgconfig.in
+++ misc/gen-pkgconfig.in 2017-04-03 08:35:03.194142314 +0000
+++ misc/gen-pkgconfig.in 2017-04-24 06:53:27.184085187 +0000
@@ -76,7 +76,7 @@ if test "$includedir" != "/usr/include"
fi
@ -398,7 +398,7 @@
echo "** creating ${name}${suffix}.pc"
--- misc/ncurses-config.in
+++ misc/ncurses-config.in 2017-04-03 08:35:03.194142314 +0000
+++ misc/ncurses-config.in 2017-04-24 06:53:27.184085187 +0000
@@ -100,7 +100,7 @@ while test $# -gt 0; do
# compile/link
--cflags)
@ -409,11 +409,11 @@
fi
if test "${includedir}" != /usr/include ; then
--- misc/terminfo.src
+++ misc/terminfo.src 2017-04-03 08:35:03.250141276 +0000
+++ misc/terminfo.src 2017-04-24 07:10:12.780603866 +0000
@@ -301,7 +301,9 @@ dumb|80-column dumb tty,
am,
cols#80,
bel=^G, cr=^M, cud1=^J, ind=^J,
bel=^G, cr=\r, cud1=\n, ind=\n,
-unknown|unknown terminal type,
+unknown|switch|patch|unknown terminal type,
+ gn, use=dumb,
@ -465,7 +465,7 @@
vt220-old|vt200-old|DEC VT220 in vt100 emulation mode,
@@ -3225,7 +3235,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=^M,
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,
- cup=\E[%i%p1%d;%p2%dH$<10>, cuu1=\E[A, dch1=\E[P,
+ cup=\E[%i%p1%d;%p2%dH$<10>, cuu1=\E[A, cvvis=\E[?25h, dch1=\E[P,
@ -482,14 +482,14 @@
cols#80, lines#24, wsl#80,
@@ -3395,7 +3406,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=^J, 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,
- dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M,
+ cvvis=\E[?25h, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M,
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,
@@ -3866,6 +3877,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.
@ -497,7 +497,7 @@
teraterm2.3|Tera Term Pro,
km, xon@,
ncv#43, vt@,
@@ -3875,7 +3887,7 @@ teraterm2.3|Tera Term Pro,
@@ -3874,7 +3886,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,
@ -506,7 +506,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,
@@ -4080,6 +4092,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.
@ -514,16 +514,16 @@
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 (
@@ -4089,7 +4102,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=^J, 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,
- dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M,
+ cvvis=\E[?25h, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M,
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,
@@ -4584,8 +4597,26 @@ xterm-noapp|xterm with cursor keys in no
@@ -4583,8 +4596,26 @@ xterm-noapp|xterm with cursor keys in no
xterm-24|vs100|xterms|xterm terminal emulator (X Window System),
lines#24, use=xterm-old,
@ -550,50 +550,50 @@
use=xterm-new,
# This entry assumes that xterm's handling of VT100 SI/SO is disabled by
@@ -4928,7 +4959,7 @@ xterms-sun|small (80x24) xterm with sunF
@@ -4927,7 +4958,7 @@ xterms-sun|small (80x24) xterm with sunF
#### GNOME (VTE)
# this describes the alpha-version of Gnome terminal shipped with Redhat 6.0
-gnome-rh62|Gnome terminal,
+gnome-rh62|Gnome terminal on Red Hat,
bce,
kdch1=\177, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
kdch1=^?, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
use=xterm-color,
@@ -5104,10 +5135,14 @@ mgt|Multi GNOME Terminal,
@@ -5103,10 +5134,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).
-kvt|KDE terminal,
+kvt-rh|KDE terminal,
bce, km@,
kdch1=\177, kend=\E[F, khome=\E[H, use=xterm-color,
kdch1=^?, kend=\E[F, khome=\E[H, use=xterm-color,
+# This is kvt for SuSE because we do not support BrokenByDesign[tm].
+kvt|KDE terminal,
+ kbs=\177, kdch1=\E[3~, use=kvt-rh,
+kvt|KDE terminal,
+ kdch1=^?, kdch1=\E[3~, use=kvt-rh,
+
# Konsole 1.0.1
# (formerly known as kvt)
#
@@ -5238,14 +5273,14 @@ mlterm3|multi lingual terminal emulator,
@@ -5237,14 +5272,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,
- acsc=00``aaffgghhjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+ acsc=++\,\,--..00II``aaffgghhjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
bel=^G, bold=\E[1m, cbt=\E[Z, civis=\E[?25l,
clear=\E[H\E[2J, cnorm=\E[?25h, cr=^M,
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=^J, 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,
- dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M,
- ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, enacs=,
+ cvvis=\E[?25h, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM,
+ dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, enacs=,
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=^J, indn=\E[%p1%dS,
is2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>,
@@ -5301,6 +5336,7 @@ mlterm-256color|mlterm 3.0 with xterm 25
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=^?,
@@ -5300,6 +5335,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".
@ -601,25 +601,25 @@
#
# removed dch/dch1 because they are inconsistent with bce/ech -TD
# remove km as per tack test -TD
@@ -5312,13 +5348,14 @@ rxvt-basic|rxvt terminal base (X Window
clear=\E[H\E[2J, cnorm=\E[?25h, cr=^M,
@@ -5311,13 +5347,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=^J, 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, cvvis=\E[?25h,
dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K,
enacs=\E(B\E)0, flash=\E[?5h$<100/>\E[?5l, home=\E[H,
ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL,
il1=\E[L, ind=^J, is1=\E[?47l\E=\E[?1l,
il1=\E[L, ind=\n, is1=\E[?47l\E=\E[?1l,
- is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, kbs=^H,
- kcbt=\E[Z, kmous=\E[M, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O,
+ is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, kbs=\177, kcbt=\E[Z,
+ is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, kbs=^?, kcbt=\E[Z,
+ kmous=\E[M, kf1=\E[11~, kf2=\E[12~, kf3=\E[13~, kf4=\E[14~,
+ rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O,
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,
@@ -5329,7 +5366,7 @@ rxvt-basic|rxvt terminal base (X Window
@@ -5328,7 +5365,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,
@ -628,7 +628,7 @@
# Key Codes from rxvt reference:
#
# Note: Shift + F1-F10 generates F11-F20
@@ -5412,8 +5449,8 @@ rxvt-basic|rxvt terminal base (X Window
@@ -5411,8 +5448,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,
@ -639,7 +639,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~,
@@ -5474,6 +5511,38 @@ rxvt-cygwin-native|rxvt terminal emulato
@@ -5473,6 +5510,38 @@ rxvt-cygwin-native|rxvt terminal emulato
\302x\263y\363z\362{\343|\330~\376,
use=rxvt-cygwin,
@ -678,7 +678,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,
@@ -5520,7 +5589,7 @@ mrxvt-256color|multitabbed rxvt with 256
@@ -5519,7 +5588,7 @@ mrxvt-256color|multitabbed rxvt with 256
# Eterm 0.9.3
#
# removed kf0 which conflicts with kf10 -TD
@ -687,7 +687,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
@@ -5534,13 +5603,13 @@ Eterm|Eterm-color|Eterm with xterm-style
@@ -5533,13 +5602,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,15 +695,15 @@
+ cvvis=\E[?25h, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M,
ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E)0,
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=^J,
ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\n,
is1=\E[?47l\E>\E[?1l,
is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, kNXT@,
- kPRV@, ka1=\E[7~, ka3=\E[5~, kb2=\EOu, kbeg=\EOu, kbs=^H,
+ kPRV@, ka1=\E[7~, ka3=\E[5~, kb2=\EOu, kbeg=\EOu, kbs=\177,
+ kPRV@, ka1=\E[7~, ka3=\E[5~, kb2=\EOu, kbeg=\EOu, kbs=^?,
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,
@@ -6143,7 +6212,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
@ -711,8 +711,8 @@
+eterm-19|gnu emacs term.el terminal emulation,
am, mir, xenl,
cols#80, lines#24,
bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=^M,
@@ -6158,6 +6227,13 @@ eterm|gnu emacs term.el terminal emulati
bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=\r,
@@ -6156,6 +6225,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,
@ -726,25 +726,25 @@
# 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
@@ -6278,7 +6354,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=^J, is2=\E)0,
ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=\n, is2=\E)0,
- kbs=^H, kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC,
+ kbs=\177, kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC,
+ kbs=^?, kcbt=\E[Z, 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,
kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
@@ -6480,7 +6556,7 @@ screen2|old VT 100/ANSI X3.64 virtual te
@@ -6478,7 +6554,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,
- il1=\E[L, ind=^J, kbs=^H, kcub1=\ED, kcud1=\EB, kcuf1=\EC,
+ il1=\E[L, ind=^J, kbs=\177, kcub1=\ED, kcud1=\EB, kcuf1=\EC,
- il1=\E[L, ind=\n, kbs=^H, kcub1=\ED, kcud1=\EB, kcuf1=\EC,
+ il1=\E[L, ind=\n, kbs=^?, kcub1=\ED, kcud1=\EB, kcuf1=\EC,
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=^M^J, rc=\E8, ri=\EM, rmir=\E[4l, rmso=\E[23m,
@@ -8339,7 +8415,7 @@ hp700-wy|HP700/41 emulating wyse30,
nel=\r\n, rc=\E8, ri=\EM, rmir=\E[4l, rmso=\E[23m,
@@ -8337,7 +8413,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,
@ -753,7 +753,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,
@@ -11560,6 +11636,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit
@@ -11558,6 +11634,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit
# at support for the VT320 itself.
# Please send changes with explanations to bug-gnu-emacs@prep.ai.mit.edu.
# (vt320-k3: I added <rmam>/<smam> based on the init string -- esr)
@ -761,25 +761,25 @@
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,
@@ -11569,7 +11646,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio
@@ -11567,7 +11644,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=^J, 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,
- dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M,
+ cvvis=\E[?25h, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M,
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,
@@ -15986,7 +16063,7 @@ ibm3101|i3101|IBM 3101-10,
@@ -15981,7 +16058,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=^J, kcub1=\ED, kcud1=\EB,
kcuf1=\EC, kcuu1=\EA, nel=^M^J, tbc=\EH,
el=\EI, home=\EH, hts=\E0, ind=\n, kcub1=\ED, kcud1=\EB,
kcuf1=\EC, kcuu1=\EA, nel=\r\n, tbc=\EH,
-ibm3151|IBM 3151 display,
+ibm3151|i3151|IBM 3151 display,
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
@@ -16244,7 +16321,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De
@@ -16239,7 +16316,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.
@ -789,7 +789,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-04-03 08:35:03.198142240 +0000
+++ ncurses/Makefile.in 2017-04-24 06:53:27.192085032 +0000
@@ -218,7 +218,7 @@ $(DESTDIR)$(libdir) :
../lib : ; mkdir $@
@ -800,8 +800,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 2017-04-03 08:35:03.198142240 +0000
@@ -2049,6 +2049,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec
+++ ncurses/curses.priv.h 2017-04-24 06:53:27.192085032 +0000
@@ -2079,6 +2079,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);
@ -811,7 +811,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-04-03 08:35:03.198142240 +0000
+++ ncurses/run_cmd.sh 2017-04-24 06:53:27.192085032 +0000
@@ -0,0 +1,11 @@
+#!/bin/sh
+
@ -825,7 +825,7 @@
+
+exec ${1+"$@"}
--- ncurses/tinfo/MKfallback.sh
+++ ncurses/tinfo/MKfallback.sh 2017-04-03 08:35:03.198142240 +0000
+++ ncurses/tinfo/MKfallback.sh 2017-04-24 07:11:25.651194948 +0000
@@ -68,6 +68,12 @@ else
tmp_info=
fi
@ -843,8 +843,8 @@
for x in $*
do
echo "/* $x */"
- infocmp -E $x
+ $infocmp -E $x
- infocmp -E $x | sed -e 's/\<short\>/NCURSES_INT2/g'
+ $infocmp -E $x | sed -e 's/\<short\>/NCURSES_INT2/g'
done
cat <<EOF
@ -858,7 +858,7 @@
done
--- ncurses/tinfo/access.c
+++ ncurses/tinfo/access.c 2017-04-03 08:35:03.198142240 +0000
+++ ncurses/tinfo/access.c 2017-04-24 06:53:27.192085032 +0000
@@ -35,6 +35,9 @@
#include <ctype.h>
@ -901,8 +901,8 @@
_nc_access(const char *path, int mode)
{
--- ncurses/tinfo/lib_setup.c
+++ ncurses/tinfo/lib_setup.c 2017-04-03 08:35:03.198142240 +0000
@@ -593,6 +593,9 @@ _nc_locale_breaks_acs(TERMINAL * termp)
+++ ncurses/tinfo/lib_setup.c 2017-04-24 06:53:27.192085032 +0000
@@ -599,6 +599,9 @@ _nc_locale_breaks_acs(TERMINAL *termp)
} else if ((value = tigetnum("U8")) >= 0) {
result = value; /* use extension feature */
} else if ((env = getenv("TERM")) != 0) {
@ -913,7 +913,7 @@
result = 1; /* always broken */
} else if (strstr(env, "screen") != 0
--- ncurses/tinfo/read_entry.c
+++ ncurses/tinfo/read_entry.c 2017-04-03 08:35:03.198142240 +0000
+++ ncurses/tinfo/read_entry.c 2017-04-24 06:53:27.192085032 +0000
@@ -431,6 +431,7 @@ _nc_read_file_entry(const char *const fi
FILE *fp = 0;
int code;
@ -931,7 +931,7 @@
return (code);
}
--- ncurses/tinfo/read_termcap.c
+++ ncurses/tinfo/read_termcap.c 2017-04-03 08:35:03.198142240 +0000
+++ ncurses/tinfo/read_termcap.c 2017-04-24 06:53:27.192085032 +0000
@@ -322,14 +322,18 @@ _nc_getent(
*/
if (fd >= 0) {
@ -978,8 +978,8 @@
}
if (copied != 0)
--- test/test.priv.h
+++ test/test.priv.h 2017-04-03 08:35:03.198142240 +0000
@@ -798,12 +798,12 @@ extern char *strnames[], *strcodes[], *s
+++ test/test.priv.h 2017-04-24 06:53:27.192085032 +0000
@@ -801,12 +801,12 @@ extern char *strnames[], *strcodes[], *s
#endif
/* out-of-band values for representing absent capabilities */

50
ncurses.changes
View File

@ -1,3 +1,53 @@
-------------------------------------------------------------------
Mon Apr 24 08:15:55 UTC 2017 - werner@suse.de
- Also split libtic into normal and wide version libticw as those
libraries are linked with libtinfo respectively libtinfow
- The tack tool does require the old _nc_read_entry()
-------------------------------------------------------------------
Mon Apr 24 06:46:05 UTC 2017 - werner@suse.de
- Add ncurses patch 20170422
+ build-fix for termcap-configuration (report by Chi-Hsuan Yen).
+ improve terminfo manual page discussion of control- and graphics-
characters.
+ remove tic warning about "^?" in string capabilities, which was
marked as an extension (cf: 20000610, 20110820); however all Unix
implementations support this and X/Open Curses does not address it.
On the other hand, termcap never did support this feature.
+ correct missing comma-separator between string capabilities in
icl6402 and m2-nam -TD
+ restore rmir/smir in ansi+idc to better match original ansiterm+idc,
add alias ansiterm (report by Robert King).
+ amend an old check for ambiguous use of "ma" in terminfo versus
a termcap use, if the capability is cancelled to treat it as number.
+ correct a case in _nc_captoinfo() which read "%%" and emitted "%".
+ modify sscanf calls in _nc_infotocap() for patterns "%{number}%+%c"
and "%'char'%+%c" to check that the final character is really 'c',
avoiding a case in icl6404 which cannot be converted to termcap.
+ in _nc_infotocap(), add a check to ensure that terminfo "^?" is not
written to termcap, because the BSDs did not implement that.
+ in _nc_tic_expand() and _nc_infotocap(), improve string-length check
when deciding whether to use "^X" or "\xxx" format for control
characters, to make the output of tic/infocmp more predictable.
+ limit termcap "%d" width to 2 digits on input, and use "%2" in
preference to "%02" on output.
+ correct terminfo/termcap conversion of "%02" and "%03" into "%2" and
"%3"; the result repeated the last character.
+ add man/scr_dump.5 to document screen-dump format.
- Add ncurses patch 20170415
+ modify several test programs to use new popup_msgs, adapted from
help-screen used in test/edit_field.c
+ drop two symbols obsoleted in 2004: _nc_check_termtype, and
_nc_resolve_uses
+ fix some old copyright dates (cf: 20031025).
+ build-fixes for test/savescreen.c to work with AIX and HPUX.
+ minor fix to configure script, adding a backslash/continuation.
+ extend TERMINAL structure for ABI 6 to store numbers internally as
integers rather than short, by adding new data for this purpose.
+ more fixes for minor memory-leaks in test-programs.
-------------------------------------------------------------------
Thu Apr 13 13:16:58 UTC 2017 - werner@suse.de

6
ncurses.spec
View File

@ -569,6 +569,7 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
--enable-ext-mouse \
--enable-widec \
--with-termlib=tinfow \
--with-ticlib=ticw \
--enable-ext-colors \
--disable-overwrite \
%if %{with symversion}
@ -608,6 +609,7 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
--disable-ext-mouse \
--enable-widec \
--with-termlib=tinfow \
--with-ticlib=ticw \
--disable-ext-colors \
--disable-overwrite \
%if %{with symversion}
@ -652,7 +654,7 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
(cd %{root}/; tar -cpSf - *)|tar -xpsSf - -C %{buildroot}/
rm -rf %{root}
mkdir %{buildroot}/%{_lib}
for model in libncurses libncursest libncursesw libncursestw libtinfo libtinfow
for model in libncurses libncursest libncursesw libncursestw libtinfo libtinfow libtic libticw
do
for lib in %{buildroot}%{_libdir}/${model}.so.* ; do
test -e "${lib}" || continue
@ -712,7 +714,7 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
ln -sf ../${lib##*/} ${lnk}
esac
done
for model in libncurses libncursest libncursesw libncursestw libtinfo libtinfow
for model in libncurses libncursest libncursesw libncursestw libtinfo libtinfow libtic libticw
do
for lib in %{buildroot}%{_libdir}/${model}.so.* ; do
test -e "${lib}" || continue