Browse Source

[multilib-testing] -> [multilib] 'lib32-glib2-2.72.3-1' move

master
Nathan Owens 1 month ago
parent
commit
f330a16d5b
Signed by: ndowens
GPG Key ID: DC5A6F8092641E2D
  1. 75
      lib32-glib2/x86_64/multilib-testing/PKGBUILD
  2. 12
      lib32-glib2/x86_64/multilib-testing/gio-querymodules-32.hook
  3. 7
      lib32-glib2/x86_64/multilib-testing/gio-querymodules-32.script
  4. 27
      lib32-glib2/x86_64/multilib-testing/multilib.diff
  5. 6
      lib32-glib2/x86_64/multilib/PKGBUILD

75
lib32-glib2/x86_64/multilib-testing/PKGBUILD

@ -1,75 +0,0 @@
# Maintainer: Nathan Owens <ndowens@artixlinux.org>
# Contributor: Ionut Biru <ibiru@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
# Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi>
pkgname=lib32-glib2
pkgver=2.72.3
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)
options=(debug)
_commit=dce30492f6087a8e1e288f1706d41142b74ca1ff # tags/2.72.3^0
source=("git+https://gitlab.gnome.org/GNOME/glib.git#commit=$_commit"
multilib.diff
gio-querymodules-32.{hook,script})
sha256sums=('SKIP'
'565bed0df558d372b8248750d45e5e57d9e427c86c2bd639b8354452eaeaf3e9'
'2fe9543c97829300c25e6b45ed01fb63d3b699649fb2924b9a41443ccec8b946'
'1c96fb5f09baf59987e4b97bf3af37ea8feedcc753b48c91ffc6bff080461f21')
pkgver() {
cd glib
git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
}
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"
# Produce more debug info: GLib has a lot of useful macros
CFLAGS+=' -g3'
CXXFLAGS+=' -g3'
CFLAGS+=" -DG_DISABLE_CAST_CHECKS"
artix-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:

12
lib32-glib2/x86_64/multilib-testing/gio-querymodules-32.hook

@ -1,12 +0,0 @@
[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

7
lib32-glib2/x86_64/multilib-testing/gio-querymodules-32.script

@ -1,7 +0,0 @@
#!/bin/bash
while read -r d; do
[[ -d $d ]] || continue
gio-querymodules-32 "$d"
rmdir --ignore-fail-on-non-empty "$d"
done

27
lib32-glib2/x86_64/multilib-testing/multilib.diff

@ -1,27 +0,0 @@
diff --git i/gio/tests/meson.build w/gio/tests/meson.build
index 3ed23a5f2..1889140ae 100644
--- i/gio/tests/meson.build
+++ w/gio/tests/meson.build
@@ -782,6 +782,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 301158e0f..d2d79bcc3 100644
--- i/glib/tests/meson.build
+++ w/glib/tests/meson.build
@@ -115,7 +115,9 @@ glib_tests = {
'thread' : {},
'thread-pool' : {},
'timeout' : {},
- 'timer' : {},
+ 'timer' : {
+ 'suite' : ['flaky'],
+ },
'tree' : {},
'types' : {},
'utf8-performance' : {},

6
lib32-glib2/x86_64/multilib/PKGBUILD

@ -1,10 +1,10 @@
# Maintainer: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
# Maintainer: Nathan Owens <ndowens@artixlinux.org>
# Contributor: Ionut Biru <ibiru@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
# Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi>
pkgname=lib32-glib2
pkgver=2.72.2
pkgver=2.72.3
pkgrel=1
pkgdesc="Low level core library (32-bit)"
url="https://wiki.gnome.org/Projects/GLib"
@ -15,7 +15,7 @@ makedepends=(gettext gtk-doc shared-mime-info python lib32-libelf git util-linux
meson lib32-dbus)
checkdepends=(desktop-file-utils lib32-glib2)
options=(debug)
_commit=a2e950a0210012bd5aa29a6617dfb9d3c8b7a867 # tags/2.72.2^0
_commit=dce30492f6087a8e1e288f1706d41142b74ca1ff # tags/2.72.3^0
source=("git+https://gitlab.gnome.org/GNOME/glib.git#commit=$_commit"
multilib.diff
gio-querymodules-32.{hook,script})

Loading…
Cancel
Save