[bug#62467] [PATCH gnome-team v2 01/12] gnu: glib: Update to 2.76.1.

[Maxim Cournoyer]

Hi,

Liliana Marie Prikler <liliana.prikler@gmail.com> writes:

> Am Samstag, dem 08.04.2023 um 15:37 -0400 schrieb Maxim Cournoyer:
>> Hi!
>> 
>> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
>> 
>> > * gnu/packages/glib.scm (glib): Update to 2.76.1.
>> > [source]<snippet>: Adjust accordingly.
>> > [arguments]<#:phases>: Add ‘set-G_TEST_SRCDIR’.  Update ‘delete-
>> > failing-tests’.
>> > [propagated-inputs]: Replace pcre with pcre2.
>> > (glib-with-documentation): Inherit from glib.
>> > * gnu/packages/gnome.scm (sysprof, gtranslator): Use glib.
>> > * gnu/packages/gtk.scm (gtksourceview): Use glib.
>> > * gnu/packages/guile-xyz.scm (guile-g-golf): Use glib.
>> > * gnu/packages/patches/glib-skip-failing-test.patch: Adjust
>> > accordingly.
>> > ---
>> >  gnu/packages/glib.scm                         | 92 +++++----------
>> > ----
>> >  gnu/packages/gnome.scm                        |  8 +-
>> >  gnu/packages/gtk.scm                          |  2 +-
>> >  gnu/packages/guile-xyz.scm                    |  2 +-
>> >  .../patches/glib-skip-failing-test.patch      |  3 +-
>> >  5 files changed, 30 insertions(+), 77 deletions(-)
>> > 
>> > diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
>> > index f85d5e3225..ecf5cb491f 100644
>> > --- a/gnu/packages/glib.scm
>> > +++ b/gnu/packages/glib.scm
>> > @@ -215,7 +215,7 @@ (define-public dbus-verbose
>> >  (define glib
>> >    (package
>> >      (name "glib")
>> > -    (version "2.70.2")
>> > +    (version "2.76.1")
>> >      (source
>> >       (origin
>> >         (method url-fetch)
>> > @@ -224,14 +224,14 @@ (define glib
>> >                         name "/" (string-take version 4) "/"
>> >                         name "-" version ".tar.xz"))
>> >         (sha256
>> > -        (base32
>> > "0vw08p4jllavp9qmlqg1yl1zanmy53yid46wipas6gfdhnf4al85"))
>> > +        (base32
>> > "17x1zpr2avj8hjbpc6hp2sf2885lxac46v0kajsgan3929m0zp23"))
>> >         (patches
>> >          (search-patches "glib-appinfo-watch.patch"
>> >                          "glib-skip-failing-test.patch"))
>> >         (modules '((guix build utils)))
>> >         (snippet
>> >          '(begin
>> > -           (substitute* "tests/spawn-test.c"
>> > +           (substitute* "glib/tests/spawn-test.c"
>> >               (("/bin/sh") "sh"))))))
>> >      (build-system meson-build-system)
>> >      (outputs '("out"                    ;libraries, locales, etc
>> > @@ -256,6 +256,9 @@ (define glib
>> >         #:phases
>> >         (modify-phases %standard-phases
>> >           ;; Needed to pass the test phase on slower ARM and i686
>> > machines.
>> > +         (add-after 'unpack 'set-G_TEST_SRCDIR
>> > +           (lambda _
>> > +             (setenv "G_TEST_SRCDIR" (string-append (getcwd)
>> > "/gio/tests"))))
>> >           (add-after 'unpack 'increase-test-timeout
>> >             (lambda _
>> >               (substitute* "meson.build"
>> > @@ -270,9 +273,19 @@ (define glib
>> >                 (substitute* '("unix.c" "utils.c")
>> >                   (("[ \t]*g_test_add_func.*;") "")))
>> >               (with-directory-excursion "gio/tests"
>> > -               (substitute* '("contenttype.c" "gdbus-address-get-
>> > session.c"
>> > -                              "gdbus-peer.c" "appinfo.c" "desktop-
>> > app-info.c")
>> > -                 (("[ \t]*g_test_add_func.*;") "")))
>> > +               (substitute* '("contenttype.c"
>> > +                              "gdbus-address-get-session.c"
>> > +                              "gdbus-server-auth.c"
>> > +                              "gdbus-peer.c"
>> > +                              "appinfo.c"
>> > +                              "desktop-app-info.c")
>> > +                 (("[ \t]*g_test_add_func.*;") ""))
>> > +               (unless (which "update-desktop-database")
>> > +                 (substitute* '("file.c")
>> 
>> file.c doesn't need to be in a list.
> Nice catch.
>
>> > +                 (("[ \t]*g_test_add_func.*query-default-
>> > handler.*;") "")))
>> 
>> The indentation seems off here.  Is it really necessary to use the
>> unless conditional here?  I'd perhaps simply disable the test
>> generally.
> I'd like to let it run when the input exists, but that's a circle. 
> We'd have to check it in glib-with-documentation.

I see.  LGTM then.

-- 
Thanks,
Maxim