[arch-commits] Commit in lib32-librsvg/trunk (PKGBUILD multilib.diff)

[Jan Steffens]

    Date: Saturday, April 23, 2022 @ 11:24:09
  Author: heftig
Revision: 1187593

2.54.1-1

Modified:
  lib32-librsvg/trunk/PKGBUILD
  lib32-librsvg/trunk/multilib.diff

---------------+
 PKGBUILD      |    8 ++++----
 multilib.diff |   49 ++++---------------------------------------------
 2 files changed, 8 insertions(+), 49 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-23 11:21:15 UTC (rev 1187592)
+++ PKGBUILD	2022-04-23 11:24:09 UTC (rev 1187593)
@@ -4,8 +4,8 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 
 pkgname=lib32-librsvg
-pkgver=2.54.0
-pkgrel=2
+pkgver=2.54.1
+pkgrel=1
 epoch=2
 pkgdesc="SVG rendering library (32-bit)"
 url="https://wiki.gnome.org/Projects/LibRsvg"
@@ -16,11 +16,11 @@
 makedepends=(gobject-introspection git rust lib32-rust-libs)
 checkdepends=(ttf-dejavu)
 options=(debug)
-_commit=bad722eb736b84e043d824df1683b63d73421ca7  # tags/2.54.0^0
+_commit=f6dfe9e247c36a6005c4cc75db39c6eef767d1af  # tags/2.54.1^0
 source=("git+https://gitlab.gnome.org/GNOME/librsvg.git#commit=$_commit"
         multilib.diff)
 sha256sums=('SKIP'
-            '57b647c6fb237c1f1457b04dca69c95e123581983dbfb7b0ad144f4720313a6b')
+            '2bf8570948e0ff3da4c26a8c5d600bd3a66f26bc81abcaeb437df28c01aa9a2a')
 
 pkgver() {
   cd librsvg

Modified: multilib.diff
===================================================================
--- multilib.diff	2022-04-23 11:21:15 UTC (rev 1187592)
+++ multilib.diff	2022-04-23 11:24:09 UTC (rev 1187593)
@@ -1,14 +1,8 @@
 diff --git i/Makefile.am w/Makefile.am
-index a2ec6f42..236d01e3 100644
+index 83e73c38..8cb853c7 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
+@@ -141,9 +141,7 @@ else
  CARGO_RELEASE_ARGS=--release
  endif
  
@@ -18,46 +12,11 @@
  
  CARGO_VERBOSE = $(cargo_verbose_$(V))
  cargo_verbose_ = $(cargo_verbose_$(AM_DEFAULT_VERBOSITY))
-@@ -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
+index 9abc587e..d3be718f 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)])
+@@ -278,9 +278,7 @@ AC_ARG_VAR(RUST_TARGET, [Set rust target (default=$host)])
  : ${RUST_TARGET:=$host}
  
  AM_CONDITIONAL([CROSS_COMPILING], [test "x$cross_compiling" = xyes])