From 1a1f776c2dfec7b939538674009ddf259a13f01a Mon Sep 17 00:00:00 2001
From: Tee KOBAYASHI <xtkoba@gmail.com>
Date: Sun, 25 Dec 2022 13:58:06 +0900
Subject: [PATCH] megacmd: Fix hardcoded paths

---
 packages/megacmd/build.sh                   |  8 +++++++-
 packages/megacmd/sdk-src-posix-fs.cpp.patch | 13 +++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/packages/megacmd/build.sh b/packages/megacmd/build.sh
index df30cbb7b8..b072650693 100644
--- a/packages/megacmd/build.sh
+++ b/packages/megacmd/build.sh
@@ -3,9 +3,11 @@ TERMUX_PKG_DESCRIPTION="Provides non UI access to MEGA services"
 TERMUX_PKG_LICENSE="BSD 2-Clause"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=1.5.1
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/meganz/MEGAcmd.git
 TERMUX_PKG_GIT_BRANCH=${TERMUX_PKG_VERSION}_Linux
-TERMUX_PKG_DEPENDS="c-ares, cryptopp, ffmpeg, freeimage, libc++, libcurl, libsodium, libsqlite, libuv, mediainfo, openssl, pcre, readline, zlib"
+# dbus is required for $PREFIX/var/lib/dbus/machine-id
+TERMUX_PKG_DEPENDS="c-ares, cryptopp, dbus, ffmpeg, freeimage, libc++, libcurl, libsodium, libsqlite, libuv, mediainfo, openssl, pcre, readline, zlib"
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --disable-static
@@ -34,3 +36,7 @@ termux_step_post_make_install() {
 		rm -f $_LIBPTHREAD_A
 	fi
 }
+
+termux_step_post_massage() {
+	find lib -name '*.la' -delete
+}
diff --git a/packages/megacmd/sdk-src-posix-fs.cpp.patch b/packages/megacmd/sdk-src-posix-fs.cpp.patch
index 81f18d7776..4790ed4a28 100644
--- a/packages/megacmd/sdk-src-posix-fs.cpp.patch
+++ b/packages/megacmd/sdk-src-posix-fs.cpp.patch
@@ -18,3 +18,16 @@
      if (!MEGAjvm)
      {
          LOG_err << "No JVM found";
+@@ -1787,10 +1787,10 @@
+     uuid_unparse(uuid, uuid_str);
+     id->append(uuid_str);
+ #else
+-    int fd = open("/etc/machine-id", O_RDONLY);
++    int fd = open("@TERMUX_PREFIX@/etc/machine-id", O_RDONLY);
+     if (fd < 0)
+     {
+-        fd = open("/var/lib/dbus/machine-id", O_RDONLY);
++        fd = open("@TERMUX_PREFIX@/var/lib/dbus/machine-id", O_RDONLY);
+         if (fd < 0)
+         {
+             return;