Fredrik Fornwall
6 years ago
7 changed files with 38 additions and 58 deletions
@ -1,12 +0,0 @@ |
|||
diff -u -r ../fish-2.7.0/src/builtin_argparse.cpp ./src/builtin_argparse.cpp
|
|||
--- ../fish-2.7.0/src/builtin_argparse.cpp 2017-11-23 06:45:49.000000000 +0100
|
|||
+++ ./src/builtin_argparse.cpp 2017-11-30 00:33:41.800475273 +0100
|
|||
@@ -444,7 +444,7 @@
|
|||
|
|||
if (!opt_spec->long_flag.empty()) { |
|||
long_options.get()[i++] = {opt_spec->long_flag.c_str(), arg_type, NULL, |
|||
- opt_spec->short_flag};
|
|||
+ (int) opt_spec->short_flag};
|
|||
} |
|||
} |
|||
long_options.get()[i] = {NULL, 0, NULL, 0}; |
@ -1,14 +0,0 @@ |
|||
https://reviews.freebsd.org/D14058 |
|||
|
|||
diff -u -r ../fish-2.7.1/src/common.h ./src/common.h
|
|||
--- ../fish-2.7.1/src/common.h 2017-12-22 16:16:29.000000000 +0000
|
|||
+++ ./src/common.h 2018-09-21 22:05:33.472645301 +0000
|
|||
@@ -658,7 +658,7 @@
|
|||
void append_format(wcstring &str, const wchar_t *format, ...); |
|||
void append_formatv(wcstring &str, const wchar_t *format, va_list ap); |
|||
|
|||
-#ifdef __cpp_lib_make_unique
|
|||
+#if __cplusplus >= 201402L
|
|||
using std::make_unique; |
|||
#else |
|||
/// make_unique implementation |
@ -0,0 +1,12 @@ |
|||
diff -u -r ../fish-3.0.0/src/env.cpp ./src/env.cpp
|
|||
--- ../fish-3.0.0/src/env.cpp 2018-12-28 13:01:03.000000000 +0000
|
|||
+++ ./src/env.cpp 2018-12-28 23:00:54.389770761 +0000
|
|||
@@ -1656,7 +1656,7 @@
|
|||
// See https://github.com/fish-shell/fish-shell/issues/5180 |
|||
const char *uname = getpwuid(geteuid())->pw_name; |
|||
// /tmp/fish.user |
|||
- std::string tmpdir = "/tmp/fish.";
|
|||
+ std::string tmpdir = "@TERMUX_PREFIX@/tmp/fish.";
|
|||
tmpdir.append(uname); |
|||
|
|||
if (check_runtime_path(tmpdir.c_str()) != 0) { |
@ -1,12 +0,0 @@ |
|||
diff -u -r ../fish-2.4b1/src/env_universal_common.cpp ./src/env_universal_common.cpp
|
|||
--- ../fish-2.4b1/src/env_universal_common.cpp 2016-10-18 10:17:06.000000000 -0400
|
|||
+++ ./src/env_universal_common.cpp 2016-10-19 17:42:06.900520935 -0400
|
|||
@@ -137,7 +137,7 @@
|
|||
} |
|||
|
|||
// /tmp/fish.user |
|||
- std::string tmpdir = "/tmp/fish.";
|
|||
+ std::string tmpdir = "@TERMUX_PREFIX@/tmp/fish.";
|
|||
tmpdir.append(uname); |
|||
if (check_runtime_path(tmpdir.c_str()) != 0) { |
|||
debug(0, |
Loading…
Reference in new issue