Date: Saturday, June 2, 2018 @ 01:00:16 Author: heftig Revision: 337033
archrelease: copy trunk to multilib-x86_64 Added: lib32-librsvg/repos/multilib-x86_64/PKGBUILD (from rev 337032, lib32-librsvg/trunk/PKGBUILD) lib32-librsvg/repos/multilib-x86_64/multilib.diff (from rev 337032, lib32-librsvg/trunk/multilib.diff) Deleted: lib32-librsvg/repos/multilib-x86_64/PKGBUILD lib32-librsvg/repos/multilib-x86_64/multilib.diff ---------------+ PKGBUILD | 114 ++++++++++++++++++++++++++++---------------------------- multilib.diff | 68 ++++++++++++++++----------------- 2 files changed, 91 insertions(+), 91 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-06-02 00:59:37 UTC (rev 337032) +++ PKGBUILD 2018-06-02 01:00:16 UTC (rev 337033) @@ -1,57 +0,0 @@ -# $Id$ -# Maintainer: Maxime Gauduin <aluc...@archlinux.org> -# Contributor: jtts <juss...@mbnet.fi> -# Contributor: Jan de Groot <j...@archlinux.org> - -pkgname=lib32-librsvg -pkgver=2.42.4 -pkgrel=1 -pkgdesc="SVG rendering library (32-bit)" -url="https://wiki.gnome.org/Projects/LibRsvg" -arch=(x86_64) -license=(LGPL) -depends=(lib32-gdk-pixbuf2 lib32-pango lib32-libcroco librsvg) -makedepends=(intltool gobject-introspection vala python2 gtk-doc git lib32-rust) -_commit=46ffa7d6f9b41e989cde8f0d0b6cc645f985582d # tags/2.42.4^0 -source=("git+https://gitlab.gnome.org/GNOME/librsvg.git#commit=$_commit" - multilib.diff) -sha256sums=('SKIP' - '0b29502b08f40e8d68b88949ed0c9ec50382cdc647c914c1a4c45bab11c9174c') - -pkgver() { - cd librsvg - git describe --tags | sed 's/-/+/g' -} - -prepare() { - cd librsvg - - # Hack to cross-compile rust only - patch -Np1 -i ../multilib.diff - - NOCONFIGURE=1 ./autogen.sh -} - -build() { - export CC='gcc -m32' - export CXX='g++ -m32' - export PKG_CONFIG_PATH=/usr/lib32/pkgconfig - - cd librsvg - ./configure --prefix=/usr --disable-static --enable-vala --disable-gtk-doc --libdir=/usr/lib32 - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool - make -} - -check() { - cd librsvg - make check -} - -package() { - cd librsvg - make DESTDIR="$pkgdir" install - rm -r "$pkgdir"/usr/{bin,include,share} -} - -# vim: ts=2 sw=2 et: Copied: lib32-librsvg/repos/multilib-x86_64/PKGBUILD (from rev 337032, lib32-librsvg/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-06-02 01:00:16 UTC (rev 337033) @@ -0,0 +1,57 @@ +# $Id$ +# Maintainer: Maxime Gauduin <aluc...@archlinux.org> +# Contributor: jtts <juss...@mbnet.fi> +# Contributor: Jan de Groot <j...@archlinux.org> + +pkgname=lib32-librsvg +pkgver=2.42.5 +pkgrel=1 +pkgdesc="SVG rendering library (32-bit)" +url="https://wiki.gnome.org/Projects/LibRsvg" +arch=(x86_64) +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 +source=("git+https://gitlab.gnome.org/GNOME/librsvg.git#commit=$_commit" + multilib.diff) +sha256sums=('SKIP' + '0b29502b08f40e8d68b88949ed0c9ec50382cdc647c914c1a4c45bab11c9174c') + +pkgver() { + cd librsvg + git describe --tags | sed 's/-/+/g' +} + +prepare() { + cd librsvg + + # Hack to cross-compile rust only + patch -Np1 -i ../multilib.diff + + NOCONFIGURE=1 ./autogen.sh +} + +build() { + export CC='gcc -m32' + export CXX='g++ -m32' + export PKG_CONFIG_PATH=/usr/lib32/pkgconfig + + cd librsvg + ./configure --prefix=/usr --disable-static --enable-vala --disable-gtk-doc --libdir=/usr/lib32 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool + make +} + +check() { + cd librsvg + make check +} + +package() { + cd librsvg + make DESTDIR="$pkgdir" install + rm -r "$pkgdir"/usr/{bin,include,share} +} + +# vim: ts=2 sw=2 et: Deleted: multilib.diff =================================================================== --- multilib.diff 2018-06-02 00:59:37 UTC (rev 337032) +++ multilib.diff 2018-06-02 01:00:16 UTC (rev 337033) @@ -1,34 +0,0 @@ - Makefile.am | 6 ++---- - configure.ac | 4 +--- - 2 files changed, 3 insertions(+), 7 deletions(-) - -diff --git c/Makefile.am i/Makefile.am -index a5a16220..10c4bb57 100644 ---- c/Makefile.am -+++ i/Makefile.am -@@ -116,9 +116,7 @@ else - CARGO_RELEASE_ARGS=--release - endif - --if CROSS_COMPILING --CARGO_TARGET_ARGS=--target=$(host) --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 ---- c/configure.ac -+++ i/configure.ac -@@ -282,9 +282,7 @@ fi - AM_CONDITIONAL([DEBUG_RELEASE], [test "x$debug_release" = "xyes"]) - - AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes) --if test "x$cross_compiling" = "xyes" ; then -- RUST_TARGET_SUBDIR="$host/$RUST_TARGET_SUBDIR" --fi -+RUST_TARGET_SUBDIR="i686-unknown-linux-gnu/$RUST_TARGET_SUBDIR" - AC_SUBST([RUST_TARGET_SUBDIR]) - - dnl =========================================================================== Copied: lib32-librsvg/repos/multilib-x86_64/multilib.diff (from rev 337032, lib32-librsvg/trunk/multilib.diff) =================================================================== --- multilib.diff (rev 0) +++ multilib.diff 2018-06-02 01:00:16 UTC (rev 337033) @@ -0,0 +1,34 @@ + Makefile.am | 6 ++---- + configure.ac | 4 +--- + 2 files changed, 3 insertions(+), 7 deletions(-) + +diff --git c/Makefile.am i/Makefile.am +index a5a16220..10c4bb57 100644 +--- c/Makefile.am ++++ i/Makefile.am +@@ -116,9 +116,7 @@ else + CARGO_RELEASE_ARGS=--release + endif + +-if CROSS_COMPILING +-CARGO_TARGET_ARGS=--target=$(host) +-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 +--- c/configure.ac ++++ i/configure.ac +@@ -282,9 +282,7 @@ fi + AM_CONDITIONAL([DEBUG_RELEASE], [test "x$debug_release" = "xyes"]) + + AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes) +-if test "x$cross_compiling" = "xyes" ; then +- RUST_TARGET_SUBDIR="$host/$RUST_TARGET_SUBDIR" +-fi ++RUST_TARGET_SUBDIR="i686-unknown-linux-gnu/$RUST_TARGET_SUBDIR" + AC_SUBST([RUST_TARGET_SUBDIR]) + + dnl ===========================================================================