From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: Liliana Marie Prikler <liliana.prikler@gmail.com>
Cc: rg@raghavgururajan.name, 62467@debbugs.gnu.org
Subject: [bug#62467] [PATCH gnome-team v2 01/12] gnu: glib: Update to 2.76.1.
Date: Sat, 08 Apr 2023 15:37:52 -0400 [thread overview]
Message-ID: <87edourwq7.fsf@gmail.com> (raw)
In-Reply-To: <dbab0750dafb48ff76078f84a268af042c31d79b.camel@gmail.com> (Liliana Marie Prikler's message of "Sun, 26 Mar 2023 17:39:11 +0200")
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.
> + (("[ \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.
The rest LGTM.
--
Thanks,
Maxim
next prev parent reply other threads:[~2023-04-08 19:38 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-26 19:20 [bug#62467] [PATCH gnome-team 0/5] Update fundamental packages Liliana Marie Prikler
2023-03-26 15:39 ` [bug#62467] [PATCH gnome-team v3 02/15] gnu: glib: Update to 2.76.1 Liliana Marie Prikler
2023-03-26 15:39 ` [bug#62467] [PATCH gnome-team v2 01/12] " Liliana Marie Prikler
2023-04-08 19:37 ` Maxim Cournoyer [this message]
2023-04-08 19:54 ` Liliana Marie Prikler
2023-04-09 5:03 ` Maxim Cournoyer
2023-03-26 15:39 ` [bug#62467] [PATCH gnome-team 1/5] " Liliana Marie Prikler
2023-03-26 15:53 ` [bug#62467] [PATCH gnome-team v3 03/15] gnu: Make pango-next the new pango Liliana Marie Prikler
2023-03-26 15:53 ` [bug#62467] [PATCH gnome-team v2 02/12] " Liliana Marie Prikler
2023-04-08 19:39 ` Maxim Cournoyer
2023-03-26 15:53 ` [bug#62467] [PATCH gnome-team 2/5] " Liliana Marie Prikler
2023-03-26 18:53 ` [bug#62467] [PATCH gnome-team v3 04/15] gnu: pango: Update to 1.50.14 Liliana Marie Prikler
2023-03-26 18:53 ` [bug#62467] [PATCH gnome-team 3/5] " Liliana Marie Prikler
2023-03-26 18:53 ` [bug#62467] [PATCH gnome-team v2 03/12] " Liliana Marie Prikler
2023-04-08 19:39 ` Maxim Cournoyer
2023-03-26 19:14 ` [bug#62467] [PATCH gnome-team v2 04/12] gnu: Make gobject-introspection-next the new gobject-introspection Liliana Marie Prikler
2023-04-08 19:41 ` Maxim Cournoyer
2023-03-26 19:14 ` [bug#62467] [PATCH gnome-team 4/5] " Liliana Marie Prikler
2023-03-26 19:14 ` [bug#62467] [PATCH gnome-team v3 05/15] " Liliana Marie Prikler
2023-03-26 19:19 ` [bug#62467] [PATCH gnome-team v3 06/15] gnu: gobject-introspection: Update to 1.76.1 Liliana Marie Prikler
2023-03-26 19:19 ` [bug#62467] [PATCH gnome-team v2 05/12] " Liliana Marie Prikler
2023-04-08 19:40 ` Maxim Cournoyer
2023-03-26 19:19 ` [bug#62467] [PATCH gnome-team 5/5] " Liliana Marie Prikler
2023-03-28 4:26 ` [bug#62467] [PATCH gnome-team v3 07/15] gnu: libsoup-minimal@2: Update to 2.74.3 Liliana Marie Prikler
2023-03-28 4:26 ` [bug#62467] [PATCH gnome-team v2 06/12] " Liliana Marie Prikler
2023-04-08 19:42 ` Maxim Cournoyer
2023-04-08 19:56 ` Liliana Marie Prikler
2023-04-09 5:04 ` Maxim Cournoyer
2023-03-28 16:50 ` [bug#62467] [PATCH gnome-team v3 08/15] gnu: python-pygobject: Set upstream-name Liliana Marie Prikler
2023-03-28 16:50 ` [bug#62467] [PATCH gnome-team v2 07/12] " Liliana Marie Prikler
2023-04-08 19:42 ` Maxim Cournoyer
2023-03-28 16:51 ` [bug#62467] [PATCH gnome-team v3 09/15] gnu: python-pygobject: Update to 3.44.1 Liliana Marie Prikler
2023-03-28 16:51 ` [bug#62467] [PATCH gnome-team v2 08/12] " Liliana Marie Prikler
2023-04-08 19:43 ` Maxim Cournoyer
2023-03-28 19:34 ` [bug#62467] [PATCH gnome-team v3 12/15] gnu: librsvg: Fix build Liliana Marie Prikler
2023-03-28 19:34 ` [bug#62467] [PATCH gnome-team v2 11/12] " Liliana Marie Prikler
2023-04-08 19:49 ` Maxim Cournoyer
2023-04-08 20:03 ` Liliana Marie Prikler
2023-04-09 5:07 ` Maxim Cournoyer
2023-04-10 12:51 ` Liliana Marie Prikler
2023-04-11 1:49 ` Maxim Cournoyer
2023-03-30 4:28 ` [bug#62467] [PATCH gnome-team v3 11/15] gnu: gtk+: Update to 3.24.37 Liliana Marie Prikler
2023-03-30 4:28 ` [bug#62467] [PATCH gnome-team v2 10/12] " Liliana Marie Prikler
2023-04-08 19:34 ` Maxim Cournoyer
2023-03-30 18:41 ` [bug#62467] [PATCH gnome-team v2 09/12] gnu: gtk+-2: Fix build by hardening list store Liliana Marie Prikler
2023-04-08 19:47 ` Maxim Cournoyer
2023-04-08 20:00 ` Liliana Marie Prikler
2023-04-09 5:06 ` Maxim Cournoyer
2023-03-30 18:41 ` [bug#62467] [PATCH gnome-team v3 10/15] " Liliana Marie Prikler
2023-03-31 18:54 ` [bug#62467] [PATCH gnome-team v3 13/15] gnu: inkscape: Update stable version to 1.2.1 Liliana Marie Prikler
2023-03-31 18:54 ` [bug#62467] [PATCH gnome-team v2 12/12] " Liliana Marie Prikler
2023-04-08 19:51 ` Maxim Cournoyer
2023-03-31 21:43 ` [bug#62467] [PATCH gnome-team v2 00/12] Update fundamental packages Liliana Marie Prikler
2023-04-02 17:27 ` Raghav Gururajan via Guix-patches via
2023-04-02 18:20 ` Liliana Marie Prikler
2023-04-03 16:37 ` [bug#62467] [PATCH gnome-team v3 01/15] gnu: librsvg-2.40: Fix test failure with Pango 1.50 Kaelyn Takata
2023-04-11 20:52 ` Maxim Cournoyer
2023-04-10 7:08 ` [bug#62467] [PATCH gnome-team v3 14/15] gnu: inkscape: Use new package style Liliana Marie Prikler
2023-04-10 16:12 ` [bug#62467] [PATCH gnome-team v3 15/15] gnu: Remove lib2geom 1.1 Liliana Marie Prikler
2023-04-11 20:57 ` Maxim Cournoyer
2023-04-12 5:33 ` Liliana Marie Prikler
2023-04-13 2:33 ` Maxim Cournoyer
2023-04-13 5:12 ` bug#62467: " Liliana Marie Prikler
2023-04-11 7:06 ` [bug#62467] [PATCH gnome-team v3 00/15] Update glib to 2.76.1 Liliana Marie Prikler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87edourwq7.fsf@gmail.com \
--to=maxim.cournoyer@gmail.com \
--cc=62467@debbugs.gnu.org \
--cc=liliana.prikler@gmail.com \
--cc=rg@raghavgururajan.name \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.