From 00a102db0bac7f9d0b7c3c8ccfef518bdbe4a3a7 Mon Sep 17 00:00:00 2001 From: termux-pacman-bot Date: Fri, 2 Aug 2024 08:38:53 +0000 Subject: [PATCH] enhance(main/yazi): Remove VERGEN_IDEMPOTENT_OUTPUT from version output --- ...ding-error-caused-by-trash-crate-139.patch | 25 +++++++++++++++++++ packages/yazi/build.sh | 8 +++--- 2 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 packages/yazi/0001-fix-android-building-error-caused-by-trash-crate-139.patch diff --git a/packages/yazi/0001-fix-android-building-error-caused-by-trash-crate-139.patch b/packages/yazi/0001-fix-android-building-error-caused-by-trash-crate-139.patch new file mode 100644 index 0000000000..7c4f388696 --- /dev/null +++ b/packages/yazi/0001-fix-android-building-error-caused-by-trash-crate-139.patch @@ -0,0 +1,25 @@ +From 9d1fab84efdd78dcf102262601d6965ec760ad95 Mon Sep 17 00:00:00 2001 +From: Xerxes-2 +Date: Fri, 2 Aug 2024 14:46:43 +1000 +Subject: [PATCH] fix: android building error caused by `trash` crate (#1393) + +--- + yazi-scheduler/src/file/file.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/yazi-scheduler/src/file/file.rs b/yazi-scheduler/src/file/file.rs +index 5b06385..24e8090 100644 +--- a/yazi-scheduler/src/file/file.rs ++++ b/yazi-scheduler/src/file/file.rs +@@ -140,7 +140,7 @@ impl File { + { + trash::delete(&task.target)?; + } +- Ok::<_, trash::Error>(()) ++ Ok::<_, anyhow::Error>(()) + }) + .await??; + self.prog.send(TaskProg::Adv(task.id, 1, task.length))?; +-- +2.46.0 + diff --git a/packages/yazi/build.sh b/packages/yazi/build.sh index 8cb3d0a63e..2106e1c126 100644 --- a/packages/yazi/build.sh +++ b/packages/yazi/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://yazi-rs.github.io/ TERMUX_PKG_DESCRIPTION="Blazing fast terminal file manager written in Rust, based on async I/O" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="0.2.5" +TERMUX_PKG_VERSION="0.3.0" TERMUX_PKG_SRCURL=https://github.com/sxyazi/yazi/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=aea4a6ebd7f56c5d5fe6afbea143fc98c336d4ccd7852f2e8983c23e205988c4 +TERMUX_PKG_SHA256=0a0c1583accca16759392f258367156a2c36fb0b1d37152b07e1aa5239c531ff TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_BUILD_IN_SRC=true @@ -25,7 +25,9 @@ termux_step_pre_configure() { } termux_step_make() { - YAZI_GEN_COMPLETIONS=true cargo build --jobs $TERMUX_PKG_MAKE_PROCESSES --target $CARGO_TARGET_NAME --release + VERGEN_GIT_SHA="termux" \ + YAZI_GEN_COMPLETIONS=true \ + cargo build --jobs $TERMUX_PKG_MAKE_PROCESSES --target $CARGO_TARGET_NAME --release } termux_step_make_install() {