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

radare2: use prefixed path for 'dir.types' (#1621)

Browse Source
This commit is contained in:
Leonid Pliushch 2017-10-06 08:47:09 +03:00 committed by Fredrik Fornwall
parent 9cea865e49
commit cd9bf31b77
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/radare2/build.sh
View File

@ -1,7 +1,7 @@
TERMUX_PKG_HOMEPAGE=https://rada.re TERMUX_PKG_HOMEPAGE=https://rada.re
TERMUX_PKG_DESCRIPTION="Advanced Hexadecimal Editor" TERMUX_PKG_DESCRIPTION="Advanced Hexadecimal Editor"
TERMUX_PKG_VERSION=1.6.0 TERMUX_PKG_VERSION=1.6.0
TERMUX_PKG_REVISION=1 TERMUX_PKG_REVISION=2
TERMUX_PKG_SHA256=759d1c65dcd69d1189fc73e427c568ec234a7ca1958c19f5001c255dd31a3787 TERMUX_PKG_SHA256=759d1c65dcd69d1189fc73e427c568ec234a7ca1958c19f5001c255dd31a3787
TERMUX_PKG_SRCURL=https://github.com/radare/radare2/archive/$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SRCURL=https://github.com/radare/radare2/archive/$TERMUX_PKG_VERSION.tar.gz
TERMUX_PKG_BUILD_IN_SRC="yes" TERMUX_PKG_BUILD_IN_SRC="yes"

16
packages/radare2/libr-core-cconfig.c.patch
View File

@ -1,18 +1,20 @@
diff -u -r ../radare2-1.5.0/libr/core/cconfig.c ./libr/core/cconfig.c diff -uNr radare2-1.6.0/libr/core/cconfig.c radare2-1.6.0.mod/libr/core/cconfig.c
--- ../radare2-1.5.0/libr/core/cconfig.c 2017-05-30 17:39:22.000000000 +0000 --- radare2-1.6.0/libr/core/cconfig.c 2017-07-11 18:54:22.000000000 +0300
+++ ./libr/core/cconfig.c 2017-06-14 22:12:21.397368964 +0000 +++ radare2-1.6.0.mod/libr/core/cconfig.c 2017-10-05 17:44:43.354444523 +0300
@@ -2145,9 +2145,7 @@ @@ -2202,10 +2202,8 @@
SETPREF ("dir.plugins", R2_LIBDIR"/radare2/"R2_VERSION"/", "Path to plugin files to be loaded at startup");
#endif #endif
SETCB ("dir.source", "", &cb_dirsrc, "Path to find source files"); SETCB ("dir.source", "", &cb_dirsrc, "Path to find source files");
SETPREF ("dir.types", "/usr/include", "Default path to look for cparse type files"); - SETPREF ("dir.types", "/usr/include", "Default path to look for cparse type files");
-#if __ANDROID__ -#if __ANDROID__
- SETPREF ("dir.projects", "/data/data/org.radare.radare2installer/radare2/projects", "Default path for projects"); - SETPREF ("dir.projects", "/data/data/org.radare.radare2installer/radare2/projects", "Default path for projects");
-#elif __WINDOWS__ -#elif __WINDOWS__
+ SETPREF ("dir.types", "@TERMUX_PREFIX@/include", "Default path to look for cparse type files");
+#if __WINDOWS__ +#if __WINDOWS__
SETPREF ("dir.projects", "~\\"R2_HOMEDIR"\\projects", "Default path for projects"); SETPREF ("dir.projects", "~\\"R2_HOMEDIR"\\projects", "Default path for projects");
#else #else
SETPREF ("dir.projects", "~/"R2_HOMEDIR"/projects", "Default path for projects"); SETPREF ("dir.projects", "~/"R2_HOMEDIR"/projects", "Default path for projects");
@@ -2283,6 +2281,9 @@ @@ -2343,6 +2341,9 @@
#if __WINDOWS__ #if __WINDOWS__
r_config_set (cfg, "http.browser", "start"); r_config_set (cfg, "http.browser", "start");
#else #else
@ -22,7 +24,7 @@ diff -u -r ../radare2-1.5.0/libr/core/cconfig.c ./libr/core/cconfig.c
if (r_file_exists ("/usr/bin/openURL")) { // iOS ericautils if (r_file_exists ("/usr/bin/openURL")) { // iOS ericautils
r_config_set (cfg, "http.browser", "/usr/bin/openURL"); r_config_set (cfg, "http.browser", "/usr/bin/openURL");
} else if (r_file_exists ("/system/bin/toolbox")) { } else if (r_file_exists ("/system/bin/toolbox")) {
@@ -2295,14 +2296,13 @@ @@ -2355,14 +2356,13 @@
} else { } else {
r_config_set (cfg, "http.browser", "firefox"); r_config_set (cfg, "http.browser", "firefox");
} }