public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/rust-difftastic] f43: Update to version 0.69.0; Resolves RHBZ#2448278
@ 2026-06-30 19:06 Michel Lind
0 siblings, 0 replies; only message in thread
From: Michel Lind @ 2026-06-30 19:06 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/rust-difftastic
Branch : f43
Commit : 9168e910b3e536f03d1475b1aed5fc686babb3b5
Author : Michel Lind <salimma@fedoraproject.org>
Date : 2026-06-30T16:32:40+01:00
Stats : +29/-35 in 6 file(s)
URL : https://src.fedoraproject.org/rpms/rust-difftastic/c/9168e910b3e536f03d1475b1aed5fc686babb3b5?branch=f43
Log:
Update to version 0.69.0; Resolves RHBZ#2448278
Signed-off-by: Michel Lind <salimma@fedoraproject.org>
---
diff --git a/.gitignore b/.gitignore
index f2677f6..0db864f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
/difftastic-0.61.0.crate
/difftastic-0.63.0.crate
/difftastic-0.67.0.crate
+/difftastic-0.69.0.crate
diff --git a/difftastic-disable-tree-sitter-clojure-orchard.diff b/difftastic-disable-tree-sitter-clojure-orchard.diff
index 6ea75fb..02f3e44 100644
--- a/difftastic-disable-tree-sitter-clojure-orchard.diff
+++ b/difftastic-disable-tree-sitter-clojure-orchard.diff
@@ -1,22 +1,22 @@
--- a/src/parse/guess_language.rs
+++ b/src/parse/guess_language.rs
-@@ -22,7 +22,6 @@ pub(crate) enum Language {
- Apex,
+@@ -24,7 +24,6 @@ pub(crate) enum Language {
+ Asm,
Bash,
C,
- Clojure,
CMake,
CommonLisp,
CPlusPlus,
-@@ -123,7 +122,6 @@ pub(crate) fn language_name(language: La
- Apex => "Apex",
+@@ -126,7 +125,6 @@ pub(crate) fn language_name(language: La
+ Asm => "Assembly",
Bash => "Bash",
C => "C",
- Clojure => "Clojure",
CMake => "CMake",
CommonLisp => "Common Lisp",
CPlusPlus => "C++",
-@@ -245,10 +243,6 @@ pub(crate) fn language_globs(language: L
+@@ -249,10 +247,6 @@ pub(crate) fn language_globs(language: L
],
Apex => &["*.cls", "*.apexc", "*.trigger"],
C => &["*.c"],
@@ -27,7 +27,7 @@
CMake => &["*.cmake", "*.cmake.in", "CMakeLists.txt"],
CommonLisp => &["*.lisp", "*.lsp", "*.asd"],
// Treat .h as C++ rather than C. This is an arbitrary choice, but
-@@ -528,7 +522,6 @@ fn from_emacs_mode_header(src: &str) ->
+@@ -532,7 +526,6 @@ fn from_emacs_mode_header(src: &str) ->
return Some(match mode_name.to_ascii_lowercase().trim() {
"ada" => Ada,
"c" => C,
@@ -37,7 +37,7 @@
"dart" => Dart,
--- a/src/parse/tree_sitter_parser.rs
+++ b/src/parse/tree_sitter_parser.rs
-@@ -181,24 +181,6 @@ pub(crate) fn from_language(language: gu
+@@ -207,25 +207,6 @@ pub(crate) fn from_language(language: gu
sub_languages: vec![],
}
}
@@ -51,6 +51,7 @@
- delimiter_tokens: vec![("{", "}"), ("(", ")"), ("[", "]")]
- .into_iter()
- .collect(),
+- ignore_trailing_tokens: vec![],
- highlight_query: ts::Query::new(
- &language,
- tree_sitter_clojure_orchard::HIGHLIGHTS_QUERY,
@@ -64,7 +65,7 @@
let language = tree_sitter::Language::new(language_fn);
--- a/src/diff/sliders.rs
+++ b/src/diff/sliders.rs
-@@ -60,7 +60,7 @@ fn prefer_outer_delimiter(language: gues
+@@ -97,7 +97,7 @@ fn prefer_outer_delimiter(language: gues
match language {
// For Lisp family languages, we get the best result with the
// outer delimiter.
diff --git a/difftastic-fix-metadata.diff b/difftastic-fix-metadata.diff
index 6852836..6736824 100644
--- a/difftastic-fix-metadata.diff
+++ b/difftastic-fix-metadata.diff
@@ -1,6 +1,6 @@
---- difftastic-0.67.0/Cargo.toml 1970-01-01T00:00:01+00:00
-+++ difftastic-0.67.0/Cargo.toml 2026-06-04T11:28:03.895428+00:00
-@@ -67,7 +67,6 @@
+--- difftastic-0.69.0/Cargo.toml 1970-01-01T00:00:01+00:00
++++ difftastic-0.69.0/Cargo.toml 2026-06-29T20:15:46.284887+00:00
+@@ -90,7 +90,6 @@
[dependencies.crossterm]
version = "0.28.0"
@@ -8,7 +8,7 @@
[dependencies.encoding_rs]
version = "0.8.35"
-@@ -76,13 +75,13 @@
+@@ -99,13 +98,13 @@
version = "0.3.1"
[dependencies.hashbrown]
@@ -24,7 +24,7 @@
[dependencies.lazy_static]
version = "1.4.0"
-@@ -131,7 +130,7 @@
+@@ -154,7 +153,7 @@
version = "0.11.0"
[dependencies.strum]
@@ -33,28 +33,22 @@
features = ["derive"]
[dependencies.tree-sitter]
-@@ -149,9 +148,6 @@
+@@ -175,9 +174,6 @@
[dependencies.tree-sitter-c-sharp]
version = "0.23.1"
-[dependencies.tree-sitter-clojure-orchard]
--version = "0.2.0"
+-version = "0.2.5"
-
[dependencies.tree-sitter-cmake]
version = "0.7.1"
-@@ -228,7 +224,7 @@
- version = "3.0.2"
+@@ -362,7 +358,7 @@
+ version = "0.9.4"
- [dependencies.tree-sitter-ocaml]
--version = "0.23.2"
-+version = "0.24"
-
- [dependencies.tree-sitter-pascal]
- version = "0.10.0"
-@@ -326,4 +322,4 @@
- [features]
-
- [target."cfg(not(any(target_env = \"msvc\", target_os = \"illumos\", target_os = \"freebsd\")))".dependencies.tikv-jemallocator]
+ [target.'cfg(not(any(windows, target_os = "illumos", target_os = "freebsd")))'.dependencies.tikv-jemallocator]
-version = "0.6"
-+version = ">=0.6, <0.8"
++version = ">=0.6,<0.8"
+
+ [profile.release]
+ lto = "thin"
diff --git a/rust-difftastic.spec b/rust-difftastic.spec
index 807bd8f..a2c166a 100644
--- a/rust-difftastic.spec
+++ b/rust-difftastic.spec
@@ -4,7 +4,7 @@
%global crate difftastic
Name: rust-difftastic
-Version: 0.67.0
+Version: 0.69.0
Release: %autorelease
Summary: Structural diff that understands syntax
@@ -12,14 +12,13 @@ License: MIT
URL: https://crates.io/crates/difftastic
Source: %{crates_source}
# * manpage
-Source1: https://github.com/Wilfred/difftastic/raw/%{version}/difft.1
+Source2: https://github.com/Wilfred/difftastic/raw/%{version}/difft.1
# Manually created patch for downstream crate metadata changes
# * drop crossterm/windows
# * bump hashbrown from 0.14 to 0.16
# * relax upper bound on ignore
# * allow strum 0.27: https://github.com/Wilfred/difftastic/pull/822
# * temporarily drop tree-sitter-clojure-orchard, pending legal clarification
-# * bump tree-sitter-ocaml from 0.23.2 to 0.24
# * allow tikv-jemallocator 0.7: https://github.com/Wilfred/difftastic/pull/985
Patch: difftastic-fix-metadata.diff
# * strip out Clojure support from the codebase
@@ -72,7 +71,7 @@ License: %{shrink:
%autosetup -n %{crate}-%{version} -p1
%cargo_prep
# manpage
-cp -p %{SOURCE1} .
+cp -p %{SOURCE2} .
%generate_buildrequires
%cargo_generate_buildrequires
diff --git a/rust2rpm.toml b/rust2rpm.toml
index 50795fb..01a5621 100644
--- a/rust2rpm.toml
+++ b/rust2rpm.toml
@@ -1,6 +1,6 @@
[package]
extra-sources = [
- { "number" = 1, "file" = "https://github.com/Wilfred/difftastic/raw/%{version}/difft.1", "comments" = ["manpage"] },
+ { "number" = 2, "file" = "https://github.com/Wilfred/difftastic/raw/%{version}/difft.1", "comments" = ["manpage"] },
]
extra-patches = [
{ "number" = 2, "file" = "difftastic-disable-tree-sitter-clojure-orchard.diff", "comments" = ["strip out Clojure support from the codebase", "https://lists.fedoraproject.org/archives/list/legal@lists.fedoraproject.org/thread/D476PEK5GI4D5OSF4QBKZLHM77QC3LSH/"] },
@@ -11,7 +11,6 @@ cargo-toml-patch-comments = [
"relax upper bound on ignore",
"allow strum 0.27: https://github.com/Wilfred/difftastic/pull/822",
"temporarily drop tree-sitter-clojure-orchard, pending legal clarification",
- "bump tree-sitter-ocaml from 0.23.2 to 0.24",
"allow tikv-jemallocator 0.7: https://github.com/Wilfred/difftastic/pull/985",
]
extra-files = [
diff --git a/sources b/sources
index 90b0854..25b6ee7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (difftastic-0.67.0.crate) = 9488d42e405f99dcc1d588ec363725b6c54774c2f49bf31fd5ece88fdfbf911d852475be1dca161f432269da324c1c8e65c5d6b8bee2e8ee472ab495c0237cad
+SHA512 (difftastic-0.69.0.crate) = 77add05b352b1dbc21af1c250c283ad9b1df0b62ccb9d816596e99af735c9220d299081968bee2b8dee7789c431ff2fe320b95d9266cddbb897c06709fd48db9
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-06-30 19:06 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-30 19:06 [rpms/rust-difftastic] f43: Update to version 0.69.0; Resolves RHBZ#2448278 Michel Lind
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox