From 56e38728f4d9863c0f4868bb3e89b4873f9f78ce Mon Sep 17 00:00:00 2001
From: Henrik Grimler <grimler@termux.dev>
Date: Fri, 10 Jun 2022 13:26:48 +0200
Subject: [PATCH] fix(root/frida): remove frida-tools subpackage

It was suppose to be removed in commit c2cbc4368ebe
("enhance(root/frida): mv python tools to frida-python").
---
 root-packages/frida/build.sh                  | 5 +++--
 root-packages/frida/frida-tools.subpackage.sh | 5 -----
 2 files changed, 3 insertions(+), 7 deletions(-)
 delete mode 100644 root-packages/frida/frida-tools.subpackage.sh

diff --git a/root-packages/frida/build.sh b/root-packages/frida/build.sh
index 5ccc166f5d..bd8e61cdaa 100644
--- a/root-packages/frida/build.sh
+++ b/root-packages/frida/build.sh
@@ -6,6 +6,7 @@ _MAJOR_VERSION=15
 _MINOR_VERSION=1
 _MICRO_VERSION=24
 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.${_MINOR_VERSION}.${_MICRO_VERSION}
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_GIT_BRANCH=$TERMUX_PKG_VERSION
 TERMUX_PKG_SRCURL=https://github.com/frida/frida.git
 TERMUX_PKG_DEPENDS="libiconv"
@@ -15,9 +16,9 @@ TERMUX_PKG_NO_STATICSPLIT=true
 TERMUX_PKG_EXTRA_MAKE_ARGS="ANDROID_NDK_ROOT=$NDK"
 TERMUX_PKG_CONFFILES="var/service/frida-server/run var/service/frida-server/down"
 TERMUX_PKG_HOSTBUILD=true
-TERMUX_PKG_CONFLICTS="frida-tools (<< 15.1.24)"
+TERMUX_PKG_CONFLICTS="frida-tools (<< 15.1.24-1)"
 TERMUX_PKG_BREAKS="frida-server (<< 15.1.24)"
-TERMUX_PKG_REPLACES="frida-tools (<< 15.1.24), frida-server (<< 15.1.24)"
+TERMUX_PKG_REPLACES="frida-tools (<< 15.1.24-1), frida-server (<< 15.1.24)"
 
 termux_step_host_build() {
 	termux_setup_nodejs
diff --git a/root-packages/frida/frida-tools.subpackage.sh b/root-packages/frida/frida-tools.subpackage.sh
deleted file mode 100644
index b6718be778..0000000000
--- a/root-packages/frida/frida-tools.subpackage.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-TERMUX_SUBPKG_DESCRIPTION="CLI tools for Frida"
-TERMUX_SUBPKG_INCLUDE="
-bin/frida-portal
-bin/gum-graft
-"