[PR PATCH] tree-sitter: update to 0.24.3, revbump of neovim, emacs, rizin.

[PR PATCH] tree-sitter: update to 0.24.3, revbump of neovim, emacs, rizin.

[dataCobra]

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

There is a new pull request by dataCobra against master on the void-packages repository

https://github.com/dataCobra/void-packages tree-sitter
https://github.com/void-linux/void-packages/pull/52616

tree-sitter: update to 0.24.3, revbump of neovim, emacs, rizin.
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-musl
  - i686


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-tree-sitter-52616.patch --]
[-- Type: text/x-diff, Size: 3777 bytes --]

From d205bbac29595c84df03094f48d1ef1aaab4379b Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Sat, 12 Oct 2024 16:02:38 +0200
Subject: [PATCH 1/4] emacs: revbump for tree-sitter

---
 srcpkgs/emacs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/emacs/template b/srcpkgs/emacs/template
index 48d3cf352f6b84..03f32ff7e382fa 100644
--- a/srcpkgs/emacs/template
+++ b/srcpkgs/emacs/template
@@ -1,7 +1,7 @@
 # Template file for 'emacs'
 pkgname=emacs
 version=29.4
-revision=1
+revision=2
 create_wrksrc=required
 build_style=gnu-configure
 configure_args="--with-file-notification=inotify --with-modules

From 6c414489f1264633dc87904bd325b489ccf1bb68 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Sat, 12 Oct 2024 16:02:42 +0200
Subject: [PATCH 2/4] neovim: revbump for tree-sitter

---
 srcpkgs/neovim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/neovim/template b/srcpkgs/neovim/template
index ea19534107a4e5..cf27c7509ad4a9 100644
--- a/srcpkgs/neovim/template
+++ b/srcpkgs/neovim/template
@@ -1,7 +1,7 @@
 # Template file for 'neovim'
 pkgname=neovim
 version=0.10.2
-revision=1
+revision=2
 # as per https://github.com/neovim/neovim/blob/master/cmake.deps/deps.txt
 _treesitter_c_version=0.21.3
 _treesitter_lua_version=0.1.0

From 47ec020dd23387a26d146e8b3818e37d0c79e57e Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Sat, 12 Oct 2024 16:02:45 +0200
Subject: [PATCH 3/4] rizin: revbump for tree-sitter

---
 srcpkgs/rizin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rizin/template b/srcpkgs/rizin/template
index a684f0d17ab157..a1d3a9a46f7e07 100644
--- a/srcpkgs/rizin/template
+++ b/srcpkgs/rizin/template
@@ -3,7 +3,7 @@
 # Rebuild cutter on update
 pkgname=rizin
 version=0.7.3
-revision=1
+revision=2
 build_style=meson
 configure_args="-D use_sys_capstone=enabled -D use_capstone_version=v5
  -D use_sys_magic=enabled -D use_sys_libzip=enabled -D use_sys_zlib=enabled

From 6c60c3b05f9f801e815bdf806873bfbf179cc0a4 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Sat, 12 Oct 2024 16:30:58 +0200
Subject: [PATCH 4/4] tree-sitter: update to 0.24.3.

---
 common/shlibs                | 3 ++-
 srcpkgs/tree-sitter/template | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index d9b54da38025a0..232bd817b7282e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4196,7 +4196,8 @@ libsword-1.8.1.so libsword-1.8.1_6
 libgivaro.so.9 givaro-4.1.1_1
 liblinbox.so.0 linbox-1.6.3_1
 libpari-gmp-tls.so.8 pari-2.15.0_1
-libtree-sitter.so.0 tree-sitter-0.19.0_1
+libtree-sitter.so.0 tree-sitter-0.24.3_1
+libtree-sitter.so.0.24 tree-sitter-0.24.3_1
 libplanarity.so.0 planarity-3.0.1.1_1
 libgap.so.9 gap-4.13.0_1
 libgtkdatabox.so.1 gtkdatabox3-1.0.0_1
