Upgrade to 2.55.90

This commit is contained in:
li-long315 2023-03-15 15:27:03 +08:00
parent 7f0fb46e55
commit dc64acc5cd
6 changed files with 65 additions and 19 deletions

View File

@ -0,0 +1,27 @@
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

BIN
cargo-vendor.tar.gz Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
librsvg-2.55.90.tar.xz Normal file

Binary file not shown.

View File

@ -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
Source1: cargo-vendor.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}
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 <lilong@kylinos.cn> - 2.55.90-1
- Upgrade to 2.55.90
* Mon Jan 02 2023 lin zhang <lin.zhang@turbolinux.com.cn> - 2.55.1-1
- Update to 2.55.1 and add cargo compile files