From: Liliana Marie Prikler <liliana.prikler@gmail.com>
To: 73610@debbugs.gnu.org
Cc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com,
vivien@planete-kraus.eu
Subject: [bug#73610] [PATCH gnome-team 1/2] gnu: glib: Update to 2.82.1.
Date: Thu, 3 Oct 2024 11:25:01 +0200 [thread overview]
Message-ID: <b48b7cba767c5b709136fb07d7a232a52253751d.1727947939.git.liliana.prikler@gmail.com> (raw)
In-Reply-To: <cover.1727947939.git.liliana.prikler@gmail.com>
GLib 2.82.1 builds without the packaging module, instead using internal
code for version checks. Currently, CI fails with 2.80.5, because
python-packaging-bootstrap (and therefore glib) can not be cross-built.
For more information on the upstream change, see
<https://gitlab.gnome.org/GNOME/glib/-/issues/3301> and
<https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4133>.
* gnu/packages/glib.scm (glib): Update to 2.82.1.
[#:phases]: Remove ‘wrap-python’.
[inputs]: Remove python-packaging-bootstrap.
---
gnu/packages/glib.scm | 17 ++++-------------
1 file changed, 4 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 1c2c2a3179..3bf201e7cf 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -75,7 +75,6 @@ (define-module (gnu packages glib)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages pretty-print)
#:use-module (gnu packages python)
- #:use-module (gnu packages python-build)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages web)
@@ -246,7 +245,7 @@ (define-public dbus-verbose
(define glib
(package
(name "glib")
- (version "2.80.5")
+ (version "2.82.1")
(source
(origin
(method url-fetch)
@@ -255,7 +254,7 @@ (define glib
name "/" (string-take version 4) "/"
name "-" version ".tar.xz"))
(sha256
- (base32 "0wb77rnfcfmz368dg7b8d4waif8qddidcdvyvszmns9wh3gaj8wz"))
+ (base32 "19l98kdv6d4363minliw0imvxh4qfdw5im988knf8bpm1d2391j7"))
(patches
(search-patches "glib-appinfo-watch.patch"
"glib-skip-failing-test.patch"))
@@ -478,12 +477,7 @@ (define glib
(("^bindir=.*")
"")
(("=\\$\\{bindir\\}/")
- "="))))
- (add-after 'install 'wrap-python
- (lambda* (#:key outputs #:allow-other-keys)
- ;; gdbus-codegen imports packaging.version.
- (wrap-program (search-input-file outputs "bin/gdbus-codegen")
- `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH")))))))))
+ "=")))))))
(native-inputs
(list dbus
gettext-minimal
@@ -499,12 +493,9 @@ (define glib
;; are for the 'patch-shebangs' phase, to make
;; sure the installed scripts end up with a correct shebang
;; when cross-compiling.
- ;; "python-packaging-bootstrap" is needed by 'wrap-python' to
- ;; ensure gdbus-codegen works as expected.
bash-minimal
python
- python-wrapper
- python-packaging-bootstrap))
+ python-wrapper))
(propagated-inputs
(list libffi ; in the Requires.private field of gobject-2.0.pc
pcre2 ; in the Requires.private field of glib-2.0.pc
--
2.46.0
next prev parent reply other threads:[~2024-10-03 10:51 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-03 9:32 [bug#73610] [PATCH gnome-team 0/2] Update GLib to 2.82.1 Liliana Marie Prikler
2024-10-03 9:25 ` Liliana Marie Prikler [this message]
2024-10-03 9:25 ` [bug#73610] [PATCH gnome-team v2 1/4] gnu: glib: Update " Liliana Marie Prikler
2024-10-03 9:31 ` [bug#73610] [PATCH gnome-team v2 2/4] gnu: gobject-introspection: Update to 1.82.0 Liliana Marie Prikler
2024-10-05 7:55 ` [bug#73610] [PATCH gnome-team v2 3/4] gnu: bootstrap glib and gobject against each other Liliana Marie Prikler
2024-10-05 7:59 ` [bug#73610] [PATCH gnome-team v2 4/4] gnu: cairo: Update to 1.18.2 Liliana Marie Prikler
2024-10-03 9:31 ` [bug#73610] [PATCH gnome-team 2/2] gnu: gobject-introspection: Update to 1.82.0 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
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b48b7cba767c5b709136fb07d7a232a52253751d.1727947939.git.liliana.prikler@gmail.com \
--to=liliana.prikler@gmail.com \
--cc=73610@debbugs.gnu.org \
--cc=maxim.cournoyer@gmail.com \
--cc=vivien@planete-kraus.eu \
/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 public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).