ncurses: Update to 6.1.

Compile tested on ar71xx.

Old size:
  6527 bin/packages/mips_24kc/base/terminfo_6.0-1_mips_24kc.ipk
141465 bin/packages/mips_24kc/base/libncurses_6.0-1_mips_24kc.ipk

New size:
  6873 bin/packages/mips_24kc/base/terminfo_6.1-1_mips_24kc.ipk
146950 bin/packages/mips_24kc/base/libncurses_6.1-1_mips_24kc.ipk

Signed-off-by: Rosen Penev <rosenp@gmail.com>

diff --git a/package/libs/ncurses/Makefile b/package/libs/ncurses/Makefile
index 26fabeef7704c2377414528cf914347b95770e36..95f05fa7115f6cf5b242a0bf2b6f94de0f671bc0 100644 (file)
--- a/package/libs/ncurses/Makefile
+++ b/package/libs/ncurses/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ncurses
-PKG_VERSION:=6.0
+PKG_VERSION:=6.1
 PKG_RELEASE:=1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@GNU/ncurses
-PKG_HASH:=f551c24b30ce8bfb6e96d9f59b42fbea30fa3a6123384172f9e7284bcf647260
+PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
+PKG_HASH:=aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17
 
 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 49537b94eee92b17308ff80bed1f03d21f179834..ed7b2ee448973b8a201d6e7266a2765c524d1edf 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
-@@ -5214,6 +5214,172 @@ rxvt-cygwin-native|rxvt terminal emulato
+@@ -5875,6 +5875,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 394b6f9fde989f28c276708bcf9716b4a5321e9b..ebd6df2e9139aee89be3cb6c16e582e8ed70d063 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,52 +1,52 @@
 --- a/misc/terminfo.src
 +++ b/misc/terminfo.src
-@@ -3955,6 +3955,7 @@ xterm-xfree86|xterm terminal emulator (X
+@@ -4327,6 +4327,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,
-@@ -5048,6 +5049,7 @@ mlterm-256color|mlterm 3.0 with xterm 25
+       rin=\E[%p1%dT, use=ansi+rep, use=ecma+strikeout,
+       use=xterm+sm+1006, use=xterm+pcfkeys, use=xterm+tmux,
+@@ -5703,6 +5704,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,
-@@ -5058,7 +5060,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,
+       clear=\E[H\E[2J, cnorm=\E[?25h, cr=\r,
+@@ -5713,7 +5715,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@, ich1=\E[@, 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,
-@@ -6118,6 +6120,7 @@ eterm-color|Emacs term.el terminal emula
+@@ -6883,6 +6885,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,
 +      kbs=\177,
-       acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+       acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy
+            yzz{{||}}~~,
        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,
-@@ -6128,7 +6131,7 @@ screen|VT 100/ANSI X3.64 virtual termina
+@@ -6894,7 +6897,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, ht=^I, hts=\EH,
-       ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=^J, is2=\E)0,
--      kbs=^H, kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC,
-+      kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC,
-       kcuu1=\EOA, kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~,
+       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,
+-      ind=\n, indn=\E[%p1%dS, is2=\E)0, kbs=^H, kcbt=\E[Z,
++      ind=\n, indn=\E[%p1%dS, is2=\E)0, kcbt=\E[Z,
+       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,
-       kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
-@@ -6252,6 +6255,7 @@ screen.xterm-r6|screen customized for X1
+@@ -7023,6 +7026,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,
 +      kbs=^H,
-       acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260i\316j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330}\234~\376,
-       use=screen+fkeys, use=screen,
- # Other terminals
+       acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260i
+            \316j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u
+            \264v\301w\302x\263y\363z\362{\343|\330}\234~\376,

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 0424b237819795fa7be5ab1fe572783704299450..b84fcb965c867db7057f5c2f696f48e4cbf387e6 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
-@@ -491,11 +491,22 @@ sed -n -f $ED1 \
+@@ -505,11 +505,22 @@ sed -n -f $ED1 \
        -e 's/gen_$//' \
        -e 's/  / /g' >>$TMP
  

diff --git a/package/libs/ncurses/patches/500-cross.patch b/package/libs/ncurses/patches/500-cross.patch
deleted file mode 100644 (file)
index 590bddf..0000000
--- a/package/libs/ncurses/patches/500-cross.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -5720,7 +5720,7 @@ CF_EOF
-                       EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS"
-               fi
-               CF_SHARED_SONAME
--              MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $[@]'
-+              MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_shared_soname',-stats,$(LDFLAGS) -lc -o $[@]'
-               ;;
-       (mingw*)
-               cf_cv_shlib_version=mingw

diff --git a/package/libs/ncurses/patches/900-terminfo.patch b/package/libs/ncurses/patches/900-terminfo.patch
index ab623b1973ce9f621a8c8fe0be73f24d70d5ee55..645b7ad90ee7d6a92176e81f53e6cdc71718dd54 100644 (file)
--- a/package/libs/ncurses/patches/900-terminfo.patch
+++ b/package/libs/ncurses/patches/900-terminfo.patch
@@ -1,20 +1,20 @@
 --- a/misc/terminfo.src
 +++ b/misc/terminfo.src
-@@ -4919,12 +4919,11 @@ konsole-xf3x|KDE console window with key
- # The value for kbs reflects local customization rather than the settings used
- # for XFree86 xterm.
+@@ -5563,12 +5563,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,
 -      kend=\EOF, khome=\EOH, use=konsole+pcfkeys,
 -      use=konsole-vt100,
--# Konsole does not implement shifted cursor-keys.
+-
 -konsole+pcfkeys|konsole subset of xterm+pcfkeys,
--      kLFT@, kRIT@, kcbt=\E[Z, kind@, kri@, kDN@, kUP@, use=xterm+pcc2,
--      use=xterm+pcf0,
+-      kcbt=\E[Z, use=xterm+pcc2, use=xterm+pcf0,
+-      use=xterm+pce2,
 +      kend=\EOF, kf1=\EOP, kf13=\EO2P, kf14=\EO2Q, kf15=\EO2R,
 +      kf16=\EO2S, kf17=\E[15;2~, kf18=\E[17;2~, kf19=\E[18;2~,
 +      kf2=\EOQ, kf20=\E[19;2~, kf21=\E[20;2~, kf22=\E[21;2~,
 +      kf23=\E[23;2~, kf24=\E[24;2~, kf3=\EOR, kf4=\EOS,
 +      khome=\EOH, use=konsole-vt100,
+ 
+ # Obsolete: vt100.keymap
  # KDE's "vt100" keyboard has no relationship to any terminal that DEC made, but
- # it is still useful for deriving the other entries.
- konsole-vt100|KDE console window with vt100 (sic) keyboard,