Date: Thursday, February 23, 2023 @ 20:59:17 Author: heftig Revision: 1403752
2.74.6-1 Modified: lib32-glib2/trunk/PKGBUILD lib32-glib2/trunk/multilib.diff ---------------+ PKGBUILD | 10 +++++----- multilib.diff | 8 +++----- 2 files changed, 8 insertions(+), 10 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2023-02-23 20:42:34 UTC (rev 1403751) +++ PKGBUILD 2023-02-23 20:59:17 UTC (rev 1403752) @@ -5,7 +5,7 @@ pkgbase=lib32-glib2 pkgname=(lib32-glib2) -pkgver=2.74.5 +pkgver=2.74.6 pkgrel=1 pkgdesc="Low level core library (32-bit)" url="https://wiki.gnome.org/Projects/GLib"; @@ -36,7 +36,7 @@ options=( debug ) -_commit=39a71aff372ed491a24ca84409d9f93bc7c5d6d4 # tags/2.74.5^0 +_commit=a5dde6304670af590f25a2992104c0880003acf0 # tags/2.74.6^0 source=( "git+https://gitlab.gnome.org/GNOME/glib.git#commit=$_commit"; "git+https://gitlab.gnome.org/GNOME/gvdb.git"; @@ -45,7 +45,7 @@ ) b2sums=('SKIP' 'SKIP' - 'b2e2df4e965d38e4e8efea57eea31feca36699d6766b70b2fbd3f21f4fe85ee139308e4a12832107eeac0f032f3e09dc3dc35daedaa831a353eb025f41af07c3' + '39b757816b28bc4101cf59b651dd414e69372c19c88104addbd7f130c56f867b7ef23cc5161c655c022de446b1e0c9ef9055dba7e9709587602254faf77b604b' '34276fb3952c1286835dbbec7e8f306cbc819fa8b49e22c8a75b248cf7dbda87fb896c4915e267cb150bad28161fc4025843c00c4b6bb57a22e41f22ecf19efd' 'f0372ba65b6203e569da5bc8b262e76f2b7f2682de3eca5006953e4de2e99785d9793044d2f5350cd2b863cb1760780deb36651a7ab20bc7ab317d1eeafcd07f') @@ -57,8 +57,8 @@ prepare() { cd glib - # Fix build (missing include) - git cherry-pick -n 03cb4261e00cf505790f4fd4e69f97b2ef4fcccd + # Fix tests: GLibC 2.37's vasprintf segfaults when passed a NULL format + git cherry-pick -n c4203f740ced1f1fc576caf1550441b57107fd00 # Test suite workaround git apply -3 ../multilib.diff Modified: multilib.diff =================================================================== --- multilib.diff 2023-02-23 20:42:34 UTC (rev 1403751) +++ multilib.diff 2023-02-23 20:59:17 UTC (rev 1403752) @@ -11,17 +11,15 @@ # Rename symbol to match the one in the C file diff --git i/glib/tests/meson.build w/glib/tests/meson.build -index db01b54b4..42a852b2b 100644 +index db01b54b4..55f9c2e1f 100644 --- i/glib/tests/meson.build +++ w/glib/tests/meson.build -@@ -126,7 +126,9 @@ glib_tests = { +@@ -126,7 +126,7 @@ glib_tests = { 'thread-pool' : {}, 'thread-pool-slow' : {'suite' : ['slow']}, 'timeout' : {}, - 'timer' : {}, -+ 'timer' : { -+ 'suite' : ['flaky'], -+ }, ++ 'timer' : {'suite' : ['flaky']}, 'tree' : {}, 'types' : {}, 'utf8-performance' : {},
