From d7d3d2f88a8278c0e3bd2272b8ef9be5fb2ae2f6 Mon Sep 17 00:00:00 2001
From: ismay <git.email@ismay.email>
Date: Tue, 14 May 2024 11:19:12 +0200
Subject: [PATCH 1/2] kakoune: update to 2024.05.09.

---
 .../patches/fix-hanging-git-tests.patch       | 106 ++++++++++++++++++
 srcpkgs/kakoune/template                      |   6 +-
 2 files changed, 108 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/kakoune/patches/fix-hanging-git-tests.patch

diff --git a/srcpkgs/kakoune/patches/fix-hanging-git-tests.patch b/srcpkgs/kakoune/patches/fix-hanging-git-tests.patch
new file mode 100644
index 00000000000000..97da53d286b297
--- /dev/null
+++ b/srcpkgs/kakoune/patches/fix-hanging-git-tests.patch
@@ -0,0 +1,106 @@
+https://github.com/mawww/kakoune/commit/0e92b3fdefddbf81a008b3678faf4bf550be215c
+https://github.com/mawww/kakoune/commit/8c2775f665fd4aae603b423362cf0d4d917fc0df
+
+--- 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": [] }] }'
+--- 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
+--- 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
+--- 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": [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 -ignore 11
++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" ] }'
+-ui_out -ignore 5
++ui_out -until '{ "jsonrpc": "2.0", "method": "refresh", "params": [false] }'
+--- 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
+--- 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
+--- 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/src/file.cc b/src/file.cc
+index be2989641b..ca2d283404 100644
diff --git a/srcpkgs/kakoune/template b/srcpkgs/kakoune/template
index cea330d16886a4..c8be8086576278 100644
--- a/srcpkgs/kakoune/template
+++ b/srcpkgs/kakoune/template
@@ -1,20 +1,18 @@
 # Template file for 'kakoune'
 pkgname=kakoune
 reverts=20180409_1
-version=2023.08.05
+version=2024.05.09
 revision=1
-build_wrksrc="src"
 build_style=gnu-makefile
 make_build_args="debug=no gzip_man=no"
 make_install_args="debug=no gzip_man=no"
-make_use_env=yes
 hostmakedepends="pkg-config"
 short_desc="Selection-based vim-like editor with less keystrokes"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Unlicense"
 homepage="https://kakoune.org"
 distfiles="https://github.com/mawww/kakoune/releases/download/v${version}/kakoune-${version}.tar.bz2"
-checksum=3e45151e0addd3500de2d6a29b5aacf2267c42bb256d44a782e73defb29cda5c
+checksum=2190bddfd3af590c0593c38537088976547506f47bd6eb6c0e22350dbd16a229
 
 post_patch() {
 	vsed -i -e 's/-O3//' Makefile

From afb9b3944ae9ee17c99780d3c938dbb8da56f3eb Mon Sep 17 00:00:00 2001
From: ismay <git.email@ismay.email>
Date: Sat, 18 May 2024 14:13:09 +0200
Subject: [PATCH 2/2] fixup! kakoune: update to 2024.05.09.

---
 .../patches/fix-hanging-git-tests.patch       | 106 ------------------
 srcpkgs/kakoune/template                      |   4 +-
 2 files changed, 2 insertions(+), 108 deletions(-)
 delete mode 100644 srcpkgs/kakoune/patches/fix-hanging-git-tests.patch

diff --git a/srcpkgs/kakoune/patches/fix-hanging-git-tests.patch b/srcpkgs/kakoune/patches/fix-hanging-git-tests.patch
deleted file mode 100644
index 97da53d286b297..00000000000000
--- a/srcpkgs/kakoune/patches/fix-hanging-git-tests.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-https://github.com/mawww/kakoune/commit/0e92b3fdefddbf81a008b3678faf4bf550be215c
-https://github.com/mawww/kakoune/commit/8c2775f665fd4aae603b423362cf0d4d917fc0df
-
---- 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": [] }] }'
---- 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
---- 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
---- 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": [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 -ignore 11
-+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" ] }'
--ui_out -ignore 5
-+ui_out -until '{ "jsonrpc": "2.0", "method": "refresh", "params": [false] }'
---- 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
---- 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
---- 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/src/file.cc b/src/file.cc
-index be2989641b..ca2d283404 100644
diff --git a/srcpkgs/kakoune/template b/srcpkgs/kakoune/template
index c8be8086576278..fd1079c5096f1a 100644
--- a/srcpkgs/kakoune/template
+++ b/srcpkgs/kakoune/template
@@ -1,7 +1,7 @@
 # Template file for 'kakoune'
 pkgname=kakoune
 reverts=20180409_1
-version=2024.05.09
+version=2024.05.18
 revision=1
 build_style=gnu-makefile
 make_build_args="debug=no gzip_man=no"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Unlicense"
 homepage="https://kakoune.org"
 distfiles="https://github.com/mawww/kakoune/releases/download/v${version}/kakoune-${version}.tar.bz2"
-checksum=2190bddfd3af590c0593c38537088976547506f47bd6eb6c0e22350dbd16a229
+checksum=dae8ac2e61d21d9bcd10145aa70b421234309a7b0bc57fad91bc34dbae0cb9fa
 
 post_patch() {
 	vsed -i -e 's/-O3//' Makefile