diff --git a/srcpkgs/tree-sitter/template b/srcpkgs/tree-sitter/template
index ecb118c7ea6df7..0dc984bff47e87 100644
--- a/srcpkgs/tree-sitter/template
+++ b/srcpkgs/tree-sitter/template
@@ -1,6 +1,6 @@
 # Template file for 'tree-sitter'
 pkgname=tree-sitter
-version=0.22.6
+version=0.24.3
 revision=1
 build_style=cargo
 make_install_args="--path=cli"
@@ -10,7 +10,7 @@ license="MIT"
 homepage="https://tree-sitter.github.io"
 changelog="https://raw.githubusercontent.com/tree-sitter/tree-sitter/master/CHANGELOG.md"
 distfiles="https://github.com/tree-sitter/tree-sitter/archive/refs/tags/v${version}.tar.gz"
-checksum=e2b687f74358ab6404730b7fb1a1ced7ddb3780202d37595ecd7b20a8f41861f
+checksum=0a8d0cf8e09caba22ed0d8439f7fa1e3d8453800038e43ccad1f34ef29537da1
 make_check=no # tests require generating fixtures from remote repositories
 
 post_build() {

Re: [PR PATCH] [Updated] tree-sitter: update to 0.24.3, revbump of neovim, emacs, rizin.

[dataCobra]

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

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

https://github.com/dataCobra/void-packages tree-sitter
https://github.com/void-linux/void-packages/pull/52616

tree-sitter: update to 0.24.3, revbump of neovim, emacs, rizin.
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-musl
  - i686


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-tree-sitter-52616.patch --]
[-- Type: text/x-diff, Size: 3777 bytes --]

From 08e33513ee1a9b527aa21730ac25bc1108f6fa92 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Sat, 12 Oct 2024 16:33:53 +0200
Subject: [PATCH 1/4] tree-sitter: update to 0.24.3.

---
 common/shlibs                | 3 ++-
 srcpkgs/tree-sitter/template | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index d9b54da38025a0..232bd817b7282e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4196,7 +4196,8 @@ libsword-1.8.1.so libsword-1.8.1_6
 libgivaro.so.9 givaro-4.1.1_1
 liblinbox.so.0 linbox-1.6.3_1
 libpari-gmp-tls.so.8 pari-2.15.0_1
-libtree-sitter.so.0 tree-sitter-0.19.0_1
+libtree-sitter.so.0 tree-sitter-0.24.3_1
+libtree-sitter.so.0.24 tree-sitter-0.24.3_1
 libplanarity.so.0 planarity-3.0.1.1_1
 libgap.so.9 gap-4.13.0_1
 libgtkdatabox.so.1 gtkdatabox3-1.0.0_1
diff --git a/srcpkgs/tree-sitter/template b/srcpkgs/tree-sitter/template
index ecb118c7ea6df7..0dc984bff47e87 100644
--- a/srcpkgs/tree-sitter/template
+++ b/srcpkgs/tree-sitter/template
@@ -1,6 +1,6 @@
 # Template file for 'tree-sitter'
 pkgname=tree-sitter
-version=0.22.6
+version=0.24.3
 revision=1
 build_style=cargo
 make_install_args="--path=cli"
@@ -10,7 +10,7 @@ license="MIT"
 homepage="https://tree-sitter.github.io"
 changelog="https://raw.githubusercontent.com/tree-sitter/tree-sitter/master/CHANGELOG.md"
 distfiles="https://github.com/tree-sitter/tree-sitter/archive/refs/tags/v${version}.tar.gz"
