[ncurses/f18] update to 20121013
Miroslav Lichvar
mlichvar at fedoraproject.org
Mon Oct 15 17:11:32 UTC 2012
commit 58d63cc4969ce22c202c52e6839133cc340570b7
Author: Miroslav Lichvar <mlichvar at redhat.com>
Date: Mon Oct 15 16:48:11 2012 +0200
update to 20121013
.gitignore | 4 +-
ncurses-config.patch | 10 ++++----
ncurses-kbs.patch | 52 ++++++++++++++++++++++---------------------------
ncurses.spec | 9 ++++---
sources | 4 +-
5 files changed, 37 insertions(+), 42 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7937e6b..40640f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
/ncurses-5.9.tar.gz
-/ncurses-5.9-20111224-patch.sh.bz2
-/ncurses-5.9-20111231-20120204.patch.bz2
+/ncurses-5.9-20120616-patch.sh.bz2
+/ncurses-5.9-20120622-20121013.patch.bz2
diff --git a/ncurses-config.patch b/ncurses-config.patch
index 731785f..007d6fc 100644
--- a/ncurses-config.patch
+++ b/ncurses-config.patch
@@ -1,15 +1,15 @@
diff -up ncurses-5.9/misc/ncurses-config.in.config ncurses-5.9/misc/ncurses-config.in
---- ncurses-5.9/misc/ncurses-config.in.config 2011-07-18 15:58:01.606366364 +0200
-+++ ncurses-5.9/misc/ncurses-config.in 2011-07-18 16:06:32.572122421 +0200
+--- ncurses-5.9/misc/ncurses-config.in.config 2012-10-15 15:33:36.092521158 +0200
++++ ncurses-5.9/misc/ncurses-config.in 2012-10-15 15:34:55.906581012 +0200
@@ -35,7 +35,6 @@ exec_prefix="@exec_prefix@"
bindir="@bindir@"
includedir="@includedir@"
-libdir="@libdir@"
+ datarootdir="@datarootdir@"
datadir="@datadir@"
mandir="@mandir@"
-
-@@ -83,12 +82,7 @@ while test $# -gt 0; do
+@@ -85,12 +84,7 @@ while test $# -gt 0; do
ENDECHO
;;
--libs)
@@ -22,7 +22,7 @@ diff -up ncurses-5.9/misc/ncurses-config.in.config ncurses-5.9/misc/ncurses-conf
if test @TINFO_NAME@ = @LIB_NAME@ ; then
sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
$LIBDIR @EXTRA_LDFLAGS@ -l${THIS} @LIBS@
-@@ -120,7 +114,6 @@ ENDECHO
+@@ -122,7 +116,6 @@ ENDECHO
echo "${includedir}"
;;
--libdir)
diff --git a/ncurses-kbs.patch b/ncurses-kbs.patch
index 68073a2..2ae4378 100644
--- a/ncurses-kbs.patch
+++ b/ncurses-kbs.patch
@@ -1,23 +1,7 @@
diff -up ncurses-5.9/misc/terminfo.src.kbs ncurses-5.9/misc/terminfo.src
---- ncurses-5.9/misc/terminfo.src.kbs 2011-07-18 16:07:06.202072897 +0200
-+++ ncurses-5.9/misc/terminfo.src 2011-07-18 16:08:04.893153591 +0200
-@@ -3290,6 +3290,7 @@ xterm-xfree86|xterm terminal emulator (X
- # This version reflects the current xterm features.
- xterm-new|modern xterm terminal emulator,
- npc,
-+ kbs=\177,
- indn=\E[%p1%dS, kb2=\EOE, kcbt=\E[Z, kent=\EOM,
- rin=\E[%p1%dT, use=xterm+pcfkeys, use=xterm+tmux,
- use=xterm-basic,
-@@ -4096,6 +4097,7 @@ mlterm-256color|mlterm 3.0 with xterm 25
- rxvt-basic|rxvt terminal base (X Window System),
- OTbs, am, bce, eo, mir, msgr, xenl, xon, XT,
- cols#80, it#8, lines#24,
-+ kbs=\177,
- acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
- bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[?25l,
- clear=\E[H\E[2J, cnorm=\E[?25h, cr=^M,
-@@ -4106,7 +4108,7 @@ rxvt-basic|rxvt terminal base (X Window
+--- ncurses-5.9/misc/terminfo.src.kbs 2012-10-15 16:37:52.560806161 +0200
++++ ncurses-5.9/misc/terminfo.src 2012-10-15 18:40:59.698731800 +0200
+@@ -4304,7 +4304,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,
@@ -26,15 +10,16 @@ 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,
rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=\E>, rmso=\E[27m,
rmul=\E[24m,
-@@ -4876,6 +4878,7 @@ eterm-color|Emacs term.el terminal emula
- screen|VT 100/ANSI X3.64 virtual terminal,
- OTbs, OTpt, am, km, mir, msgr, xenl, G0,
- colors#8, cols#80, it#8, lines#24, ncv@, pairs#64, U8#1,
-+ kbs=\177,
- acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
- bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[?25l,
- clear=\E[H\E[J, cnorm=\E[34h\E[?25h, cr=^M,
-@@ -4885,7 +4888,7 @@ screen|VT 100/ANSI X3.64 virtual termina
+@@ -4314,7 +4314,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%;,
+ 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,
++ use=rxvt+pcfkeys, use=vt220+keypad, use=xterm+kbs,
+ # Key Codes from rxvt reference:
+ #
+ # Note: Shift + F1-F10 generates F11-F20
+@@ -5142,7 +5142,7 @@ screen|VT 100/ANSI X3.64 virtual termina
cvvis=\E[34l, dch=\E[%p1%dP, dch1=\E[P, 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@,
@@ -43,7 +28,16 @@ diff -up ncurses-5.9/misc/terminfo.src.kbs ncurses-5.9/misc/terminfo.src
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,
-@@ -4991,6 +4994,7 @@ screen.xterm-r6|screen customized for X1
+@@ -5154,7 +5154,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%;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,
++ S0=\E(%p1%c, use=ecma+color, use=xterm+kbs,
+ # 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,
+@@ -5248,6 +5248,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,
diff --git a/ncurses.spec b/ncurses.spec
index 1f6bc67..6a4ab8f 100644
--- a/ncurses.spec
+++ b/ncurses.spec
@@ -1,14 +1,14 @@
Summary: Ncurses support utilities
Name: ncurses
Version: 5.9
-Release: 5.20120204%{?dist}
+Release: 5.20121013%{?dist}
License: MIT
Group: System Environment/Base
URL: http://invisible-island.net/ncurses/ncurses.html
Source0: ftp://invisible-island.net/ncurses/ncurses-%{version}.tar.gz
-Patch1: ncurses-5.9-20111224-patch.sh.bz2
-Patch2: ncurses-5.9-20111231-20120204.patch.bz2
+Patch1: ncurses-5.9-20120616-patch.sh.bz2
+Patch2: ncurses-5.9-20120622-20121013.patch.bz2
Patch8: ncurses-config.patch
Patch9: ncurses-libs.patch
Patch11: ncurses-urxvt.patch
@@ -118,7 +118,8 @@ done
--enable-pc-files \\\
--with-pkg-config-libdir=%{_libdir}/pkgconfig \\\
--with-termlib=tinfo \\\
- --with-chtype=long
+ --with-chtype=long \\\
+ --with-xterm-kbs=DEL
mkdir narrowc widec
cd narrowc
diff --git a/sources b/sources
index 4c13869..de7e74f 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
8cb9c412e5f2d96bc6f459aa8c6282a1 ncurses-5.9.tar.gz
-3138ed61b6290f201f3456ddc2dc8e38 ncurses-5.9-20111224-patch.sh.bz2
-801567a454758ced0e1c7adc7bf58b9a ncurses-5.9-20111231-20120204.patch.bz2
+f54bf02a349f96a7c4f0d00922f3a0d4 ncurses-5.9-20120616-patch.sh.bz2
+8ad14348e7221202b8316c01fd30b34c ncurses-5.9-20120622-20121013.patch.bz2
More information about the scm-commits
mailing list