[openwrt/openwrt] ncurses: update to 6.4
LEDE Commits
lede-commits at lists.infradead.org
Wed Jan 4 15:12:38 PST 2023
hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/87b9825521b846e2fc25b1ba683354410307f84b
commit 87b9825521b846e2fc25b1ba683354410307f84b
Author: Linhui Liu <liulinhui36 at gmail.com>
AuthorDate: Tue Jan 3 09:35:34 2023 +0800
ncurses: update to 6.4
Update to the latest released version.
Signed-off-by: Linhui Liu <liulinhui36 at gmail.com>
---
package/libs/ncurses/Makefile | 6 ++---
.../patches/100-ncurses-5.6-20080112-urxvt.patch | 2 +-
.../patches/101-ncurses-5.6-20080628-kbs.patch | 26 +++++++++++-----------
.../ncurses/patches/102-ncurses-5.9-gcc-5.patch | 2 +-
.../patches/103-ncurses-ar-determinism.patch | 4 ++--
package/libs/ncurses/patches/900-terminfo.patch | 2 +-
6 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/package/libs/ncurses/Makefile b/package/libs/ncurses/Makefile
index 14f74082af..29261a4cd0 100644
--- a/package/libs/ncurses/Makefile
+++ b/package/libs/ncurses/Makefile
@@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=ncurses
PKG_CPE_ID:=cpe:/a:gnu:ncurses
-PKG_VERSION:=6.3
-PKG_RELEASE:=$(AUTORELEASE)
+PKG_VERSION:=6.4
+PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
-PKG_HASH:=97fc51ac2b085d4cde31ef4d2c3122c21abc217e9090a43a30fc5ec21684e059
+PKG_HASH:=6931283d9ac87c5073f30b6290c4c75f21632bb4fc3603ac8100812bed248159
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 2fdbb7b0be..70d64bd8e1 100644
--- 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
-@@ -6616,6 +6616,172 @@ rxvt-cygwin-native|rxvt terminal emulato
+@@ -6886,6 +6886,172 @@ rxvt-cygwin-native|rxvt terminal emulato
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 2d299197b0..9f00350a46 100644
--- 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
-@@ -4815,6 +4815,7 @@ xterm+nofkeys|building block for xterm f
- # This version reflects the current xterm features.
- xterm-new|modern xterm terminal emulator,
+@@ -4984,6 +4984,7 @@ xterm-xfree86|xterm terminal emulator (X
+
+ xterm+nofkeys|building block for xterm fkey-variants,
npc,
+ kbs=\177,
kcbt=\E[Z, kent=\EOM, nel=\EE, use=ecma+index,
- use=ansi+rep, use=ecma+strikeout, use=xterm+pcfkeys,
- use=xterm+nofkeys,
-@@ -6416,6 +6417,7 @@ mlterm-256color|mlterm 3.0 with xterm 25
+ use=ansi+rep, use=ecma+strikeout, use=vt420+lrmm,
+ use=xterm+sm+1006, use=xterm+tmux, use=ecma+italics,
+@@ -6689,6 +6690,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,
@@ -16,24 +16,24 @@
acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r,
csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
-@@ -6425,7 +6427,7 @@ rxvt-basic|rxvt terminal base (X Window
+@@ -6698,7 +6700,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@, il=\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,
-@@ -8060,6 +8062,7 @@ dumb-emacs-ansi|Emacs dumb terminal with
- screen|VT 100/ANSI X3.64 virtual terminal,
+ rmir=\E[4l, rmkx=\E>, rmso=\E[27m, rmul=\E[24m,
+ rs1=\E>\E[1;3;4;5;6l\E[?7h\E[m\E[r\E[2J\E[H,
+@@ -8347,6 +8349,7 @@ dumb-emacs-ansi|Emacs dumb terminal with
+ screen-base|VT 100/ANSI X3.64 virtual terminal (base),
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``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy
yzz{{||}}~~,
bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[?25l,
-@@ -8071,7 +8074,7 @@ screen|VT 100/ANSI X3.64 virtual termina
+@@ -8358,7 +8361,7 @@ screen-base|VT 100/ANSI X3.64 virtual te
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, 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~,
-@@ -8199,6 +8202,7 @@ screen.xterm-r6|screen customized for X1
+@@ -8500,6 +8503,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/libs/ncurses/patches/102-ncurses-5.9-gcc-5.patch b/package/libs/ncurses/patches/102-ncurses-5.9-gcc-5.patch
index a6398acf8e..5f1461b7b0 100644
--- 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
-@@ -511,11 +511,22 @@ sed -n -f $ED1 \
+@@ -512,11 +512,22 @@ sed -n -f $ED1 \
-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 5ef8ab7ab0..a4599130cc 100644
--- 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
-@@ -505,7 +505,7 @@ AC_CACHE_CHECK(for options to update arc
+@@ -523,7 +523,7 @@ AC_CACHE_CHECK(for options to update arc
;;
(*)
cf_cv_ar_flags=unknown
@@ -11,7 +11,7 @@
# check if $ARFLAGS already contains this choice
--- a/configure
+++ b/configure
-@@ -5072,7 +5072,7 @@ else
+@@ -5110,7 +5110,7 @@ else
;;
(*)
cf_cv_ar_flags=unknown
diff --git a/package/libs/ncurses/patches/900-terminfo.patch b/package/libs/ncurses/patches/900-terminfo.patch
index 96d78cde34..86e3bc16b2 100644
--- 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
-@@ -6240,12 +6240,11 @@ konsole-xf3x|KDE console window with key
+@@ -6514,12 +6514,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,
More information about the lede-commits
mailing list