Date: Thursday, March 17, 2022 @ 00:43:26 Author: heftig Revision: 1156223
2.54.0-1 Modified: lib32-librsvg/trunk/PKGBUILD lib32-librsvg/trunk/multilib.diff ---------------+ PKGBUILD | 25 +++++++++++----------- multilib.diff | 63 ++++++++++++++++++++++++++++++++++++++++++++------------ 2 files changed, 63 insertions(+), 25 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-03-17 00:25:06 UTC (rev 1156222) +++ PKGBUILD 2022-03-17 00:43:26 UTC (rev 1156223) @@ -4,7 +4,7 @@ # Contributor: Jan de Groot <[email protected]> pkgname=lib32-librsvg -pkgver=2.52.7 +pkgver=2.54.0 pkgrel=1 epoch=2 pkgdesc="SVG rendering library (32-bit)" @@ -11,15 +11,15 @@ url="https://wiki.gnome.org/Projects/LibRsvg"; arch=(x86_64) license=(LGPL) -depends=(lib32-gdk-pixbuf2 lib32-pango lib32-libxml2 librsvg) -makedepends=(gobject-introspection gtk-doc git rust lib32-rust-libs) +depends=(lib32-cairo lib32-freetype2 lib32-gdk-pixbuf2 lib32-glib2 + lib32-harfbuzz lib32-libxml2 lib32-pango librsvg) +makedepends=(gobject-introspection git rust lib32-rust-libs) checkdepends=(ttf-dejavu) -provides=(librsvg-${pkgver%%.*}.so) -_commit=bd01002f6c92b35a80b445f2e96f0ac3a7bc5bea # tags/2.52.7^0 +_commit=bad722eb736b84e043d824df1683b63d73421ca7 # tags/2.54.0^0 source=("git+https://gitlab.gnome.org/GNOME/librsvg.git#commit=$_commit"; multilib.diff) sha256sums=('SKIP' - 'b3d86492069009dad784f542a9c681248bc2fe3802899175e06c0c9931679536') + '57b647c6fb237c1f1457b04dca69c95e123581983dbfb7b0ad144f4720313a6b') pkgver() { cd librsvg @@ -29,7 +29,7 @@ prepare() { cd librsvg - # Hack to cross-compile rust only + # Hack to remove docs and cross-compile rust only git apply -3 ../multilib.diff NOCONFIGURE=1 ./autogen.sh @@ -47,21 +47,22 @@ export RUST_TARGET=i686-unknown-linux-gnu ./configure --prefix=/usr --disable-static --disable-vala \ - --disable-gtk-doc --disable-introspection --libdir=/usr/lib32 + --disable-introspection --libdir=/usr/lib32 sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool make } check() { - cd librsvg # Test suite is very dependent on the versions of # Cairo, Pango, FreeType and HarfBuzz - make check || : + make -C librsvg check || : } package() { - cd librsvg - make DESTDIR="$pkgdir" install + provides=(librsvg-${pkgver%%.*}.so) + + make -C librsvg DESTDIR="$pkgdir" install + rm -r "$pkgdir"/usr/{bin,include,share} } Modified: multilib.diff =================================================================== --- multilib.diff 2022-03-17 00:25:06 UTC (rev 1156222) +++ multilib.diff 2022-03-17 00:43:26 UTC (rev 1156223) @@ -1,11 +1,13 @@ - Makefile.am | 2 -- - configure.ac | 4 +--- - 2 files changed, 1 insertion(+), 5 deletions(-) - -diff --git c/Makefile.am i/Makefile.am -index e93714e4..effe5d3d 100644 ---- c/Makefile.am -+++ i/Makefile.am +diff --git i/Makefile.am w/Makefile.am +index a2ec6f42..236d01e3 100644 +--- i/Makefile.am ++++ w/Makefile.am +@@ -1,4 +1,4 @@ +-SUBDIRS = . gdk-pixbuf-loader tests doc win32 ++SUBDIRS = . gdk-pixbuf-loader tests win32 + + NULL = + @@ -137,9 +137,7 @@ else CARGO_RELEASE_ARGS=--release endif @@ -16,11 +18,46 @@ CARGO_VERBOSE = $(cargo_verbose_$(V)) cargo_verbose_ = $(cargo_verbose_$(AM_DEFAULT_VERBOSITY)) -diff --git c/configure.ac i/configure.ac -index 41590ca9..84cd56bd 100644 ---- c/configure.ac -+++ i/configure.ac -@@ -255,9 +255,7 @@ AC_ARG_VAR(RUST_TARGET, [Set rust target (default=$host)]) +@@ -228,13 +226,6 @@ $(RSVG_CONVERT_BIN): $(RSVG_CONVERT_SRC) + rsvg-convert$(EXEEXT): $(RSVG_CONVERT_BIN) + cd $(LIBRSVG_BUILD_DIR) && mv $(RSVG_CONVERT_BIN) rsvg-convert$(EXEEXT) + +-rsvg-convert.1: rsvg-convert.rst +- $(RST2MAN) $(top_srcdir)/rsvg-convert.rst rsvg-convert.1 +- +-man1_MANS = rsvg-convert.1 +- +-CLEANFILES += rsvg-convert.1 +- + dist_doc_DATA = \ + COMPILING.md \ + CONTRIBUTING.md \ +diff --git i/configure.ac w/configure.ac +index 0bc55612..07b0cea4 100644 +--- i/configure.ac ++++ w/configure.ac +@@ -113,20 +113,6 @@ AX_COMPARE_VERSION([$rust_version],[lt],[$MINIMUM_RUST_VER], [ + AC_MSG_ERROR([librsvg needs at least rustc version $MINIMUM_RUST_VER]) + ]) + +-dnl Man page generator +- +-AC_CHECK_PROGS(RST2MAN, [rst2man rst2man.py], [no]) +-AS_IF(test x$RST2MAN = xno, +- AC_MSG_ERROR([rst2man is required. Please install python3-docutils.]) +-) +- +-dnl Gi-docgen +- +-AC_CHECK_TOOL(GI_DOCGEN, [gi-docgen], [no]) +-AS_IF(test x$GI_DOCGEN = xno, +- AC_MSG_ERROR([gi-docgen is required. Please install it.]) +-) +- + dnl =========================================================================== + + #AC_CANONICAL_HOST +@@ -276,9 +262,7 @@ AC_ARG_VAR(RUST_TARGET, [Set rust target (default=$host)]) : ${RUST_TARGET:=$host} AM_CONDITIONAL([CROSS_COMPILING], [test "x$cross_compiling" = xyes])
