sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

megacmd: Get rid of references to MEGAjvm

Browse Source
This commit is contained in:
Tee KOBAYASHI 2022-01-22 15:52:21 +09:00 committed by YAKSH BARIYA
parent da1feb8853
commit 391bd4fd72
3 changed files with 50 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/megacmd/build.sh
View File

@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Provides non UI access to MEGA services"
TERMUX_PKG_LICENSE="BSD 2-Clause"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=1.4.1
TERMUX_PKG_REVISION=3
TERMUX_PKG_REVISION=4
_COMMIT=fd50adec27d1c2fdea8f7264cb30b8d8117d0699
TERMUX_PKG_SRCURL=https://github.com/meganz/MEGAcmd.git
TERMUX_PKG_GIT_BRANCH=master

20
packages/megacmd/sdk-src-posix-fs.cpp.patch Normal file
View File

@ -0,0 +1,20 @@
--- a/sdk/src/posix/fs.cpp
+++ b/sdk/src/posix/fs.cpp
@@ -30,7 +30,7 @@
#include "mega/osx/osxutils.h"
#endif
-#ifdef __ANDROID__
+#ifdef __ANDROID_NO_TERMUX__
#include <jni.h>
extern JavaVM *MEGAjvm;
#endif
@@ -1530,7 +1530,7 @@
void PosixFileSystemAccess::statsid(string *id) const
{
-#ifdef __ANDROID__
+#ifdef __ANDROID_NO_TERMUX__
if (!MEGAjvm)
{
LOG_err << "No JVM found";

29
packages/megacmd/sdk-src-posix-net.cpp.patch Normal file
View File

@ -0,0 +1,29 @@
--- a/sdk/src/posix/net.cpp
+++ b/sdk/src/posix/net.cpp
@@ -23,7 +23,7 @@
#include "mega/posix/meganet.h"
#include "mega/logging.h"
-#if defined(__ANDROID__) && ARES_VERSION >= 0x010F00
+#if defined(__ANDROID_NO_TERMUX__) && ARES_VERSION >= 0x010F00
#include <jni.h>
extern JavaVM *MEGAjvm;
#endif
@@ -288,7 +288,7 @@
ares_library_init(ARES_LIB_INIT_ALL);
}
-#if defined(__ANDROID__) && ARES_VERSION >= 0x010F00
+#if defined(__ANDROID_NO_TERMUX__) && ARES_VERSION >= 0x010F00
initialize_android();
#endif
@@ -2852,7 +2852,7 @@
return (DNS_CACHE_EXPIRES && (Waiter::ds - ipv6timestamp) >= DNS_CACHE_TIMEOUT_DS);
}
-#if defined(__ANDROID__) && ARES_VERSION >= 0x010F00
+#if defined(__ANDROID_NO_TERMUX__) && ARES_VERSION >= 0x010F00
void CurlHttpIO::initialize_android()
{
if (!MEGAjvm)