Package: hx
Version: 25.07.1+20251230+~0.1.1+~0.3.0+20251022-1
Severity: serious
Tags: patch
As discussed at https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1116062
rust-gix has been updated to 0.73, the hx package needs adjusting
to build with the new version.
diff -Nru hx-25.07.1+20251230+~0.1.1+~0.3.0+20251022/debian/changelog
hx-25.07.1+20251230+~0.1.1+~0.3.0+20251022/debian/changelog
--- hx-25.07.1+20251230+~0.1.1+~0.3.0+20251022/debian/changelog 2025-12-31
08:46:11.000000000 +0000
+++ hx-25.07.1+20251230+~0.1.1+~0.3.0+20251022/debian/changelog 2026-02-17
12:40:47.000000000 +0000
@@ -1,3 +1,11 @@
+hx (25.07.1+20251230+~0.1.1+~0.3.0+20251022-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Adjust 2002_gix.patch for gix 0.73.
+ * Bump build-dependencies for gix crate to 0.73.
+
+ -- Peter Michael Green <[email protected]> Tue, 17 Feb 2026 12:40:47 +0000
+
hx (25.07.1+20251230+~0.1.1+~0.3.0+20251022-1) unstable; urgency=medium
[ upstream ]
diff -Nru hx-25.07.1+20251230+~0.1.1+~0.3.0+20251022/debian/control
hx-25.07.1+20251230+~0.1.1+~0.3.0+20251022/debian/control
--- hx-25.07.1+20251230+~0.1.1+~0.3.0+20251022/debian/control 2025-12-31
08:46:11.000000000 +0000
+++ hx-25.07.1+20251230+~0.1.1+~0.3.0+20251022/debian/control 2026-02-17
12:40:47.000000000 +0000
@@ -26,8 +26,8 @@
librust-futures-util-0.3+async-await-dev,
librust-futures-util-0.3+std-dev,
librust-fuzzy-matcher-0.3+default-dev,
- librust-gix-0.69+attributes-dev,
- librust-gix-0.69+status-dev,
+ librust-gix-0.73+attributes-dev,
+ librust-gix-0.73+status-dev,
librust-globset-0.4+default-dev,
librust-grep-regex-0.1+default-dev,
librust-grep-searcher-0.1+default-dev,
diff -Nru
hx-25.07.1+20251230+~0.1.1+~0.3.0+20251022/debian/patches/2002_gix.patch
hx-25.07.1+20251230+~0.1.1+~0.3.0+20251022/debian/patches/2002_gix.patch
--- hx-25.07.1+20251230+~0.1.1+~0.3.0+20251022/debian/patches/2002_gix.patch
2025-12-31 08:46:11.000000000 +0000
+++ hx-25.07.1+20251230+~0.1.1+~0.3.0+20251022/debian/patches/2002_gix.patch
2026-02-17 12:40:47.000000000 +0000
@@ -1,6 +1,5 @@
Description: use older minor versions of crate gix
- This essentially reverts upstream git commits
- e8cad18, 5a671e6 and 09b2f6a.
+ This essentially reverts upstream git commit e8cad18.
Author: Jonas Smedegaard <[email protected]>
Bug-Debian: https://bugs.debian.org/1116062
Forwarded: not-needed
@@ -14,39 +13,12 @@
arc-swap = { version = "1.7.1" }
-gix = { version = "0.76.0", features = ["attributes", "status"],
default-features = false, optional = true }
-+gix = { version = "0.69.1", features = ["attributes", "status"],
default-features = false, optional = true }
++gix = { version = "0.73.0", features = ["attributes", "status"],
default-features = false, optional = true }
imara-diff = "0.2.0"
anyhow = "1"
--- a/helix-vcs/src/git.rs
+++ b/helix-vcs/src/git.rs
-@@ -11,7 +11,7 @@
- use gix::objs::tree::EntryKind;
- use gix::sec::trust::DefaultForLevel;
- use gix::status::{
-- index_worktree::Item,
-+ index_worktree::iter::Item,
- plumbing::index_as_worktree::{Change, EntryStatus},
- UntrackedFiles,
- };
-@@ -45,7 +45,7 @@
- let data = file_object.detach().data;
- // Get the actual data that git would make out of the git object.
- // This will apply the user's git config or attributes like crlf
conversions.
-- if let Some(work_dir) = repo.workdir() {
-+ if let Some(work_dir) = repo.work_dir() {
- let rela_path = file.strip_prefix(work_dir)?;
- let rela_path = gix::path::try_into_bstr(rela_path)?;
- let (mut pipeline, _) = repo.filter_pipeline(None)?;
-@@ -128,7 +128,7 @@
- /// Emulates the result of running `git status` from the command line.
- fn status(repo: &Repository, f: impl Fn(Result<FileChange>) -> bool) ->
Result<()> {
- let work_dir = repo
-- .workdir()
-+ .work_dir()
- .ok_or_else(|| anyhow::anyhow!("working tree not found"))?
- .to_path_buf();
-
@@ -162,7 +162,7 @@
} => {
let path = work_dir.join(rela_path.to_path()?);
@@ -56,12 +28,3 @@
EntryStatus::Change(Change::Removed) =>
FileChange::Deleted { path },
EntryStatus::Change(Change::Modification { .. }) => {
FileChange::Modified { path }
-@@ -195,7 +195,7 @@
-
- /// Finds the object that contains the contents of a file at a specific
commit.
- fn find_file_in_commit(repo: &Repository, commit: &Commit, file: &Path) ->
Result<ObjectId> {
-- let repo_dir = repo.workdir().context("repo has no worktree")?;
-+ let repo_dir = repo.work_dir().context("repo has no worktree")?;
- let rel_path = file.strip_prefix(repo_dir)?;
- let tree = commit.tree()?;
- let tree_entry = tree
diff -Nru
hx-25.07.1+20251230+~0.1.1+~0.3.0+20251022/debian/patches/2002_imara-diff.patch
hx-25.07.1+20251230+~0.1.1+~0.3.0+20251022/debian/patches/2002_imara-diff.patch
---
hx-25.07.1+20251230+~0.1.1+~0.3.0+20251022/debian/patches/2002_imara-diff.patch
2025-12-31 08:46:11.000000000 +0000
+++
hx-25.07.1+20251230+~0.1.1+~0.3.0+20251022/debian/patches/2002_imara-diff.patch
2026-02-17 12:40:47.000000000 +0000
@@ -22,7 +22,7 @@
@@ -18,7 +18,7 @@
arc-swap = { version = "1.7.1" }
- gix = { version = "0.69.1", features = ["attributes", "status"],
default-features = false, optional = true }
+ gix = { version = "0.73.0", features = ["attributes", "status"],
default-features = false, optional = true }
-imara-diff = "0.2.0"
+imara-diff = "0.1.8"
anyhow = "1"
