X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/6250534f1ee25ae7a93cd1e06c4b3b486a962729..197daca251715e518bb8367c8e32a7c5fa99f9ea:/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 0e80598c..f1004345 100644
--- a/packages/fish/src-env_universal_common.cpp.patch
+++ b/packages/fish/src-env_universal_common.cpp.patch
@@ -1,49 +1,12 @@
-diff -u -r ../fish-2.3.1/src/env_universal_common.cpp ./src/env_universal_common.cpp
---- ../fish-2.3.1/src/env_universal_common.cpp	2016-07-03 08:15:45.000000000 -0400
-+++ ./src/env_universal_common.cpp	2016-08-05 09:18:38.753535780 -0400
-@@ -166,7 +166,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
 -        std::string tmpdir = "/tmp/fish.";
 +        std::string tmpdir = "@TERMUX_PREFIX@/tmp/fish.";
          tmpdir.append(uname);
-         if (check_runtime_path(tmpdir.c_str()) != 0)
-         {
-@@ -1141,6 +1141,7 @@
-     return result;
- }
- 
-+#ifndef __ANDROID__
- 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) */
-@@ -1304,6 +1305,7 @@
-         }
-     }
- };
-+#endif
- 
- /* A notifyd-based notifier. Very straightforward. */
- class universal_notifier_notifyd_t : public universal_notifier_t
-@@ -1625,7 +1627,9 @@
-     } options[] =
-     {
-         {"default", universal_notifier_t::strategy_default},
-+#ifndef __ANDROID__
-         {"shmem", universal_notifier_t::strategy_shmem_polling},
-+#endif
-         {"pipe", universal_notifier_t::strategy_named_pipe},
-         {"notifyd", universal_notifier_t::strategy_notifyd}
-     };
-@@ -1687,8 +1691,10 @@
-     }
-     switch (strat)
-     {
-+#ifndef __ANDROID__
-         case strategy_shmem_polling:
-             return new universal_notifier_shmem_poller_t();
-+#endif
-             
-         case strategy_notifyd:
-             return new universal_notifier_notifyd_t();
+         if (check_runtime_path(tmpdir.c_str()) != 0) {
+             debug(0,