public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/rust-tree-sitter] rawhide: Update to version 0.26.9; Fixes RHBZ#2420885
@ 2026-06-03  6:47 Aleksei Bavshin
  0 siblings, 0 replies; only message in thread
From: Aleksei Bavshin @ 2026-06-03  6:47 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/rust-tree-sitter
Branch : rawhide
Commit : 25a437a5b1a8f281f96d1739b3af8ee22544e715
Author : Aleksei Bavshin <alebastr@fedoraproject.org>
Date   : 2026-05-28T22:40:35-07:00
Stats  : +20/-131 in 8 file(s)
URL    : https://src.fedoraproject.org/rpms/rust-tree-sitter/c/25a437a5b1a8f281f96d1739b3af8ee22544e715?branch=rawhide

Log:
Update to version 0.26.9; Fixes RHBZ#2420885

---
diff --git a/LICENSE.upstream b/LICENSE.upstream
deleted file mode 100644
index 451fe1d..0000000
--- a/LICENSE.upstream
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2018-2024 Max Brunsfeld
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

diff --git a/README.md b/README.md
deleted file mode 100644
index 235c97f..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# rust-tree-sitter
-
-The rust-tree-sitter package

diff --git a/rust-tree-sitter.spec b/rust-tree-sitter.spec
index 814e83e..8247ff5 100644
--- a/rust-tree-sitter.spec
+++ b/rust-tree-sitter.spec
@@ -6,7 +6,7 @@
 %global crate tree-sitter
 
 Name:           rust-tree-sitter
-Version:        0.25.10
+Version:        0.26.9
 Release:        %autorelease
 Summary:        Rust bindings to the Tree-sitter parsing library
 
@@ -15,8 +15,6 @@ Summary:        Rust bindings to the Tree-sitter parsing library
 License:        MIT AND Unicode-DFS-2016 AND BSD-2-Clause AND BSD-3-Clause AND LicenseRef-Fedora-Public-Domain
 URL:            https://crates.io/crates/tree-sitter
 Source:         %{crates_source}
-# * Upstream license file - tree-sitter/tree-sitter#1520
-Source2:        https://github.com/tree-sitter/tree-sitter/raw/v%{version}/LICENSE#/LICENSE.upstream
 # Manually created patch for downstream crate metadata changes
 # * Fixup license for bundled ICU
 # * Drop 'wasmtime' features
@@ -26,8 +24,6 @@ Source2:        https://github.com/tree-sitter/tree-sitter/raw/v%{version}/LICEN
 Patch:          tree-sitter-fix-metadata.diff
 # * Always generate bindings with bindgen
 Patch2:         tree-sitter-build-bindings-unconditionally.patch
-# * Fix rust-version detection in build.rs
-Patch3:         tree-sitter-bindgen-rust-version.patch
 
 BuildRequires:  cargo-rpm-macros >= 24
 
@@ -94,8 +90,6 @@ rm -f binding_rust/bindings.rs
 
 %install
 %cargo_install
-# prepare upstream license file for %%license
-install -D -m 0644 -pv %{SOURCE2} %{buildroot}%{crate_instdir}/LICENSE
 
 %if %{with check}
 %check

diff --git a/rust2rpm.toml b/rust2rpm.toml
index 580fb23..c9a072c 100644
--- a/rust2rpm.toml
+++ b/rust2rpm.toml
@@ -3,25 +3,13 @@ cargo-toml-patch-comments = [
     "Fixup license for bundled ICU",
     "Drop 'wasmtime' features",
     "Make 'bindgen' required",
-    "Bump 'bindgen' dependency to v0.72: https://github.com/tree-sitter/tree-sitter/commit/46309a1",
 ]
-license-files = { include = ["LICENSE"] }
-
-[[package.extra-sources]]
-comments = ["Upstream license file - tree-sitter/tree-sitter#1520"]
-file = "https://github.com/tree-sitter/tree-sitter/raw/v%{version}/LICENSE#/LICENSE.upstream"
-number = 2
 
 [[package.extra-patches]]
 comments = ["Always generate bindings with bindgen"]
 file = "tree-sitter-build-bindings-unconditionally.patch"
 number = 2
 
