rpms/ncurses
6
0
Fork 0
Code Issues Pull Requests Releases Activity

update to 6.0-20150810

Browse Source
This commit is contained in:
Miroslav Lichvar 2015-08-12 17:35:42 +02:00
parent 809d2181db
commit 222499d84f
6 changed files with 48 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1 +1 @@
/ncurses-5.9-20150214.tgz /ncurses-6.0-20150810.tgz

32
ncurses-kbs.patch
View File

@ -1,7 +1,7 @@
diff -up ncurses-5.9/misc/terminfo.src.kbs ncurses-5.9/misc/terminfo.src diff -up ncurses-6.0-20150810/misc/terminfo.src.kbs ncurses-6.0-20150810/misc/terminfo.src
--- ncurses-5.9/misc/terminfo.src.kbs 2013-05-13 11:17:28.074878157 +0200 --- ncurses-6.0-20150810/misc/terminfo.src.kbs 2015-08-12 17:20:04.911042013 +0200
+++ ncurses-5.9/misc/terminfo.src 2013-05-13 11:17:28.083878169 +0200 +++ ncurses-6.0-20150810/misc/terminfo.src 2015-08-12 17:29:44.997760090 +0200
@@ -4748,7 +4748,7 @@ rxvt-basic|rxvt terminal base (X Window @@ -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, 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, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[L,
ind=^J, is1=\E[?47l\E=\E[?1l, ind=^J, is1=\E[?47l\E=\E[?1l,
@ -10,7 +10,7 @@ diff -up ncurses-5.9/misc/terminfo.src.kbs ncurses-5.9/misc/terminfo.src
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,
@@ -4758,7 +4758,7 @@ rxvt-basic|rxvt terminal base (X Window @@ -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%;, sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%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,17 +19,17 @@ diff -up ncurses-5.9/misc/terminfo.src.kbs ncurses-5.9/misc/terminfo.src
# Key Codes from rxvt reference: # Key Codes from rxvt reference:
# #
# Note: Shift + F1-F10 generates F11-F20 # Note: Shift + F1-F10 generates F11-F20
@@ -5590,7 +5590,7 @@ screen|VT 100/ANSI X3.64 virtual termina @@ -6129,7 +6129,7 @@ screen|VT 100/ANSI X3.64 virtual termina
cvvis=\E[34l, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K,
dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E(B\E)0, enacs=\E(B\E)0, flash=\Eg, home=\E[H, ht=^I, hts=\EH,
flash=\Eg, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=^J, is2=\E)0,
- il=\E[%p1%dL, il1=\E[L, ind=^J, is2=\E)0, kbs=^H, kcbt=\E[Z, - kbs=^H, kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC,
+ il=\E[%p1%dL, il1=\E[L, ind=^J, is2=\E)0, kcbt=\E[Z, + kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC,
kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kcuu1=\EOA, kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~,
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,
@@ -5602,7 +5602,7 @@ screen|VT 100/ANSI X3.64 virtual termina kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
sgr=\E[0%?%p6%t;1%;%?%p1%t;3%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;, @@ -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%;,
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, E0=\E(B,
- S0=\E(%p1%c, use=ecma+color, - S0=\E(%p1%c, use=ecma+color,
@ -37,7 +37,7 @@ diff -up ncurses-5.9/misc/terminfo.src.kbs ncurses-5.9/misc/terminfo.src
# 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,
@@ -5696,6 +5696,7 @@ screen.xterm-r6|screen customized for X1 @@ -6253,6 +6253,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,

40
ncurses-libs.patch
View File

@ -1,12 +1,12 @@
diff -up ncurses-5.9-20150214/c++/Makefile.in.libs ncurses-5.9-20150214/c++/Makefile.in diff -up ncurses-6.0-20150810/c++/Makefile.in.libs ncurses-6.0-20150810/c++/Makefile.in
--- ncurses-5.9-20150214/c++/Makefile.in.libs 2014-11-15 01:46:17.000000000 +0100 --- ncurses-6.0-20150810/c++/Makefile.in.libs 2015-08-06 01:15:41.000000000 +0200
+++ ncurses-5.9-20150214/c++/Makefile.in 2015-02-20 15:55:29.944373449 +0100 +++ ncurses-6.0-20150810/c++/Makefile.in 2015-08-12 17:07:35.573822650 +0200
@@ -112,7 +112,7 @@ LOCAL_LIBDIR = @top_builddir@/lib @@ -112,7 +112,7 @@ LOCAL_LIBDIR = @top_builddir@/lib
LINK = @LINK_PROGS@ $(LIBTOOL_LINK) @CXXLDFLAGS@ LINK = @LINK_PROGS@ $(LIBTOOL_LINK) @CXXLDFLAGS@
SHLIB_DIRS = -L../lib SHLIB_DIRS = -L../lib
-SHLIB_LIST = $(SHLIB_DIRS) -lform@LIB_SUFFIX@ -lmenu@LIB_SUFFIX@ -lpanel@LIB_SUFFIX@ -lncurses@LIB_SUFFIX@ @SHLIB_LIST@ -SHLIB_LIST = $(SHLIB_DIRS) -lform@USE_LIB_SUFFIX@ -lmenu@USE_LIB_SUFFIX@ -lpanel@USE_LIB_SUFFIX@ -lncurses@USE_LIB_SUFFIX@ @SHLIB_LIST@
+SHLIB_LIST = $(SHLIB_DIRS) -lform@LIB_SUFFIX@ -lmenu@LIB_SUFFIX@ -lpanel@LIB_SUFFIX@ -lncurses@LIB_SUFFIX@ #@SHLIB_LIST@ +SHLIB_LIST = $(SHLIB_DIRS) -lform@USE_LIB_SUFFIX@ -lmenu@USE_LIB_SUFFIX@ -lpanel@USE_LIB_SUFFIX@ -lncurses@USE_LIB_SUFFIX@ #@SHLIB_LIST@
LIBROOT = ncurses++ LIBROOT = ncurses++
@ -20,39 +20,39 @@ diff -up ncurses-5.9-20150214/c++/Makefile.in.libs ncurses-5.9-20150214/c++/Make
AUTO_SRC = \ AUTO_SRC = \
etip.h etip.h
diff -up ncurses-5.9-20150214/form/Makefile.in.libs ncurses-5.9-20150214/form/Makefile.in diff -up ncurses-6.0-20150810/form/Makefile.in.libs ncurses-6.0-20150810/form/Makefile.in
--- ncurses-5.9-20150214/form/Makefile.in.libs 2015-02-20 15:55:29.945373051 +0100 --- ncurses-6.0-20150810/form/Makefile.in.libs 2015-08-12 17:06:49.072684924 +0200
+++ ncurses-5.9-20150214/form/Makefile.in 2015-02-20 15:56:52.384528763 +0100 +++ ncurses-6.0-20150810/form/Makefile.in 2015-08-12 17:08:14.945939259 +0200
@@ -107,7 +107,7 @@ LINK = $(LIBTOOL_LINK) @@ -107,7 +107,7 @@ LINK = $(LIBTOOL_LINK)
LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@ LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@
SHLIB_DIRS = -L../lib SHLIB_DIRS = -L../lib
-SHLIB_LIST = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@ -SHLIB_LIST = $(SHLIB_DIRS) -lncurses@USE_LIB_SUFFIX@ @SHLIB_LIST@
+SHLIB_LIST = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ #@SHLIB_LIST@ +SHLIB_LIST = $(SHLIB_DIRS) -lncurses@USE_LIB_SUFFIX@ #@SHLIB_LIST@
RPATH_LIST = @RPATH_LIST@ RPATH_LIST = @RPATH_LIST@
RESULTING_SYMS = @RESULTING_SYMS@ RESULTING_SYMS = @RESULTING_SYMS@
diff -up ncurses-5.9-20150214/menu/Makefile.in.libs ncurses-5.9-20150214/menu/Makefile.in diff -up ncurses-6.0-20150810/menu/Makefile.in.libs ncurses-6.0-20150810/menu/Makefile.in
--- ncurses-5.9-20150214/menu/Makefile.in.libs 2015-02-20 15:55:29.945373051 +0100 --- ncurses-6.0-20150810/menu/Makefile.in.libs 2015-08-12 17:06:49.072684924 +0200
+++ ncurses-5.9-20150214/menu/Makefile.in 2015-02-20 15:57:11.139056836 +0100 +++ ncurses-6.0-20150810/menu/Makefile.in 2015-08-12 17:09:10.135102716 +0200
@@ -107,7 +107,7 @@ LINK = $(LIBTOOL_LINK) @@ -107,7 +107,7 @@ LINK = $(LIBTOOL_LINK)
LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@ LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@
SHLIB_DIRS = -L../lib SHLIB_DIRS = -L../lib
-SHLIB_LIST = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@ -SHLIB_LIST = $(SHLIB_DIRS) -lncurses@USE_LIB_SUFFIX@ @SHLIB_LIST@
+SHLIB_LIST = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ #@SHLIB_LIST@ +SHLIB_LIST = $(SHLIB_DIRS) -lncurses@USE_LIB_SUFFIX@ #@SHLIB_LIST@
RPATH_LIST = @RPATH_LIST@ RPATH_LIST = @RPATH_LIST@
RESULTING_SYMS = @RESULTING_SYMS@ RESULTING_SYMS = @RESULTING_SYMS@
diff -up ncurses-5.9-20150214/panel/Makefile.in.libs ncurses-5.9-20150214/panel/Makefile.in diff -up ncurses-6.0-20150810/panel/Makefile.in.libs ncurses-6.0-20150810/panel/Makefile.in
--- ncurses-5.9-20150214/panel/Makefile.in.libs 2015-02-20 15:55:29.945373051 +0100 --- ncurses-6.0-20150810/panel/Makefile.in.libs 2015-08-12 17:06:49.072684924 +0200
+++ ncurses-5.9-20150214/panel/Makefile.in 2015-02-20 15:57:37.425584116 +0100 +++ ncurses-6.0-20150810/panel/Makefile.in 2015-08-12 17:09:33.324171396 +0200
@@ -109,7 +109,7 @@ LINK = $(LIBTOOL_LINK) @@ -109,7 +109,7 @@ LINK = $(LIBTOOL_LINK)
LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@ LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@
SHLIB_DIRS = -L../lib SHLIB_DIRS = -L../lib
-SHLIB_LIST = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@ -SHLIB_LIST = $(SHLIB_DIRS) -lncurses@USE_LIB_SUFFIX@ @SHLIB_LIST@
+SHLIB_LIST = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ #@SHLIB_LIST@ +SHLIB_LIST = $(SHLIB_DIRS) -lncurses@USE_LIB_SUFFIX@ #@SHLIB_LIST@
RPATH_LIST = @RPATH_LIST@ RPATH_LIST = @RPATH_LIST@
RESULTING_SYMS = @RESULTING_SYMS@ RESULTING_SYMS = @RESULTING_SYMS@

10
ncurses-urxvt.patch
View File

@ -1,8 +1,8 @@
diff -up ncurses-5.9/misc/terminfo.src.urxvt ncurses-5.9/misc/terminfo.src diff -up ncurses-6.0-20150810/misc/terminfo.src.urxvt ncurses-6.0-20150810/misc/terminfo.src
--- ncurses-5.9/misc/terminfo.src.urxvt 2012-02-07 18:28:00.000000000 +0100 --- ncurses-6.0-20150810/misc/terminfo.src.urxvt 2015-07-25 21:27:20.000000000 +0200
+++ ncurses-5.9/misc/terminfo.src 2012-02-07 18:28:50.650076519 +0100 +++ ncurses-6.0-20150810/misc/terminfo.src 2015-08-12 17:31:25.257057040 +0200
@@ -4417,6 +4417,173 @@ rxvt-cygwin-native|rxvt terminal emulato @@ -5214,6 +5214,173 @@ rxvt-cygwin-native|rxvt terminal emulato
rxvt-16color|xterm with 16 colors like aixterm, rxvt-16color|rxvt with 16 colors like aixterm,
ncv#32, use=ibm+16color, use=rxvt, ncv#32, use=ibm+16color, use=rxvt,
+# rxvt-unicode +# rxvt-unicode

9
ncurses.spec
View File

@ -1,7 +1,7 @@
%global revision 20150214 %global revision 20150810
Summary: Ncurses support utilities Summary: Ncurses support utilities
Name: ncurses Name: ncurses
Version: 5.9 Version: 6.0
Release: 21.%{revision}%{?dist} Release: 21.%{revision}%{?dist}
License: MIT License: MIT
Group: System Environment/Base Group: System Environment/Base
@ -109,6 +109,7 @@ done
%build %build
%global ncurses_options \\\ %global ncurses_options \\\
--with-abi-version=5 \\\
--with-shared --without-ada --with-ospeed=unsigned \\\ --with-shared --without-ada --with-ospeed=unsigned \\\
--enable-hard-tabs --enable-xmc-glitch --enable-colorfgbg \\\ --enable-hard-tabs --enable-xmc-glitch --enable-colorfgbg \\\
--with-terminfo-dirs=%{_sysconfdir}/terminfo:%{_datadir}/terminfo \\\ --with-terminfo-dirs=%{_sysconfdir}/terminfo:%{_datadir}/terminfo \\\
@ -149,9 +150,9 @@ baseterms=
for termname in \ for termname in \
ansi dumb linux vt100 vt100-nav vt102 vt220 vt52 \ ansi dumb linux vt100 vt100-nav vt102 vt220 vt52 \
Eterm\* aterm bterm cons25 cygwin eterm\* gnome gnome-256color hurd jfbterm \ Eterm\* aterm bterm cons25 cygwin eterm\* gnome gnome-256color hurd jfbterm \
konsole konsole-256color mach\* mlterm mrxvt nsterm putty\* pcansi \ konsole konsole-256color mach\* mlterm mrxvt nsterm putty{,-\*} pcansi \
rxvt{,-\*} screen{,-\*color,.\*} st{,-\*} sun teraterm teraterm2.3 \ rxvt{,-\*} screen{,-\*color,.\*} st{,-\*} sun teraterm teraterm2.3 \
vte vte-256color vwmterm wsvt25\* xfce xterm xterm-\* tmux{,-\*} vte vte-256color vwmterm wsvt25\* xfce xterm xterm-\*
do do
for i in $RPM_BUILD_ROOT%{_datadir}/terminfo/?/$termname; do for i in $RPM_BUILD_ROOT%{_datadir}/terminfo/?/$termname; do
for t in $(find $RPM_BUILD_ROOT%{_datadir}/terminfo -samefile $i); do for t in $(find $RPM_BUILD_ROOT%{_datadir}/terminfo -samefile $i); do

2
sources
View File

@ -1 +1 @@
ba499fe0df88170f87ab96f75bef6505 ncurses-5.9-20150214.tgz 78bfcb4634a87b4cda390956586f8f1f ncurses-6.0-20150810.tgz