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

diff --git a/packages/radare2/paths.patch b/packages/radare2/paths.patch
index 39b95e67..66e60a0e 100644
--- a/packages/radare2/paths.patch
+++ b/packages/radare2/paths.patch
@@ -1,33 +1,20 @@
-diff -u -r ../radare2-1.0/libr/core/config.c ./libr/core/config.c
---- ../radare2-1.0/libr/core/config.c	2016-11-08 21:10:46.000000000 -0500
-+++ ./libr/core/config.c	2016-11-10 07:40:51.899121470 -0500
-@@ -1835,9 +1835,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.radare.radare2installer/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");
-@@ -1970,9 +1968,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.radare.radare2installer/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-1.0/libr/util/file.c ./libr/util/file.c
---- ../radare2-1.0/libr/util/file.c	2016-11-08 21:10:46.000000000 -0500
-+++ ./libr/util/file.c	2016-11-10 07:42:18.409808792 -0500
-@@ -808,7 +808,7 @@
- 		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.radare.radare2installer/radare2/tmp");