Control: tags -1 +patch
git-delta fails to build because of two issues. First, rust-bat was
updated to 0.25. That's https://bugs.debian.org/1101624
Second, the ongoing libgit2 1.9 transition (with rust-git2 updated to
0.20.1) requires an update in git-delta.
I am attaching patches to fix these issues.
Thank you,
Jeremy Bícha
From 0de69e2545b410188cd8420d5b33e233a285eb94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jeremy=20B=C3=ADcha?= <jeremy.bi...@canonical.com>
Date: Sat, 5 Apr 2025 16:02:48 -0400
Subject: [PATCH 2/2] Build with rust-bat 0.25
Closes: #1101624
---
debian/control | 6 +++---
debian/patches/2003_bat.patch | 21 +++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 25 insertions(+), 3 deletions(-)
create mode 100644 debian/patches/2003_bat.patch
diff --git a/debian/control b/debian/control
index a45bfc7..7d15ea8 100644
--- a/debian/control
+++ b/debian/control
@@ -12,9 +12,9 @@ Build-Depends:
librust-ansi-term-0.12+default-dev,
librust-anstyle-parse-0.2+default-dev,
librust-anyhow-1+default-dev,
- librust-bat-0.24+minimal-application-dev,
- librust-bat-0.24+paging-dev,
- librust-bat-0.24+regex-onig-dev,
+ librust-bat-0.25+minimal-application-dev,
+ librust-bat-0.25+paging-dev,
+ librust-bat-0.25+regex-onig-dev,
librust-bitflags-2+default-dev,
librust-box-drawing-0.1+default-dev,
librust-bytelines-2-dev,
diff --git a/debian/patches/2003_bat.patch b/debian/patches/2003_bat.patch
new file mode 100644
index 0000000..a74b32e
--- /dev/null
+++ b/debian/patches/2003_bat.patch
@@ -0,0 +1,21 @@
+From: =?utf-8?q?Jeremy_B=C3=ADcha?= <jeremy.bi...@canonical.com>
+Date: Sat, 5 Apr 2025 16:02:15 -0400
+Subject: Update rust-bat version
+
+---
+ Cargo.toml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index 3c9e86c..1f9f6c7 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -19,7 +19,7 @@ ansi_colours = "1.2.1"
+ ansi_term = "0.12.1"
+ anstyle-parse = "0.2.1"
+ anyhow = "1.0.70"
+-bat = { version = "0.24.0", default-features = false, features = [
++bat = { version = "0.25.0", default-features = false, features = [
+ "minimal-application",
+ "paging",
+ "regex-onig",
diff --git a/debian/patches/series b/debian/patches/series
index 8e8b525..45aaf53 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@
2002_bytelines.patch
2002_rstest.patch
2002_terminal-colorsaurus.patch
+2003_bat.patch
--
2.48.1
From 3023fb003ef43831fe9e46e8d344856fe426551a Mon Sep 17 00:00:00 2001
From: Simon Quigley <tsimo...@ubuntu.com>
Date: Sat, 22 Feb 2025 15:57:38 -0600
Subject: [PATCH 1/2] Update dependencies for libgit2 0.20
---
debian/control | 2 +-
debian/patches/1001_git2.patch | 2 +-
debian/patches/1001_itertools.patch | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/debian/control b/debian/control
index 33689b8..a45bfc7 100644
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,7 @@ Build-Depends:
librust-console-0.15+default-dev,
librust-ctrlc-3+default-dev,
librust-dirs-5+default-dev,
- librust-git2-0.19-dev,
+ librust-git2-0.20-dev,
librust-grep-cli-0.1+default-dev,
librust-insta-1+colors-dev,
librust-insta-1+default-dev,
diff --git a/debian/patches/1001_git2.patch b/debian/patches/1001_git2.patch
index 2afca0b..e33d36a 100644
--- a/debian/patches/1001_git2.patch
+++ b/debian/patches/1001_git2.patch
@@ -10,7 +10,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
ctrlc = "3.2.5"
dirs = "5.0.1"
-git2 = { version = "0.18.2", default-features = false, features = [] }
-+git2 = { version = ">= 0.18.2, <= 0.19", default-features = false, features = [] }
++git2 = { version = ">= 0.18.2, <= 0.21", default-features = false, features = [] }
grep-cli = "0.1.8"
itertools = "0.10.5"
lazy_static = "1.4"
diff --git a/debian/patches/1001_itertools.patch b/debian/patches/1001_itertools.patch
index b6084a4..e1c3123 100644
--- a/debian/patches/1001_itertools.patch
+++ b/debian/patches/1001_itertools.patch
@@ -5,9 +5,9 @@ Last-Update: 2024-05-31
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/Cargo.toml
+++ b/Cargo.toml
-@@ -41,7 +41,7 @@
+@@ -41,7 +41,7 @@ ctrlc = "3.2.5"
dirs = "5.0.1"
- git2 = { version = ">= 0.18.2, <= 0.19", default-features = false, features = [] }
+ git2 = { version = ">= 0.18.2, <= 0.21", default-features = false, features = [] }
grep-cli = "0.1.8"
-itertools = "0.10.5"
+itertools = ">= 0.10.5, <= 0.13"
--
2.48.1
