Date: Wednesday, October 27, 2021 @ 07:25:32 Author: heftig Revision: 1034685
archrelease: copy trunk to multilib-x86_64 Added: lib32-librsvg/repos/multilib-x86_64/PKGBUILD (from rev 1034684, lib32-librsvg/trunk/PKGBUILD) lib32-librsvg/repos/multilib-x86_64/multilib.diff (from rev 1034684, lib32-librsvg/trunk/multilib.diff) Deleted: lib32-librsvg/repos/multilib-x86_64/PKGBUILD lib32-librsvg/repos/multilib-x86_64/multilib.diff ---------------+ PKGBUILD | 136 ++++++++++++++++++++++++++++---------------------------- multilib.diff | 66 +++++++++++++-------------- 2 files changed, 101 insertions(+), 101 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2021-10-27 07:25:15 UTC (rev 1034684) +++ PKGBUILD 2021-10-27 07:25:32 UTC (rev 1034685) @@ -1,68 +0,0 @@ -# Maintainer: Jan Alexander Steffens (heftig) <hef...@archlinux.org> -# Contributor: Maxime Gauduin <aluc...@archlinux.org> -# Contributor: jtts <juss...@mbnet.fi> -# Contributor: Jan de Groot <j...@archlinux.org> - -pkgname=lib32-librsvg -pkgver=2.52.0 -pkgrel=1 -epoch=2 -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-libxml2 librsvg) -makedepends=(gobject-introspection gtk-doc git rust lib32-rust-libs) -checkdepends=(ttf-dejavu) -provides=(librsvg-${pkgver%%.*}.so) -_commit=1729feb4c197a7dd94fe303931d51eb843bdcaf9 # tags/2.52.0^0 -source=("git+https://gitlab.gnome.org/GNOME/librsvg.git#commit=$_commit" - multilib.diff) -sha256sums=('SKIP' - 'b3d86492069009dad784f542a9c681248bc2fe3802899175e06c0c9931679536') - -pkgver() { - cd librsvg - git describe --tags | sed 's/-/+/g' -} - -prepare() { - cd librsvg - - # Hack to cross-compile rust only - git apply -3 ../multilib.diff - - NOCONFIGURE=1 ./autogen.sh -} - -# Use LTO -export CARGO_PROFILE_RELEASE_LTO=true CARGO_PROFILE_RELEASE_CODEGEN_UNITS=1 - -build() { - cd librsvg - - export CC='gcc -m32' - export CXX='g++ -m32' - export PKG_CONFIG=i686-pc-linux-gnu-pkg-config - export RUST_TARGET=i686-unknown-linux-gnu - - ./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 - make -} - -check() { - cd librsvg - # Test suite is very dependent on the versions of - # Cairo, Pango, FreeType and HarfBuzz - make check || : -} - -package() { - cd librsvg - make DESTDIR="$pkgdir" install - rm -r "$pkgdir"/usr/{bin,include,share} -} - -# vim:set sw=2 et: Copied: lib32-librsvg/repos/multilib-x86_64/PKGBUILD (from rev 1034684, lib32-librsvg/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-10-27 07:25:32 UTC (rev 1034685) @@ -0,0 +1,68 @@ +# Maintainer: Jan Alexander Steffens (heftig) <hef...@archlinux.org> +# Contributor: Maxime Gauduin <aluc...@archlinux.org> +# Contributor: jtts <juss...@mbnet.fi> +# Contributor: Jan de Groot <j...@archlinux.org> + +pkgname=lib32-librsvg +pkgver=2.52.3 +pkgrel=1 +epoch=2 +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-libxml2 librsvg) +makedepends=(gobject-introspection gtk-doc git rust lib32-rust-libs) +checkdepends=(ttf-dejavu) +provides=(librsvg-${pkgver%%.*}.so) +_commit=d921db497ccddfb89cc5c69b4745dad31eb4568b # tags/2.52.3^0 +source=("git+https://gitlab.gnome.org/GNOME/librsvg.git#commit=$_commit" + multilib.diff) +sha256sums=('SKIP' + 'b3d86492069009dad784f542a9c681248bc2fe3802899175e06c0c9931679536') + +pkgver() { + cd librsvg + git describe --tags | sed 's/-/+/g' +} + +prepare() { + cd librsvg + + # Hack to cross-compile rust only + git apply -3 ../multilib.diff + + NOCONFIGURE=1 ./autogen.sh +} + +# Use LTO +export CARGO_PROFILE_RELEASE_LTO=true CARGO_PROFILE_RELEASE_CODEGEN_UNITS=1 + +build() { + cd librsvg + + export CC='gcc -m32' + export CXX='g++ -m32' + export PKG_CONFIG=i686-pc-linux-gnu-pkg-config + export RUST_TARGET=i686-unknown-linux-gnu + + ./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 + make +} + +check() { + cd librsvg + # Test suite is very dependent on the versions of + # Cairo, Pango, FreeType and HarfBuzz + make check || : +} + +package() { + cd librsvg + make DESTDIR="$pkgdir" install + rm -r "$pkgdir"/usr/{bin,include,share} +} + +# vim:set sw=2 et: Deleted: multilib.diff =================================================================== --- multilib.diff 2021-10-27 07:25:15 UTC (rev 1034684) +++ multilib.diff 2021-10-27 07:25:32 UTC (rev 1034685) @@ -1,33 +0,0 @@ - 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 -@@ -137,9 +137,7 @@ else - CARGO_RELEASE_ARGS=--release - endif - --if CROSS_COMPILING - CARGO_TARGET_ARGS=--target=$(RUST_TARGET) --endif - - 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)]) - : ${RUST_TARGET:=$host} - - AM_CONDITIONAL([CROSS_COMPILING], [test "x$cross_compiling" = xyes]) --AS_IF([test "x$cross_compiling" = "xyes"], [ -- RUST_TARGET_SUBDIR="$RUST_TARGET/$RUST_TARGET_SUBDIR" --]) -+RUST_TARGET_SUBDIR="$RUST_TARGET/$RUST_TARGET_SUBDIR" - AC_SUBST([RUST_TARGET_SUBDIR]) - - dnl =========================================================================== Copied: lib32-librsvg/repos/multilib-x86_64/multilib.diff (from rev 1034684, lib32-librsvg/trunk/multilib.diff) =================================================================== --- multilib.diff (rev 0) +++ multilib.diff 2021-10-27 07:25:32 UTC (rev 1034685) @@ -0,0 +1,33 @@ + 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 +@@ -137,9 +137,7 @@ else + CARGO_RELEASE_ARGS=--release + endif + +-if CROSS_COMPILING + CARGO_TARGET_ARGS=--target=$(RUST_TARGET) +-endif + + 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)]) + : ${RUST_TARGET:=$host} + + AM_CONDITIONAL([CROSS_COMPILING], [test "x$cross_compiling" = xyes]) +-AS_IF([test "x$cross_compiling" = "xyes"], [ +- RUST_TARGET_SUBDIR="$RUST_TARGET/$RUST_TARGET_SUBDIR" +-]) ++RUST_TARGET_SUBDIR="$RUST_TARGET/$RUST_TARGET_SUBDIR" + AC_SUBST([RUST_TARGET_SUBDIR]) + + dnl ===========================================================================