diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md index 8f0ca31a660..319e2795b9e 100644 --- a/Ports/AvailablePorts.md +++ b/Ports/AvailablePorts.md @@ -132,7 +132,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n | [`jot`](jot/) | jot (OpenBSD) | 6.6 | https://github.com/ibara/libpuffy | | [`jq`](jq/) | jq | 1.6 | https://stedolan.github.io/jq/ | | [`julius`](julius/) | julius | 1.7.0 | https://github.com/bvschaik/julius | -| [`kakoune`](kakoune/) | Modal text editor | 24d6072 | https://github.com/mawww/kakoune | +| [`kakoune`](kakoune/) | Modal text editor | e605ad8 | https://github.com/mawww/kakoune | | [`klong`](klong/) | Klong | 20220315 | https://t3x.org/klong/ | | [`lame`](lame/) | LAME Ain't an MP3 Encoder | 3.100 | https://lame.sourceforge.io/ | | [`lcms2`](lcms2/) | Small-footprint color management engine | 2.15 | https://github.com/mm2/Little-CMS | diff --git a/Ports/kakoune/package.sh b/Ports/kakoune/package.sh index c5fec0bee4c..c2da32feb27 100755 --- a/Ports/kakoune/package.sh +++ b/Ports/kakoune/package.sh @@ -1,8 +1,8 @@ #!/usr/bin/env -S bash ../.port_include.sh port='kakoune' -version='24d6072353f7c7e7cac84b4eb085036a8c852f96' +version='e605ad8582d8e015806ed9b4d7aba8ca1ea13d57' files=( - "https://github.com/mawww/kakoune/archive/${version}.tar.gz#16440b204770972f318e24e4e178ada474b7cfeb029cefa69e9ff035700a129e" + "https://github.com/mawww/kakoune/archive/${version}.tar.gz#420823df611202f3c18a004def032cc9cec46c63b7754249aae2d8c1e72fb1b2" ) depends=( 'bash' diff --git a/Ports/kakoune/patches/0001-Use-proc-self-exe-on-SerenityOS.patch b/Ports/kakoune/patches/0001-Use-proc-self-exe-on-SerenityOS.patch index 10f18861d75..c661af615b8 100644 --- a/Ports/kakoune/patches/0001-Use-proc-self-exe-on-SerenityOS.patch +++ b/Ports/kakoune/patches/0001-Use-proc-self-exe-on-SerenityOS.patch @@ -8,10 +8,10 @@ Subject: [PATCH] Use /proc/self/exe on SerenityOS 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/file.cc b/src/file.cc -index d38c956..9c74364 100644 +index 58eb92844051059e66a7f0cc47f70091b821f81f..0531938bf0dd7bf1a8ac3d7be7bec8b629aaabd1 100644 --- a/src/file.cc +++ b/src/file.cc -@@ -603,7 +603,7 @@ FsStatus get_fs_status(StringView filename) +@@ -621,7 +621,7 @@ FsStatus get_fs_status(StringView filename) String get_kak_binary_path() { char buffer[2048]; @@ -20,6 +20,3 @@ index d38c956..9c74364 100644 ssize_t res = readlink("/proc/self/exe", buffer, 2048); kak_assert(res != -1); buffer[res] = '\0'; --- -2.37.3 - diff --git a/Ports/kakoune/patches/0002-Use-bash-instead-of-bin-sh.patch b/Ports/kakoune/patches/0002-Use-bash-instead-of-bin-sh.patch index 23b591a0a36..5aaa24236db 100644 --- a/Ports/kakoune/patches/0002-Use-bash-instead-of-bin-sh.patch +++ b/Ports/kakoune/patches/0002-Use-bash-instead-of-bin-sh.patch @@ -8,7 +8,7 @@ Subject: [PATCH] Use bash instead of /bin/sh 1 file changed, 5 insertions(+), 38 deletions(-) diff --git a/src/shell_manager.cc b/src/shell_manager.cc -index 96cfb06..4eb71db 100644 +index 62a60dc299a2696e6562d85077d7b3fab99fe5d8..6b6f48d932f5031670efff8e4ed67e2e78e25c26 100644 --- a/src/shell_manager.cc +++ b/src/shell_manager.cc @@ -34,44 +34,11 @@ namespace Kakoune @@ -61,6 +61,3 @@ index 96cfb06..4eb71db 100644 // Add Kakoune binary location to the path to guarantee that %sh{ ... } // have access to the kak command regardless of if the user installed it --- -2.37.3 - diff --git a/Ports/kakoune/patches/ReadMe.md b/Ports/kakoune/patches/ReadMe.md index ba302dae339..52105e690e8 100644 --- a/Ports/kakoune/patches/ReadMe.md +++ b/Ports/kakoune/patches/ReadMe.md @@ -1,9 +1,12 @@ -# Patches for Kakoune on SerenityOS +# Patches for kakoune on SerenityOS ## `0001-Use-proc-self-exe-on-SerenityOS.patch` Use /proc/self/exe on SerenityOS + ## `0002-Use-bash-instead-of-bin-sh.patch` Use bash instead of /bin/sh + +