update to 6.1-20180127

This commit is contained in:
Miroslav Lichvar 2018-01-29 11:43:16 +01:00
parent 1adea888ef
commit d332c33f2f
5 changed files with 30 additions and 31 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
/ncurses-6.0-20171125.tgz /ncurses-6.1-20180127.tgz

View File

@ -1,7 +1,7 @@
diff -up ncurses-5.9/misc/ncurses-config.in.config ncurses-5.9/misc/ncurses-config.in diff -up ncurses-6.1-20180127/misc/ncurses-config.in.config ncurses-6.1-20180127/misc/ncurses-config.in
--- ncurses-5.9/misc/ncurses-config.in.config 2012-10-15 15:33:36.092521158 +0200 --- ncurses-6.1-20180127/misc/ncurses-config.in.config 2017-12-09 23:45:44.000000000 +0100
+++ ncurses-5.9/misc/ncurses-config.in 2012-10-15 15:34:55.906581012 +0200 +++ ncurses-6.1-20180127/misc/ncurses-config.in 2018-01-29 10:57:48.596590822 +0100
@@ -35,7 +35,6 @@ exec_prefix="@exec_prefix@" @@ -40,7 +40,6 @@ exec_prefix="@exec_prefix@"
bindir="@bindir@" bindir="@bindir@"
includedir="@includedir@" includedir="@includedir@"
@ -9,7 +9,7 @@ diff -up ncurses-5.9/misc/ncurses-config.in.config ncurses-5.9/misc/ncurses-conf
datarootdir="@datarootdir@" datarootdir="@datarootdir@"
datadir="@datadir@" datadir="@datadir@"
mandir="@mandir@" mandir="@mandir@"
@@ -85,12 +84,7 @@ while test $# -gt 0; do @@ -111,12 +110,7 @@ while test $# -gt 0; do
ENDECHO ENDECHO
;; ;;
--libs) --libs)
@ -22,8 +22,8 @@ diff -up ncurses-5.9/misc/ncurses-config.in.config ncurses-5.9/misc/ncurses-conf
if test @TINFO_NAME@ = @LIB_NAME@ ; then if test @TINFO_NAME@ = @LIB_NAME@ ; then
sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
$LIBDIR @EXTRA_LDFLAGS@ -l${THIS} @LIBS@ $LIBDIR @EXTRA_LDFLAGS@ -l${THIS} @LIBS@
@@ -122,7 +116,6 @@ ENDECHO @@ -154,7 +148,6 @@ ENDECHO
echo "${includedir}" echo $INCS
;; ;;
--libdir) --libdir)
- echo "${libdir}" - echo "${libdir}"

View File

