Date: Tuesday, March 23, 2021 @ 18:38:20 Author: heftig Revision: 410783
2.68.0-4: FS#70131 Modified: glib2/trunk/PKGBUILD glib2/trunk/noisy-glib-compile-schemas.diff ---------------------------------+ PKGBUILD | 8 ++++++-- noisy-glib-compile-schemas.diff | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-03-23 17:35:54 UTC (rev 410782) +++ PKGBUILD 2021-03-23 18:38:20 UTC (rev 410783) @@ -4,7 +4,7 @@ pkgbase=glib2 pkgname=(glib2 glib2-docs) pkgver=2.68.0 -pkgrel=3 +pkgrel=4 pkgdesc="Low level core library" url="https://wiki.gnome.org/Projects/GLib"; license=(LGPL) @@ -17,7 +17,7 @@ noisy-glib-compile-schemas.diff glib-compile-schemas.hook gio-querymodules.{hook,script}) sha256sums=('SKIP' - '81a4df0b638730cffb7fa263c04841f7ca6b9c9578ee5045db6f30ff0c3fc531' + 'b1cb539389aaabd13671424452f2805112a359b96c9e0e7f80fad804a77f9c7e' '64ae5597dda3cc160fc74be038dbe6267d41b525c0c35da9125fbf0de27f9b25' '2a9f9b8235f48e3b7d0f6cfcbc76cd2116c45f28692cac4bd61074c495bd5eb7' '92d08db5aa30bda276bc3d718e7ff9dd01dc40dcab45b359182dcc290054e24e') @@ -30,6 +30,10 @@ prepare() { cd glib + # https://bugs.archlinux.org/task/70131 + # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2010 + git cherry-pick -n 07ab2e26c937 77649d3d3d94 + # Suppress noise from glib-compile-schemas.hook git apply -3 ../noisy-glib-compile-schemas.diff } Modified: noisy-glib-compile-schemas.diff =================================================================== --- noisy-glib-compile-schemas.diff 2021-03-23 17:35:54 UTC (rev 410782) +++ noisy-glib-compile-schemas.diff 2021-03-23 18:38:20 UTC (rev 410783) @@ -1,8 +1,8 @@ diff --git i/gio/glib-compile-schemas.c w/gio/glib-compile-schemas.c -index b8de0907248f6860..130f89b1728f7932 100644 +index cfea042f8..1b2afe457 100644 --- i/gio/glib-compile-schemas.c +++ w/gio/glib-compile-schemas.c -@@ -1219,19 +1219,6 @@ parse_state_start_schema (ParseState *state, +@@ -1232,19 +1232,6 @@ parse_state_start_schema (ParseState *state, return; }
