CVS commit: pkgsrc/editors/emacs29

["Matthias Scheler" <tron%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tron
Date:           Mon Dec 22 19:51:06 UTC 2025

Modified Files:
        pkgsrc/editors/emacs29: distinfo
Added Files:
        pkgsrc/editors/emacs29/patches: patch-src_treesit.c

Log Message:
emacs29: Fix build with version 0.26.x of "tree-sitter" package


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/editors/emacs29/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/editors/emacs29/patches/patch-src_treesit.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/editors/emacs29/distinfo
diff -u pkgsrc/editors/emacs29/distinfo:1.4 pkgsrc/editors/emacs29/distinfo:1.5
--- pkgsrc/editors/emacs29/distinfo:1.4 Mon Jun 24 00:36:23 2024
+++ pkgsrc/editors/emacs29/distinfo     Mon Dec 22 19:51:06 2025
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.4 2024/06/24 00:36:23 gdt Exp $
+$NetBSD: distinfo,v 1.5 2025/12/22 19:51:06 tron Exp $
 
 BLAKE2s (emacs-29.4.tar.xz) = dfe3ab5088f59a4c153aaf5e18920d4c81beffdd678d4fa4116abbe49ed41e2f
 SHA512 (emacs-29.4.tar.xz) = 66b38081cb01d2c46ff7beefb45986cc225b4c922c30712ad0d456c6cae5507176ed99418c8f26948c5375c8afde4e4b2507d23ed997dbb5392d12150a121d80
 Size (emacs-29.4.tar.xz) = 52210344 bytes
 SHA1 (patch-Makefile.in) = cb43792c8996c781f382ae102ea771af8f3d3190
+SHA1 (patch-src_treesit.c) = f58370000074137997b8119ab55f49f2964010bb

Added files:

Index: pkgsrc/editors/emacs29/patches/patch-src_treesit.c
diff -u /dev/null pkgsrc/editors/emacs29/patches/patch-src_treesit.c:1.1
--- /dev/null   Mon Dec 22 19:51:06 2025
+++ pkgsrc/editors/emacs29/patches/patch-src_treesit.c  Mon Dec 22 19:51:06 2025
@@ -0,0 +1,60 @@
+$NetBSD: patch-src_treesit.c,v 1.1 2025/12/22 19:51:06 tron Exp $
+
+Fix build with version 0.26.x of "tree-sitter".
+
+--- src/treesit.c.orig 2024-06-21 14:10:07.000000000 +0100
++++ src/treesit.c      2025-12-22 19:31:18.581988953 +0000
+@@ -34,7 +34,7 @@
+ # include "w32common.h"
+ 
+ /* In alphabetical order.  */
+-#undef ts_language_version
++#undef ts_language_abi_version
+ #undef ts_node_child
+ #undef ts_node_child_by_field_name
+ #undef ts_node_child_count
+@@ -89,7 +89,7 @@
+ #undef ts_tree_get_changed_ranges
+ #undef ts_tree_root_node
+ 
+-DEF_DLL_FN (uint32_t, ts_language_version, (const TSLanguage *));
++DEF_DLL_FN (uint32_t, ts_language_abi_version, (const TSLanguage *));
+ DEF_DLL_FN (TSNode, ts_node_child, (TSNode, uint32_t));
+ DEF_DLL_FN (TSNode, ts_node_child_by_field_name,
+           (TSNode, const char *, uint32_t));
+@@ -166,7 +166,7 @@
+   if (!library)
+     return false;
+ 
+-  LOAD_DLL_FN (library, ts_language_version);
++  LOAD_DLL_FN (library, ts_language_abi_version);
+   LOAD_DLL_FN (library, ts_node_child);
+   LOAD_DLL_FN (library, ts_node_child_by_field_name);
+   LOAD_DLL_FN (library, ts_node_child_count);
+@@ -224,7 +224,7 @@
+   return true;
+ }
+ 
+-#define ts_language_version fn_ts_language_version
++#define ts_language_abi_version fn_ts_language_abi_version
+ #define ts_node_child fn_ts_node_child
+ #define ts_node_child_by_field_name fn_ts_node_child_by_field_name
+ #define ts_node_child_count fn_ts_node_child_count
+@@ -664,7 +664,7 @@
+     {
+       *signal_symbol = Qtreesit_load_language_error;
+       *signal_data = list2 (Qversion_mismatch,
+-                          make_fixnum (ts_language_version (lang)));
++                          make_fixnum (ts_language_abi_version (lang)));
+       return NULL;
+     }
+   return lang;
+@@ -735,7 +735,7 @@
+                                                      &signal_data);
+       if (ts_language == NULL)
+       return Qnil;
+-      uint32_t version =  ts_language_version (ts_language);
++      uint32_t version =  ts_language_abi_version (ts_language);
+       return make_fixnum((ptrdiff_t) version);
+     }
+ }