Skip to content
Snippets Groups Projects
Commit 7b2a2ab6 authored by Celeste's avatar Celeste
Browse files

community/kakoune: upgrade to 2024.05.18

parent 0e72b2bb
No related branches found
No related tags found
1 merge request!66139community/kakoune: upgrade to 2024.05.18
Pipeline #235075 skipped
Hide whitespace changes
Inline Side-by-side
community/kakoune/APKBUILD
+ 3
− 7
View file @ 7b2a2ab6
# Contributor: Leo <thinkabit.ukim@gmail.com>
# Maintainer: Willow Barraco <contact@willowbarraco.fr>
pkgname=kakoune
pkgver=2024.05.09
pkgrel=1
pkgver=2024.05.18
pkgrel=0
pkgdesc="Code editor heavily inspired by Vim, but with less keystrokes"
url="https://kakoune.org"
arch="all"
......@@ -13,8 +13,6 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/mawww/kakoune/archive/v$pkgv
alpine-linux.kak
0001-fix-CXXFLAGS.patch
constexpr.patch
fix-tests-1.patch
fix-tests-2.patch
"
build() {
......@@ -32,10 +30,8 @@ package() {
}
sha512sums="
e510b01574d505aa99e1927b2ef43c52ef866163fcc59a334951159c63f21ce671e475aba7fcf79a284105ff8bebf76f8e987799cb415e1503dbe1d1dd4fe2c4 kakoune-2024.05.09.tar.gz
1e5ccd4882dd3a8682e4e53f562296e737ae9238a343cf543ddbf71cbabc9543d21397a41d91a187593ea0809d1935bf41f83f5ab6ad2e41b213ed03ab32b79a kakoune-2024.05.18.tar.gz
c5b11dc28adf785b4e83637fe1d5c9db334616d2d3f6c667823745e273f739c57d0d408b9bec8a65210e3c7ccb80a5b488ebbb3c0c5de8bdec13e1b4b4d02b77 alpine-linux.kak
83295606d1191ae66339ccd813b5f123ab49b22bafcdd578b109ea367dae52c5de7f6b8e44119579163befb349e3b76b4b9e4b20f951466dc2c270c38e64ceb1 0001-fix-CXXFLAGS.patch
aa5df7a115e7b7ecaba85794ea56961fd1c638f4590300474fa72c8900ecb36742d7c8075ebc48151f40ba2dc427c4d8bcca9c844793768a1d0c4e66f22d328c constexpr.patch
3ad545cbbc23f0273032543a24e380236e149dfed540da7b51c073b3c07107d3c7a4f0ff17c739fc45c41e0d52e2b6608979f5e1d1d1f60e774994a330027fa1 fix-tests-1.patch
a5000d3605e45a0d26f05a4d79e7c0993f4c45c3a6ccd07817a7ba73c10a7af0c30fa36d2cb013cb96252684b602f71d1c87085ba1df91072f9a5ba29b6bcbfd fix-tests-2.patch
"
community/kakoune/fix-tests-1.patch deleted 100644 → 0
+ 0
− 120
View file @ 0e72b2bb
Patch-Source: https://github.com/mawww/kakoune/commit/8c2775f665fd4aae603b423362cf0d4d917fc0df
--
From 8c2775f665fd4aae603b423362cf0d4d917fc0df Mon Sep 17 00:00:00 2001
From: Maxime Coste <mawww@kakoune.org>
Date: Fri, 10 May 2024 12:04:27 +1000
Subject: [PATCH] Fix tests that were failing on alpine
Ensure perl exists for git blame tests, replace timing sensitive
`ui_out -ignore ...` with `ui_out -until '...'`
---
test/commands/edit-fifo-noscroll/script | 13 ++++++-------
test/run | 6 ++++++
test/tools/git/blame-in-diff/enabled | 2 +-
test/tools/git/blame-in-diff/script | 7 +++----
test/tools/git/blame-jump-message/enabled | 2 +-
test/tools/git/blame-jump-message/script | 7 +++----
6 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/test/commands/edit-fifo-noscroll/script b/test/commands/edit-fifo-noscroll/script
index f64e1a778a..3a719e6a36 100644
--- a/test/commands/edit-fifo-noscroll/script
+++ b/test/commands/edit-fifo-noscroll/script
@@ -1,19 +1,18 @@
-ui_out -ignore 7
+ui_out -until '{ "jsonrpc": "2.0", "method": "refresh", "params": [true] }'
exec 5>fifo
-ui_out '{ "jsonrpc": "2.0", "method": "refresh", "params": [true] }'
echo '* line1' >&5
ui_out '{ "jsonrpc": "2.0", "method": "draw", "params": [[[{ "face": { "fg": "black", "bg": "white", "underline": "default", "attributes": [] }, "contents": "*" }, { "face": { "fg": "default", "bg": "default", "underline": "default", "attributes": [] }, "contents": " line1\u000a" }]], { "fg": "default", "bg": "default", "underline": "default", "attributes": [] }, { "fg": "blue", "bg": "default", "underline": "default", "attributes": [] }] }'
-ui_out -ignore 2
+ui_out -until '{ "jsonrpc": "2.0", "method": "refresh", "params": [false] }'
echo '* line2' >&5
ui_out '{ "jsonrpc": "2.0", "method": "draw", "params": [[[{ "face": { "fg": "black", "bg": "white", "underline": "default", "attributes": [] }, "contents": "*" }, { "face": { "fg": "default", "bg": "default", "underline": "default", "attributes": [] }, "contents": " line1\u000a" }], [{ "face": { "fg": "default", "bg": "default", "underline": "default", "attributes": [] }, "contents": "* line2\u000a" }]], { "fg": "default", "bg": "default", "underline": "default", "attributes": [] }, { "fg": "blue", "bg": "default", "underline": "default", "attributes": [] }] }'
-ui_out -ignore 2
+ui_out -until '{ "jsonrpc": "2.0", "method": "refresh", "params": [false] }'
dd if=/dev/zero bs=2049 count=1 2>/dev/null | sed s/././g >&5
-ui_out -ignore 3
+ui_out -until '{ "jsonrpc": "2.0", "method": "refresh", "params": [false] }'
ui_in '{ "jsonrpc": "2.0", "method": "keys", "params": [ "gjxH|wc -c | tr -d \" \"<ret>" ] }'
-ui_out -ignore 6
+ui_out -until '{ "jsonrpc": "2.0", "method": "refresh", "params": [false] }'
exec 5>&-
-ui_out '{ "jsonrpc": "2.0", "method": "draw_status", "params": [[], [{ "face": { "fg": "default", "bg": "default", "underline": "default", "attributes": [] }, "contents": "*fifo* 3:4 " }, { "face": { "fg": "black", "bg": "yellow", "underline": "default", "attributes": [] }, "contents": "[scratch]" }, { "face": { "fg": "default", "bg": "default", "underline": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "blue", "bg": "default", "underline": "default", "attributes": [] }, "contents": "1 sel" }, { "face": { "fg": "default", "bg": "default", "underline": "default", "attributes": [] }, "contents": " - client0@[kak-tests]" }], { "fg": "cyan", "bg": "default", "underline": "default", "attributes": [] }] }'
+ui_out -until '{ "jsonrpc": "2.0", "method": "draw_status", "params": [[], [{ "face": { "fg": "default", "bg": "default", "underline": "default", "attributes": [] }, "contents": "*fifo* 3:4 " }, { "face": { "fg": "black", "bg": "yellow", "underline": "default", "attributes": [] }, "contents": "[scratch]" }, { "face": { "fg": "default", "bg": "default", "underline": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "blue", "bg": "default", "underline": "default", "attributes": [] }, "contents": "1 sel" }, { "face": { "fg": "default", "bg": "default", "underline": "default", "attributes": [] }, "contents": " - client0@[kak-tests]" }], { "fg": "cyan", "bg": "default", "underline": "default", "attributes": [] }] }'
diff --git a/test/run b/test/run
index 95f71a9e94..e26aea054e 100755
--- a/test/run
+++ b/test/run
@@ -190,6 +190,12 @@ ui_out() {
skip_count=$(( skip_count - 1 ))
done
;;
+ -until)
+ shift
+ while read -r event <&4; do
+ [ "$event" == "$1" ] && break
+ done
+ ;;
-until-grep)
shift
while
diff --git a/test/tools/git/blame-in-diff/enabled b/test/tools/git/blame-in-diff/enabled
index a041a9b460..b5b8908197 100755
--- a/test/tools/git/blame-in-diff/enabled
+++ b/test/tools/git/blame-in-diff/enabled
@@ -1,2 +1,2 @@
#!/bin/sh
-command -v git >/dev/null
+command -v git >/dev/null && command -v perl >/dev/null
diff --git a/test/tools/git/blame-in-diff/script b/test/tools/git/blame-in-diff/script
index e5ca34b2f5..6adda9225f 100644
--- a/test/tools/git/blame-in-diff/script
+++ b/test/tools/git/blame-in-diff/script
@@ -1,11 +1,10 @@
-ui_out -ignore 7
-ui_out -ignore 11
+ui_out -until '{ "jsonrpc": "2.0", "method": "refresh", "params": [true] }'
# We've jumped to the new version of line 2. Move to the old version so we
# can annotate the old file.
ui_in '{ "jsonrpc": "2.0", "method": "keys", "params": [ "k:git blame<ret>" ] }'
-ui_out -ignore 11
+ui_out -until '{ "jsonrpc": "2.0", "method": "refresh", "params": [false] }'
# We should have jumped to the old version of line 2, assert on kak_selection.
ui_in '{ "jsonrpc": "2.0", "method": "keys", "params": [ "x" ] }'
-ui_out -ignore 5
+ui_out -until '{ "jsonrpc": "2.0", "method": "refresh", "params": [false] }'
diff --git a/test/tools/git/blame-jump-message/enabled b/test/tools/git/blame-jump-message/enabled
index a041a9b460..b5b8908197 100755
--- a/test/tools/git/blame-jump-message/enabled
+++ b/test/tools/git/blame-jump-message/enabled
@@ -1,2 +1,2 @@
#!/bin/sh
-command -v git >/dev/null
+command -v git >/dev/null && command -v perl >/dev/null
diff --git a/test/tools/git/blame-jump-message/script b/test/tools/git/blame-jump-message/script
index 67834a40d8..9f6fb6e0f1 100644
--- a/test/tools/git/blame-jump-message/script
+++ b/test/tools/git/blame-jump-message/script
@@ -1,6 +1,5 @@
-while ! ui_out -until-grep draw_status | grep -v '\[fifo\]' >/dev/null;
-do
- :
+while true; do
+ ui_out -until-grep draw_status | grep -v '\[fifo\]' >/dev/null && break
done
actual_draw_status=$(ui_out -until-grep draw_status)
@@ -11,5 +10,5 @@ EOF
expected_subject_json=\"$(printf '%s' "$expected_subject" | sed 's/"/\\"/g')\"
expected_draw_status='{ "jsonrpc": "2.0", "method": "draw_status", "params": [[{ "face": { "fg": "black", "bg": "yellow", "underline": "default", "attributes": [] }, "contents": '"$expected_subject_json"' }], [{ "face": { "fg": "default", "bg": "default", "underline": "default", "attributes": [] }, "contents": "*git* 13:2 " }, { "face": { "fg": "black", "bg": "yellow", "underline": "default", "attributes": [] }, "contents": "[scratch]" }, { "face": { "fg": "default", "bg": "default", "underline": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "blue", "bg": "default", "underline": "default", "attributes": [] }, "contents": "1 sel" }, { "face": { "fg": "default", "bg": "default", "underline": "default", "attributes": [] }, "contents": " - client0@[kak-tests]" }], { "fg": "cyan", "bg": "default", "underline": "default", "attributes": [] }] }'
-assert_eq "$actual_draw_status" "$expected_draw_status"
+assert_eq "$expected_draw_status" "$actual_draw_status"
ui_out -ignore 2
community/kakoune/fix-tests-2.patch deleted 100644 → 0
+ 0
− 55
View file @ 0e72b2bb
Patch-Source: https://github.com/mawww/kakoune/commit/0e92b3fdefddbf81a008b3678faf4bf550be215c
--
From 0e92b3fdefddbf81a008b3678faf4bf550be215c Mon Sep 17 00:00:00 2001
From: Maxime Coste <mawww@kakoune.org>
Date: Sun, 12 May 2024 14:18:17 +1000
Subject: [PATCH] Fix another case where git tests were hanging
---
rc/tools/git.kak | 2 +-
test/run | 2 +-
test/tools/git/blame-in-diff/script | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/rc/tools/git.kak b/rc/tools/git.kak
index ac349a9719..def591d860 100644
--- a/rc/tools/git.kak
+++ b/rc/tools/git.kak
@@ -224,7 +224,7 @@ define-command -params 1.. \
execute-keys <a-l><semicolon><a-?>^commit<ret><a-semicolon>
} catch %{
# Missing commit line, assume it is an uncommitted change.
- execute-keys <a-l><semicolon><a-?>\A<ret><a-semicolon>
+ execute-keys <a-l><semicolon>Gg<a-semicolon>
}
require-module diff
try %{
diff --git a/test/run b/test/run
index e26aea054e..a65f539677 100755
--- a/test/run
+++ b/test/run
@@ -193,7 +193,7 @@ ui_out() {
-until)
shift
while read -r event <&4; do
- [ "$event" == "$1" ] && break
+ [ "$event" = "$1" ] && break
done
;;
-until-grep)
diff --git a/test/tools/git/blame-in-diff/script b/test/tools/git/blame-in-diff/script
index 6adda9225f..e22b3ec8ae 100644
--- a/test/tools/git/blame-in-diff/script
+++ b/test/tools/git/blame-in-diff/script
@@ -1,9 +1,9 @@
-ui_out -until '{ "jsonrpc": "2.0", "method": "refresh", "params": [true] }'
+ui_out -until '{ "jsonrpc": "2.0", "method": "refresh", "params": [false] }'
# We've jumped to the new version of line 2. Move to the old version so we
# can annotate the old file.
ui_in '{ "jsonrpc": "2.0", "method": "keys", "params": [ "k:git blame<ret>" ] }'
-ui_out -until '{ "jsonrpc": "2.0", "method": "refresh", "params": [false] }'
+while ui_out -until-grep '"draw_status"' | grep '\[fifo\]'; do :; done > /dev/null
# We should have jumped to the old version of line 2, assert on kak_selection.
ui_in '{ "jsonrpc": "2.0", "method": "keys", "params": [ "x" ] }'
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment