mc: multple fixes (#2367)

[termux-packages] / packages / ncurses / build.sh

diff --git a/packages/ncurses/build.sh b/packages/ncurses/build.sh
index b446a2e..f709dca 100755 (executable)
--- a/packages/ncurses/build.sh
+++ b/packages/ncurses/build.sh
@@ -1,11 +1,14 @@
 TERMUX_PKG_HOMEPAGE=http://invisible-island.net/ncurses/
 TERMUX_PKG_DESCRIPTION="Library for text-based user interfaces in a terminal-independent manner"
-TERMUX_PKG_VERSION=6.0.20171216
-TERMUX_PKG_SHA256=ef0189b3cad00d234f7f275cc98cc69e373f97ea598a6ba93cd99445e0603023
-TERMUX_PKG_SRCURL=http://invisible-mirror.net/archives/ncurses/current/ncurses-${TERMUX_PKG_VERSION:0:3}-${TERMUX_PKG_VERSION:4}.tgz
+TERMUX_PKG_VERSION=6.1.20180331
+TERMUX_PKG_REVISION=1
+TERMUX_PKG_SHA256=031337b0f1b7a2b4a0752deb4dde78f5c21a6dd1c3880e2a8da15796767169b7
+TERMUX_PKG_SRCURL=https://dl.bintray.com/termux/upstream/ncurses-${TERMUX_PKG_VERSION:0:3}-${TERMUX_PKG_VERSION:4}.tgz
 # --without-normal disables static libraries:
+# --disable-stripping to disable -s argument to install which does not work when cross compiling:
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 ac_cv_header_locale_h=no
+--disable-stripping
 --enable-const
 --enable-ext-colors
 --enable-ext-mouse
@@ -46,13 +49,15 @@ termux_step_post_make_install () {
                done
                (cd pkgconfig && ln -s -f ${lib}w.pc `echo $lib | sed 's/w//'`.pc)
        done
+       # some packages want libcurses while building/compiling
+       ln -sf libncurses.so libcurses.so
 
-       # Some packages wants this:
+       # Some packages want these:
        cd $TERMUX_PREFIX/include/
-       rm -Rf ncursesw
-       mkdir ncursesw
-       cd ncursesw
-       ln -s ../{ncurses.h,termcap.h,panel.h,unctrl.h,menu.h,form.h,tic.h,nc_tparm.h,term.h,eti.h,term_entry.h,ncurses_dll.h,curses.h} .
+       rm -Rf ncurses{,w}
+       mkdir ncurses{,w}
+       ln -s ../{ncurses.h,termcap.h,panel.h,unctrl.h,menu.h,form.h,tic.h,nc_tparm.h,term.h,eti.h,term_entry.h,ncurses_dll.h,curses.h} ncurses
+       ln -s ../{ncurses.h,termcap.h,panel.h,unctrl.h,menu.h,form.h,tic.h,nc_tparm.h,term.h,eti.h,term_entry.h,ncurses_dll.h,curses.h} ncursesw
 }
 
 termux_step_post_massage () {