[packages/librsvg] - updated to 2.60.0, uses meson now

qboosh qboosh at pld-linux.org
Fri Mar 21 21:06:56 CET 2025 

commit 1434dc6d5de33cb69f0a008949037f2dd5d076c7
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Mar 21 20:59:00 2025 +0100

    - updated to 2.60.0, uses meson now

 librsvg.spec | 91 ++++++++++++++++++++++++------------------------------------
 x32.patch    | 11 --------
 2 files changed, 37 insertions(+), 65 deletions(-)
---
diff --git a/librsvg.spec b/librsvg.spec
index e9ac207..afb42ec 100644
--- a/librsvg.spec
+++ b/librsvg.spec
@@ -4,7 +4,7 @@
 %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.58.5
+%define		crates_ver	2.60.0
 
 Summary:	A Raph's Library for Rendering SVG Data
 Summary(pl.UTF-8):	Biblioteka Raph's SVG do renderowania danych SVG
@@ -12,49 +12,51 @@ Summary(pt_BR.UTF-8):	Biblioteca SVG
 Summary(ru.UTF-8):	SVG библиотека
 Summary(uk.UTF-8):	SVG бібліотека
 Name:		librsvg
-Version:	2.58.5
+Version:	2.60.0
 Release:	1
 Epoch:		1
 License:	LGPL v2+
 Group:		X11/Libraries
-Source0:	https://download.gnome.org/sources/librsvg/2.58/%{name}-%{version}.tar.xz
-# Source0-md5:	40354357d8da605691ef24dc430550db
-# cargo vendor-filterer --platform='*-unknown-linux-*' --tier=2
+Source0:	https://download.gnome.org/sources/librsvg/2.60/%{name}-%{version}.tar.xz
+# Source0-md5:	ba3320798fec656c58c849df030dd7d3
+# cargo vendor-filterer --platform='*-unknown-linux-*' --tier=2 --features avif,pixbuf
 Source1:	%{name}-crates-%{crates_ver}.tar.xz
-# Source1-md5:	c4e0788dfaea389cae5141c20757944d
+# Source1-md5:	78edcd0935254159444a94c1d595b9c8
 Source2:	rsvg
-Patch0:		x32.patch
 URL:		https://wiki.gnome.org/Projects/LibRsvg
-BuildRequires:	autoconf >= 2.69
-BuildRequires:	automake >= 1:1.9
-BuildRequires:	cairo-devel >= 1.17.0
-BuildRequires:	cairo-gobject-devel >= 1.17.0
+BuildRequires:	cairo-devel >= 1.18.0
+BuildRequires:	cairo-gobject-devel >= 1.18.0
 BuildRequires:	cargo
+BuildRequires:	cargo-c >= 0.9.19
+BuildRequires:	dav1d-devel >= 1.3.0
 BuildRequires:	docbook-dtd43-xml
 BuildRequires:	docutils
 BuildRequires:	fontconfig-devel
 # pkgconfig(freetype) >= 20.0.14
 BuildRequires:	freetype-devel >= 1:2.8
-BuildRequires:	gdk-pixbuf2-devel >= 2.20
-%{?with_apidocs:BuildRequires:	gi-docgen}
+# with fixed gdk_pixbuf_query_loaders in .pc file
+BuildRequires:	gdk-pixbuf2-devel >= 2.42.12-2
+%{?with_apidocs:BuildRequires:	gi-docgen >= 2021.1}
 BuildRequires:	glib2-devel >= 1:2.50.0
-BuildRequires:	gobject-introspection-devel >= 0.10.8
+BuildRequires:	gobject-introspection-devel >= 1.39.0
 BuildRequires:	harfbuzz-devel >= 2.0.0
-BuildRequires:	libtool >= 2:2.0
 BuildRequires:	libxml2-devel >= 1:2.9.0
+BuildRequires:	meson >= 1.3.0
+BuildRequires:	ninja >= 1.5
 BuildRequires:	pango-devel >= 1:1.50.0
 BuildRequires:	pkgconfig
 BuildRequires:	rpm-build >= 4.6
 BuildRequires:	rpm-pythonprov
-BuildRequires:	rpmbuild(macros) >= 2.029
-BuildRequires:	rust >= 1.70.0
+BuildRequires:	rpmbuild(macros) >= 2.042
+BuildRequires:	rust >= 1.77.2
 BuildRequires:	sed >= 4.0
 BuildRequires:	tar >= 1:1.22
 %{?with_vala:BuildRequires:	vala >= 2:0.18}
 BuildRequires:	xz
 Requires(post,postun):	/sbin/ldconfig
 Requires(post,postun):	gdk-pixbuf2
-Requires:	cairo-gobject >= 1.17.0
+Requires:	cairo-gobject >= 1.18.0
+Requires:	dav1d >= 1.3.0
 Requires:	freetype >= 1:2.8
 Requires:	gdk-pixbuf2 >= 2.20
 Requires:	glib2 >= 1:2.50.0
