public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/tree-sitter-elixir] rawhide: Fix `make install`.
@ 2026-07-20 12:29 Peter Oliver
  0 siblings, 0 replies; only message in thread
From: Peter Oliver @ 2026-07-20 12:29 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/tree-sitter-elixir
Branch : rawhide
Commit : 0530520b95da3dbd10925d2ad4893a37009da44b
Author : Peter Oliver <git@mavit.org.uk>
Date   : 2026-07-20T13:28:01+01:00
Stats  : +87/-0 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/tree-sitter-elixir/c/0530520b95da3dbd10925d2ad4893a37009da44b?branch=rawhide

Log:
Fix `make install`.

---
diff --git a/0001-Regenerate-tree-sitter-elixir.pc.in.patch b/0001-Regenerate-tree-sitter-elixir.pc.in.patch
new file mode 100644
index 0000000..b73732c
--- /dev/null
+++ b/0001-Regenerate-tree-sitter-elixir.pc.in.patch
@@ -0,0 +1,36 @@
+From fa0c47f83e4a858914fee1122f1deb4d38dca36d Mon Sep 17 00:00:00 2001
+From: Peter Oliver <git@mavit.org.uk>
+Date: Mon, 20 Jul 2026 13:10:17 +0100
+Subject: [PATCH] Regenerate `tree-sitter-elixir.pc.in`
+
+Fixes `Illegal char '@' (0x40) in: @VERSION@` fatal error when building an RPM package.
+---
+ bindings/c/tree-sitter-elixir.pc.in | 15 +++++++--------
+ 1 file changed, 7 insertions(+), 8 deletions(-)
+
+diff --git a/bindings/c/tree-sitter-elixir.pc.in b/bindings/c/tree-sitter-elixir.pc.in
+index f370382..c543ff4 100644
+--- a/bindings/c/tree-sitter-elixir.pc.in
++++ b/bindings/c/tree-sitter-elixir.pc.in
+@@ -1,11 +1,10 @@
+-prefix=@PREFIX@
+-libdir=@LIBDIR@
+-includedir=@INCLUDEDIR@
++prefix=@CMAKE_INSTALL_PREFIX@
++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
+ 
+ Name: tree-sitter-elixir
+-Description: Elixir grammar for tree-sitter
+-URL: @URL@
+-Version: @VERSION@
+-Requires: @REQUIRES@
+-Libs: -L${libdir} @ADDITIONAL_LIBS@ -ltree-sitter-elixir
++Description: @PROJECT_DESCRIPTION@
++URL: @PROJECT_HOMEPAGE_URL@
++Version: @PROJECT_VERSION@
++Libs: -L${libdir} -ltree-sitter-elixir
+ Cflags: -I${includedir}
+-- 
+2.55.0
+

diff --git a/5c22791c9836d436ce31de5e454fbad0e706ea96.patch b/5c22791c9836d436ce31de5e454fbad0e706ea96.patch
new file mode 100644
index 0000000..bbf778d
--- /dev/null
+++ b/5c22791c9836d436ce31de5e454fbad0e706ea96.patch
@@ -0,0 +1,45 @@
+From 5c22791c9836d436ce31de5e454fbad0e706ea96 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jonatan=20K=C5=82osko?= <jonatanklosko@gmail.com>
+Date: Tue, 3 Mar 2026 14:22:24 +0100
+Subject: [PATCH] Do not ignore header files in C bindings
+
+---
+ .gitignore                      |  1 -
+ bindings/c/tree-sitter-elixir.h | 16 ++++++++++++++++
+ 2 files changed, 16 insertions(+), 1 deletion(-)
+ create mode 100644 bindings/c/tree-sitter-elixir.h
+
+diff --git a/.gitignore b/.gitignore
+index 1148bd0..3fe87f7 100644
+--- a/.gitignore
++++ b/.gitignore
+@@ -18,7 +18,6 @@ Cargo.lock
+ /*.dylib
+ /*.so*
+ *.o
+-/bindings/c/*.h
+ /bindings/c/tree-sitter-*.pc
+ 
+ # Files generated by Swift
+diff --git a/bindings/c/tree-sitter-elixir.h b/bindings/c/tree-sitter-elixir.h
+new file mode 100644
+index 0000000..b68df67
+--- /dev/null
++++ b/bindings/c/tree-sitter-elixir.h
+@@ -0,0 +1,16 @@
++#ifndef TREE_SITTER_ELIXIR_H_
++#define TREE_SITTER_ELIXIR_H_
++
++typedef struct TSLanguage TSLanguage;
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++const TSLanguage *tree_sitter_elixir(void);
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif // TREE_SITTER_ELIXIR_H_

diff --git a/tree-sitter-elixir.spec b/tree-sitter-elixir.spec
index 4046c92..1a61a19 100644
--- a/tree-sitter-elixir.spec
+++ b/tree-sitter-elixir.spec
@@ -7,6 +7,12 @@ Source:         %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
 BuildRequires:  tree-sitter-srpm-macros >= 0.4.2
 BuildSystem:    tree_sitter
 
+# https://github.com/elixir-lang/tree-sitter-elixir/issues/88
+Patch: 5c22791c9836d436ce31de5e454fbad0e706ea96.patch
+
+# https://github.com/elixir-lang/tree-sitter-elixir/pull/91
+Patch: 0001-Regenerate-tree-sitter-elixir.pc.in.patch
+
 %{tree_sitter -l Elixir}
 
 

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-07-20 12:29 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-20 12:29 [rpms/tree-sitter-elixir] rawhide: Fix `make install` Peter Oliver

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox