Date: Wednesday, November 3, 2021 @ 20:33:06 Author: heftig Revision: 1035665
archrelease: copy trunk to multilib-testing-x86_64 Added: lib32-glib2/repos/multilib-testing-x86_64/ lib32-glib2/repos/multilib-testing-x86_64/PKGBUILD (from rev 1035664, lib32-glib2/trunk/PKGBUILD) lib32-glib2/repos/multilib-testing-x86_64/gio-querymodules-32.hook (from rev 1035664, lib32-glib2/trunk/gio-querymodules-32.hook) lib32-glib2/repos/multilib-testing-x86_64/gio-querymodules-32.script (from rev 1035664, lib32-glib2/trunk/gio-querymodules-32.script) lib32-glib2/repos/multilib-testing-x86_64/multilib.diff (from rev 1035664, lib32-glib2/trunk/multilib.diff) ----------------------------+ PKGBUILD | 65 +++++++++++++++++++++++++++++++++++++++++++ gio-querymodules-32.hook | 12 +++++++ gio-querymodules-32.script | 7 ++++ multilib.diff | 27 +++++++++++++++++ 4 files changed, 111 insertions(+) Copied: lib32-glib2/repos/multilib-testing-x86_64/PKGBUILD (from rev 1035664, lib32-glib2/trunk/PKGBUILD) =================================================================== --- multilib-testing-x86_64/PKGBUILD (rev 0) +++ multilib-testing-x86_64/PKGBUILD 2021-11-03 20:33:06 UTC (rev 1035665) @@ -0,0 +1,65 @@ +# Maintainer: Jan Alexander Steffens (heftig) <hef...@archlinux.org> +# Contributor: Ionut Biru <ib...@archlinux.org> +# Contributor: Pierre Schmitz <pie...@archlinux.de> +# Contributor: Mikko Seppälä <t-r-...@mbnet.fi> + +pkgname=lib32-glib2 +pkgver=2.70.1 +pkgrel=1 +pkgdesc="Low level core library (32-bit)" +url="https://wiki.gnome.org/Projects/GLib" +license=(LGPL) +arch=(x86_64) +depends=(lib32-pcre lib32-libffi lib32-util-linux lib32-zlib glib2) +makedepends=(gettext gtk-doc shared-mime-info python lib32-libelf git util-linux + meson lib32-dbus) +checkdepends=(desktop-file-utils lib32-glib2) +source=("git+https://gitlab.gnome.org/GNOME/glib.git?signed#tag=$pkgver" + multilib.diff + gio-querymodules-32.{hook,script}) +sha256sums=('SKIP' + '05598afa7b995ad6118aefd81975e460e917276608079cf55c1f8d088ce7a36c' + '2fe9543c97829300c25e6b45ed01fb63d3b699649fb2924b9a41443ccec8b946' + '1c96fb5f09baf59987e4b97bf3af37ea8feedcc753b48c91ffc6bff080461f21') +validpgpkeys=('923B7025EE03C1C59F42684CF0942E894B2EAFA0') # Philip Withnall (https://endlessos.org/) <pwithn...@endlessos.org> + +prepare() { + cd glib + + # Test suite workaround + git apply -3 ../multilib.diff +} + +build() { + export CC="gcc -m32 -mstackrealign" + export CXX="g++ -m32 -mstackrealign" + export PKG_CONFIG="i686-pc-linux-gnu-pkg-config" + + CFLAGS+=" -DG_DISABLE_CAST_CHECKS" + arch-meson glib build \ + -D glib_debug=disabled \ + -D selinux=disabled \ + --libdir=/usr/lib32 + meson compile -C build +} + +check() { + meson test -C build --no-suite flaky --no-suite slow --print-errorlogs +} + +package() { + depends+=(libmount.so libffi.so) + provides+=(libgio-2.0.so libglib-2.0.so libgmodule-2.0.so libgobject-2.0.so + libgthread-2.0.so) + + meson install -C build --destdir "$pkgdir" + + rm -r "$pkgdir"/usr/{share,include} + find "$pkgdir/usr/bin" -type f -not -name gio-querymodules -printf 'Removing %P\n' -delete + mv "$pkgdir"/usr/bin/gio-querymodules{,-32} + + install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 *.hook + install -D gio-querymodules-32.script "$pkgdir/usr/share/libalpm/scripts/gio-querymodules-32" +} + +# vim:set sw=2 et: Copied: lib32-glib2/repos/multilib-testing-x86_64/gio-querymodules-32.hook (from rev 1035664, lib32-glib2/trunk/gio-querymodules-32.hook) =================================================================== --- multilib-testing-x86_64/gio-querymodules-32.hook (rev 0) +++ multilib-testing-x86_64/gio-querymodules-32.hook 2021-11-03 20:33:06 UTC (rev 1035665) @@ -0,0 +1,12 @@ +[Trigger] +Type = Path +Operation = Install +Operation = Upgrade +Operation = Remove +Target = usr/lib32/gio/modules/ + +[Action] +Description = Updating 32-bit GIO module cache... +When = PostTransaction +Exec = /usr/share/libalpm/scripts/gio-querymodules-32 +NeedsTargets Copied: lib32-glib2/repos/multilib-testing-x86_64/gio-querymodules-32.script (from rev 1035664, lib32-glib2/trunk/gio-querymodules-32.script) =================================================================== --- multilib-testing-x86_64/gio-querymodules-32.script (rev 0) +++ multilib-testing-x86_64/gio-querymodules-32.script 2021-11-03 20:33:06 UTC (rev 1035665) @@ -0,0 +1,7 @@ +#!/bin/bash + +while read -r d; do + [[ -d $d ]] || continue + gio-querymodules-32 "$d" + rmdir --ignore-fail-on-non-empty "$d" +done Copied: lib32-glib2/repos/multilib-testing-x86_64/multilib.diff (from rev 1035664, lib32-glib2/trunk/multilib.diff) =================================================================== --- multilib-testing-x86_64/multilib.diff (rev 0) +++ multilib-testing-x86_64/multilib.diff 2021-11-03 20:33:06 UTC (rev 1035665) @@ -0,0 +1,27 @@ +diff --git i/gio/tests/meson.build w/gio/tests/meson.build +index 5dbfb8e60..6224460ce 100644 +--- i/gio/tests/meson.build ++++ w/gio/tests/meson.build +@@ -721,6 +721,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() + '-r', + '-b','binary', + '@INPUT@', ++ '--oformat', 'elf32-i386', + '-o','@OUTPUT@']) + + # Rename symbol to match the one in the C file +diff --git i/glib/tests/meson.build w/glib/tests/meson.build +index c77ccdd14..fedbb5286 100644 +--- i/glib/tests/meson.build ++++ w/glib/tests/meson.build +@@ -102,7 +102,9 @@ glib_tests = { + 'thread' : {}, + 'thread-pool' : {}, + 'timeout' : {}, +- 'timer' : {}, ++ 'timer' : { ++ 'suite' : ['flaky'], ++ }, + 'tree' : {}, + 'utf8-performance' : {}, + 'utf8-pointer' : {},