projects
/
openwrt
/
staging
/
jow.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a508ab1
)
ncurses: update to 6.2
author
DENG Qingfang
<dengqf6@mail2.sysu.edu.cn>
Wed, 4 Mar 2020 16:07:54 +0000
(
00:07
+0800)
committer
Hans Dedecker
<dedeckeh@gmail.com>
Thu, 5 Mar 2020 19:48:58 +0000
(20:48 +0100)
Update ncurses to 6.2
Signed-off-by: DENG Qingfang <dengqf6@mail2.sysu.edu.cn>
package/libs/ncurses/Makefile
patch
|
blob
|
history
package/libs/ncurses/patches/100-ncurses-5.6-20080112-urxvt.patch
patch
|
blob
|
history
package/libs/ncurses/patches/101-ncurses-5.6-20080628-kbs.patch
patch
|
blob
|
history
package/libs/ncurses/patches/102-ncurses-5.9-gcc-5.patch
patch
|
blob
|
history
package/libs/ncurses/patches/103-ncurses-ar-determinism.patch
patch
|
blob
|
history
package/libs/ncurses/patches/200-fix_missing_include.patch
patch
|
blob
|
history
package/libs/ncurses/patches/900-terminfo.patch
patch
|
blob
|
history
diff --git
a/package/libs/ncurses/Makefile
b/package/libs/ncurses/Makefile
index e22eb2b8935dd9a24ecbe5736a51a9d66791f1d2..cc1e960a0cb5391fe3372d23fd2d4a5a2ba08d1d 100644
(file)
--- a/
package/libs/ncurses/Makefile
+++ b/
package/libs/ncurses/Makefile
@@
-8,12
+8,12
@@
include $(TOPDIR)/rules.mk
PKG_NAME:=ncurses
include $(TOPDIR)/rules.mk
PKG_NAME:=ncurses
-PKG_VERSION:=6.
1
-PKG_RELEASE:=
5
+PKG_VERSION:=6.
2
+PKG_RELEASE:=
1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
-PKG_HASH:=
aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17
+PKG_HASH:=
30306e0c76e0f9f1f0de987cf1c82a5c21e1ce6568b9227f7da5b71cbea86c9d
PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=README
PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=README
diff --git
a/package/libs/ncurses/patches/100-ncurses-5.6-20080112-urxvt.patch
b/package/libs/ncurses/patches/100-ncurses-5.6-20080112-urxvt.patch
index ed7b2ee448973b8a201d6e7266a2765c524d1edf..d654eb28f03ead9935f713a284f230e2c2065b45 100644
(file)
--- a/
package/libs/ncurses/patches/100-ncurses-5.6-20080112-urxvt.patch
+++ b/
package/libs/ncurses/patches/100-ncurses-5.6-20080112-urxvt.patch
@@
-1,6
+1,6
@@
--- a/misc/terminfo.src
+++ b/misc/terminfo.src
--- a/misc/terminfo.src
+++ b/misc/terminfo.src
-@@ -
5875,6 +587
5,172 @@ rxvt-cygwin-native|rxvt terminal emulato
+@@ -
6145,6 +614
5,172 @@ rxvt-cygwin-native|rxvt terminal emulato
rxvt-16color|rxvt with 16 colors like aixterm,
ncv#32, use=ibm+16color, use=rxvt,
rxvt-16color|rxvt with 16 colors like aixterm,
ncv#32, use=ibm+16color, use=rxvt,
diff --git
a/package/libs/ncurses/patches/101-ncurses-5.6-20080628-kbs.patch
b/package/libs/ncurses/patches/101-ncurses-5.6-20080628-kbs.patch
index ebd6df2e9139aee89be3cb6c16e582e8ed70d063..835c0c53d6eb088f7f96114b6d1a67ee8e92d602 100644
(file)
--- a/
package/libs/ncurses/patches/101-ncurses-5.6-20080628-kbs.patch
+++ b/
package/libs/ncurses/patches/101-ncurses-5.6-20080628-kbs.patch
@@
-1,14
+1,14
@@
--- a/misc/terminfo.src
+++ b/misc/terminfo.src
--- a/misc/terminfo.src
+++ b/misc/terminfo.src
-@@ -4
327,6 +4327
,7 @@ xterm-xfree86|xterm terminal emulator (X
+@@ -4
513,6 +4513
,7 @@ xterm-xfree86|xterm terminal emulator (X
# This version reflects the current xterm features.
xterm-new|modern xterm terminal emulator,
npc,
+ kbs=\177,
# 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=ansi+rep, use=ecma+strikeout
,
+
kcbt=\E[Z, kent=\EOM, use=ecma+index, use=ansi+rep
,
+
use=ecma+strikeout, use=xterm+keypad, use=vt420+lrmm
,
use=xterm+sm+1006, use=xterm+pcfkeys, use=xterm+tmux,
use=xterm+sm+1006, use=xterm+pcfkeys, use=xterm+tmux,
-@@ -5
703,6 +570
4,7 @@ mlterm-256color|mlterm 3.0 with xterm 25
+@@ -5
943,6 +594
4,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,
rxvt-basic|rxvt terminal base (X Window System),
OTbs, am, bce, eo, mir, msgr, xenl, xon, XT,
cols#80, it#8, lines#24,
@@
-16,16
+16,16
@@
acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[?25l,
clear=\E[H\E[2J, cnorm=\E[?25h, cr=\r,
acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[?25l,
clear=\E[H\E[2J, cnorm=\E[?25h, cr=\r,
-@@ -5
713,7 +571
5,7 @@ rxvt-basic|rxvt terminal base (X Window
+@@ -5
953,7 +595
5,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@, i
ch1=\E[@, il=\E[%p1%d
L,
- i
l1=\E[L, i
nd=\n, is1=\E[?47l\E=\E[?1l,
+ ht=^I, hts=\EH, ich=\E[%p1%d@, i
l=\E[%p1%dL, il1=\E[
L,
+ ind=\n, 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,
- 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,
-@@ -
6883,6 +6885
,7 @@ dumb-emacs-ansi|Emacs dumb terminal with
+@@ -
7454,6 +7456
,7 @@ dumb-emacs-ansi|Emacs dumb terminal with
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,
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,
@@
-33,7
+33,7
@@
acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy
yzz{{||}}~~,
bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[?25l,
acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy
yzz{{||}}~~,
bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[?25l,
-@@ -
6894,7 +6897
,7 @@ screen|VT 100/ANSI X3.64 virtual termina
+@@ -
7465,7 +7468
,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, hpa=\E[%i%p1%dG,
ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L,
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, hpa=\E[%i%p1%dG,
ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L,
@@
-42,7
+42,7
@@
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,
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,
-@@ -7
023,6 +7026
,7 @@ screen.xterm-r6|screen customized for X1
+@@ -7
594,6 +7597
,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,
# on Solaris because Sun's curses implementation gets confused.
screen.teraterm|disable ncv in teraterm,
ncv#127,
diff --git
a/package/libs/ncurses/patches/102-ncurses-5.9-gcc-5.patch
b/package/libs/ncurses/patches/102-ncurses-5.9-gcc-5.patch
index b84fcb965c867db7057f5c2f696f48e4cbf387e6..972b64977dfb56576c49ae421941d4d000ceb25e 100644
(file)
--- a/
package/libs/ncurses/patches/102-ncurses-5.9-gcc-5.patch
+++ b/
package/libs/ncurses/patches/102-ncurses-5.9-gcc-5.patch
@@
-15,7
+15,7
@@
Subject: [PATCH] ncurses 5.9 - patch 20141206
--- a/ncurses/base/MKlib_gen.sh
+++ b/ncurses/base/MKlib_gen.sh
--- a/ncurses/base/MKlib_gen.sh
+++ b/ncurses/base/MKlib_gen.sh
-@@ -50
5,11 +505
,22 @@ sed -n -f $ED1 \
+@@ -50
2,11 +502
,22 @@ sed -n -f $ED1 \
-e 's/gen_$//' \
-e 's/ / /g' >>$TMP
-e 's/gen_$//' \
-e 's/ / /g' >>$TMP
diff --git
a/package/libs/ncurses/patches/103-ncurses-ar-determinism.patch
b/package/libs/ncurses/patches/103-ncurses-ar-determinism.patch
index d4c8f1170399f5e0c7202b1a337f284c2631f30a..1bfa93e3aae6705fc40567b3ed0bda2f0d0c806c 100644
(file)
--- a/
package/libs/ncurses/patches/103-ncurses-ar-determinism.patch
+++ b/
package/libs/ncurses/patches/103-ncurses-ar-determinism.patch
@@
-1,6
+1,6
@@
--- a/aclocal.m4
+++ b/aclocal.m4
--- a/aclocal.m4
+++ b/aclocal.m4
-@@ -45
1,7 +451
,7 @@ AC_REQUIRE([CF_PROG_AR])
+@@ -45
4,7 +454
,7 @@ AC_REQUIRE([CF_PROG_AR])
AC_CACHE_CHECK(for options to update archives, cf_cv_ar_flags,[
cf_cv_ar_flags=unknown
AC_CACHE_CHECK(for options to update archives, cf_cv_ar_flags,[
cf_cv_ar_flags=unknown
@@
-11,7
+11,7
@@
# check if $ARFLAGS already contains this choice
--- a/configure
+++ b/configure
# check if $ARFLAGS already contains this choice
--- a/configure
+++ b/configure
-@@ -4
503,7 +4503
,7 @@ if test "${cf_cv_ar_flags+set}" = set; t
+@@ -4
751,7 +4751
,7 @@ if test "${cf_cv_ar_flags+set}" = set; t
else
cf_cv_ar_flags=unknown
else
cf_cv_ar_flags=unknown
diff --git
a/package/libs/ncurses/patches/200-fix_missing_include.patch
b/package/libs/ncurses/patches/200-fix_missing_include.patch
index 4616c4fb7026205b2f7c7dad8f16f33888d535bb..3c4a0d13a7fd84a725374f19dc0aea2514ac12f0 100644
(file)
--- a/
package/libs/ncurses/patches/200-fix_missing_include.patch
+++ b/
package/libs/ncurses/patches/200-fix_missing_include.patch
@@
-1,6
+1,6
@@
--- a/ncurses/curses.priv.h
+++ b/ncurses/curses.priv.h
--- a/ncurses/curses.priv.h
+++ b/ncurses/curses.priv.h
-@@ -5
5,6 +55
,11 @@ extern "C" {
+@@ -5
6,6 +56
,11 @@ extern "C" {
#include <ncurses_cfg.h>
#include <ncurses_cfg.h>
diff --git
a/package/libs/ncurses/patches/900-terminfo.patch
b/package/libs/ncurses/patches/900-terminfo.patch
index 645b7ad90ee7d6a92176e81f53e6cdc71718dd54..3c37183f28d2d2fd54501b7ab04e47d20a828d68 100644
(file)
--- a/
package/libs/ncurses/patches/900-terminfo.patch
+++ b/
package/libs/ncurses/patches/900-terminfo.patch
@@
-1,6
+1,6
@@
--- a/misc/terminfo.src
+++ b/misc/terminfo.src
--- a/misc/terminfo.src
+++ b/misc/terminfo.src
-@@ -5
563,12 +5563
,11 @@ konsole-xf3x|KDE console window with key
+@@ -5
802,12 +5802
,11 @@ konsole-xf3x|KDE console window with key
# The value for kbs (see konsole-vt100) reflects local customization rather
# than the settings used for XFree86 xterm.
konsole-xf4x|KDE console window with keyboard for XFree86 4.x xterm,
# The value for kbs (see konsole-vt100) reflects local customization rather
# than the settings used for XFree86 xterm.
konsole-xf4x|KDE console window with keyboard for XFree86 4.x xterm,