X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/8e66b39bf1c96b0ca31999931cb28ccb00e5d9ee..506ef46baeadc6f10456f75599e59ffce859d626:/packages/fish/src-env_universal_common.cpp.patch diff --git a/packages/fish/src-env_universal_common.cpp.patch b/packages/fish/src-env_universal_common.cpp.patch index 59c17700..38b00226 100644 --- a/packages/fish/src-env_universal_common.cpp.patch +++ b/packages/fish/src-env_universal_common.cpp.patch @@ -1,7 +1,7 @@ -diff -u -r ../fish-shell-c76d86631717929b3a2f259615e8603e69e13256/src/env_universal_common.cpp ./src/env_universal_common.cpp ---- ../fish-shell-c76d86631717929b3a2f259615e8603e69e13256/src/env_universal_common.cpp 2016-05-03 01:20:53.000000000 -0400 -+++ ./src/env_universal_common.cpp 2016-05-03 06:59:06.896497467 -0400 -@@ -134,7 +134,7 @@ +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 @@ -10,7 +10,7 @@ diff -u -r ../fish-shell-c76d86631717929b3a2f259615e8603e69e13256/src/env_univer tmpdir.append(uname); if (check_runtime_path(tmpdir.c_str()) != 0) { debug(0, -@@ -985,6 +985,7 @@ +@@ -987,6 +987,7 @@ return result; } @@ -18,15 +18,15 @@ diff -u -r ../fish-shell-c76d86631717929b3a2f259615e8603e69e13256/src/env_univer class universal_notifier_shmem_poller_t : public universal_notifier_t { // This is what our shared memory looks like. Everything here is stored in network byte order // (big-endian). -@@ -1126,6 +1127,7 @@ - } +@@ -1127,6 +1128,7 @@ + return usec_per_sec / 3; // 3 times a second } }; +#endif /// A notifyd-based notifier. Very straightforward. class universal_notifier_notifyd_t : public universal_notifier_t { -@@ -1409,7 +1412,9 @@ +@@ -1410,7 +1412,9 @@ const char *name; universal_notifier_t::notifier_strategy_t strat; } options[] = {{"default", universal_notifier_t::strategy_default}, @@ -36,7 +36,7 @@ diff -u -r ../fish-shell-c76d86631717929b3a2f259615e8603e69e13256/src/env_univer {"pipe", universal_notifier_t::strategy_named_pipe}, {"notifyd", universal_notifier_t::strategy_notifyd}}; const size_t opt_count = sizeof options / sizeof *options; -@@ -1462,9 +1467,11 @@ +@@ -1463,9 +1467,11 @@ strat = resolve_default_strategy(); } switch (strat) {