* Re: [PR PATCH] [Updated] kakoune: update to 2024.05.09.
2024-05-14 9:22 [PR PATCH] kakoune: update to 2024.05.09 ismay
@ 2024-05-14 9:42 ` ismay
2024-05-14 15:48 ` ismay
` (8 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: ismay @ 2024-05-14 9:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 492 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**
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: 1138 bytes --]
From 7bfdc04172d941810abd45d469be4e44291d36fc Mon Sep 17 00:00:00 2001
From: ismay <git.email@ismay.email>
Date: Tue, 14 May 2024 11:19:12 +0200
Subject: [PATCH] kakoune: update to 2024.05.09.
---
srcpkgs/kakoune/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
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
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PR PATCH] [Updated] kakoune: update to 2024.05.09.
2024-05-14 9:22 [PR PATCH] kakoune: update to 2024.05.09 ismay
2024-05-14 9:42 ` [PR PATCH] [Updated] " ismay
@ 2024-05-14 15:48 ` ismay
2024-05-14 16:17 ` ismay
` (7 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: ismay @ 2024-05-14 15:48 UTC (permalink / raw)
To: ml
[-- 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: 1610 bytes --]
From 889dd3b3f820947feb7d5a69a9b46e8d3a5dd015 Mon Sep 17 00:00:00 2001
From: ismay <git.email@ismay.email>
Date: Tue, 14 May 2024 11:19:12 +0200
Subject: [PATCH] kakoune: update to 2024.05.09.
---
srcpkgs/kakoune/patches/cross.patch | 11 +++++++++++
srcpkgs/kakoune/template | 5 ++---
2 files changed, 13 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/kakoune/patches/cross.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/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
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PR PATCH] [Updated] kakoune: update to 2024.05.09.
2024-05-14 9:22 [PR PATCH] kakoune: update to 2024.05.09 ismay
2024-05-14 9:42 ` [PR PATCH] [Updated] " ismay
2024-05-14 15:48 ` ismay
@ 2024-05-14 16:17 ` ismay
2024-05-14 16:20 ` ismay
` (6 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: ismay @ 2024-05-14 16:17 UTC (permalink / raw)
To: ml
[-- 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: 3968 bytes --]
From 65add427e5f2fc9475386a0fd9369ac04100b692 Mon Sep 17 00:00:00 2001
From: ismay <git.email@ismay.email>
Date: Tue, 14 May 2024 11:19:12 +0200
Subject: [PATCH] kakoune: update to 2024.05.09.
---
srcpkgs/kakoune/patches/cross.patch | 11 +++++
.../patches/fix-hanging-git-tests.patch | 44 +++++++++++++++++++
srcpkgs/kakoune/template | 5 +--
3 files changed, 57 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..54fd73ac4d68f5
--- /dev/null
+++ b/srcpkgs/kakoune/patches/fix-hanging-git-tests.patch
@@ -0,0 +1,44 @@
+https://github.com/mawww/kakoune/commit/0e92b3fdefddbf81a008b3678faf4bf550be215c
+
+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
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PR PATCH] [Updated] kakoune: update to 2024.05.09.
2024-05-14 9:22 [PR PATCH] kakoune: update to 2024.05.09 ismay
` (2 preceding siblings ...)
2024-05-14 16:17 ` ismay
@ 2024-05-14 16:20 ` ismay
2024-05-14 16:36 ` ismay
` (5 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: ismay @ 2024-05-14 16:20 UTC (permalink / raw)
To: ml
[-- 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: 4294 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] 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
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PR PATCH] [Updated] kakoune: update to 2024.05.09.
2024-05-14 9:22 [PR PATCH] kakoune: update to 2024.05.09 ismay
` (3 preceding siblings ...)
2024-05-14 16:20 ` ismay
@ 2024-05-14 16:36 ` ismay
2024-05-14 16:54 ` ismay
` (4 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: ismay @ 2024-05-14 16:36 UTC (permalink / raw)
To: ml
[-- 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] }'
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PR PATCH] [Updated] kakoune: update to 2024.05.09.
2024-05-14 9:22 [PR PATCH] kakoune: update to 2024.05.09 ismay
` (4 preceding siblings ...)
2024-05-14 16:36 ` ismay
@ 2024-05-14 16:54 ` ismay
2024-05-15 6:37 ` ismay
` (3 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: ismay @ 2024-05-14 16:54 UTC (permalink / raw)
To: ml
[-- 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: 14909 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 2ab16499d72deefe42eda96512d3923607f7cdc8 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 | 125 +++++++++++++-----
1 file changed, 89 insertions(+), 36 deletions(-)
diff --git a/srcpkgs/kakoune/patches/fix-hanging-git-tests.patch b/srcpkgs/kakoune/patches/fix-hanging-git-tests.patch
index 92b31b9788345e..97da53d286b297 100644
--- a/srcpkgs/kakoune/patches/fix-hanging-git-tests.patch
+++ b/srcpkgs/kakoune/patches/fix-hanging-git-tests.patch
@@ -1,53 +1,106 @@
-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.. \
- 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/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
-@@ -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)
-diff --git a/test/tools/git/blame-in-diff/script b/test/tools/git/blame-in-diff/script
-index 6adda9225f..e22b3ec8ae 100644
+ 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,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] }'
+--- 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
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PR PATCH] [Updated] kakoune: update to 2024.05.09.
2024-05-14 9:22 [PR PATCH] kakoune: update to 2024.05.09 ismay
` (5 preceding siblings ...)
2024-05-14 16:54 ` ismay
@ 2024-05-15 6:37 ` ismay
2024-05-18 12:13 ` ismay
` (2 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: ismay @ 2024-05-15 6:37 UTC (permalink / raw)
To: ml
[-- 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: 8842 bytes --]
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] 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
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PR PATCH] [Updated] kakoune: update to 2024.05.09.
2024-05-14 9:22 [PR PATCH] kakoune: update to 2024.05.09 ismay
` (6 preceding siblings ...)
2024-05-15 6:37 ` ismay
@ 2024-05-18 12:13 ` ismay
2024-05-19 10:13 ` [PR PATCH] [Updated] kakoune: update to 2024.05.18 ismay
2024-05-20 22:59 ` [PR PATCH] [Merged]: " sgn
9 siblings, 0 replies; 11+ messages in thread
From: ismay @ 2024-05-18 12:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 694 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
`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: 17542 bytes --]
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
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PR PATCH] [Updated] kakoune: update to 2024.05.18.
2024-05-14 9:22 [PR PATCH] kakoune: update to 2024.05.09 ismay
` (7 preceding siblings ...)
2024-05-18 12:13 ` ismay
@ 2024-05-19 10:13 ` ismay
2024-05-20 22:59 ` [PR PATCH] [Merged]: " sgn
9 siblings, 0 replies; 11+ messages in thread
From: ismay @ 2024-05-19 10:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 694 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.18.
#### 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
`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: 1239 bytes --]
From a39eec064d629bcb3286466d94e68d20fbf48578 Mon Sep 17 00:00:00 2001
From: ismay <git.email@ismay.email>
Date: Tue, 14 May 2024 11:19:12 +0200
Subject: [PATCH] kakoune: update to 2024.05.18.
---
srcpkgs/kakoune/template | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/kakoune/template b/srcpkgs/kakoune/template
index cea330d16886a4..fd1079c5096f1a 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.18
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=dae8ac2e61d21d9bcd10145aa70b421234309a7b0bc57fad91bc34dbae0cb9fa
post_patch() {
vsed -i -e 's/-O3//' Makefile
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PR PATCH] [Merged]: kakoune: update to 2024.05.18.
2024-05-14 9:22 [PR PATCH] kakoune: update to 2024.05.09 ismay
` (8 preceding siblings ...)
2024-05-19 10:13 ` [PR PATCH] [Updated] kakoune: update to 2024.05.18 ismay
@ 2024-05-20 22:59 ` sgn
9 siblings, 0 replies; 11+ messages in thread
From: sgn @ 2024-05-20 22:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 549 bytes --]
There's a merged pull request on the void-packages repository
kakoune: update to 2024.05.18.
https://github.com/void-linux/void-packages/pull/50328
Description:
#### 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
#### Notes
- `build_wrksrc="src"` was removed because of [this change](https://github.com/mawww/kakoune/commit/b05295637e7dbe5239a1142a72afe8265e5d77c3#diff-3e2513390df543315686d7c85bd901ca9256268970032298815d2f893a9f0685)
^ permalink raw reply [flat|nested] 11+ messages in thread