@@ -100,7 +102,7 @@ Summary(ru.UTF-8):	Библиотечные линки и файлы загол
 Summary(uk.UTF-8):	Бібліотечні лінки та файли заголовків для розробки з librsvg
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	cairo-gobject-devel >= 1.17.0
+Requires:	cairo-gobject-devel >= 1.18.0
 Requires:	freetype-devel >= 1:2.8
 Requires:	gdk-pixbuf2-devel >= 2.20
 Requires:	glib2-devel >= 1:2.50.0
@@ -174,20 +176,14 @@ API języka Vala do biblioteki librsvg.
 
 %prep
 %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
+cat >.cargo/config.toml <<EOF
 [source.crates-io]
 replace-with = 'vendored-sources'
 
@@ -197,37 +193,25 @@ EOF
 
 %build
 export CARGO_HOME="$(pwd)/.cargo"
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
-%ifarch x32
-	RUST_TARGET=x86_64-unknown-linux-gnux32 \
-%endif
-	%{__enable_disable apidocs gtk-doc} \
-	--enable-introspection \
-	--disable-silent-rules \
-	%{__enable_disable static_libs static} \
-	%{?with_vala:--enable-vala}
-
-%{__make}
+export PKG_CONFIG_ALLOW_CROSS=1
+%meson \
+	%{!?with_static_libs:--default-library=shared} \
+	-Davif=enabled \
+	-Ddocs=%{__enabled_disabled apidocs} \
+	-Dintrospection=enabled \
+	-Dpixbuf=enabled \
+	-Dpixbuf-loader=enabled \
+	-Dvala=%{__enabled_disabled vala}
+
+%meson_build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 export CARGO_HOME="$(pwd)/.cargo"
+export PKG_CONFIG_ALLOW_CROSS=1
 
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	pkgconfigdir=%{_pkgconfigdir}
-
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/gdk-pixbuf-2.0/2.*.*/loaders/*.la
-%if %{with static_libs}
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/gdk-pixbuf-2.0/2.*.*/loaders/*.a
-%endif
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/librsvg-2.la
+%meson_install
 
 cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}
 
@@ -235,8 +219,6 @@ cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}
 install -d $RPM_BUILD_ROOT%{_gidocdir}
 %{__mv} $RPM_BUILD_ROOT%{_datadir}/doc/Rsvg-2.0 $RPM_BUILD_ROOT%{_gidocdir}
 %endif
-# README.md packaged as %doc, the rest useful just for developers
-%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/librsvg
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -261,7 +243,7 @@ fi
 %attr(755,root,root) %{_libdir}/librsvg-2.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/librsvg-2.so.2
 %{_libdir}/girepository-1.0/Rsvg-2.0.typelib
-%attr(755,root,root) %{_libdir}/gdk-pixbuf-2.0/2.*.*/loaders/libpixbufloader-svg.so
+%attr(755,root,root) %{_libdir}/gdk-pixbuf-2.0/2.*.*/loaders/libpixbufloader_svg.so
 %{_datadir}/thumbnailers/librsvg.thumbnailer
 %{_mandir}/man1/rsvg-convert.1*
 
@@ -287,5 +269,6 @@ fi
 %if %{with vala}
 %files -n vala-librsvg
 %defattr(644,root,root,755)
+%{_datadir}/vala/vapi/librsvg-2.0.deps
 %{_datadir}/vala/vapi/librsvg-2.0.vapi
 %endif
diff --git a/x32.patch b/x32.patch
deleted file mode 100644
index 875fa03..0000000
--- a/x32.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- librsvg-2.52.0/configure.ac.orig	2021-09-16 17:12:26.890707115 +0200
-+++ librsvg-2.52.0/configure.ac	2021-09-16 17:14:30.413803506 +0200
-@@ -173,7 +173,7 @@
- AS_IF([test "x$enable_pixbuf_loader" = "xyes"], [
-   PKG_CHECK_MODULES([GDK_PIXBUF],[gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED])
- 
--  AC_PATH_PROGS([GDK_PIXBUF_QUERYLOADERS],[gdk-pixbuf-query-loaders gdk-pixbuf-query-loaders-64 gdk-pixbuf-query-loaders-32],[none])
-+  AC_PATH_PROGS([GDK_PIXBUF_QUERYLOADERS],[gdk-pixbuf-query-loaders gdk-pixbuf-query-loaders-64 gdk-pixbuf-query-loaders-32 gdk-pixbuf-query-loaders-x32],[none])
- 
-   AS_IF([test "x$GDK_PIXBUF_QUERYLOADERS" = "xnone"], [
-     AC_MSG_ERROR([gdk-pixbuf-query-loaders not found in path])
================================================================

---- gitweb:

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

More information about the pld-cvs-commit mailing list