X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/af14ff2341e797d4e816426525d9ef23bfc8f6fc..7ee53f93d9d395caf9e29ac39443d19e5f40a8c1:/packages/radare2/paths.patch

diff --git a/packages/radare2/paths.patch b/packages/radare2/paths.patch
index f49492cd..66e60a0e 100644
--- a/packages/radare2/paths.patch
+++ b/packages/radare2/paths.patch
@@ -1,36 +1,23 @@
-diff -u -r ../radare2-0.10.5/libr/core/config.c ./libr/core/config.c
---- ../radare2-0.10.5/libr/core/config.c	2016-08-16 19:28:34.000000000 -0400
-+++ ./libr/core/config.c	2016-09-16 08:20:42.072720023 -0400
-@@ -1656,9 +1656,7 @@
+diff -uNr radare2-1.6.0/libr/include/r_magic.h radare2-1.6.0.mod/libr/include/r_magic.h
+--- radare2-1.6.0/libr/include/r_magic.h	2017-07-11 18:54:22.000000000 +0300
++++ radare2-1.6.0.mod/libr/include/r_magic.h	2017-09-12 12:34:00.112989113 +0300
+@@ -12,7 +12,7 @@
+ R_LIB_VERSION_HEADER(r_magic);
+ 
+ #ifndef MAGICFILE
+-#define MAGICFILE "/etc/magic"
++#define MAGICFILE "@TERMUX_PREFIX@/etc/magic"
  #endif
- 	SETCB("dir.source", "", &cb_dirsrc, "Path to find source files");
- 	SETPREF("dir.types", "/usr/include", "Default path to look for cparse type files");
--#if __ANDROID__
--	SETPREF("dir.projects", "/data/data/org.radare2.installer/radare2/projects", "Default path for projects");
--#elif __WINDOWS__
-+#if __WINDOWS__
- 	SETPREF("dir.projects", "~\\"R2_HOMEDIR"\\projects", "Default path for projects");
- #else
- 	SETPREF("dir.projects", "~/"R2_HOMEDIR"/projects", "Default path for projects");
-@@ -1778,9 +1776,7 @@
- 	SETI("http.maxsize", 0, "Maximum file size for upload");
- 	SETPREF("http.bind", "localhost", "Server address");
- 	SETPREF("http.homeroot", "~/.config/radare2/www", "http home root directory");
--#if __ANDROID__
--	SETPREF("http.root", "/data/data/org.radare2.installer/www", "http root directory");
--#elif __WINDOWS__
-+#if __WINDOWS__
- 	SETPREF("http.root", "www", "http root directory");
- #else
- 	SETPREF("http.root", R2_WWWROOT, "http root directory");
-diff -u -r ../radare2-0.10.5/libr/util/file.c ./libr/util/file.c
---- ../radare2-0.10.5/libr/util/file.c	2016-08-16 19:28:34.000000000 -0400
-+++ ./libr/util/file.c	2016-09-16 08:18:35.302578773 -0400
-@@ -770,7 +770,7 @@
- 	char *path = r_sys_getenv ("TEMP");
- 	if (!path) path = strdup ("C:\\WINDOWS\\Temp\\");
+ 
+ #define R_MAGIC_PATH R2_PREFIX "/share/radare2/" R2_VERSION "/magic"
+diff -uNr radare2-1.6.0/libr/util/file.c radare2-1.6.0.mod/libr/util/file.c
+--- radare2-1.6.0/libr/util/file.c	2017-07-11 18:54:22.000000000 +0300
++++ radare2-1.6.0.mod/libr/util/file.c	2017-09-12 12:34:06.732989109 +0300
+@@ -874,7 +874,7 @@
+ 		path = strdup (tmpdir);
+ 	}
  #elif __ANDROID__
--	char *path = strdup ("/data/data/org.radare2.installer/radare2/tmp");
+-	char *path = strdup ("/data/data/org.radare.radare2installer/radare2/tmp");
 +	char *path = strdup ("@TERMUX_PREFIX@/tmp");
  #else
  	char *path = r_sys_getenv ("TMPDIR");