update to 6.0-20170212
This commit is contained in:
Miroslav Lichvar
parent
bd4b2e6f74
commit
eb1f5af041
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
||||
/ncurses-6.0-20160709.tgz
|
||||
/ncurses-6.0-20170212.tgz
|
||||
|
||||
@ -6,6 +6,7 @@ $SRC/ncurses-*/configure $TCONFIGARGS \
|
||||
--enable-hard-tabs --enable-xmc-glitch --enable-colorfgbg \
|
||||
--enable-overwrite \
|
||||
--enable-pc-files \
|
||||
--disable-wattr-macros \
|
||||
--with-termlib=tinfo \
|
||||
--with-chtype=long \
|
||||
--with-ticlib
|
||||
|
||||
@ -1,21 +0,0 @@
|
||||
diff -up ncurses-6.0-20160116/include/curses.h.in.compheader ncurses-6.0-20160116/include/curses.h.in
|
||||
--- ncurses-6.0-20160116/include/curses.h.in.compheader 2016-01-26 10:28:56.531558497 +0100
|
||||
+++ ncurses-6.0-20160116/include/curses.h.in 2015-12-20 00:08:31.000000000 +0100
|
||||
@@ -1152,7 +1152,7 @@ extern NCURSES_EXPORT(int) NCURSES_SP_NA
|
||||
#define wattron(win,at) wattr_on(win, NCURSES_CAST(attr_t, at), NULL)
|
||||
#define wattroff(win,at) wattr_off(win, NCURSES_CAST(attr_t, at), NULL)
|
||||
|
||||
-#if !NCURSES_OPAQUE
|
||||
+#ifdef NCURSES_INTERNALS
|
||||
#if NCURSES_WIDECHAR && @NCURSES_EXT_COLORS@
|
||||
#define wattrset(win,at) ((win) \
|
||||
? ((win)->_color = NCURSES_CAST(int, PAIR_NUMBER(at)), \
|
||||
@@ -1300,7 +1300,7 @@ extern NCURSES_EXPORT(int) NCURSES_SP_NA
|
||||
#define slk_attr_off(a,v) ((v) ? ERR : slk_attroff(a))
|
||||
#define slk_attr_on(a,v) ((v) ? ERR : slk_attron(a))
|
||||
|
||||
-#if !NCURSES_OPAQUE
|
||||
+#ifdef NCURSES_INTERNALS
|
||||
#if NCURSES_WIDECHAR && @NCURSES_EXT_COLORS@
|
||||
#define wattr_set(win,a,p,opts) (((win) \
|
||||
? ((win)->_attrs = ((a) & ~A_COLOR), \
|
||||
@ -1,17 +1,17 @@
|
||||
diff -up ncurses-6.0-20150810/misc/terminfo.src.kbs ncurses-6.0-20150810/misc/terminfo.src
|
||||
--- ncurses-6.0-20150810/misc/terminfo.src.kbs 2015-08-12 17:20:04.911042013 +0200
|
||||
+++ ncurses-6.0-20150810/misc/terminfo.src 2015-08-12 17:29:44.997760090 +0200
|
||||
@@ -5058,7 +5058,7 @@ rxvt-basic|rxvt terminal base (X Window
|
||||
enacs=\E(B\E)0, flash=\E[?5h\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,
|
||||
diff -up ncurses-6.0-20170212/misc/terminfo.src.kbs ncurses-6.0-20170212/misc/terminfo.src
|
||||
--- ncurses-6.0-20170212/misc/terminfo.src.kbs 2017-02-14 15:13:30.225791601 +0100
|
||||
+++ ncurses-6.0-20170212/misc/terminfo.src 2017-02-14 15:17:13.284411455 +0100
|
||||
@@ -5282,7 +5282,7 @@ rxvt-basic|rxvt terminal base (X Window
|
||||
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,
|
||||
- is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, kbs=^H,
|
||||
+ is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l,
|
||||
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,
|
||||
rmul=\E[24m,
|
||||
@@ -5068,7 +5068,7 @@ rxvt-basic|rxvt terminal base (X Window
|
||||
sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;,
|
||||
@@ -5294,7 +5294,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,
|
||||
- use=rxvt+pcfkeys, use=vt220+keypad,
|
||||
@ -19,7 +19,7 @@ diff -up ncurses-6.0-20150810/misc/terminfo.src.kbs ncurses-6.0-20150810/misc/te
|
||||
# Key Codes from rxvt reference:
|
||||
#
|
||||
# Note: Shift + F1-F10 generates F11-F20
|
||||
@@ -6129,7 +6129,7 @@ screen|VT 100/ANSI X3.64 virtual termina
|
||||
@@ -6414,7 +6414,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,
|
||||
@ -28,8 +28,8 @@ diff -up ncurses-6.0-20150810/misc/terminfo.src.kbs ncurses-6.0-20150810/misc/te
|
||||
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~,
|
||||
@@ -6140,7 +6140,7 @@ screen|VT 100/ANSI X3.64 virtual termina
|
||||
sgr=\E[0%?%p6%t;1%;%?%p1%t;3%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;2%;m%?%p9%t\016%e\017%;,
|
||||
@@ -6426,7 +6426,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,
|
||||
smkx=\E[?1h\E=, smso=\E[3m, smul=\E[4m, tbc=\E[3g, E0=\E(B,
|
||||
- S0=\E(%p1%c, use=ecma+color,
|
||||
@ -37,11 +37,11 @@ diff -up ncurses-6.0-20150810/misc/terminfo.src.kbs ncurses-6.0-20150810/misc/te
|
||||
# The bce and status-line entries are from screen 3.9.13 (and require some
|
||||
# changes to .screenrc).
|
||||
screen-bce|VT 100/ANSI X3.64 virtual terminal with bce,
|
||||
@@ -6253,6 +6253,7 @@ screen.xterm-r6|screen customized for X1
|
||||
@@ -6540,6 +6540,7 @@ screen.xterm-r6|screen customized for X1
|
||||
# on Solaris because Sun's curses implementation gets confused.
|
||||
screen.teraterm|disable ncv in teraterm,
|
||||
ncv#127,
|
||||
+ kbs=^H,
|
||||
acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260i\316j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330}\234~\376,
|
||||
use=screen+fkeys, use=screen,
|
||||
# Other terminals
|
||||
acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260i
|
||||
\316j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u
|
||||
\264v\301w\302x\263y\363z\362{\343|\330}\234~\376,
|
||||
|
||||
13
ncurses.spec
13
ncurses.spec
@ -1,4 +1,4 @@
|
||||
%global revision 20160709
|
||||
%global revision 20170212
|
||||
Summary: Ncurses support utilities
|
||||
Name: ncurses
|
||||
Version: 6.0
|
||||
@ -8,8 +8,6 @@ Group: System Environment/Base
|
||||
URL: http://invisible-island.net/ncurses/ncurses.html
|
||||
Source0: ftp://invisible-island.net/ncurses/current/ncurses-%{version}-%{revision}.tgz
|
||||
|
||||
# make installed ncurses.h compatible with narrow-char libncurses (#1270534)
|
||||
Patch7: ncurses-compheader.patch
|
||||
Patch8: ncurses-config.patch
|
||||
Patch9: ncurses-libs.patch
|
||||
Patch11: ncurses-urxvt.patch
|
||||
@ -123,7 +121,6 @@ The ncurses-static package includes static libraries of the ncurses library.
|
||||
%prep
|
||||
%setup -q -n %{name}-%{version}-%{revision}
|
||||
|
||||
%patch7 -p1 -b .headercomp
|
||||
%patch8 -p1 -b .config
|
||||
%patch9 -p1 -b .libs
|
||||
%patch11 -p1 -b .urxvt
|
||||
@ -141,6 +138,7 @@ common_options="\
|
||||
--enable-overwrite \
|
||||
--enable-pc-files \
|
||||
--enable-xmc-glitch \
|
||||
--disable-wattr-macros \
|
||||
--with-cxx-shared \
|
||||
--with-ospeed=unsigned \
|
||||
--with-pkg-config-libdir=%{_libdir}/pkgconfig \
|
||||
@ -191,9 +189,10 @@ baseterms=
|
||||
for termname in \
|
||||
ansi dumb linux vt100 vt100-nav vt102 vt220 vt52 \
|
||||
Eterm\* aterm bterm cons25 cygwin eterm\* gnome gnome-256color hurd jfbterm \
|
||||
konsole konsole-256color mach\* mlterm mrxvt nsterm putty{,-\*} pcansi \
|
||||
rxvt{,-\*} screen{,-\*color,.\*} st{,-\*} sun teraterm teraterm2.3 \
|
||||
tmux{,-\*} vte vte-256color vwmterm wsvt25\* xfce xterm xterm-\*
|
||||
konsole konsole-256color mach\* mlterm mrxvt nsterm putty{,-256color} pcansi \
|
||||
rxvt{,-\*} screen{,-\*color,.[^mlp]\*,.linux,.mlterm\*,.putty{,-256color},.mrxvt} \
|
||||
st{,-\*} sun teraterm teraterm2.3 tmux{,-\*} vte vte-256color vwmterm \
|
||||
wsvt25\* xfce xterm xterm-\*
|
||||
do
|
||||
for i in $RPM_BUILD_ROOT%{_datadir}/terminfo/?/$termname; do
|
||||
for t in $(find $RPM_BUILD_ROOT%{_datadir}/terminfo -samefile $i); do
|
||||
|
||||
Loading…
Reference in New Issue
Block a user