From ee099b019ea113846788258c17a198b359ae6c58 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sun, 19 Apr 2020 00:49:28 +0200
Subject: [PATCH] fd: Update from 7.5.0 to 8.0.0

---
 packages/fd/build.sh          |  4 ++--
 packages/fd/src-main.rs.patch | 23 ++++++++++-------------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/packages/fd/build.sh b/packages/fd/build.sh
index 6178b9ca1..b00c2d5ef 100644
--- a/packages/fd/build.sh
+++ b/packages/fd/build.sh
@@ -1,9 +1,9 @@
 TERMUX_PKG_HOMEPAGE=https://github.com/sharkdp/fd
 TERMUX_PKG_DESCRIPTION="Simple, fast and user-friendly alternative to find"
 TERMUX_PKG_LICENSE="Apache-2.0"
-TERMUX_PKG_VERSION=7.5.0
+TERMUX_PKG_VERSION=8.0.0
 TERMUX_PKG_SRCURL=https://github.com/sharkdp/fd/archive/v$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_SHA256=8a78ca24323c832cf205c1fce8276fc25ae90371531c32e155301937986ea713
+TERMUX_PKG_SHA256=fba93204c10266317e0981914c630b08e12cd322c75ff2a2e504ff1dce17d557
 TERMUX_PKG_BUILD_IN_SRC=true
 
 termux_step_post_make_install() {
diff --git a/packages/fd/src-main.rs.patch b/packages/fd/src-main.rs.patch
index f4181ce26..dfea96792 100644
--- a/packages/fd/src-main.rs.patch
+++ b/packages/fd/src-main.rs.patch
@@ -1,15 +1,12 @@
-diff -u -r ../fd-7.4.0/src/main.rs ./src/main.rs
---- ../fd-7.4.0/src/main.rs	2019-09-15 17:29:15.000000000 +0000
-+++ ./src/main.rs	2019-09-17 19:37:47.620364849 +0000
-@@ -35,11 +35,6 @@
-     pattern_has_uppercase_char, transform_args_with_exec, FileTypes,
- };
+diff -u -r ../fd-8.0.0/src/main.rs ./src/main.rs
+--- ../fd-8.0.0/src/main.rs	2020-04-16 08:11:05.000000000 +0000
++++ ./src/main.rs	2020-04-18 22:36:31.485685000 +0000
+@@ -30,7 +30,7 @@
+ use crate::regex_helper::pattern_has_uppercase_char;
  
--// We use jemalloc for performance reasons, see https://github.com/sharkdp/fd/pull/481
+ // We use jemalloc for performance reasons, see https://github.com/sharkdp/fd/pull/481
 -#[cfg(all(not(windows), not(target_env = "musl")))]
--#[global_allocator]
--static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;
--
- fn main() {
-     let checked_args = transform_args_with_exec(env::args_os());
-     let matches = app::build_app().get_matches_from(checked_args);
++#[cfg(all(not(windows), not(target_env = "musl"), not(target_os = "android")))]
+ #[global_allocator]
+ static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;
+