diff --git a/packages/mc/build.sh b/packages/mc/build.sh index df79386ac..ff6220a86 100755 --- a/packages/mc/build.sh +++ b/packages/mc/build.sh @@ -1,13 +1,17 @@ TERMUX_PKG_HOMEPAGE=https://www.midnight-commander.org/ TERMUX_PKG_DESCRIPTION="Midnight Commander - a powerful file manager" TERMUX_PKG_VERSION=4.8.20 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SHA256=017ee7f4f8ae420a04f4d6fcebaabe5b494661075c75442c76e9c8b1923d501c TERMUX_PKG_SRCURL=http://ftp.midnight-commander.org/mc-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_DEPENDS="libandroid-support, ncurses, glib" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -ac_cv_path_UNZIP=$PREFIX/bin/unzip -ac_cv_path_ZIP=$PREFIX/bin/zip +ac_cv_path_UNZIP=$TERMUX_PREFIX/bin/unzip +ac_cv_path_ZIP=$TERMUX_PREFIX/bin/zip +ac_cv_path_PERL=$TERMUX_PREFIX/bin/perl +ac_cv_path_PYTHON=$TERMUX_PREFIX/bin/python +ac_cv_path_RUBY=$TERMUX_PREFIX/bin/ruby +--with-ncurses-includes=$TERMUX_PREFIX/include --with-ncurses-libs=$TERMUX_PREFIX/lib --with-screen=ncurses " diff --git a/packages/mc/man2hlp.in.patch b/packages/mc/man2hlp.in.patch new file mode 100644 index 000000000..923d54af4 --- /dev/null +++ b/packages/mc/man2hlp.in.patch @@ -0,0 +1,10 @@ +diff --git a/src/man2hlp/man2hlp.in b/src/man2hlp/man2hlp.in +index f095830..f7a97ea 100644 +--- a/src/man2hlp/man2hlp.in ++++ b/src/man2hlp/man2hlp.in +@@ -1,4 +1,4 @@ +-#! @PERL@ -w ++#! /usr/bin/perl -w + # + # Man page to help file converter + # Copyright (C) 1994, 1995, 1998, 2000, 2001, 2002, 2003, 2004, 2005, diff --git a/packages/mc/use-python2-for-extfs-helpers.patch b/packages/mc/use-python2-for-extfs-helpers.patch new file mode 100644 index 000000000..5f03d120c --- /dev/null +++ b/packages/mc/use-python2-for-extfs-helpers.patch @@ -0,0 +1,20 @@ +diff --git a/src/vfs/extfs/helpers/s3+.in b/src/vfs/extfs/helpers/s3+.in +index 2ab596a..65b709b 100644 +--- a/src/vfs/extfs/helpers/s3+.in ++++ b/src/vfs/extfs/helpers/s3+.in +@@ -1,4 +1,4 @@ +-#! @PYTHON@ ++#! @PYTHON@2 + # -*- coding: utf-8 -*- + + # +diff --git a/src/vfs/extfs/helpers/uc1541.in b/src/vfs/extfs/helpers/uc1541.in +index dd7b7c4..8da6bfb 100644 +--- a/src/vfs/extfs/helpers/uc1541.in ++++ b/src/vfs/extfs/helpers/uc1541.in +@@ -1,4 +1,4 @@ +-#! @PYTHON@ ++#! @PYTHON@2 + """ + UC1541 Virtual filesystem + diff --git a/packages/ncurses/build.sh b/packages/ncurses/build.sh index 8be3bf4fd..f709dca91 100755 --- a/packages/ncurses/build.sh +++ b/packages/ncurses/build.sh @@ -1,6 +1,7 @@ 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.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: @@ -48,15 +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 wants libcurses while building/compiling - ln -sf libncurses.so libcurses.so + # 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 () {