From bb6bf4a61af8f6855fe9ad010eb93471dfa2a00f Mon Sep 17 00:00:00 2001
From: Jan Horak <jhorak@redhat.com>
Date: Fri, 7 Feb 2025 11:19:45 +0100
Subject: [PATCH] Fixing build failures - cargo.lock version too high for RHEL8

Resolves: RHEL-76251
---
 build-cargo-lock-version.patch | 11 +++++++++++
 thunderbird.spec               |  4 ++++
 2 files changed, 15 insertions(+)
 create mode 100644 build-cargo-lock-version.patch

diff --git a/build-cargo-lock-version.patch b/build-cargo-lock-version.patch
new file mode 100644
index 0000000..a94c27b
--- /dev/null
+++ b/build-cargo-lock-version.patch
@@ -0,0 +1,11 @@
+diff -up thunderbird-128.7.0/comm/rust/Cargo.lock.cargo-lock thunderbird-128.7.0/comm/rust/Cargo.lock
+--- thunderbird-128.7.0/comm/rust/Cargo.lock.cargo-lock	2025-02-07 10:14:12.483795636 +0100
++++ thunderbird-128.7.0/comm/rust/Cargo.lock	2025-02-07 10:14:15.654801697 +0100
+@@ -1,6 +1,6 @@
+ # This file is automatically @generated by Cargo.
+ # It is not intended for manual editing.
+-version = 4
++version = 3
+ 
+ [[package]]
+ name = "aa-stroke"
diff --git a/thunderbird.spec b/thunderbird.spec
index 1f5a9f3..c2253ed 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -200,6 +200,7 @@ Patch11:        rust-file-removal.patch
 Patch12:        firefox-system-nss-replace-xyber-with-mlkem.patch
 # Thunderbird has a copy of third_party/rust/neqo-crypto/ in comm/third_party/rust/neqo-crypto/
 Patch13:        thunderbird-system-nss-replace-xyber-with-mlkem.patch
+Patch14:        build-cargo-lock-version.patch
 
 # -- Upstreamed patches --
 Patch51:       mozilla-bmo1170092.patch
@@ -1071,6 +1072,9 @@ echo "--------------------------------------------"
 %patch -P12 -p1 -b .firefox-system-nss-replace-xyber-with-mlkem
 %patch -P13 -p1 -b .thunderbird-system-nss-replace-xyber-with-mlkem
 %endif
+%if 0%{?rhel} == 8
+%patch -P14 -p1 -b .cargo-lock-version
+%endif
 
 # -- Upstreamed patches --
 %patch -P51 -p1 -b .mozilla-bmo1170092