bump(main/librsvg): 2.59.0

Fixes #21465

packages/librsvg/build.sh

@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://wiki.gnome.org/action/show/Projects/LibRsvg
 TERMUX_PKG_DESCRIPTION="Library to render SVG files using cairo"
 TERMUX_PKG_LICENSE="LGPL-2.1"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION="2.58.3"
+TERMUX_PKG_VERSION="2.59.0"
 TERMUX_PKG_SRCURL=https://ftp.gnome.org/pub/GNOME/sources/librsvg/${TERMUX_PKG_VERSION%.*}/librsvg-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=49f29a0a92f4c2d19a2cb41e96ab2fce7eb5bde41850c8a914fcf655e3110944
+TERMUX_PKG_SHA256=370d6ada5cf0de91ceb70d849ed069523ce5de2b33b4c7e86bc640673ad65483
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="fontconfig, freetype, gdk-pixbuf, glib, harfbuzz, libcairo, libpng, libxml2, pango"
 TERMUX_PKG_BUILD_DEPENDS="g-ir-scanner"
@@ -13,15 +13,22 @@ TERMUX_PKG_REPLACES="librsvg-dev"
 TERMUX_PKG_VERSIONED_GIR=false
 TERMUX_PKG_DISABLE_GIR=false
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
-ac_cv_path_GDK_PIXBUF_QUERYLOADERS=$TERMUX_PREFIX/bin/gdk-pixbuf-query-loaders
---disable-gtk-doc
---enable-introspection
---disable-static
+-Ddocs=disabled
+-Dintrospection=enabled
+-Dtests=false
 "
 
 termux_step_pre_configure() {
 	termux_setup_gir
+	termux_setup_meson
 	termux_setup_rust
+	termux_setup_cargo_c
+	
+	# termux_setup_rust unsets CFLAGS so we called termux_setup_meson before
+	# we need to reset termux_setup_meson to avoid `line 70: CFLAGS: unbound variable` error
+	termux_setup_meson() { :; }
+
+	sed -i 's/@BUILD_TRIPLET@/'"$CARGO_TARGET_NAME"'/' "meson.build"
 
 	LDFLAGS+=" -fuse-ld=lld"
 

packages/librsvg/meson.build.patch

@@ -0,0 +1,25 @@
++++ ./meson.build
+@@ -160,7 +160,7 @@
+ if host_system == 'windows'
+   build_gir = get_option('introspection').require(get_option('default_library') != 'static' and not meson.is_cross_build() and gi_dep.found())
+ else
+-  build_gir = get_option('introspection').require(not meson.is_cross_build() and gi_dep.found())
++  build_gir = get_option('introspection').require(gi_dep.found())
+ endif
+ build_vala = get_option('vala').require(not meson.is_cross_build() and vapigen_dep.found())
+ 
+@@ -451,13 +451,7 @@
+   cargo_wrapper_args += ['--release']
+ endif
+ 
+-if target_arg != []
+-  cargo_wrapper_args += target_arg
+-endif
+-if toolchain_arg != []
+-  cargo_wrapper_args += toolchain_arg
+-endif
+-
++cargo_wrapper_args += ['--target', '@BUILD_TRIPLET@']
+ # avif support with dav1d
+ 
+ if dav1d_dep.found()

packages/librsvg/no-pixbuf-loaders-cache.patch

@@ -1,35 +0,0 @@
---- a/gdk-pixbuf-loader/Makefile.am
-+++ b/gdk-pixbuf-loader/Makefile.am
-@@ -48,10 +48,7 @@
- 	$(AM_LDFLAGS)
- rsvg_loader_LDADD = \
- 	$(GDK_PIXBUF_LIBS)
--EXTRA_rsvg_loader_DEPENDENCIES = libpixbufloader-svg.la gdk-pixbuf-loaders
--
--gdk-pixbuf-loaders: Makefile
--	$(AM_V_GEN) ( $(GDK_PIXBUF_QUERYLOADERS) ./libpixbufloader-svg.la && GDK_PIXBUF_MODULEDIR=$(gdk_pixbuf_moduledir) $(GDK_PIXBUF_QUERYLOADERS)) > gdk-pixbuf.loaders 2>/dev/null
-+EXTRA_rsvg_loader_DEPENDENCIES = libpixbufloader-svg.la
- 
- if CROSS_COMPILING
- RUN_QUERY_LOADER_TEST=false
---- a/gdk-pixbuf-loader/Makefile.in
-+++ b/gdk-pixbuf-loader/Makefile.in
-@@ -455,7 +455,7 @@
- @ENABLE_PIXBUF_LOADER_TRUE@rsvg_loader_LDADD = \
- @ENABLE_PIXBUF_LOADER_TRUE@	$(GDK_PIXBUF_LIBS)
- 
--@ENABLE_PIXBUF_LOADER_TRUE@EXTRA_rsvg_loader_DEPENDENCIES = libpixbufloader-svg.la gdk-pixbuf-loaders
-+@ENABLE_PIXBUF_LOADER_TRUE@EXTRA_rsvg_loader_DEPENDENCIES = libpixbufloader-svg.la
- @CROSS_COMPILING_FALSE@@ENABLE_PIXBUF_LOADER_TRUE@RUN_QUERY_LOADER_TEST = test -z "$(DESTDIR)"
- @CROSS_COMPILING_TRUE@@ENABLE_PIXBUF_LOADER_TRUE@RUN_QUERY_LOADER_TEST = false
- @ENABLE_PIXBUF_LOADER_TRUE@thumbnailerdir = $(datadir)/thumbnailers/
-@@ -865,9 +865,6 @@
- .PRECIOUS: Makefile
- 
- 
--@ENABLE_PIXBUF_LOADER_TRUE@gdk-pixbuf-loaders: Makefile
--@ENABLE_PIXBUF_LOADER_TRUE@	$(AM_V_GEN) ( $(GDK_PIXBUF_QUERYLOADERS) ./libpixbufloader-svg.la && GDK_PIXBUF_MODULEDIR=$(gdk_pixbuf_moduledir) $(GDK_PIXBUF_QUERYLOADERS)) > gdk-pixbuf.loaders 2>/dev/null
--
- # The following bit is stolen from gdk-pixbuf/gdk-pixbuf/Makefile.am:
- #
- # Running this if cross compiling or if DESTDIR is set is going to