diff --git a/packages/librsvg/build.sh b/packages/librsvg/build.sh index db83a46ad..2290c51a5 100644 --- a/packages/librsvg/build.sh +++ b/packages/librsvg/build.sh @@ -2,12 +2,16 @@ 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.0" TERMUX_PKG_VERSION=2.46.4 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=http://ftp.gnome.org/pub/GNOME/sources/librsvg/${TERMUX_PKG_VERSION:0:4}/librsvg-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=b45b9ee3b64c58baaf800bcdff5fcd04d79930dba4c56e46e0d3b0aead40cc29 TERMUX_PKG_DEPENDS="gdk-pixbuf, libcairo, libcroco, pango, zlib" TERMUX_PKG_BREAKS="librsvg-dev" TERMUX_PKG_REPLACES="librsvg-dev" -TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-introspection --disable-pixbuf-loader" +TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" +ac_cv_path_GDK_PIXBUF_QUERYLOADERS=$TERMUX_PREFIX/bin/gdk-pixbuf-query-loaders +--disable-introspection +" termux_step_pre_configure() { termux_setup_rust diff --git a/packages/librsvg/no-pixbuf-loaders-cache.patch b/packages/librsvg/no-pixbuf-loaders-cache.patch new file mode 100644 index 000000000..061602236 --- /dev/null +++ b/packages/librsvg/no-pixbuf-loaders-cache.patch @@ -0,0 +1,37 @@ +diff -uNr librsvg-2.46.4/gdk-pixbuf-loader/Makefile.am librsvg-2.46.4.mod/gdk-pixbuf-loader/Makefile.am +--- librsvg-2.46.4/gdk-pixbuf-loader/Makefile.am 2019-08-22 10:39:24.000000000 +0300 ++++ librsvg-2.46.4.mod/gdk-pixbuf-loader/Makefile.am 2020-01-13 23:51:44.231919334 +0200 +@@ -47,10 +47,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_QUERYLOADERS)) > gdk-pixbuf.loaders 2>/dev/null ++EXTRA_rsvg_loader_DEPENDENCIES = libpixbufloader-svg.la + + if CROSS_COMPILING + RUN_QUERY_LOADER_TEST=false +diff -uNr librsvg-2.46.4/gdk-pixbuf-loader/Makefile.in librsvg-2.46.4.mod/gdk-pixbuf-loader/Makefile.in +--- librsvg-2.46.4/gdk-pixbuf-loader/Makefile.in 2019-11-21 18:53:18.000000000 +0200 ++++ librsvg-2.46.4.mod/gdk-pixbuf-loader/Makefile.in 2020-01-13 23:52:08.176024176 +0200 +@@ -483,7 +483,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/ +@@ -894,9 +894,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_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