[arch-commits] Commit in lib32-glib2/trunk (PKGBUILD multilib.diff)

[Jan Steffens]

    Date: Monday, March 4, 2019 @ 23:52:31
  Author: heftig
Revision: 437686

2.60.0-1

Added:
  lib32-glib2/trunk/multilib.diff
Modified:
  lib32-glib2/trunk/PKGBUILD

---------------+
 PKGBUILD      |   14 ++++++++++----
 multilib.diff |   12 ++++++++++++
 2 files changed, 22 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-03-04 23:28:31 UTC (rev 437685)
+++ PKGBUILD	2019-03-04 23:52:31 UTC (rev 437686)
@@ -3,7 +3,7 @@
 # Contributor: Mikko Seppälä <t-r-a-y at mbnet.fi>
 
 pkgname=lib32-glib2
-pkgver=2.58.3
+pkgver=2.60.0
 pkgrel=1
 pkgdesc="Low level core library (32-bit)"
 url="https://wiki.gnome.org/Projects/GLib"
@@ -13,10 +13,12 @@
 makedepends=(gettext gtk-doc shared-mime-info python lib32-libelf git util-linux meson lib32-dbus)
 checkdepends=(desktop-file-utils lib32-glib2)
 options=(!emptydirs)
-_commit=f2d1128ffae0de87680e411fb62ccfccafed6b1c  # tags/2.58.3^0
+_commit=2edc5aa6dfffec0a48c8a1e9381b73d1096e0489  # tags/2.60.0^0
 source=("git+https://gitlab.gnome.org/GNOME/glib.git#commit=$_commit"
+        multilib.diff
         gio-querymodules-32.hook)
 sha256sums=('SKIP'
+            '9c59f120cdccdbd960c5e3aab11f6c3c4b464ff4f7fc267520f5baad7919310a'
             '73b6791b58180e2a02fe908938e6c547ee1b263f8c387262f9a8c4105ffa999a')
 
 pkgver() {
@@ -26,6 +28,7 @@
 
 prepare() {
   cd glib
+  patch -Np1 -i ../multilib.diff
 }
 
 build() {
@@ -34,13 +37,13 @@
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
 
   arch-meson glib build \
-    -D selinux=false \
+    -D selinux=disabled \
     --libdir=/usr/lib32
   ninja -C build
 }
 
 check() {
-  meson test -C build -t 2
+  meson test -C build --no-suite flaky
 }
 
 package() {
@@ -51,6 +54,9 @@
   mv "$pkgdir"/usr/bin/gio-querymodules{,-32}
 
   install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 *.hook
+
+  # Remove installed tests
+  rm -r "$pkgdir/usr/lib/installed-tests"
 }
 
 # vim:set sw=2 et:

Added: multilib.diff
===================================================================
--- multilib.diff	                        (rev 0)
+++ multilib.diff	2019-03-04 23:52:31 UTC (rev 437686)
@@ -0,0 +1,12 @@
+diff --git i/gio/tests/meson.build w/gio/tests/meson.build
+index 5c0e03365..d69346216 100644
+--- i/gio/tests/meson.build
++++ w/gio/tests/meson.build
+@@ -586,6 +586,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