Date: Wednesday, August 8, 2018 @ 04:49:40 Author: heftig Revision: 370321
2.42.6-1 Modified: lib32-librsvg/trunk/PKGBUILD lib32-librsvg/trunk/multilib.diff ---------------+ PKGBUILD | 7 ++++--- multilib.diff | 21 ++++++++++----------- 2 files changed, 14 insertions(+), 14 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-08-08 04:37:45 UTC (rev 370320) +++ PKGBUILD 2018-08-08 04:49:40 UTC (rev 370321) @@ -4,7 +4,7 @@ # Contributor: Jan de Groot <[email protected]> pkgname=lib32-librsvg -pkgver=2.42.5 +pkgver=2.42.6 pkgrel=1 pkgdesc="SVG rendering library (32-bit)" url="https://wiki.gnome.org/Projects/LibRsvg"; @@ -12,11 +12,11 @@ license=(LGPL) depends=(lib32-gdk-pixbuf2 lib32-pango lib32-libcroco librsvg) makedepends=(intltool gobject-introspection vala python2 gtk-doc git lib32-rust) -_commit=497c925593e41c12cec4a55e4365655a29c3fe59 # tags/2.42.5^0 +_commit=fa70c935c143aa8928d9336d28cb010da7e0a869 # tags/2.42.6^0 source=("git+https://gitlab.gnome.org/GNOME/librsvg.git#commit=$_commit"; multilib.diff) sha256sums=('SKIP' - '0b29502b08f40e8d68b88949ed0c9ec50382cdc647c914c1a4c45bab11c9174c') + 'f562f9fda0c8bcad8de3f6eea9eee16014a5634261a6646724da99d9ca497bbf') pkgver() { cd librsvg @@ -36,6 +36,7 @@ export CC='gcc -m32' export CXX='g++ -m32' export PKG_CONFIG_PATH=/usr/lib32/pkgconfig + export RUST_TARGET=i686-unknown-linux-gnu cd librsvg ./configure --prefix=/usr --disable-static --enable-vala --disable-gtk-doc --libdir=/usr/lib32 Modified: multilib.diff =================================================================== --- multilib.diff 2018-08-08 04:37:45 UTC (rev 370320) +++ multilib.diff 2018-08-08 04:49:40 UTC (rev 370321) @@ -1,34 +1,33 @@ - Makefile.am | 6 ++---- + Makefile.am | 2 -- configure.ac | 4 +--- - 2 files changed, 3 insertions(+), 7 deletions(-) + 2 files changed, 1 insertion(+), 5 deletions(-) diff --git c/Makefile.am i/Makefile.am -index a5a16220..10c4bb57 100644 +index 69bf4bc3..1a70f8de 100644 --- c/Makefile.am +++ i/Makefile.am -@@ -116,9 +116,7 @@ else +@@ -128,9 +128,7 @@ else CARGO_RELEASE_ARGS=--release endif -if CROSS_COMPILING --CARGO_TARGET_ARGS=--target=$(host) + CARGO_TARGET_ARGS=--target=$(RUST_TARGET) -endif -+CARGO_TARGET_ARGS=--target=i686-unknown-linux-gnu CARGO_VERBOSE = $(cargo_verbose_$(V)) cargo_verbose_ = $(cargo_verbose_$(AM_DEFAULT_VERBOSITY)) diff --git c/configure.ac i/configure.ac -index 2fae2362..9d4004f8 100644 +index 6afdc9f7..e398c2c2 100644 --- c/configure.ac +++ i/configure.ac -@@ -282,9 +282,7 @@ fi - AM_CONDITIONAL([DEBUG_RELEASE], [test "x$debug_release" = "xyes"]) +@@ -293,9 +293,7 @@ if test "x$RUST_TARGET" == x; then + fi AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes) -if test "x$cross_compiling" = "xyes" ; then -- RUST_TARGET_SUBDIR="$host/$RUST_TARGET_SUBDIR" +- RUST_TARGET_SUBDIR="$RUST_TARGET/$RUST_TARGET_SUBDIR" -fi -+RUST_TARGET_SUBDIR="i686-unknown-linux-gnu/$RUST_TARGET_SUBDIR" ++RUST_TARGET_SUBDIR="$RUST_TARGET/$RUST_TARGET_SUBDIR" AC_SUBST([RUST_TARGET_SUBDIR]) dnl ===========================================================================
