Date: Wednesday, November 30, 2022 @ 23:27:43
Author: heftig
Revision: 1355555
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 1355554, lib32-glib2/trunk/PKGBUILD)
lib32-glib2/repos/multilib-testing-x86_64/gio-querymodules-32.hook
(from rev 1355554, lib32-glib2/trunk/gio-querymodules-32.hook)
lib32-glib2/repos/multilib-testing-x86_64/gio-querymodules-32.script
(from rev 1355554, lib32-glib2/trunk/gio-querymodules-32.script)
lib32-glib2/repos/multilib-testing-x86_64/multilib.diff
(from rev 1355554, lib32-glib2/trunk/multilib.diff)
----------------------------+
PKGBUILD | 106 +++++++++++++++++++++++++++++++++++++++++++
gio-querymodules-32.hook | 12 ++++
gio-querymodules-32.script | 7 ++
multilib.diff | 27 ++++++++++
4 files changed, 152 insertions(+)
Copied: lib32-glib2/repos/multilib-testing-x86_64/PKGBUILD (from rev 1355554,
lib32-glib2/trunk/PKGBUILD)
===================================================================
--- multilib-testing-x86_64/PKGBUILD (rev 0)
+++ multilib-testing-x86_64/PKGBUILD 2022-11-30 23:27:43 UTC (rev 1355555)
@@ -0,0 +1,106 @@
+# Maintainer: Jan Alexander Steffens (heftig) <[email protected]>
+# Contributor: Ionut Biru <[email protected]>
+# Contributor: Pierre Schmitz <[email protected]>
+# Contributor: Mikko Seppälä <[email protected]>
+
+pkgbase=lib32-glib2
+pkgname=(lib32-glib2)
+pkgver=2.74.2
+pkgrel=2
+pkgdesc="Low level core library (32-bit)"
+url="https://wiki.gnome.org/Projects/GLib";
+license=(LGPL)
+arch=(x86_64)
+depends=(
+ glib2
+ lib32-libffi
+ lib32-pcre2
+ lib32-util-linux
+ lib32-zlib
+)
+makedepends=(
+ gettext
+ git
+ gtk-doc
+ lib32-dbus
+ lib32-libelf
+ meson
+ python
+ shared-mime-info
+ util-linux
+)
+checkdepends=(
+ desktop-file-utils
+ lib32-glib2
+)
+options=(
+ debug
+)
+_commit=b5299ed2055aa3ccd628aceb016c1e9bda516e39 # tags/2.74.2^0
+source=(
+ "git+https://gitlab.gnome.org/GNOME/glib.git#commit=$_commit";
+ multilib.diff
+ gio-querymodules-32.{hook,script}
+)
+b2sums=('SKIP'
+
'b9d92328756941953f9120e21867b3e4b8aa48c1d3451f787011acb8996d2a4f20860e1a46dbf492774c0c5b0bab8a7dc9f3ae74481dff4a3bf7ff1e74ee0711'
+
'34276fb3952c1286835dbbec7e8f306cbc819fa8b49e22c8a75b248cf7dbda87fb896c4915e267cb150bad28161fc4025843c00c4b6bb57a22e41f22ecf19efd'
+
'f0372ba65b6203e569da5bc8b262e76f2b7f2682de3eca5006953e4de2e99785d9793044d2f5350cd2b863cb1760780deb36651a7ab20bc7ab317d1eeafcd07f')
+
+pkgver() {
+ cd glib
+ git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
+}
+
+prepare() {
+ cd glib
+
+ # Fix building WebKitGTK
+ git cherry-pick -n 560e56fa71f21e8f0f7b91322d560dedb1af13e4
+
+ # 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"
+
+ # Produce more debug info: GLib has a lot of useful macros
+ CFLAGS+=' -g3'
+ CXXFLAGS+=' -g3'
+
+ CFLAGS+=" -DG_DISABLE_CAST_CHECKS"
+ arch-meson glib build \
+ --libdir=/usr/lib32 \
+ -D glib_debug=disabled \
+ -D selinux=disabled \
+ -D sysprof=disabled \
+ -D man=false \
+ -D gtk_doc=false
+ meson compile -C build
+}
+
+check() {
+ meson test -C build --no-suite flaky --no-suite slow --print-errorlogs
+}
+
+package_lib32-glib2() {
+ depends+=(
+ libffi.so
+ libmount.so
+ )
+ provides+=(libg{lib,io,module,object,thread}-2.0.so)
+
+ meson install -C build --destdir "$pkgdir"
+
+ rm -r "$pkgdir"/usr/{lib,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 sts=-1 et:
Copied: lib32-glib2/repos/multilib-testing-x86_64/gio-querymodules-32.hook
(from rev 1355554, 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 2022-11-30 23:27:43 UTC
(rev 1355555)
@@ -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 1355554, 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 2022-11-30 23:27:43 UTC
(rev 1355555)
@@ -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
1355554, lib32-glib2/trunk/multilib.diff)
===================================================================
--- multilib-testing-x86_64/multilib.diff (rev 0)
+++ multilib-testing-x86_64/multilib.diff 2022-11-30 23:27:43 UTC (rev
1355555)
@@ -0,0 +1,27 @@
+diff --git i/gio/tests/meson.build w/gio/tests/meson.build
+index e7fa812c4..5c84e6072 100644
+--- i/gio/tests/meson.build
++++ w/gio/tests/meson.build
+@@ -836,6 +836,7 @@ if meson.can_run_host_binaries()
+ '-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 db01b54b4..42a852b2b 100644
+--- i/glib/tests/meson.build
++++ w/glib/tests/meson.build
+@@ -126,7 +126,9 @@ glib_tests = {
+ 'thread-pool' : {},
+ 'thread-pool-slow' : {'suite' : ['slow']},
+ 'timeout' : {},
+- 'timer' : {},
++ 'timer' : {
++ 'suite' : ['flaky'],
++ },
+ 'tree' : {},
+ 'types' : {},
+ 'utf8-performance' : {},