@ -1,7 +1,7 @@
diff -up ncurses-6.0-20170520/misc/terminfo.src.kbs ncurses-6.0-20170520/misc/terminfo.src diff -up ncurses-6.1-20180127/misc/terminfo.src.kbs ncurses-6.1-20180127/misc/terminfo.src
--- ncurses-6.0-20170520/misc/terminfo.src.kbs 2017-05-26 16:11:13.909282724 +0200 --- ncurses-6.1-20180127/misc/terminfo.src.kbs 2018-01-29 10:59:01.644758573 +0100
+++ ncurses-6.0-20170520/misc/terminfo.src 2017-05-26 16:12:54.818576300 +0200 +++ ncurses-6.1-20180127/misc/terminfo.src 2018-01-29 11:02:34.018246276 +0100
@@ -5316,7 +5316,7 @@ rxvt-basic|rxvt terminal base (X Window @@ -5713,7 +5713,7 @@ rxvt-basic|rxvt terminal base (X Window
enacs=\E(B\E)0, flash=\E[?5h$<100/>\E[?5l, home=\E[H, 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, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL,
il1=\E[L, ind=\n, is1=\E[?47l\E=\E[?1l, il1=\E[L, ind=\n, is1=\E[?47l\E=\E[?1l,
@ -10,7 +10,7 @@ diff -up ncurses-6.0-20170520/misc/terminfo.src.kbs ncurses-6.0-20170520/misc/te
kcbt=\E[Z, kmous=\E[M, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O, kcbt=\E[Z, kmous=\E[M, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O,
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,
@@ -5328,7 +5328,7 @@ rxvt-basic|rxvt terminal base (X Window @@ -5725,7 +5725,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,
@ -19,25 +19,24 @@ diff -up ncurses-6.0-20170520/misc/terminfo.src.kbs ncurses-6.0-20170520/misc/te
# Key Codes from rxvt reference: # Key Codes from rxvt reference:
# #
# Note: Shift + F1-F10 generates F11-F20 # Note: Shift + F1-F10 generates F11-F20
@@ -6447,7 +6447,7 @@ screen|VT 100/ANSI X3.64 virtual termina @@ -6897,7 +6897,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, hpa=\E[%i%p1%dG,
ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=\n, is2=\E)0, ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L,
- kbs=^H, kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, - ind=\n, indn=\E[%p1%dS, is2=\E)0, kbs=^H, kcbt=\E[Z,
+ kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, + ind=\n, indn=\E[%p1%dS, is2=\E)0, kcbt=\E[Z,
kcuu1=\EOA, kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~, 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, 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~, @@ -6911,6 +6911,7 @@ screen|VT 100/ANSI X3.64 virtual termina
@@ -6459,7 +6459,7 @@ screen|VT 100/ANSI X3.64 virtual termina
5%;%?%p5%t;2%;m%?%p9%t\016%e\017%;,
sgr0=\E[m\017, smacs=^N, smcup=\E[?1049h, smir=\E[4h, sgr0=\E[m\017, smacs=^N, smcup=\E[?1049h, smir=\E[4h,
smkx=\E[?1h\E=, smso=\E[3m, smul=\E[4m, tbc=\E[3g, E0=\E(B, smkx=\E[?1h\E=, smso=\E[3m, smul=\E[4m, tbc=\E[3g,
- S0=\E(%p1%c, use=ecma+color, vpa=\E[%i%p1%dd, E0=\E(B, S0=\E(%p1%c, use=ecma+color,
+ S0=\E(%p1%c, use=ecma+color, use=xterm+kbs, + use=xterm+kbs,
# The bce and status-line entries are from screen 3.9.13 (and require some # The bce and status-line entries are from screen 3.9.13 (and require some
# changes to .screenrc). # changes to .screenrc).
screen-bce|VT 100/ANSI X3.64 virtual terminal with bce, screen-bce|VT 100/ANSI X3.64 virtual terminal with bce,
@@ -6573,6 +6573,7 @@ screen.xterm-r6|screen customized for X1 @@ -7026,6 +7027,7 @@ screen.xterm-r6|screen customized for X1
# on Solaris because Sun's curses implementation gets confused. # on Solaris because Sun's curses implementation gets confused.
screen.teraterm|disable ncv in teraterm, screen.teraterm|disable ncv in teraterm,
ncv#127, ncv#127,

View File

@ -1,12 +1,12 @@
%global revision 20171125 %global revision 20180127
Summary: Ncurses support utilities Summary: Ncurses support utilities
Name: ncurses Name: ncurses
Version: 6.0 Version: 6.1
Release: 15.%{revision}%{?dist} Release: 15.%{revision}%{?dist}
License: MIT License: MIT
Group: System Environment/Base Group: System Environment/Base
URL: http://invisible-island.net/ncurses/ncurses.html URL: https://invisible-island.net/ncurses/ncurses.html
Source0: ftp://ftp.invisible-island.net/ncurses/current/ncurses-%{version}-%{revision}.tgz Source0: https://invisible-mirror.net/archives/ncurses/current/ncurses-%{version}-%{revision}.tgz
Patch8: ncurses-config.patch Patch8: ncurses-config.patch
Patch9: ncurses-libs.patch Patch9: ncurses-libs.patch

View File

@ -1 +1 @@
SHA512 (ncurses-6.0-20171125.tgz) = b06336a4696d5d5195177c0226f34aefebff05035247d43e1b958fb2098efb0fc2bf5a3c9d402c7c5e8fec65d03f5f290a84ef624f4a2f9348499551c5f4f09b SHA512 (ncurses-6.1-20180127.tgz) = bb814cf2e9697512e5b0b701e49f7a014718cd74a95e43e34e7411620e199ebe8a04e5777cb532b548b8bd4f0182071ab68c87ac0bfa6b13b3dc17a80ec4a656