From 03c6f730356002a13042ba59f158d68f6813d114 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sun, 29 Jul 2018 23:58:51 +0200
Subject: [PATCH] megatools: Update from 1.9.98 to 1.10.1

---
 packages/megatools/build.sh                  |  5 ++---
 packages/megatools/fix-hardcoded-paths.patch | 21 --------------------
 packages/megatools/lib-mega.c.patch          | 21 ++++++++++++++++++++
 3 files changed, 23 insertions(+), 24 deletions(-)
 delete mode 100644 packages/megatools/fix-hardcoded-paths.patch
 create mode 100644 packages/megatools/lib-mega.c.patch

diff --git a/packages/megatools/build.sh b/packages/megatools/build.sh
index 9b38b600d..04090fb6e 100644
--- a/packages/megatools/build.sh
+++ b/packages/megatools/build.sh
@@ -1,9 +1,8 @@
 TERMUX_PKG_HOMEPAGE=https://github.com/megous/megatools
 TERMUX_PKG_DESCRIPTION="Open-source command line tools and C library (libmega) for accessing Mega.co.nz cloud storage"
-TERMUX_PKG_VERSION=1.9.98
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_VERSION=1.10.1
+TERMUX_PKG_SHA256=87f703423e8ef470e6bb7af47f2450d8d1ac7ec3fcff463dd4898d64950b867e
 TERMUX_PKG_SRCURL=https://github.com/megous/megatools/archive/$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_SHA256=8e8614d7c29dc00fc47999d2a47372ae115635df9f30779fe32032f1a7289cec
 TERMUX_PKG_DEPENDS="glib, libandroid-support, libcurl, libgmp, openssl"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-fuse --enable-docs-build"
 TERMUX_PKG_BUILD_IN_SRC=yes
diff --git a/packages/megatools/fix-hardcoded-paths.patch b/packages/megatools/fix-hardcoded-paths.patch
deleted file mode 100644
index 2c167dc93..000000000
--- a/packages/megatools/fix-hardcoded-paths.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -uNr megatools-1.9.98/lib/mega.c megatools-1.9.98.mod/lib/mega.c
---- megatools-1.9.98/lib/mega.c	2016-11-03 15:47:43.000000000 +0200
-+++ megatools-1.9.98.mod/lib/mega.c	2017-09-14 14:39:19.422860139 +0300
-@@ -2859,7 +2859,7 @@
- 
-   if (has_ffmpegthumbnailer && g_regex_match_simple("\\.(mpg|mpeg|avi|mkv|flv|rm|mp4|wmv|asf|ram|mov)$", local_path, G_REGEX_CASELESS, 0))
-   {
--    gchar buf[50] = "/tmp/megatools.XXXXXX";
-+    gchar buf[50] = "@TERMUX_PREFIX@/tmp/megatools.XXXXXX";
-     gchar* dir = g_mkdtemp(buf);
-     if (dir)
-     {
-@@ -2895,7 +2895,7 @@
-   }
-   else if (has_convert && g_regex_match_simple("\\.(jpe?g|png|gif|bmp|tiff|svg|pnm|eps|ico|pdf)$", local_path, G_REGEX_CASELESS, 0))
-   {
--    gchar buf[50] = "/tmp/megatools.XXXXXX";
-+    gchar buf[50] = "@TERMUX_PREFIX@/tmp/megatools.XXXXXX";
-     gchar* dir = g_mkdtemp(buf);
-     if (dir)
-     {
diff --git a/packages/megatools/lib-mega.c.patch b/packages/megatools/lib-mega.c.patch
new file mode 100644
index 000000000..e43e15585
--- /dev/null
+++ b/packages/megatools/lib-mega.c.patch
@@ -0,0 +1,21 @@
+diff -u -r ../megatools-1.10.1/lib/mega.c ./lib/mega.c
+--- ../megatools-1.10.1/lib/mega.c	2018-07-27 11:40:26.000000000 +0000
++++ ./lib/mega.c	2018-07-29 21:32:54.574899892 +0000
+@@ -3910,7 +3910,7 @@
+ 
+ 	if (has_ffmpegthumbnailer && g_regex_match_simple("\\.(mpg|mpeg|avi|mkv|flv|rm|mp4|wmv|asf|ram|mov)$",
+ 							  local_path, G_REGEX_CASELESS, 0)) {
+-		gchar buf[50] = "/tmp/megatools.XXXXXX";
++		gchar buf[100] = "@TERMUX_PREFIX@/tmp/megatools.XXXXXX";
+ 		gchar *dir = g_mkdtemp(buf);
+ 		if (dir) {
+ 			gint status = 1;
+@@ -3941,7 +3941,7 @@
+ 		}
+ 	} else if (has_convert && g_regex_match_simple("\\.(jpe?g|png|gif|bmp|tiff|svg|pnm|eps|ico|pdf)$", local_path,
+ 						       G_REGEX_CASELESS, 0)) {
+-		gchar buf[50] = "/tmp/megatools.XXXXXX";
++		gchar buf[100] = "@TERMUX_PREFIX@/tmp/megatools.XXXXXX";
+ 		gchar *dir = g_mkdtemp(buf);
+ 		if (dir) {
+ 			gint status = 1;