From ecd2e5d9d690b54c0132128b692189de099c86b8 Mon Sep 17 00:00:00 2001
From: liweigang <liweiganga@uniontech.com>
Date: Fri, 9 May 2025 16:46:07 +0800
Subject: [PATCH] use rust compiler

---
 0001-Modify-cargo-confign-file.patch | 27 ---------------------------
 librsvg2.spec                        | 25 +++++++++++--------------
 2 files changed, 11 insertions(+), 41 deletions(-)
 delete mode 100644 0001-Modify-cargo-confign-file.patch

diff --git a/0001-Modify-cargo-confign-file.patch b/0001-Modify-cargo-confign-file.patch
deleted file mode 100644
index 7ab3fcf..0000000
--- a/0001-Modify-cargo-confign-file.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 03a3d3d25f23dac11bb9a984cce028820b960da5 Mon Sep 17 00:00:00 2001
-From: li-long315 <lilong@kylinos.cn>
-Date: Thu, 23 Mar 2023 14:25:10 +0800
-Subject: [PATCH] Modify cargo confign file
-
-Signed-off-by: li-long315 <lilong@kylinos.cn>
----
- .cargo/config | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/.cargo/config b/.cargo/config
-index cea9e5be..930525eb 100644
---- a/.cargo/config
-+++ b/.cargo/config
-@@ -19,5 +19,7 @@ verbose = true
- directory = "/usr/share/cargo/registry"
- 
- [source.crates-io]
--registry = "https://crates.io"
--replace-with = "local-registry"
-+replace-with = "vendored-sources"
-+
-+[source.vendored-sources]
-+directory = "vendor"
--- 
-2.39.1
-
diff --git a/librsvg2.spec b/librsvg2.spec
index bcc5cd2..af99c6f 100644
--- a/librsvg2.spec
+++ b/librsvg2.spec
@@ -1,20 +1,17 @@
 %bcond_without check
 %undefine _strict_symbol_defs_build
 %global _configure_disable_silent_rules 1
-%global bundled_rust_deps 0
 %global cairo_version 1.16.0
 
 Name:           librsvg2
 Version:        2.57.92
-Release:        3
+Release:        4
 Summary:        An SVG library based on cairo
 License:        LGPLv2+
 URL:            https://wiki.gnome.org/Projects/LibRsvg
 Source0:        https://download.gnome.org/sources/librsvg/2.57/librsvg-%{version}.tar.xz
 Source1:        vendor.tar.xz
 
-Patch0:         0001-Modify-cargo-confign-file.patch
-
 BuildRequires:  chrpath
 BuildRequires:  gcc
 BuildRequires:  gi-docgen
@@ -34,12 +31,8 @@ BuildRequires:  pkgconfig(pangocairo)
 BuildRequires:  pkgconfig(pangoft2)
 BuildRequires:  vala
 BuildRequires:  python3-docutils
-%if 0%{?bundled_rust_deps}
 BuildRequires:  cargo
 BuildRequires:  rust
-%else
-BuildRequires:  rust-packaging
-%endif
 
 Requires:       cairo >= %{cairo_version}
 Requires:       cairo-gobject >= %{cairo_version}
@@ -70,13 +63,14 @@ This package provides extra utilities based on the librsvg library.
 rm -vrf vendor .cargo Cargo.lock
 tar xvf %{SOURCE1}
 sed -i Makefile.am -e 's/$(CARGO) --locked/$(CARGO)/'
-%cargo_prep
-%patch0 -p1
+mkdir .cargo
+cat >> .cargo/config.toml << EOF
+[source.crates-io]
+replace-with = "vendored-sources"
 
-%if 0%{?bundled_rust_deps}
-%generate_buildrequires
-%cargo_generate_buildrequires
-%endif
+[source.vendored-sources]
+directory = "vendor"
+EOF
 
 %build
 autoreconf -fiv
@@ -124,6 +118,9 @@ rm -f %{buildroot}%{_pkgdocdir}/COMPILING.md
 %{_mandir}/man1/*.1*
 
 %changelog
+* Fri May 09 2025 liweigang <liweiganga@uniontech.com> - 2.57.92-4
+- use rust compiler
+
 * Fri Jul 19 2024 liweigang <liweiganga@uniontech.com> - 2.57.92-3
 - fix build error(automake 1.17)
 
-- 
Gitee