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

[Jan Steffens]

    Date: Friday, September 17, 2021 @ 21:29:12
  Author: heftig
Revision: 1016894

2.70.0-1

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-09-17 21:14:29 UTC (rev 1016893)
+++ PKGBUILD	2021-09-17 21:29:12 UTC (rev 1016894)
@@ -4,7 +4,7 @@
 # Contributor: Mikko Seppälä <t-r-a-y at mbnet.fi>
 
 pkgname=lib32-glib2
-pkgver=2.68.4
+pkgver=2.70.0
 pkgrel=1
 pkgdesc="Low level core library (32-bit)"
 url="https://wiki.gnome.org/Projects/GLib"
@@ -18,16 +18,11 @@
         multilib.diff
         gio-querymodules-32.{hook,script})
 sha256sums=('SKIP'
-            'dc8089b4680913243a2cc0bfcafaf7364ab444b7df65ee314963a64f3512739e'
+            '05598afa7b995ad6118aefd81975e460e917276608079cf55c1f8d088ce7a36c'
             '2fe9543c97829300c25e6b45ed01fb63d3b699649fb2924b9a41443ccec8b946'
             '1c96fb5f09baf59987e4b97bf3af37ea8feedcc753b48c91ffc6bff080461f21')
 validpgpkeys=('923B7025EE03C1C59F42684CF0942E894B2EAFA0') # Philip Withnall (https://endlessos.org/) <pwithnall at endlessos.org>
 
-pkgver() {
-  cd glib
-  git describe --tags | sed 's/-/+/g'
-}
-
 prepare() {
   cd glib
 
@@ -53,7 +48,7 @@
 }
 
 package() {
-  depends+=(libmount.so)
+  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)
 

Modified: multilib.diff
===================================================================
--- multilib.diff	2021-09-17 21:14:29 UTC (rev 1016893)
+++ multilib.diff	2021-09-17 21:29:12 UTC (rev 1016894)
@@ -1,8 +1,8 @@
 diff --git i/gio/tests/meson.build w/gio/tests/meson.build
-index a926ae01a..a982c095f 100644
+index 5dbfb8e60..6224460ce 100644
 --- i/gio/tests/meson.build
 +++ w/gio/tests/meson.build
-@@ -720,6 +720,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
+@@ -721,6 +721,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
                   '-r',
                   '-b','binary',
                   '@INPUT@',
@@ -10,3 +10,18 @@
                   '-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 c77ccdd14..fedbb5286 100644
+--- i/glib/tests/meson.build
++++ w/glib/tests/meson.build
+@@ -102,7 +102,9 @@ glib_tests = {
+   'thread' : {},
+   'thread-pool' : {},
+   'timeout' : {},
+-  'timer' : {},
++  'timer' : {
++    'suite' : ['flaky'],
++  },
+   'tree' : {},
+   'utf8-performance' : {},
+   'utf8-pointer' : {},