public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/rust-cargo-deny] f44: Remove patch for gix 0.73 compatibility, no longer needed
@ 2026-07-01 11:00 Benjamin A. Beasley
  0 siblings, 0 replies; only message in thread
From: Benjamin A. Beasley @ 2026-07-01 11:00 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/rust-cargo-deny
Branch : f44
Commit : da0b04928622fa0cb39495be584cd6b818e2b2ad
Author : Benjamin A. Beasley <code@musicinmybrain.net>
Date   : 2026-06-28T06:58:21+01:00
Stats  : +1/-40 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/rust-cargo-deny/c/da0b04928622fa0cb39495be584cd6b818e2b2ad?branch=f44

Log:
Remove patch for gix 0.73 compatibility, no longer needed

---
diff --git a/0001-Downstream-temporarily-preserve-gix-0.73-compatibili.patch b/0001-Downstream-temporarily-preserve-gix-0.73-compatibili.patch
deleted file mode 100644
index 78f8ddd..0000000
--- a/0001-Downstream-temporarily-preserve-gix-0.73-compatibili.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 3ea784f2d6b7eae64d0bf0ea29b00f36b3b26057 Mon Sep 17 00:00:00 2001
-From: "Benjamin A. Beasley" <code@musicinmybrain.net>
-Date: Sat, 13 Dec 2025 09:30:40 +0000
-Subject: [PATCH] Downstream: temporarily preserve gix 0.73 compatibility
-
-This partially reverts 7e0cff3.
----
- src/advisories/helpers/db.rs | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/advisories/helpers/db.rs b/src/advisories/helpers/db.rs
-index c0f9241..6bf2d57 100644
---- a/src/advisories/helpers/db.rs
-+++ b/src/advisories/helpers/db.rs
-@@ -331,7 +331,7 @@ fn fetch_and_checkout(repo: &mut gix::Repository) -> anyhow::Result<()> {
-         .context("unable to checkout, repository is bare")?;
-     let root_tree = repo
-         .head()?
--        .try_peel_to_id()?
-+        .try_peel_to_id_in_place()?
-         .context("unable to peel HEAD")?
-         .object()
-         .context("HEAD commit not downloaded from remote")?
--- 
-2.52.0
-

diff --git a/cargo-deny-fix-metadata.diff b/cargo-deny-fix-metadata.diff
index 7c2cf1c..af2ac1a 100644
--- a/cargo-deny-fix-metadata.diff
+++ b/cargo-deny-fix-metadata.diff
@@ -1,5 +1,5 @@
 --- cargo-deny-0.18.9/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ cargo-deny-0.18.9/Cargo.toml	2026-05-09T13:31:00.354587+00:00
++++ cargo-deny-0.18.9/Cargo.toml	2026-06-28T05:57:45.091916+00:00
 @@ -105,12 +105,13 @@
  version = "0.7"
  

diff --git a/rust-cargo-deny.spec b/rust-cargo-deny.spec
index c71adda..6a03ed9 100644
--- a/rust-cargo-deny.spec
+++ b/rust-cargo-deny.spec
@@ -14,10 +14,6 @@ Source:         %{crates_source}
 # Manually created patch for downstream crate metadata changes
 # * bump gix to version 0.83
 Patch:          cargo-deny-fix-metadata.diff
-# * Downstream: temporarily preserve gix 0.73 compatibility
-# * This partially reverts 7e0cff3.
-# * Remove this patch once we have gix 0.75.
-Patch10:        0001-Downstream-temporarily-preserve-gix-0.73-compatibili.patch
 
 BuildRequires:  cargo-rpm-macros >= 24
 

diff --git a/rust2rpm.toml b/rust2rpm.toml
index 761153d..0f6acbd 100644
--- a/rust2rpm.toml
+++ b/rust2rpm.toml
@@ -17,15 +17,6 @@ package-extra = """
 %endif
 """
 
-[[package.extra-patches]]
-number = 10
-file = "0001-Downstream-temporarily-preserve-gix-0.73-compatibili.patch"
-comments = [
-    "Downstream: temporarily preserve gix 0.73 compatibility",
-    "This partially reverts 7e0cff3.",
-    "Remove this patch once we have gix 0.75.",
-]
-
 [tests]
 skip = [
     "advisories::cfg::test::deserializes_advisories_cfg",

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-07-01 11:00 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-01 11:00 [rpms/rust-cargo-deny] f44: Remove patch for gix 0.73 compatibility, no longer needed Benjamin A. Beasley

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox