From: ismay <ismay@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] kakoune: update to 2024.05.09.
Date: Tue, 14 May 2024 18:17:12 +0200 [thread overview]
Message-ID: <20240514161712.DE52726DDD@inbox.vuxu.org> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-50328@inbox.vuxu.org>
[-- 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
next prev parent reply other threads:[~2024-05-14 16:17 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-14 9:22 [PR PATCH] " ismay
2024-05-14 9:42 ` [PR PATCH] [Updated] " ismay
2024-05-14 15:48 ` ismay
2024-05-14 16:17 ` ismay [this message]
2024-05-14 16:20 ` ismay
2024-05-14 16:36 ` ismay
2024-05-14 16:54 ` ismay
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240514161712.DE52726DDD@inbox.vuxu.org \
--to=ismay@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).