[packages/librsvg] add vendor crates; rel 2

atler atler at pld-linux.org
Mon Mar 20 12:51:18 CET 2023


commit ea1b3016e846d248adfa882954aa5c69dc072eae
Author: Jan Palus <atler at pld-linux.org>
Date:   Mon Mar 20 12:50:56 2023 +0100

    add vendor crates; rel 2
    
    releases no longer vendorized since:
    https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/718

 librsvg.spec | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)
---
diff --git a/librsvg.spec b/librsvg.spec
index 4e303b2..bbf5cc4 100644
--- a/librsvg.spec
+++ b/librsvg.spec
@@ -4,6 +4,8 @@
 %bcond_without	static_libs	# static library
 %bcond_without	vala		# Vala API (vala up to 0.38.x already contains librsvg-2.0.vapi)
 
+%define		crates_ver	2.56.0
+
 Summary:	A Raph's Library for Rendering SVG Data
 Summary(pl.UTF-8):	Biblioteka Raph's SVG do renderowania danych SVG
 Summary(pt_BR.UTF-8):	Biblioteca SVG
@@ -11,13 +13,15 @@ Summary(ru.UTF-8):	SVG библиотека
 Summary(uk.UTF-8):	SVG бібліотека
 Name:		librsvg
 Version:	2.56.0
-Release:	1
+Release:	2
 Epoch:		1
 License:	LGPL v2+
 Group:		X11/Libraries
 Source0:	https://download.gnome.org/sources/librsvg/2.56/%{name}-%{version}.tar.xz
 # Source0-md5:	ee5fa3ce1653b5b313e52007c53ab190
-Source1:	rsvg
+Source1:	%{name}-crates-%{crates_ver}.tar.xz
+# Source1-md5:	1b301d70073e295aee1a284e6bef4aac
+Source2:	rsvg
 Patch0:		x32.patch
 URL:		https://wiki.gnome.org/Projects/LibRsvg
 BuildRequires:	autoconf >= 2.69
@@ -169,14 +173,31 @@ Vala API for librsvg library.
 API języka Vala do biblioteki librsvg.
 
 %prep
-%setup -q
+%setup -q -a1
 %patch0 -p1
 
 %ifarch x32
 %{__sed} -i -e 's/test "\?x\?\$cross_compiling"\? = "\?x\?yes"\?/true/' configure.ac
 %endif
 
+%{__mv} librsvg-%{crates_ver}/* .
+sed -i -e 's/@@VERSION@@/%{version}/' Cargo.lock
+
+# use our offline registry
+export CARGO_HOME="$(pwd)/.cargo"
+
+mkdir -p "$CARGO_HOME"
+cat >.cargo/config <<EOF
+[source.crates-io]
+registry = 'https://github.com/rust-lang/crates.io-index'
+replace-with = 'vendored-sources'
+
+[source.vendored-sources]
+directory = '$PWD/vendor'
+EOF
+
 %build
+export CARGO_HOME="$(pwd)/.cargo"
 %{__libtoolize}
 %{__aclocal} -I m4
 %{__autoconf}
@@ -197,6 +218,8 @@ API języka Vala do biblioteki librsvg.
 %install
 rm -rf $RPM_BUILD_ROOT
 
+export CARGO_HOME="$(pwd)/.cargo"
+
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
 	pkgconfigdir=%{_pkgconfigdir}
@@ -207,7 +230,7 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/librsvg-2.la
 
-cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}
 
 %if %{with apidocs}
 install -d $RPM_BUILD_ROOT%{_gtkdocdir}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/librsvg.git/commitdiff/ea1b3016e846d248adfa882954aa5c69dc072eae



More information about the pld-cvs-commit mailing list