-[[package.extra-patches]]
-comments = ["Fix rust-version detection in build.rs"]
-file = "tree-sitter-bindgen-rust-version.patch"
-number = 3
-
 [features]
 hide = ["wasm"]
 
@@ -31,12 +19,6 @@ post = [
     "rm -f binding_rust/bindings.rs",
 ]
 
-[scripts.install]
-post = [
-    "# prepare upstream license file for %%license",
-    "install -D -m 0644 -pv %{SOURCE2} %{buildroot}%{crate_instdir}/LICENSE",
-]
-
 [tests]
-run = ["none"]
+run = false
 comments = ["The crate ships without the data or additional sources required for tests"]

diff --git a/sources b/sources
index 36c019d..fafc6f2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tree-sitter-0.25.10.crate) = 14cd01ac485268a051b57d636f64f77cc04074001a195eee1ef34f124e8c662de09f2dffb2115341fff83a5a1518833af424abcb51ca86cc070411390efdc532
+SHA512 (tree-sitter-0.26.9.crate) = d6b44fee512672e894d158321013143daa770b64a4e19aef7415845478f6d8887060586c967cf7479a57f97ee9b9c17ce95a1b4ff6fa57bf462eb645a9e9d381

diff --git a/tree-sitter-bindgen-rust-version.patch b/tree-sitter-bindgen-rust-version.patch
deleted file mode 100644
index deb36e9..0000000
--- a/tree-sitter-bindgen-rust-version.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 9e885b4995e9b4620a0e5fdaedfb819fcdeec0e2 Mon Sep 17 00:00:00 2001
-From: Aleksei Bavshin <alebastr89@gmail.com>
-Date: Fri, 31 Jan 2025 22:18:29 -0800
-Subject: [PATCH] fedora: fix rust-version detection in build.rs
-
----
- binding_rust/build.rs | 32 +++++---------------------------
- 1 file changed, 5 insertions(+), 27 deletions(-)
-
-diff --git a/binding_rust/build.rs b/binding_rust/build.rs
-index da4b904d..7a0dd9ea 100644
---- a/binding_rust/build.rs
-+++ b/binding_rust/build.rs
-@@ -50,32 +50,10 @@ fn main() {
- }
- 
- fn generate_bindings(out_dir: &std::path::Path) {
--    use std::{process::Command, str::FromStr};
--
--    use bindgen::RustTarget;
--
--    let output = Command::new("cargo")
--        .args(["metadata", "--format-version", "1"])
--        .output()
--        .unwrap();
--
--    let metadata = serde_json::from_slice::<serde_json::Value>(&output.stdout).unwrap();
--
--    let Some(rust_version) = metadata
--        .get("packages")
--        .and_then(|packages| packages.as_array())
--        .and_then(|packages| {
--            packages.iter().find_map(|package| {
--                if package["name"] == "tree-sitter" {
--                    package.get("rust_version").and_then(|v| v.as_str())
--                } else {
--                    None
--                }
--            })
--        })
--    else {
--        panic!("Failed to find tree-sitter package in cargo metadata");
--    };
-+    let rust_target: bindgen::RustTarget = env::var("CARGO_PKG_RUST_VERSION")
-+        .expect("rust-version")
-+        .parse()
-+        .expect("valid bindgen::RustTarget");
- 
-     const HEADER_PATH: &str = "include/tree_sitter/api.h";
- 
-@@ -105,7 +83,7 @@ fn generate_bindings(out_dir: &std::path::Path) {
-         .prepend_enum_name(false)
-         .use_core()
-         .clang_arg("-D TREE_SITTER_FEATURE_WASM")
--        .rust_target(RustTarget::from_str(rust_version).unwrap())
-+        .rust_target(rust_target)
-         .generate()
-         .expect("Failed to generate bindings");
- 
--- 
-2.49.0
-

diff --git a/tree-sitter-build-bindings-unconditionally.patch b/tree-sitter-build-bindings-unconditionally.patch
index 7e43904..1ed5084 100644
--- a/tree-sitter-build-bindings-unconditionally.patch
+++ b/tree-sitter-build-bindings-unconditionally.patch
@@ -1,4 +1,4 @@
-From 63060a0f1c6f50b29b8bbfec50bf4d8b19dca1b0 Mon Sep 17 00:00:00 2001
+From 42d212e7576876c5e7571b5b678827282a7888ee Mon Sep 17 00:00:00 2001
 From: Aleksei Bavshin <alebastr89@gmail.com>
 Date: Wed, 28 Feb 2024 18:48:11 -0800
 Subject: [PATCH] build bindings unconditionally
@@ -10,27 +10,27 @@ Subject: [PATCH] build bindings unconditionally
  3 files changed, 1 insertion(+), 7 deletions(-)
 
 diff --git a/binding_rust/build.rs b/binding_rust/build.rs
-index 255740af..da4b904d 100644
+index 57c5bc94..200d6fe2 100644
 --- a/binding_rust/build.rs
 +++ b/binding_rust/build.rs
-@@ -3,7 +3,6 @@ use std::{env, fs, path::PathBuf};
- fn main() {
+@@ -4,7 +4,6 @@ fn main() {
      let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());
+     let target = env::var("TARGET").unwrap();
  
 -    #[cfg(feature = "bindgen")]
      generate_bindings(&out_dir);
  
      fs::copy(
-@@ -50,7 +49,6 @@ fn main() {
-     println!("cargo:include={}", include_path.display());
+@@ -74,7 +73,6 @@ fn configure_wasm_build(config: &mut cc::Build) {
+     ]);
  }
  
 -#[cfg(feature = "bindgen")]
  fn generate_bindings(out_dir: &std::path::Path) {
-     use std::{process::Command, str::FromStr};
+     use std::str::FromStr;
  
 diff --git a/binding_rust/ffi.rs b/binding_rust/ffi.rs
-index af0824d7..4e59f37b 100644
+index 4c68a633..79ee8d70 100644
 --- a/binding_rust/ffi.rs
 +++ b/binding_rust/ffi.rs
 @@ -3,12 +3,8 @@
@@ -47,5 +47,5 @@ index af0824d7..4e59f37b 100644
  #[cfg(feature = "std")]
  extern "C" {
 -- 
-2.48.1
+2.54.0
 

diff --git a/tree-sitter-fix-metadata.diff b/tree-sitter-fix-metadata.diff
index ad66996..69ec237 100644
--- a/tree-sitter-fix-metadata.diff
+++ b/tree-sitter-fix-metadata.diff
@@ -1,6 +1,6 @@
---- tree-sitter-0.25.10/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ tree-sitter-0.25.10/Cargo.toml	2026-01-23T19:44:25.705364+00:00
-@@ -48,7 +48,7 @@
+--- tree-sitter-0.26.9/Cargo.toml	2006-07-24T01:21:28+00:00
++++ tree-sitter-0.26.9/Cargo.toml	2026-05-29T04:54:41.858255+00:00
+@@ -50,7 +50,7 @@
      "parsing",
      "text-editors",
  ]
@@ -9,7 +9,7 @@
  repository = "https://github.com/tree-sitter/tree-sitter"
  
  [package.metadata.docs.rs]
-@@ -69,10 +69,7 @@
+@@ -71,10 +71,7 @@
      "regex/perf",
      "regex-syntax/unicode",
  ]
@@ -21,12 +21,12 @@
  
  [lib]
  name = "tree_sitter"
-@@ -93,19 +90,8 @@
+@@ -95,19 +92,8 @@
  [dependencies.tree-sitter-language]
  version = "0.1"
  
 -[dependencies.wasmtime-c-api]
--version = "29.0.1"
+-version = "36.0.9"
 -features = [
 -    "cranelift",
 -    "gc-drc",
@@ -36,9 +36,8 @@
 -package = "wasmtime-c-api-impl"
 -
  [build-dependencies.bindgen]
--version = "0.71.1"
+ version = "0.72.0"
 -optional = true
-+version = "0.72.1"
  
  [build-dependencies.cc]
- version = "1.2.10"
+ version = "1.2.48"

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

only message in thread, other threads:[~2026-06-03  6:47 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-03  6:47 [rpms/rust-tree-sitter] rawhide: Update to version 0.26.9; Fixes RHBZ#2420885 Aleksei Bavshin

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