diff --git a/packages/exa/build.sh b/packages/exa/build.sh index b961488da..beeaf5f73 100644 --- a/packages/exa/build.sh +++ b/packages/exa/build.sh @@ -2,23 +2,22 @@ TERMUX_PKG_HOMEPAGE=https://the.exa.website TERMUX_PKG_DESCRIPTION="A modern replacement for ls" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=0.9.0 -TERMUX_PKG_REVISION=1 -TERMUX_PKG_SRCURL=https://github.com/ogham/exa/archive/058b4a57bdb1e25cbdacc0fbd1eefc09bc5f1e95.zip -TERMUX_PKG_SHA256=9931ad1c593096e69a1f0f7615e3857b1d422b7e74f63408385c663aeb2c12db +TERMUX_PKG_VERSION=0.9.0-git +TERMUX_PKG_SRCURL=https://github.com/ogham/exa/archive/39c8c67bf6237076b24915851f908d6da13c04b7.tar.gz +TERMUX_PKG_SHA256=e3fba517f0017e6a7435421d63e73c4e695f2844433d8245debb0f51b89a5a9e TERMUX_PKG_DEPENDS="zlib" -TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--no-default-features --features default" +TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--no-default-features" TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { - rm $TERMUX_PKG_SRCDIR/Makefile termux_setup_rust - CFLAGS="$CFLAGS $CPPFLAGS" - cargo update + CFLAGS="$CPPFLAGS" } termux_step_post_make_install() { mkdir -p $TERMUX_PREFIX/share/man/man1 - cp $TERMUX_PKG_SRCDIR/contrib/man/exa.1 $TERMUX_PREFIX/share/man/man1/ + mkdir -p $TERMUX_PREFIX/share/man/man5 + pandoc --standalone --to man $TERMUX_PKG_SRCDIR/man/exa.1.md --output $TERMUX_PREFIX/share/man/man1/exa.1 + pandoc --standalone --to man $TERMUX_PKG_SRCDIR/man/exa_colors.5.md --output $TERMUX_PREFIX/share/man/man5/exa_colors.5 } diff --git a/packages/exa/src-output-table.rs.patch b/packages/exa/src-output-table.rs.patch index 10f57790c..a170a9822 100644 --- a/packages/exa/src-output-table.rs.patch +++ b/packages/exa/src-output-table.rs.patch @@ -1,13 +1,14 @@ -diff -u -r ../exa-57e4c08411f59e7db91fa7d8127fbd412667ea32/src/output/table.rs ./src/output/table.rs ---- ../exa-57e4c08411f59e7db91fa7d8127fbd412667ea32/src/output/table.rs 2018-10-14 15:21:13.000000000 +0000 -+++ ./src/output/table.rs 2018-10-18 03:48:04.171402732 +0000 -@@ -246,6 +246,9 @@ +diff -u -r ../exa-39c8c67bf6237076b24915851f908d6da13c04b7/src/output/table.rs ./src/output/table.rs +--- ../exa-39c8c67bf6237076b24915851f908d6da13c04b7/src/output/table.rs 2021-01-06 16:42:09.000000000 +0800 ++++ ./src/output/table.rs 2021-01-06 16:46:14.000000000 +0800 +@@ -271,6 +271,10 @@ } - pub fn load_all() -> Self { + fn load_all() -> Self { + #[cfg(target_os = "android")] + let tz = None; ++ + #[cfg(not(target_os = "android"))] let tz = match determine_time_zone() { - Ok(t) => Some(t), - Err(ref e) => { + Ok(t) => { + Some(t)