-checksum=e2b687f74358ab6404730b7fb1a1ced7ddb3780202d37595ecd7b20a8f41861f
+checksum=0a8d0cf8e09caba22ed0d8439f7fa1e3d8453800038e43ccad1f34ef29537da1
 make_check=no # tests require generating fixtures from remote repositories
 
 post_build() {

From 4e1ab49d280d26512b5829fc196dcb5c056d81a6 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Sat, 12 Oct 2024 16:34:12 +0200
Subject: [PATCH 2/4] emacs: revbump for tree-sitter

---
 srcpkgs/emacs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/emacs/template b/srcpkgs/emacs/template
index 48d3cf352f6b84..03f32ff7e382fa 100644
--- a/srcpkgs/emacs/template
+++ b/srcpkgs/emacs/template
@@ -1,7 +1,7 @@
 # Template file for 'emacs'
 pkgname=emacs
 version=29.4
-revision=1
+revision=2
 create_wrksrc=required
 build_style=gnu-configure
 configure_args="--with-file-notification=inotify --with-modules

From 70db7cb62dfe577ca1310214b75787510d47c412 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Sat, 12 Oct 2024 16:34:26 +0200
Subject: [PATCH 3/4] neovim: revbump for tree-sitter

---
 srcpkgs/neovim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/neovim/template b/srcpkgs/neovim/template
index ea19534107a4e5..cf27c7509ad4a9 100644
--- a/srcpkgs/neovim/template
+++ b/srcpkgs/neovim/template
@@ -1,7 +1,7 @@
 # Template file for 'neovim'
 pkgname=neovim
 version=0.10.2
-revision=1
+revision=2
 # as per https://github.com/neovim/neovim/blob/master/cmake.deps/deps.txt
 _treesitter_c_version=0.21.3
 _treesitter_lua_version=0.1.0

From 0ae96fa23dcc0af10568105d3167a257445cd652 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Sat, 12 Oct 2024 16:34:37 +0200
Subject: [PATCH 4/4] rizin: revbump for tree-sitter

---
 srcpkgs/rizin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rizin/template b/srcpkgs/rizin/template
index a684f0d17ab157..a1d3a9a46f7e07 100644
--- a/srcpkgs/rizin/template
+++ b/srcpkgs/rizin/template
@@ -3,7 +3,7 @@
 # Rebuild cutter on update
 pkgname=rizin
 version=0.7.3
-revision=1
+revision=2
 build_style=meson
 configure_args="-D use_sys_capstone=enabled -D use_capstone_version=v5
  -D use_sys_magic=enabled -D use_sys_libzip=enabled -D use_sys_zlib=enabled

Re: tree-sitter: update to 0.24.3, revbump of neovim, emacs, rizin.

[tranzystorekk]

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

New comment by tranzystorekk on void-packages repository

https://github.com/void-linux/void-packages/pull/52616#issuecomment-2408709108

Comment:
Why are the revbumps necessary? Judging by the shlib, the changes shouldn't be breaking.

Re: tree-sitter: update to 0.24.3, revbump of neovim, emacs, rizin.

[tranzystorekk]

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

New comment by tranzystorekk on void-packages repository

https://github.com/void-linux/void-packages/pull/52616#issuecomment-2408709108

Comment:
Why are the revbumps necessary? Judging by the shlib, the changes shouldn't be breaking.

Re: [PR REVIEW] tree-sitter: update to 0.24.3, revbump of neovim, emacs, rizin.

[tranzystorekk]

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

New review comment by tranzystorekk on void-packages repository

https://github.com/void-linux/void-packages/pull/52616#discussion_r1797782485

Comment:
the full soname shouldn't be necessary

Re: [PR REVIEW] tree-sitter: update to 0.24.3, revbump of neovim, emacs, rizin.

[dataCobra]

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

New review comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/52616#discussion_r1797897614

Comment:
While building `xbps-src` complained that the *.24 SONAME should also be part of `common/shlib`.

But I can check again.

Re: [PR REVIEW] tree-sitter: update to 0.24.3, revbump of neovim, emacs, rizin.

[dataCobra]

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

New review comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/52616#discussion_r1797929796

Comment:
I've tested again and building neovim fails with the following shlibs error:

```
=> neovim-0.10.2_2: running pre-pkg hook: 04-generate-runtime-deps ...
   SONAME: libluv.so.1 <-> libluv>=1.30.1.0_1
   SONAME: libvterm.so.0 <-> libvterm>=0.3_1
   SONAME: /usr/lib/lua/5.1/lpeg.so <-> lua51-lpeg>=1.1.0_2
   SONAME: libmsgpack-c.so.2 <-> msgpack>=1.1.0_1
   SONAME: libtree-sitter.so.0.24 <-> UNKNOWN PKG PLEASE FIX!
   SONAME: libunibilium.so.4 <-> unibilium>=2.0.0_1
   SONAME: libluajit-5.1.so.2 <-> LuaJIT>=2.0.0_1
   SONAME: libm.so.6 <-> glibc>=2.39_1
   SONAME: libuv.so.1 <-> libuv>=1.0.0_1
   SONAME: libc.so.6 <-> glibc>=2.39_1
=> ERROR: neovim-0.10.2_2: cannot guess required shlibs, aborting!
```

Re: [PR REVIEW] tree-sitter: update to 0.24.3, revbump of neovim, emacs, rizin.

[dataCobra]

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

New review comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/52616#discussion_r1797929796

Comment:
I've tested again and building neovim fails with the following shlibs error:

```
=> neovim-0.10.2_2: running pre-pkg hook: 04-generate-runtime-deps ...
   SONAME: libluv.so.1 <-> libluv>=1.30.1.0_1
   SONAME: libvterm.so.0 <-> libvterm>=0.3_1
   SONAME: /usr/lib/lua/5.1/lpeg.so <-> lua51-lpeg>=1.1.0_2
   SONAME: libmsgpack-c.so.2 <-> msgpack>=1.1.0_1
   SONAME: libtree-sitter.so.0.24 <-> UNKNOWN PKG PLEASE FIX!
   SONAME: libunibilium.so.4 <-> unibilium>=2.0.0_1
   SONAME: libluajit-5.1.so.2 <-> LuaJIT>=2.0.0_1
   SONAME: libm.so.6 <-> glibc>=2.39_1
   SONAME: libuv.so.1 <-> libuv>=1.0.0_1
   SONAME: libc.so.6 <-> glibc>=2.39_1
=> ERROR: neovim-0.10.2_2: cannot guess required shlibs, aborting!
```

Edit: The same error comes when building rizin and emacs.

Re: [PR PATCH] [Updated] tree-sitter: update to 0.24.3, revbump of neovim, emacs, rizin.

[dataCobra]

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

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

https://github.com/dataCobra/void-packages tree-sitter
https://github.com/void-linux/void-packages/pull/52616

tree-sitter: update to 0.24.3, revbump of neovim, emacs, rizin.
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-musl
  - i686


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-tree-sitter-52616.patch --]
[-- Type: text/x-diff, Size: 3734 bytes --]

