diff --git a/0001-Modify-cargo-confign-file.patch b/0001-Modify-cargo-confign-file.patch new file mode 100644 index 0000000000000000000000000000000000000000..7ab3fcf834b200226ac12f2313bb92d5549b2ac9 --- /dev/null +++ b/0001-Modify-cargo-confign-file.patch @@ -0,0 +1,27 @@ +From 03a3d3d25f23dac11bb9a984cce028820b960da5 Mon Sep 17 00:00:00 2001 +From: li-long315 +Date: Thu, 23 Mar 2023 14:25:10 +0800 +Subject: [PATCH] Modify cargo confign file + +Signed-off-by: li-long315 +--- + .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/cargo.tar.gz b/cargo-vendor.tar.gz similarity index 37% rename from cargo.tar.gz rename to cargo-vendor.tar.gz index 5458dbb03efeaad0893ec2862187fc2118827693..0eb057d77cc7367b1b5b23e10df95b60d0c202ea 100644 Binary files a/cargo.tar.gz and b/cargo-vendor.tar.gz differ diff --git a/librsvg-2.55.1.tar.xz b/librsvg-2.55.90.tar.xz similarity index 43% rename from librsvg-2.55.1.tar.xz rename to librsvg-2.55.90.tar.xz index 56e5b59b8406f3dd22360d3c96df235a89d62a57..1040fed57d39bb0d22de8175002ca518b5460d9f 100644 Binary files a/librsvg-2.55.1.tar.xz and b/librsvg-2.55.90.tar.xz differ diff --git a/librsvg2.spec b/librsvg2.spec index 4aed9e3f47ae75965933e5a1ed9dee2c4fe746be..b3c32548af64dd45326a4a60d8b330a621174bf5 100644 --- a/librsvg2.spec +++ b/librsvg2.spec @@ -1,21 +1,39 @@ -%undefine _strict_symbol_defs_build -%global _configure_disable_silent_rules 1 -%global bundled_rust_deps 1 -%global cairo_version 1.16.0 +%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.55.1 +Version: 2.55.90 Release: 1 Summary: An SVG library based on cairo License: LGPLv2+ URL: https://wiki.gnome.org/Projects/LibRsvg Source0: https://download.gnome.org/sources/librsvg/2.55/librsvg-%{version}.tar.xz -Source1: cargo.tar.gz - -BuildRequires: chrpath gcc gobject-introspection-devel libxml2-devel gi-docgen -BuildRequires: fontconfig-devel gdk-pixbuf2-devel glib2-devel make -BuildRequires: pango-devel vala python3-docutils -BuildRequires: pkgconfig(cairo-gobject) >= %{cairo_version} cairo-devel >= %{cairo_version} +Source1: cargo-vendor.tar.gz + +Patch0: 0001-Modify-cargo-confign-file.patch + +BuildRequires: chrpath +BuildRequires: gcc +BuildRequires: gi-docgen +BuildRequires: gobject-introspection-devel +BuildRequires: make +BuildRequires: pkgconfig(cairo) >= %{cairo_version} +BuildRequires: pkgconfig(cairo-gobject) >= %{cairo_version} +BuildRequires: pkgconfig(cairo-png) >= %{cairo_version} +BuildRequires: pkgconfig(fontconfig) +BuildRequires: pkgconfig(gdk-pixbuf-2.0) +BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(gio-unix-2.0) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gthread-2.0) +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(pangocairo) +BuildRequires: pkgconfig(pangoft2) +BuildRequires: vala +BuildRequires: python3-docutils %if 0%{?bundled_rust_deps} BuildRequires: cargo BuildRequires: rust @@ -48,22 +66,20 @@ This package provides extra utilities based on the librsvg library. %package_help %prep -tar xf %{SOURCE1} -C ~/ -%autosetup -n librsvg-%{version} -p1 - -%if ! 0%{?bundled_rust_deps} -rm -vrf vendor .cargo Cargo.lock -sed -i Makefile.am -e 's/$(CARGO) --locked/$(CARGO)/' +%setup -q -n librsvg-%{version} +tar xvf %{SOURCE1} +sed -i Makefile.am -e 's/$(CARGO) --locked/$(CARGO) --offline/' +sed -i Makefile.in -e 's/$(CARGO) --locked/$(CARGO) --offline/' %cargo_prep -%endif +%patch0 -p1 -%if ! 0%{?bundled_rust_deps} +%if 0%{?bundled_rust_deps} %generate_buildrequires %cargo_generate_buildrequires %endif %build -#export CARGO="%__cargo" + %configure --disable-static \ --disable-gtk-doc \ --docdir=%{_datadir}/doc/%{name} \ @@ -108,6 +124,9 @@ rm -f %{buildroot}%{_pkgdocdir}/COMPILING.md %{_mandir}/man1/*.1* %changelog +* Thu Mar 23 2023 li-long315 - 2.55.90-1 +- Upgrade to 2.55.90 + * Mon Jan 02 2023 lin zhang - 2.55.1-1 - Update to 2.55.1 and add cargo compile files