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

[Jan Steffens]

    Date: Thursday, September 16, 2021 @ 17:21:59
  Author: heftig
Revision: 1016440

2.52.0-1

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-09-16 17:21:01 UTC (rev 1016439)
+++ PKGBUILD	2021-09-16 17:21:59 UTC (rev 1016440)
@@ -4,7 +4,7 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 
 pkgname=lib32-librsvg
-pkgver=2.50.7
+pkgver=2.52.0
 pkgrel=1
 epoch=2
 pkgdesc="SVG rendering library (32-bit)"
@@ -15,11 +15,11 @@
 makedepends=(gobject-introspection gtk-doc git rust lib32-rust-libs)
 checkdepends=(ttf-dejavu)
 provides=(librsvg-${pkgver%%.*}.so)
-_commit=6ca387974e6a3e248c261d3dac15b8d4a742d3aa  # tags/2.50.7^0
+_commit=1729feb4c197a7dd94fe303931d51eb843bdcaf9  # tags/2.52.0^0
 source=("git+https://gitlab.gnome.org/GNOME/librsvg.git#commit=$_commit"
         multilib.diff)
 sha256sums=('SKIP'
-            '92818f59a43ba67d95fca36fc2fa51fd4b23ab0e010a1aec04ab797088a8964a')
+            'b3d86492069009dad784f542a9c681248bc2fe3802899175e06c0c9931679536')
 
 pkgver() {
   cd librsvg
@@ -35,6 +35,9 @@
   NOCONFIGURE=1 ./autogen.sh
 }
 
+# Use LTO
+export CARGO_PROFILE_RELEASE_LTO=true CARGO_PROFILE_RELEASE_CODEGEN_UNITS=1
+
 build() {
   cd librsvg
 
@@ -41,11 +44,8 @@
   export CC='gcc -m32'
   export CXX='g++ -m32'
   export PKG_CONFIG=i686-pc-linux-gnu-pkg-config
-  export RUST_TARGET=i686-pc-linux-gnu
+  export RUST_TARGET=i686-unknown-linux-gnu
 
-  # Use LTO
-  export CARGO_PROFILE_RELEASE_LTO=true CARGO_PROFILE_RELEASE_CODEGEN_UNITS=1
-
   ./configure --prefix=/usr --disable-static --disable-vala \
     --disable-gtk-doc --disable-introspection --libdir=/usr/lib32
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
@@ -65,4 +65,4 @@
   rm -r "$pkgdir"/usr/{bin,include,share}
 }
 
-# vim: ts=2 sw=2 et:
+# vim:set sw=2 et:

Modified: multilib.diff
===================================================================
--- multilib.diff	2021-09-16 17:21:01 UTC (rev 1016439)
+++ multilib.diff	2021-09-16 17:21:59 UTC (rev 1016440)
@@ -3,10 +3,10 @@
  2 files changed, 1 insertion(+), 5 deletions(-)
 
 diff --git c/Makefile.am i/Makefile.am
-index 9cb38958..9adeb800 100644
+index e93714e4..effe5d3d 100644
 --- c/Makefile.am
 +++ i/Makefile.am
-@@ -149,9 +149,7 @@ else
+@@ -137,9 +137,7 @@ else
  CARGO_RELEASE_ARGS=--release
  endif
  
@@ -17,16 +17,16 @@
  CARGO_VERBOSE = $(cargo_verbose_$(V))
  cargo_verbose_ = $(cargo_verbose_$(AM_DEFAULT_VERBOSITY))
 diff --git c/configure.ac i/configure.ac
-index c4479817..b0a0bcf1 100644
+index 41590ca9..84cd56bd 100644
 --- c/configure.ac
 +++ i/configure.ac
-@@ -329,9 +329,7 @@ if test "x$RUST_TARGET" = x; then
- fi
+@@ -255,9 +255,7 @@ AC_ARG_VAR(RUST_TARGET, [Set rust target (default=$host)])
+ : ${RUST_TARGET:=$host}
  
- AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
--if test "x$cross_compiling" = "xyes" ; then
+ AM_CONDITIONAL([CROSS_COMPILING], [test "x$cross_compiling" = xyes])
+-AS_IF([test "x$cross_compiling" = "xyes"], [
 -	RUST_TARGET_SUBDIR="$RUST_TARGET/$RUST_TARGET_SUBDIR"
--fi
+-])
 +RUST_TARGET_SUBDIR="$RUST_TARGET/$RUST_TARGET_SUBDIR"
  AC_SUBST([RUST_TARGET_SUBDIR])