From 128effdb6d5e6fbf030a4e5977f93a85137176dc Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Sun, 13 Oct 2024 04:00:06 +0200
Subject: [PATCH 1/4] tree-sitter: update to 0.24.3.

---
 common/shlibs                | 2 +-
 srcpkgs/tree-sitter/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index d9b54da38025a0..3c9f4eea0659ac 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4196,7 +4196,7 @@ libsword-1.8.1.so libsword-1.8.1_6
 libgivaro.so.9 givaro-4.1.1_1
 liblinbox.so.0 linbox-1.6.3_1
 libpari-gmp-tls.so.8 pari-2.15.0_1
-libtree-sitter.so.0 tree-sitter-0.19.0_1
+libtree-sitter.so.0.24 tree-sitter-0.24.3_1
 libplanarity.so.0 planarity-3.0.1.1_1
 libgap.so.9 gap-4.13.0_1
 libgtkdatabox.so.1 gtkdatabox3-1.0.0_1
diff --git a/srcpkgs/tree-sitter/template b/srcpkgs/tree-sitter/template
index ecb118c7ea6df7..0dc984bff47e87 100644
--- a/srcpkgs/tree-sitter/template
+++ b/srcpkgs/tree-sitter/template
@@ -1,6 +1,6 @@
 # Template file for 'tree-sitter'
 pkgname=tree-sitter
