Date: Friday, March 10, 2023 @ 15:31:45 Author: heftig Revision: 1417285
2.76.0-1 Modified: lib32-glib2/trunk/PKGBUILD Deleted: lib32-glib2/trunk/multilib.diff ---------------+ PKGBUILD | 12 ++---------- multilib.diff | 25 ------------------------- 2 files changed, 2 insertions(+), 35 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2023-03-10 15:20:22 UTC (rev 1417284) +++ PKGBUILD 2023-03-10 15:31:45 UTC (rev 1417285) @@ -5,7 +5,7 @@ pkgbase=lib32-glib2 pkgname=(lib32-glib2) -pkgver=2.74.6 +pkgver=2.76.0 pkgrel=1 pkgdesc="Low level core library (32-bit)" url="https://wiki.gnome.org/Projects/GLib"; @@ -36,16 +36,14 @@ options=( debug ) -_commit=a5dde6304670af590f25a2992104c0880003acf0 # tags/2.74.6^0 +_commit=8a9ada663923e39c0e8d7eefe65390955dc3c0d8 # tags/2.76.0^0 source=( "git+https://gitlab.gnome.org/GNOME/glib.git#commit=$_commit"; "git+https://gitlab.gnome.org/GNOME/gvdb.git"; - multilib.diff gio-querymodules-32.{hook,script} ) b2sums=('SKIP' 'SKIP' - '39b757816b28bc4101cf59b651dd414e69372c19c88104addbd7f130c56f867b7ef23cc5161c655c022de446b1e0c9ef9055dba7e9709587602254faf77b604b' '34276fb3952c1286835dbbec7e8f306cbc819fa8b49e22c8a75b248cf7dbda87fb896c4915e267cb150bad28161fc4025843c00c4b6bb57a22e41f22ecf19efd' 'f0372ba65b6203e569da5bc8b262e76f2b7f2682de3eca5006953e4de2e99785d9793044d2f5350cd2b863cb1760780deb36651a7ab20bc7ab317d1eeafcd07f') @@ -57,12 +55,6 @@ prepare() { cd glib - # 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 - git submodule init git submodule set-url subprojects/gvdb "$srcdir/gvdb" git -c protocol.file.allow=always submodule update Deleted: multilib.diff =================================================================== --- multilib.diff 2023-03-10 15:20:22 UTC (rev 1417284) +++ multilib.diff 2023-03-10 15:31:45 UTC (rev 1417285) @@ -1,25 +0,0 @@ -diff --git i/gio/tests/meson.build w/gio/tests/meson.build -index 41d4e3e6c..9f8110884 100644 ---- i/gio/tests/meson.build -+++ w/gio/tests/meson.build -@@ -838,6 +838,7 @@ if meson.can_run_host_binaries() - '-r', - '-b','binary', - '@INPUT@', -+ '--oformat', 'elf32-i386', - '-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 db01b54b4..55f9c2e1f 100644 ---- i/glib/tests/meson.build -+++ w/glib/tests/meson.build -@@ -126,7 +126,7 @@ glib_tests = { - 'thread-pool' : {}, - 'thread-pool-slow' : {'suite' : ['slow']}, - 'timeout' : {}, -- 'timer' : {}, -+ 'timer' : {'suite' : ['flaky']}, - 'tree' : {}, - 'types' : {}, - 'utf8-performance' : {},
