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

[Jan Steffens]

    Date: Monday, May 30, 2022 @ 18:34:26
  Author: heftig
Revision: 1216847

2.72.2-1

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-05-30 18:32:51 UTC (rev 1216846)
+++ PKGBUILD	2022-05-30 18:34:26 UTC (rev 1216847)
@@ -4,7 +4,7 @@
 # Contributor: Mikko Seppälä <t-r-a-y at mbnet.fi>
 
 pkgname=lib32-glib2
-pkgver=2.72.1
+pkgver=2.72.2
 pkgrel=1
 pkgdesc="Low level core library (32-bit)"
 url="https://wiki.gnome.org/Projects/GLib"
@@ -15,15 +15,20 @@
              meson lib32-dbus)
 checkdepends=(desktop-file-utils lib32-glib2)
 options=(debug)
-source=("git+https://gitlab.gnome.org/GNOME/glib.git?signed#tag=$pkgver"
+_commit=a2e950a0210012bd5aa29a6617dfb9d3c8b7a867  # tags/2.72.2^0
+source=("git+https://gitlab.gnome.org/GNOME/glib.git#commit=$_commit"
         multilib.diff
         gio-querymodules-32.{hook,script})
 sha256sums=('SKIP'
-            '2840bb9367dc585178fe22bbd63a3537c800981910c29d7b7c15643eb079c6c8'
+            '565bed0df558d372b8248750d45e5e57d9e427c86c2bd639b8354452eaeaf3e9'
             '2fe9543c97829300c25e6b45ed01fb63d3b699649fb2924b9a41443ccec8b946'
             '1c96fb5f09baf59987e4b97bf3af37ea8feedcc753b48c91ffc6bff080461f21')
-validpgpkeys=('923B7025EE03C1C59F42684CF0942E894B2EAFA0') # Philip Withnall (https://endlessos.org/) <pwithnall at endlessos.org>
 
+pkgver() {
+  cd glib
+  git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
+}
+
 prepare() {
   cd glib
 

Modified: multilib.diff
===================================================================
--- multilib.diff	2022-05-30 18:32:51 UTC (rev 1216846)
+++ multilib.diff	2022-05-30 18:34:26 UTC (rev 1216847)
@@ -1,8 +1,8 @@
 diff --git i/gio/tests/meson.build w/gio/tests/meson.build
-index 81ff551dd..ebc117771 100644
+index 3ed23a5f2..1889140ae 100644
 --- i/gio/tests/meson.build
 +++ w/gio/tests/meson.build
-@@ -776,6 +776,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
+@@ -782,6 +782,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 a0c64afe6..c0fc90023 100644
+index 301158e0f..d2d79bcc3 100644
 --- i/glib/tests/meson.build
 +++ w/glib/tests/meson.build
-@@ -110,7 +110,9 @@ glib_tests = {
+@@ -115,7 +115,9 @@ glib_tests = {
    'thread' : {},
    'thread-pool' : {},
    'timeout' : {},