[rpms/rust-tame-index] epel10.3: Update gix dependency to version 0.61

[blinxen <h-k-81@hotmail.com>]

A new commit has been pushed.

Repo   : rpms/rust-tame-index
Branch : epel10.3
Commit : c287b9509ad61cd28b622c343a0bfaad3dbb3740
Author : blinxen <h-k-81@hotmail.com>
Date   : 2024-04-06T13:32:00+02:00
Stats  : +59/-2 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/rust-tame-index/c/c287b9509ad61cd28b622c343a0bfaad3dbb3740?branch=epel10.3

Log:
Update gix dependency to version 0.61

---
diff --git a/gix-compatibility.patch b/gix-compatibility.patch
new file mode 100644
index 0000000..de7dd12
--- /dev/null
+++ b/gix-compatibility.patch
@@ -0,0 +1,54 @@
+diff --git a/src/index/git_remote.rs b/src/index/git_remote.rs
+index 5726c61..b21ce67 100644
+--- a/src/index/git_remote.rs
++++ b/src/index/git_remote.rs
+@@ -412,7 +412,7 @@ pub enum GitError {
+     #[error(transparent)]
+     ReferenceLookup(#[from] Box<gix::reference::find::existing::Error>),
+     #[error(transparent)]
+-    BlobLookup(#[from] Box<gix::odb::find::existing::Error>),
++    BlobLookup(#[from] Box<gix::object::find::existing::Error>),
+     #[error(transparent)]
+     RemoteLookup(#[from] Box<gix::remote::find::existing::Error>),
+     #[error(transparent)]
+
+diff --git a/tests/git.rs b/tests/git.rs
+index eb74313..be94214 100644
+--- a/tests/git.rs
++++ b/tests/git.rs
+@@ -80,7 +80,7 @@ impl TreeUpdateBuilder {
+         repo: &gix::Repository,
+     ) -> gix::ObjectId {
+         use gix::objs::{
+-            tree::{Entry, EntryMode},
++            tree::{Entry, EntryKind},
+             Tree,
+         };
+
+@@ -94,7 +94,7 @@ impl TreeUpdateBuilder {
+             match entry {
+                 UpdateEntry::Blob(oid) => {
+                     nt.entries.push(Entry {
+-                        mode: EntryMode::Blob,
++                        mode: EntryKind::Blob.into(),
+                         oid,
+                         filename,
+                     });
+@@ -102,7 +102,7 @@ impl TreeUpdateBuilder {
+                 UpdateEntry::Tree(ut) => {
+                     // Check if there is already an existing tree
+                     let current_tree = tree_ref.entries.iter().find_map(|tre| {
+-                        if tre.filename == name && tre.mode == EntryMode::Tree {
++                        if tre.filename == name && tre.mode.is_tree() {
+                             Some(repo.find_object(tre.oid).unwrap().into_tree())
+                         } else {
+                             None
+@@ -112,7 +112,7 @@ impl TreeUpdateBuilder {
+
+                     let oid = Self::create_inner(ut, &current_tree, repo);
+                     nt.entries.push(Entry {
+-                        mode: EntryMode::Tree,
++                        mode: EntryKind::Tree.into(),
+                         oid,
+                         filename,
+                     });

diff --git a/rust-tame-index.spec b/rust-tame-index.spec
index 8f92e78..cd560b7 100644
--- a/rust-tame-index.spec
+++ b/rust-tame-index.spec
@@ -16,8 +16,11 @@ Source:         %{crates_source}
 Patch:          tame-index-fix-metadata-auto.diff
 # Manually created patch for downstream crate metadata changes
 # * remove unused benchmark-only tiny-bench dev-dependency
-# * bump optional gix dependency from 0.54 to 0.55
+# * bump optional gix dependency from 0.54 to 0.61
 Patch:          tame-index-fix-metadata.diff
+# gitoxide ccompatibility patch
+# * backport 60fd14e7d8bb3bc1b4082f50a2f36f91dcfb8b1e
+Patch:          gix-compatibility.patch
 
 BuildRequires:  cargo-rpm-macros >= 24
 

diff --git a/tame-index-fix-metadata.diff b/tame-index-fix-metadata.diff
index c44c6fd..d3cae94 100644
--- a/tame-index-fix-metadata.diff
+++ b/tame-index-fix-metadata.diff
@@ -17,7 +17,7 @@
  
  [dependencies.gix]
 -version = "0.54"
-+version = "0.55"
++version = "0.61"
  features = ["blocking-http-transport-reqwest"]
  optional = true
  default-features = false