aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2010-03-26 14:29:07 +0000
committerGabor Juhos <juhosg@openwrt.org>2010-03-26 14:29:07 +0000
commitfc3935df3811f0afb74f2b4cc8724f72d7b2ef43 (patch)
treee931491257bf42c9f0b4583b86ce0ad01ee28e77
parent78511d01b080503e9ed19376394f11effe242086 (diff)
downloadupstream-fc3935df3811f0afb74f2b4cc8724f72d7b2ef43.tar.gz
upstream-fc3935df3811f0afb74f2b4cc8724f72d7b2ef43.tar.bz2
upstream-fc3935df3811f0afb74f2b4cc8724f72d7b2ef43.zip
package/ncurses: refresh patches
SVN-Revision: 20471
-rw-r--r--package/ncurses/patches/100-ncurses-5.6-20080112-urxvt.patch7
-rw-r--r--package/ncurses/patches/101-ncurses-5.6-20080628-kbs.patch17
-rw-r--r--package/ncurses/patches/500-cross.patch7
-rw-r--r--package/ncurses/patches/900-terminfo.patch6
4 files changed, 17 insertions, 20 deletions
diff --git a/package/ncurses/patches/100-ncurses-5.6-20080112-urxvt.patch b/package/ncurses/patches/100-ncurses-5.6-20080112-urxvt.patch
index 90fcd50290..39e60ba98f 100644
--- a/package/ncurses/patches/100-ncurses-5.6-20080112-urxvt.patch
+++ b/package/ncurses/patches/100-ncurses-5.6-20080112-urxvt.patch
@@ -1,7 +1,6 @@
-diff -up ncurses-5.6/misc/terminfo.src.urxvt ncurses-5.6/misc/terminfo.src
---- ncurses-5.6/misc/terminfo.src.urxvt 2008-01-10 14:09:13.000000000 +0100
-+++ ncurses-5.6/misc/terminfo.src 2008-01-10 14:13:17.000000000 +0100
-@@ -3882,6 +3882,172 @@ rxvt-cygwin-native|rxvt terminal emulato
+--- a/misc/terminfo.src
++++ b/misc/terminfo.src
+@@ -3965,6 +3965,172 @@ rxvt-cygwin-native|rxvt terminal emulato
rxvt-16color|xterm with 16 colors like aixterm,
ncv#32, use=ibm+16color, use=rxvt,
diff --git a/package/ncurses/patches/101-ncurses-5.6-20080628-kbs.patch b/package/ncurses/patches/101-ncurses-5.6-20080628-kbs.patch
index 2f1913fe9e..3b3abd7b06 100644
--- a/package/ncurses/patches/101-ncurses-5.6-20080628-kbs.patch
+++ b/package/ncurses/patches/101-ncurses-5.6-20080628-kbs.patch
@@ -1,7 +1,6 @@
-diff -up ncurses-5.6/misc/terminfo.src.kbs ncurses-5.6/misc/terminfo.src
---- ncurses-5.6/misc/terminfo.src.kbs 2008-07-04 14:20:05.000000000 +0200
-+++ ncurses-5.6/misc/terminfo.src 2008-07-04 14:34:12.000000000 +0200
-@@ -3023,6 +3023,7 @@ xterm-xfree86|xterm terminal emulator (X
+--- a/misc/terminfo.src
++++ b/misc/terminfo.src
+@@ -3054,6 +3054,7 @@ xterm-xfree86|xterm terminal emulator (X
# This version reflects the current xterm features.
xterm-new|modern xterm terminal emulator,
npc,
@@ -9,7 +8,7 @@ diff -up ncurses-5.6/misc/terminfo.src.kbs ncurses-5.6/misc/terminfo.src
indn=\E[%p1%dS, kDC=\E[3;2~, kEND=\E[1;2F, kHOM=\E[1;2H,
kIC=\E[2;2~, kNXT=\E[6;2~, kPRV=\E[5;2~, kb2=\EOE,
kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
-@@ -3740,6 +3741,7 @@ mlterm+pcfkeys|fragment for PC-style fke
+@@ -3818,6 +3819,7 @@ mlterm+pcfkeys|fragment for PC-style fke
rxvt-basic|rxvt terminal base (X Window System),
OTbs, am, bce, eo, mir, msgr, xenl, xon,
cols#80, it#8, lines#24,
@@ -17,7 +16,7 @@ diff -up ncurses-5.6/misc/terminfo.src.kbs ncurses-5.6/misc/terminfo.src
acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[?25l,
clear=\E[H\E[2J, cnorm=\E[?25h, cr=^M,
-@@ -3750,7 +3752,7 @@ rxvt-basic|rxvt terminal base (X Window
+@@ -3828,7 +3830,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,7 +25,7 @@ diff -up ncurses-5.6/misc/terminfo.src.kbs ncurses-5.6/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,
-@@ -4451,6 +4453,7 @@ eterm|gnu emacs term.el terminal emulati
+@@ -4541,6 +4543,7 @@ eterm|gnu emacs term.el terminal emulati
screen|VT 100/ANSI X3.64 virtual terminal,
OTbs, OTpt, am, km, mir, msgr, xenl, G0,
colors#8, cols#80, it#8, lines#24, pairs#64,
@@ -34,7 +33,7 @@ diff -up ncurses-5.6/misc/terminfo.src.kbs ncurses-5.6/misc/terminfo.src
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,
-@@ -4460,7 +4463,7 @@ screen|VT 100/ANSI X3.64 virtual termina
+@@ -4550,7 +4553,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 +42,7 @@ diff -up ncurses-5.6/misc/terminfo.src.kbs ncurses-5.6/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,
-@@ -4565,6 +4568,7 @@ screen.xterm-r6|screen customized for X1
+@@ -4655,6 +4658,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/package/ncurses/patches/500-cross.patch b/package/ncurses/patches/500-cross.patch
index b1e8d63f3e..ace6252fe6 100644
--- a/package/ncurses/patches/500-cross.patch
+++ b/package/ncurses/patches/500-cross.patch
@@ -1,7 +1,6 @@
-diff -ur ncurses-5.6/aclocal.m4 ncurses-5.6-owrt/aclocal.m4
---- ncurses-5.6/aclocal.m4 2006-12-17 17:12:38.000000000 +0100
-+++ ncurses-5.6-owrt/aclocal.m4 2007-06-09 19:47:38.000000000 +0200
-@@ -4298,7 +4298,7 @@
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -4298,7 +4298,7 @@ CF_EOF
EXTRA_LDFLAGS="-Wl,-rpath,\${libdir} $EXTRA_LDFLAGS"
fi
CF_SHARED_SONAME
diff --git a/package/ncurses/patches/900-terminfo.patch b/package/ncurses/patches/900-terminfo.patch
index 71c720fbfd..7aab3dbca7 100644
--- a/package/ncurses/patches/900-terminfo.patch
+++ b/package/ncurses/patches/900-terminfo.patch
@@ -1,6 +1,6 @@
---- a/misc/terminfo.src 2009-03-16 08:18:53.000000000 +0300
-+++ b/misc/terminfo.src 2006-10-07 21:52:03.000000000 +0400
-@@ -3707,12 +3530,11 @@
+--- a/misc/terminfo.src
++++ b/misc/terminfo.src
+@@ -3707,12 +3707,11 @@ konsole-xf3x|KDE console window with key
# The value for kbs reflects local customization rather than the settings used
# for XFree86 xterm.
konsole-xf4x|KDE console window with keyboard for XFree86 4.x xterm,