Re: [PR PATCH] [Updated] kakoune: update to 2024.05.09.

[ismay <ismay@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 712 bytes --]

There is an updated pull request by ismay against master on the void-packages repository

https://github.com/ismay/void-packages update-kakoune
https://github.com/void-linux/void-packages/pull/50328

kakoune: update to 2024.05.09.
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64): **YES**, works

`build_wrksrc="src"` was removed because of [this change](https://github.com/mawww/kakoune/commit/b05295637e7dbe5239a1142a72afe8265e5d77c3#diff-3e2513390df543315686d7c85bd901ca9256268970032298815d2f893a9f0685)

A patch file from https://github.com/void-linux/void-packages/pull/50328.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-kakoune-50328.patch --]
[-- Type: text/x-diff, Size: 8549 bytes --]

From 1656ffc66e7072e3781fabd5ae12cb41ef5ff2f9 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/3] kakoune: update to 2024.05.09.

---
 srcpkgs/kakoune/patches/cross.patch           | 11 ++++
 .../patches/fix-hanging-git-tests.patch       | 53 +++++++++++++++++++
 srcpkgs/kakoune/template                      |  5 +-
 3 files changed, 66 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/kakoune/patches/cross.patch
 create mode 100644 srcpkgs/kakoune/patches/fix-hanging-git-tests.patch

diff --git a/srcpkgs/kakoune/patches/cross.patch b/srcpkgs/kakoune/patches/cross.patch
new file mode 100644
index 00000000000000..3a7d366b9aacf2
--- /dev/null
+++ b/srcpkgs/kakoune/patches/cross.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,7 @@
+ .POSIX:
+ .SUFFIXES:
+ 
+-CXX = c++
++CXX ?= c++
+ 
+ debug = no
+ static = no
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..92b31b9788345e
--- /dev/null
+++ b/srcpkgs/kakoune/patches/fix-hanging-git-tests.patch
@@ -0,0 +1,53 @@
+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" ] }'
diff --git a/srcpkgs/kakoune/template b/srcpkgs/kakoune/template
index cea330d16886a4..546b9a03c604b2 100644
--- a/srcpkgs/kakoune/template
+++ b/srcpkgs/kakoune/template
@@ -1,9 +1,8 @@
 # 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"
@@ -14,7 +13,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=3e45151e0addd3500de2d6a29b5aacf2267c42bb256d44a782e73defb29cda5c
+checksum=2190bddfd3af590c0593c38537088976547506f47bd6eb6c0e22350dbd16a229
 
 post_patch() {
 	vsed -i -e 's/-O3//' Makefile

From b95bd84530f0579ff28d7256db10f8485daf4b14 Mon Sep 17 00:00:00 2001
From: ismay <git.email@ismay.email>
Date: Tue, 14 May 2024 18:28:48 +0200
Subject: [PATCH 2/3] fixup! kakoune: update to 2024.05.09.

---
 srcpkgs/kakoune/patches/cross.patch | 11 -----------
 srcpkgs/kakoune/template            |  1 -
 2 files changed, 12 deletions(-)
 delete mode 100644 srcpkgs/kakoune/patches/cross.patch

diff --git a/srcpkgs/kakoune/patches/cross.patch b/srcpkgs/kakoune/patches/cross.patch
deleted file mode 100644
index 3a7d366b9aacf2..00000000000000
--- a/srcpkgs/kakoune/patches/cross.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -1,7 +1,7 @@
- .POSIX:
- .SUFFIXES:
- 
--CXX = c++
-+CXX ?= c++
- 
- debug = no
- static = no
diff --git a/srcpkgs/kakoune/template b/srcpkgs/kakoune/template
index 546b9a03c604b2..c8be8086576278 100644
--- a/srcpkgs/kakoune/template
+++ b/srcpkgs/kakoune/template
@@ -6,7 +6,6 @@ revision=1
 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>"

From eb4f4b280b90a880e7c2de3575cd0746d7a37a84 Mon Sep 17 00:00:00 2001
From: ismay <git.email@ismay.email>
Date: Tue, 14 May 2024 18:35:58 +0200
Subject: [PATCH 3/3] fixup! kakoune: update to 2024.05.09.

---
 .../patches/fix-hanging-git-tests.patch       | 39 +++++++++----------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/srcpkgs/kakoune/patches/fix-hanging-git-tests.patch b/srcpkgs/kakoune/patches/fix-hanging-git-tests.patch
index 92b31b9788345e..a3420e64364f31 100644
--- a/srcpkgs/kakoune/patches/fix-hanging-git-tests.patch
+++ b/srcpkgs/kakoune/patches/fix-hanging-git-tests.patch
@@ -1,16 +1,6 @@
-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
+https://github.com/mawww/kakoune/commit/0e92b3fdefddbf81a008b3678faf4bf550be215c
+https://github.com/mawww/kakoune/commit/8c2775f665fd4aae603b423362cf0d4d917fc0df
 
----
- 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.. \
@@ -26,28 +16,35 @@ 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
+@@ -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/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] }'
+@@ -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 -until '{ "jsonrpc": "2.0", "method": "refresh", "params": [false] }'
+-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] }'