Date: Thursday, February 27, 2020 @ 22:11:45 Author: heftig Revision: 584870
archrelease: copy trunk to multilib-testing-x86_64 Added: lib32-glib2/repos/multilib-testing-x86_64/ lib32-glib2/repos/multilib-testing-x86_64/0001-tests-Move-memory_monitor_tests-under-installed_test.patch (from rev 584869, lib32-glib2/trunk/0001-tests-Move-memory_monitor_tests-under-installed_test.patch) lib32-glib2/repos/multilib-testing-x86_64/PKGBUILD (from rev 584869, lib32-glib2/trunk/PKGBUILD) lib32-glib2/repos/multilib-testing-x86_64/gio-querymodules-32.hook (from rev 584869, lib32-glib2/trunk/gio-querymodules-32.hook) lib32-glib2/repos/multilib-testing-x86_64/multilib.diff (from rev 584869, lib32-glib2/trunk/multilib.diff) -----------------------------------------------------------------+ 0001-tests-Move-memory_monitor_tests-under-installed_test.patch | 52 +++++++ PKGBUILD | 74 ++++++++++ gio-querymodules-32.hook | 11 + multilib.diff | 12 + 4 files changed, 149 insertions(+) Copied: lib32-glib2/repos/multilib-testing-x86_64/0001-tests-Move-memory_monitor_tests-under-installed_test.patch (from rev 584869, lib32-glib2/trunk/0001-tests-Move-memory_monitor_tests-under-installed_test.patch) =================================================================== --- multilib-testing-x86_64/0001-tests-Move-memory_monitor_tests-under-installed_test.patch (rev 0) +++ multilib-testing-x86_64/0001-tests-Move-memory_monitor_tests-under-installed_test.patch 2020-02-27 22:11:45 UTC (rev 584870) @@ -0,0 +1,52 @@ +From 9be108136dc5e7ef0143a3ae4338476ffa6377e9 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com> +Date: Thu, 27 Feb 2020 21:13:19 +0100 +Subject: [PATCH] tests: Move memory_monitor_tests under + installed_tests_enabled + +So they're not installed when the latter is disabled. +--- + gio/tests/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gio/tests/meson.build b/gio/tests/meson.build +index 695ad1f8f..76e28fc76 100644 +--- a/gio/tests/meson.build ++++ b/gio/tests/meson.build +@@ -521,32 +521,32 @@ if installed_tests_enabled + ) + install_subdir('static-link', install_dir : installed_tests_execdir) + install_data('static-link.py', install_dir : installed_tests_execdir) +-endif + + memory_monitor_tests = [ + 'memory-monitor-dbus', + 'memory-monitor-portal', + ] + + foreach memory_monitor_test : memory_monitor_tests + cdata = configuration_data() + cdata.set('installed_tests_dir', installed_tests_execdir) + cdata.set('program', memory_monitor_test + '.py') + configure_file( + input: installed_tests_template, + output: memory_monitor_test + '.test', + install_dir: installed_tests_metadir, + configuration: cdata + ) + cdata = configuration_data() + cdata.set('libexecdir', join_paths(glib_prefix, get_option('libexecdir'))) + configure_file( + input: memory_monitor_test + '.py.in', + output: memory_monitor_test + '.py', + install_dir : installed_tests_execdir, + configuration: cdata, + ) + endforeach ++endif + + if not meson.is_cross_build() or meson.has_exe_wrapper() + +-- +2.25.1 + Copied: lib32-glib2/repos/multilib-testing-x86_64/PKGBUILD (from rev 584869, lib32-glib2/trunk/PKGBUILD) =================================================================== --- multilib-testing-x86_64/PKGBUILD (rev 0) +++ multilib-testing-x86_64/PKGBUILD 2020-02-27 22:11:45 UTC (rev 584870) @@ -0,0 +1,74 @@ +# 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.64.0 +pkgrel=1 +pkgdesc="Low level core library (32-bit)" +url="https://wiki.gnome.org/Projects/GLib" +license=(LGPL2.1) +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) +_commit=369626e3105d688afaa316d89d34e8927a8a0171 # tags/2.64.0^0 +source=("git+https://gitlab.gnome.org/GNOME/glib.git#commit=$_commit" + multilib.diff + 0001-tests-Move-memory_monitor_tests-under-installed_test.patch + gio-querymodules-32.hook) +sha256sums=('SKIP' + '2611ec4c97346c3c4eea61786ee20c801207135a9d52a771f5f340b41bf69fbc' + '3f7f20c817ef970f9d1bc6606023eca44df5c31dd2334847bc8df2dbcf8e0e43' + 'c37b2777d6c7b9d2eb6003d8bdb72175f889013bc4d582b3f7a12fc7419a2d6d') + +pkgver() { + cd glib + git describe --tags | sed 's/-/+/g' +} + +prepare() { + cd glib + + # Test suite workaround + git apply -3 ../multilib.diff + + # Clean installed tests + git apply -3 ../0001-tests-Move-memory_monitor_tests-under-installed_test.patch +} + +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 b_lto=false \ + -D b_pie=false \ + -D selinux=disabled \ + --libdir=/usr/lib32 + ninja -C build +} + +check() { + # Spurious wakeups in g_cond_wait_until, only on lib32 + meson test -C build --no-suite flaky --no-suite slow --print-errorlogs || : +} + +package() { + depends+=(libmount.so) + provides+=(libgio-2.0.so libglib-2.0.so libgmodule-2.0.so libgobject-2.0.so + libgthread-2.0.so) + + DESTDIR="$pkgdir" meson install -C build + + 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 +} + +# vim:set sw=2 et: Copied: lib32-glib2/repos/multilib-testing-x86_64/gio-querymodules-32.hook (from rev 584869, 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 2020-02-27 22:11:45 UTC (rev 584870) @@ -0,0 +1,11 @@ +[Trigger] +Type = Path +Operation = Install +Operation = Upgrade +Operation = Remove +Target = usr/lib32/gio/modules/*.so + +[Action] +Description = Updating 32-bit GIO module cache... +When = PostTransaction +Exec = /usr/bin/gio-querymodules-32 /usr/lib32/gio/modules Copied: lib32-glib2/repos/multilib-testing-x86_64/multilib.diff (from rev 584869, lib32-glib2/trunk/multilib.diff) =================================================================== --- multilib-testing-x86_64/multilib.diff (rev 0) +++ multilib-testing-x86_64/multilib.diff 2020-02-27 22:11:45 UTC (rev 584870) @@ -0,0 +1,12 @@ +diff --git i/gio/tests/meson.build w/gio/tests/meson.build +index 65f43e267..3bd66bf60 100644 +--- i/gio/tests/meson.build ++++ w/gio/tests/meson.build +@@ -598,6 +598,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