librsvg: Update to 2.54.0

This commit is contained in:
Tee KOBAYASHI 2022-03-24 21:41:34 +09:00 committed by xtkoba
parent 10fa930218
commit 0d6d755667
3 changed files with 53 additions and 14 deletions

View File

@ -2,10 +2,10 @@ 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"
_MAJOR_VERSION=2.52
TERMUX_PKG_VERSION=${_MAJOR_VERSION}.7
_MAJOR_VERSION=2.54
TERMUX_PKG_VERSION=${_MAJOR_VERSION}.0
TERMUX_PKG_SRCURL=https://ftp.gnome.org/pub/GNOME/sources/librsvg/${_MAJOR_VERSION}/librsvg-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_SHA256=057c1eeeaf85c84e254bdb707459207f5840da5b4d52b4711c03140ed09e6887
TERMUX_PKG_SHA256=baf8ebc147f146b4261bb3d0cd0fac944bf8dbb4b1f2347d23341f974dcc3085
TERMUX_PKG_DEPENDS="fontconfig, freetype, gdk-pixbuf, glib, harfbuzz, libcairo, libpng, libxml2, pango, zlib"
TERMUX_PKG_BREAKS="librsvg-dev"
TERMUX_PKG_REPLACES="librsvg-dev"
@ -13,6 +13,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
ac_cv_path_GDK_PIXBUF_QUERYLOADERS=$TERMUX_PREFIX/bin/gdk-pixbuf-query-loaders
--disable-introspection
--disable-static
ac_cv_prog_GI_DOCGEN=:
"
termux_step_pre_configure() {

View File

@ -0,0 +1,40 @@
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -14,8 +14,7 @@
CLEANFILES = build.stamp
-build.stamp: $(DOCS_SRC) $(HEADERS_WITH_DOCS) $(GIR_FILE)
- $(GI_DOCGEN) generate -C $(srcdir)/librsvg.toml --content-dir=$(top_srcdir)/doc $(GIR_FILE)
+build.stamp:
touch build.stamp
clean-local:
@@ -23,7 +22,6 @@
install-data-local: build.stamp
$(MKDIR_P) $(DESTDIR)/$(docdir)/Rsvg-2.0
- for f in Rsvg-2.0/*; do $(INSTALL_DATA) $$f $(DESTDIR)/$(docdir)/Rsvg-2.0; done
uninstall-local:
rm -rf $(DESTDIR)/$(docdir)/Rsvg-2.0
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -511,8 +511,7 @@
.PRECIOUS: Makefile
-build.stamp: $(DOCS_SRC) $(HEADERS_WITH_DOCS) $(GIR_FILE)
- $(GI_DOCGEN) generate -C $(srcdir)/librsvg.toml --content-dir=$(top_srcdir)/doc $(GIR_FILE)
+build.stamp:
touch build.stamp
clean-local:
@@ -520,7 +519,6 @@
install-data-local: build.stamp
$(MKDIR_P) $(DESTDIR)/$(docdir)/Rsvg-2.0
- for f in Rsvg-2.0/*; do $(INSTALL_DATA) $$f $(DESTDIR)/$(docdir)/Rsvg-2.0; done
uninstall-local:
rm -rf $(DESTDIR)/$(docdir)/Rsvg-2.0

View File

@ -1,22 +1,20 @@
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 @@
--- 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_QUERYLOADERS)) > gdk-pixbuf.loaders 2>/dev/null
- $(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
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 @@
--- 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)
@ -25,12 +23,12 @@ diff -uNr librsvg-2.46.4/gdk-pixbuf-loader/Makefile.in librsvg-2.46.4.mod/gdk-pi
@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 @@
@@ -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_QUERYLOADERS)) > gdk-pixbuf.loaders 2>/dev/null
-@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:
#