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

[Jan Steffens]

    Date: Thursday, March 17, 2022 @ 17:17:04
  Author: heftig
Revision: 1156734

2.72.0-1

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-03-17 16:28:28 UTC (rev 1156733)
+++ PKGBUILD	2022-03-17 17:17:04 UTC (rev 1156734)
@@ -4,8 +4,8 @@
 # Contributor: Mikko Seppälä <t-r-a-y at mbnet.fi>
 
 pkgname=lib32-glib2
-pkgver=2.70.4
-pkgrel=2
+pkgver=2.72.0
+pkgrel=1
 pkgdesc="Low level core library (32-bit)"
 url="https://wiki.gnome.org/Projects/GLib"
 license=(LGPL)
@@ -19,7 +19,7 @@
         multilib.diff
         gio-querymodules-32.{hook,script})
 sha256sums=('SKIP'
-            '05598afa7b995ad6118aefd81975e460e917276608079cf55c1f8d088ce7a36c'
+            '2840bb9367dc585178fe22bbd63a3537c800981910c29d7b7c15643eb079c6c8'
             '2fe9543c97829300c25e6b45ed01fb63d3b699649fb2924b9a41443ccec8b946'
             '1c96fb5f09baf59987e4b97bf3af37ea8feedcc753b48c91ffc6bff080461f21')
 validpgpkeys=('923B7025EE03C1C59F42684CF0942E894B2EAFA0') # Philip Withnall (https://endlessos.org/) <pwithnall at endlessos.org>
@@ -27,9 +27,6 @@
 prepare() {
   cd glib
 
-  # Unicode 14
-  git cherry-pick -n ab895d91d570a18ac74d6f4f6390488210d8fb15
-
   # Test suite workaround
   git apply -3 ../multilib.diff
 }

Modified: multilib.diff
===================================================================
--- multilib.diff	2022-03-17 16:28:28 UTC (rev 1156733)
+++ multilib.diff	2022-03-17 17:17:04 UTC (rev 1156734)
@@ -1,8 +1,8 @@
 diff --git i/gio/tests/meson.build w/gio/tests/meson.build
-index 5dbfb8e60..6224460ce 100644
+index 81ff551dd..ebc117771 100644
 --- i/gio/tests/meson.build
 +++ w/gio/tests/meson.build
-@@ -721,6 +721,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
+@@ -776,6 +776,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
                   '-r',
                   '-b','binary',
                   '@INPUT@',
@@ -11,10 +11,10 @@
  
      # 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
+index a0c64afe6..c0fc90023 100644
 --- i/glib/tests/meson.build
 +++ w/glib/tests/meson.build
-@@ -102,7 +102,9 @@ glib_tests = {
+@@ -110,7 +110,9 @@ glib_tests = {
    'thread' : {},
    'thread-pool' : {},
    'timeout' : {},
@@ -23,5 +23,5 @@
 +    'suite' : ['flaky'],
 +  },
    'tree' : {},
+   'types' : {},
    'utf8-performance' : {},
-   'utf8-pointer' : {},