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

[Jan Steffens]

    Date: Tuesday, May 21, 2019 @ 21:59:01
  Author: heftig
Revision: 468247

2.60.3-1

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

---------------+
 PKGBUILD      |    6 +++---
 multilib.diff |   19 ++++++++++++++++---
 2 files changed, 19 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-05-21 21:01:08 UTC (rev 468246)
+++ PKGBUILD	2019-05-21 21:59:01 UTC (rev 468247)
@@ -3,7 +3,7 @@
 # Contributor: Mikko Seppälä <t-r-a-y at mbnet.fi>
 
 pkgname=lib32-glib2
-pkgver=2.60.2
+pkgver=2.60.3
 pkgrel=1
 pkgdesc="Low level core library (32-bit)"
 url="https://wiki.gnome.org/Projects/GLib"
@@ -13,12 +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=a3b5608170c0b4381d0217ea99325ec7fcecb7f6  # tags/2.60.2^0
+_commit=0f6191d02a8e1ca7b08ffe0ccc4def88855baeae  # tags/2.60.3^0
 source=("git+https://gitlab.gnome.org/GNOME/glib.git#commit=$_commit"
         multilib.diff
         gio-querymodules-32.hook)
 sha256sums=('SKIP'
-            '9c59f120cdccdbd960c5e3aab11f6c3c4b464ff4f7fc267520f5baad7919310a'
+            'a0292252363f32324d03486fee0b84a79781bdcb51ad913a2bf37530d74c3b24'
             '73b6791b58180e2a02fe908938e6c547ee1b263f8c387262f9a8c4105ffa999a')
 
 pkgver() {

Modified: multilib.diff
===================================================================
--- multilib.diff	2019-05-21 21:01:08 UTC (rev 468246)
+++ multilib.diff	2019-05-21 21:59:01 UTC (rev 468247)
@@ -1,8 +1,8 @@
 diff --git i/gio/tests/meson.build w/gio/tests/meson.build
-index 5c0e03365..d69346216 100644
+index 65f43e267..3bd66bf60 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()
+@@ -598,6 +598,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
                   '-r',
                   '-b','binary',
                   '@INPUT@',
@@ -9,4 +9,17 @@
 +                 '--oformat', 'elf32-i386',
                   '-o','@OUTPUT@'])
  
- 	# Rename symbol to match the one in the C file
+     # Rename symbol to match the one in the C file
+diff --git i/glib/tests/meson.build w/glib/tests/meson.build
+index d54fc41fa..ad5511ca5 100644
+--- i/glib/tests/meson.build
++++ w/glib/tests/meson.build
+@@ -92,7 +92,7 @@ glib_tests = {
+   'test-printf' : {},
+   'thread' : {},
+   'timeout' : {},
+-  'timer' : {},
++  'timer' : {'suite': ['flaky']},
+   'tree' : {},
+   'utf8-performance' : {},
+   'utf8-pointer' : {},