The new version of rust-unicode-width fixes the assertion failure. However a libgit2 transition
has started, which brought with it a new version of rust-git2.

After bumping the dependencies I was able to succesfully build git-delta,
debdiff is attatched.
diff -Nru git-delta-0.18.2/debian/changelog git-delta-0.18.2/debian/changelog
--- git-delta-0.18.2/debian/changelog   2024-10-04 15:39:09.000000000 +0000
+++ git-delta-0.18.2/debian/changelog   2024-10-06 14:25:26.000000000 +0000
@@ -1,3 +1,12 @@
+git-delta (0.18.2-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Bump librust-unicode-width-dev build-dependency to 0.1.14 since the tests
+    fail with 0.1.13.
+  * Bump cargo and debian dependencies on git2 crate to 0.19
+
+ -- Peter Michael Green <plugw...@debian.org>  Sun, 06 Oct 2024 14:25:26 +0000
+
 git-delta (0.18.2-1) unstable; urgency=medium
 
   [ upstream ]
diff -Nru git-delta-0.18.2/debian/control git-delta-0.18.2/debian/control
--- git-delta-0.18.2/debian/control     2024-10-04 14:43:55.000000000 +0000
+++ git-delta-0.18.2/debian/control     2024-10-06 14:25:26.000000000 +0000
@@ -29,7 +29,7 @@
  librust-console-0.15+default-dev,
  librust-ctrlc-3+default-dev,
  librust-dirs-5+default-dev,
- librust-git2-0.18-dev,
+ librust-git2-0.19-dev,
  librust-grep-cli-0.1+default-dev,
  librust-insta-1+colors-dev,
  librust-insta-1+default-dev,
@@ -48,7 +48,7 @@
  librust-syntect-5+default-dev,
  librust-sysinfo-0.30-dev,
  librust-unicode-segmentation-1+default-dev,
- librust-unicode-width-0.1+default-dev,
+ librust-unicode-width-0.1+default-dev (>= 0.1.14),
  librust-xdg-2+default-dev,
 Maintainer: Jonas Smedegaard <d...@jones.dk>
 Standards-Version: 4.7.0
diff -Nru git-delta-0.18.2/debian/patches/1001_git2.patch 
git-delta-0.18.2/debian/patches/1001_git2.patch
--- git-delta-0.18.2/debian/patches/1001_git2.patch     1970-01-01 
00:00:00.000000000 +0000
+++ git-delta-0.18.2/debian/patches/1001_git2.patch     2024-10-06 
14:25:26.000000000 +0000
@@ -0,0 +1,19 @@
+Description: use newer version of crate git2
+Author: Peter Michael Green <plugw...@debian.org>
+Forwarded: not-needed
+Last-Update: 2024-10-06
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: git-delta-0.18.2/Cargo.toml
+===================================================================
+--- git-delta-0.18.2.orig/Cargo.toml
++++ git-delta-0.18.2/Cargo.toml
+@@ -39,7 +39,7 @@ clap = { version = "4.3.14", features =
+ console = "0.15.0"
+ ctrlc = "3.2.5"
+ dirs = "5.0.1"
+-git2 = { version = "0.18.2", default-features = false, features = [] }
++git2 = { version = "0.19", default-features = false, features = [] }
+ grep-cli = "0.1.8"
+ itertools = ">= 0.10.5, <= 0.13"
+ lazy_static = "1.4"
diff -Nru git-delta-0.18.2/debian/patches/series 
git-delta-0.18.2/debian/patches/series
--- git-delta-0.18.2/debian/patches/series      2024-10-04 15:39:09.000000000 
+0000
+++ git-delta-0.18.2/debian/patches/series      2024-10-06 14:25:26.000000000 
+0000
@@ -7,3 +7,4 @@
 2002_rstest.patch
 2002_terminal-colorsaurus.patch
 2002_unicode-width.patch
+1001_git2.patch

Reply via email to