GNU bug report logs - #73610
[PATCH gnome-team 0/2] Update GLib to 2.82.1

Previous Next

Full log

Message #11 received at 73610 <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: 73610 <at> debbugs.gnu.org
Subject: [PATCH gnome-team 1/2] gnu: glib: Update to 2.82.1.
Date: Thu, 3 Oct 2024 11:25:01 +0200

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

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.