kakoune: update from 2021.08.28 to 2021.10.28
This commit is contained in:
parent
bad9fd99f8
commit
17712de701
@ -2,12 +2,11 @@ TERMUX_PKG_HOMEPAGE=https://github.com/mawww/kakoune
|
||||
TERMUX_PKG_DESCRIPTION="Code editor heavily inspired by Vim"
|
||||
TERMUX_PKG_LICENSE="Unlicense"
|
||||
TERMUX_PKG_MAINTAINER="@termux"
|
||||
TERMUX_PKG_VERSION=2021.08.28
|
||||
TERMUX_PKG_REVISION=1
|
||||
TERMUX_PKG_VERSION=2021.10.28
|
||||
TERMUX_PKG_SRCURL=https://github.com/mawww/kakoune/releases/download/v$TERMUX_PKG_VERSION/kakoune-$TERMUX_PKG_VERSION.tar.bz2
|
||||
TERMUX_PKG_SHA256=6f6ed7dfd8c5723210dbd848708acf03af4b847016fd3ede96b2a89ad32276cb
|
||||
TERMUX_PKG_SHA256=2f4c93871dc31f6281712281a7119928b1d6d6f300dded84b2d3ce0ab27f2126
|
||||
TERMUX_PKG_AUTO_UPDATE=true
|
||||
TERMUX_PKG_DEPENDS="libc++, ncurses"
|
||||
TERMUX_PKG_DEPENDS="libc++"
|
||||
TERMUX_PKG_BUILD_IN_SRC=true
|
||||
TERMUX_PKG_EXTRA_MAKE_ARGS=" -C src debug=no "
|
||||
|
||||
|
@ -2,14 +2,12 @@ diff --git a/src/shell_manager.cc b/src/shell_manager.cc
|
||||
index b92edb4c..df025943 100644
|
||||
--- a/src/shell_manager.cc
|
||||
+++ b/src/shell_manager.cc
|
||||
@@ -30,9 +30,7 @@ ShellManager::ShellManager(ConstArrayView<EnvVarDesc> builtin_env_vars)
|
||||
{
|
||||
// Get a guaranteed to be POSIX shell binary
|
||||
{
|
||||
- auto size = confstr(_CS_PATH, nullptr, 0);
|
||||
- String path; path.resize(size-1, 0);
|
||||
- confstr(_CS_PATH, path.data(), size);
|
||||
+ String path = "@TERMUX_PREFIX@/bin:.";
|
||||
@@ -30,7 +30,7 @@ ShellManager::ShellManager(ConstArrayView<EnvVarDesc> builtin_env_vars)
|
||||
String path; path.resize(size-1, 0);
|
||||
confstr(_CS_PATH, path.data(), size);
|
||||
#else
|
||||
- StringView path = "/bin:/usr/bin";
|
||||
+ StringView path = "@TERMUX_PREFIX@/bin:/system/bin";
|
||||
#endif
|
||||
for (auto dir : StringView{path} | split<StringView>(':'))
|
||||
{
|
||||
String candidate = format("{}/sh", dir);
|
||||
|
@ -7,6 +7,6 @@ diff -u -r ../kakoune-2019.12.10/src/main.cc ./src/main.cc
|
||||
|
||||
-#if defined(__ELF__)
|
||||
+#if defined(__ELF__) && !defined(__ANDROID__)
|
||||
asm(R"(
|
||||
.pushsection ".debug_gdb_scripts", "MS",@progbits,1
|
||||
.byte 4
|
||||
#ifdef __arm__
|
||||
# define PROGBITS "%progbits"
|
||||
#else
|
||||
|
Loading…
Reference in New Issue
Block a user