-version=0.22.6
+version=0.24.3
 revision=1
 build_style=cargo
 make_install_args="--path=cli"
@@ -10,7 +10,7 @@ license="MIT"
 homepage="https://tree-sitter.github.io"
 changelog="https://raw.githubusercontent.com/tree-sitter/tree-sitter/master/CHANGELOG.md"
 distfiles="https://github.com/tree-sitter/tree-sitter/archive/refs/tags/v${version}.tar.gz"
-checksum=e2b687f74358ab6404730b7fb1a1ced7ddb3780202d37595ecd7b20a8f41861f
+checksum=0a8d0cf8e09caba22ed0d8439f7fa1e3d8453800038e43ccad1f34ef29537da1
 make_check=no # tests require generating fixtures from remote repositories
 
 post_build() {

From ce29bd3ca1fbe8ff353ff4c180701e751789a8b0 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Sun, 13 Oct 2024 04:00:45 +0200
Subject: [PATCH 2/4] emacs: revbump for tree-sitter

---
 srcpkgs/emacs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/emacs/template b/srcpkgs/emacs/template
index 48d3cf352f6b84..03f32ff7e382fa 100644
--- a/srcpkgs/emacs/template
+++ b/srcpkgs/emacs/template
@@ -1,7 +1,7 @@
 # Template file for 'emacs'
 pkgname=emacs
 version=29.4
-revision=1
+revision=2
 create_wrksrc=required
 build_style=gnu-configure
 configure_args="--with-file-notification=inotify --with-modules

From 786f6a4977a5044ddb5c39f8b592fbe9b2c32039 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Sun, 13 Oct 2024 04:00:57 +0200
Subject: [PATCH 3/4] neovim: revbump for tree-sitter

---
 srcpkgs/neovim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/neovim/template b/srcpkgs/neovim/template
index ea19534107a4e5..cf27c7509ad4a9 100644
--- a/srcpkgs/neovim/template
+++ b/srcpkgs/neovim/template
@@ -1,7 +1,7 @@
 # Template file for 'neovim'
 pkgname=neovim
 version=0.10.2
-revision=1
+revision=2
 # as per https://github.com/neovim/neovim/blob/master/cmake.deps/deps.txt
 _treesitter_c_version=0.21.3
 _treesitter_lua_version=0.1.0

From 315d13fc32ff97cfe60462b7ee32969c43861597 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Sun, 13 Oct 2024 04:02:31 +0200
Subject: [PATCH 4/4] rizin: revbump for tree-sitter

---
 srcpkgs/rizin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rizin/template b/srcpkgs/rizin/template
index a684f0d17ab157..a1d3a9a46f7e07 100644
--- a/srcpkgs/rizin/template
+++ b/srcpkgs/rizin/template
@@ -3,7 +3,7 @@
 # Rebuild cutter on update
 pkgname=rizin
 version=0.7.3
-revision=1
+revision=2
 build_style=meson
 configure_args="-D use_sys_capstone=enabled -D use_capstone_version=v5
  -D use_sys_magic=enabled -D use_sys_libzip=enabled -D use_sys_zlib=enabled

Re: [PR REVIEW] tree-sitter: update to 0.24.3, revbump of neovim, emacs, rizin.

[dataCobra]

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

New review comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/52616#discussion_r1797942243

Comment:
With amazing help from the IRC I've changed the common/shlib to use the correct value.

Re: [PR PATCH] [Merged]: tree-sitter: update to 0.24.3, revbump of neovim, emacs, rizin.

[tranzystorekk]

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

There's a merged pull request on the void-packages repository

tree-sitter: update to 0.24.3, revbump of neovim, emacs, rizin.
https://github.com/void-linux/void-packages/pull/52616

Description:
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-musl
  - i686