Date: Tuesday, March 23, 2021 @ 18:38:31 Author: heftig Revision: 900615
2.68.0-4: FS#70131 Modified: lib32-glib2/trunk/PKGBUILD lib32-glib2/trunk/multilib.diff ---------------+ PKGBUILD | 8 ++++++-- multilib.diff | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-03-23 18:28:45 UTC (rev 900614) +++ PKGBUILD 2021-03-23 18:38:31 UTC (rev 900615) @@ -5,7 +5,7 @@ pkgname=lib32-glib2 pkgver=2.68.0 -pkgrel=1 +pkgrel=4 pkgdesc="Low level core library (32-bit)" url="https://wiki.gnome.org/Projects/GLib"; license=(LGPL) @@ -18,7 +18,7 @@ multilib.diff gio-querymodules-32.{hook,script}) sha256sums=('SKIP' - '2611ec4c97346c3c4eea61786ee20c801207135a9d52a771f5f340b41bf69fbc' + 'dc8089b4680913243a2cc0bfcafaf7364ab444b7df65ee314963a64f3512739e' '2fe9543c97829300c25e6b45ed01fb63d3b699649fb2924b9a41443ccec8b946' '1c96fb5f09baf59987e4b97bf3af37ea8feedcc753b48c91ffc6bff080461f21') @@ -30,6 +30,10 @@ prepare() { cd glib + # https://bugs.archlinux.org/task/70131 + # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2010 + git cherry-pick -n 07ab2e26c937 77649d3d3d94 + # Test suite workaround git apply -3 ../multilib.diff } Modified: multilib.diff =================================================================== --- multilib.diff 2021-03-23 18:28:45 UTC (rev 900614) +++ multilib.diff 2021-03-23 18:38:31 UTC (rev 900615) @@ -1,8 +1,8 @@ diff --git i/gio/tests/meson.build w/gio/tests/meson.build -index 65f43e267..3bd66bf60 100644 +index a926ae01a..a982c095f 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() +@@ -720,6 +720,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() '-r', '-b','binary', '@INPUT@',
