GNU bug report logs - #73127
[PATCH gnome-team] gnu: glib: Update to 2.80.5.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 73127 in the body.
You can then email your comments to 73127 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

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

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: guix-patches <at> gnu.org
Subject: [PATCH gnome-team] gnu: glib: Update to 2.80.5.
Date: Sun, 8 Sep 2024 22:44:25 +0200

* gnu/packages/glib.scm (glib): Update to 2.80.5.
[native-inputs]: Add python-packaging-bootstrap.
---
 gnu/packages/glib.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index d6275ea63e..a0f1949f2f 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -73,6 +73,7 @@ (define-module (gnu packages glib)
   #:use-module (gnu packages popt)
   #:use-module (gnu packages pkg-config)
   #: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)
@@ -243,7 +244,7 @@ (define-public dbus-verbose
 (define glib
   (package
     (name "glib")
-    (version "2.78.0")
+    (version "2.80.5")
     (source
      (origin
        (method url-fetch)
@@ -252,7 +253,7 @@ (define glib
                        name "/" (string-take version 4) "/"
                        name "-" version ".tar.xz"))
        (sha256
-        (base32 "0c3vagxl77wma85qinbj974jvw96n5bvch2m7hqcwxq8fa5spsj4"))
+        (base32 "0wb77rnfcfmz368dg7b8d4waif8qddidcdvyvszmns9wh3gaj8wz"))
        (patches
         (search-patches "glib-appinfo-watch.patch"
                         "glib-skip-failing-test.patch"))
@@ -483,6 +484,7 @@ (define glib
            perl                         ;needed by GIO tests
            pkg-config
            python                       ;for 'patch-python-references
+           python-packaging-bootstrap
            python-wrapper
            tzdata-for-tests))           ;for tests/gdatetime.c
     (inputs

base-commit: bf0af917fe6127d79251c7c0f3e3d33e1e8b1403
-- 
2.45.2

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

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Cc: 73127 <at> debbugs.gnu.org, vivien <at> planete-kraus.eu
Subject: Re: [bug#73127] [PATCH gnome-team] gnu: glib: Update to 2.80.5.
Date: Wed, 11 Sep 2024 12:46:12 +0900

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

> * gnu/packages/glib.scm (glib): Update to 2.80.5.
> [native-inputs]: Add python-packaging-bootstrap.

Reviewed-by: Maxim Cournoyer <maxim.cournoyer <at> gmail>

-- 
Thanks,
Maxim

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

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: 73127 <at> debbugs.gnu.org
Subject: [PATCH gnome-team v2] gnu: glib: Update to 2.80.5.
Date: Sun, 8 Sep 2024 22:44:25 +0200

* gnu/packages/glib.scm (glib): Update to 2.80.5.
[#:phases]: Add ‘wrap-python’.
[inputs]: Add python-packaging-bootstrap.
---

v2 fixes builds in dependent packages, but may come at the cost of making
glib no longer cross-compilable (note: I don't know whether it can be
cross-built currently, and would like some pointers on how to achieve
this for a potential v3).  qtbase still fails --- bug report incoming.

 gnu/packages/glib.scm | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index d6275ea63e..72bcbdcc61 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -73,6 +73,7 @@ (define-module (gnu packages glib)
   #:use-module (gnu packages popt)
   #:use-module (gnu packages pkg-config)
   #: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)
@@ -243,7 +244,7 @@ (define-public dbus-verbose
 (define glib
   (package
     (name "glib")
-    (version "2.78.0")
+    (version "2.80.5")
     (source
      (origin
        (method url-fetch)
@@ -252,7 +253,7 @@ (define glib
                        name "/" (string-take version 4) "/"
                        name "-" version ".tar.xz"))
        (sha256
-        (base32 "0c3vagxl77wma85qinbj974jvw96n5bvch2m7hqcwxq8fa5spsj4"))
+        (base32 "0wb77rnfcfmz368dg7b8d4waif8qddidcdvyvszmns9wh3gaj8wz"))
        (patches
         (search-patches "glib-appinfo-watch.patch"
                         "glib-skip-failing-test.patch"))
@@ -475,7 +476,12 @@ (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
@@ -486,13 +492,17 @@ (define glib
            python-wrapper
            tzdata-for-tests))           ;for tests/gdatetime.c
     (inputs
-     (list ;; "python", "python-wrapper" and "bash-minimal"
+     (list
+      ;; "python", "python-wrapper" and "bash-minimal"
       ;; 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-wrapper
+      python-packaging-bootstrap))
     (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

base-commit: bf0af917fe6127d79251c7c0f3e3d33e1e8b1403
-- 
2.45.2

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

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Cc: 73127 <at> debbugs.gnu.org, vivien <at> planete-kraus.eu
Subject: Re: [bug#73127] [PATCH gnome-team v2] gnu: glib: Update to 2.80.5.
Date: Sat, 14 Sep 2024 22:20:23 +0900

Hi Liliana,

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

> * gnu/packages/glib.scm (glib): Update to 2.80.5.
> [#:phases]: Add ‘wrap-python’.
> [inputs]: Add python-packaging-bootstrap.
> ---
>
> v2 fixes builds in dependent packages, but may come at the cost of making
> glib no longer cross-compilable (note: I don't know whether it can be
> cross-built currently, and would like some pointers on how to achieve
> this for a potential v3).  qtbase still fails --- bug report incoming.

I wouldn't worry too much about making it non cross-compilable by adding
a Python input; I had a patch making it possible to cross-compile python
packages on old core-updates, I should revisit it.

The rest looks fine to me.

-- 
Thanks,
Maxim

Message #19 received at 73127-done <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Cc: 73127-done <at> debbugs.gnu.org, vivien <at> planete-kraus.eu
Subject: Re: bug#73127: [PATCH gnome-team] gnu: glib: Update to 2.80.5.
Date: Tue, 12 Nov 2024 17:31:31 +0900

Hi,

Maxim Cournoyer <maxim.cournoyer <at> gmail.com> writes:

> Hi Liliana,
>
> Liliana Marie Prikler <liliana.prikler <at> gmail.com> writes:
>
>> * gnu/packages/glib.scm (glib): Update to 2.80.5.
>> [#:phases]: Add ‘wrap-python’.
>> [inputs]: Add python-packaging-bootstrap.
>> ---
>>
>> v2 fixes builds in dependent packages, but may come at the cost of making
>> glib no longer cross-compilable (note: I don't know whether it can be
>> cross-built currently, and would like some pointers on how to achieve
>> this for a potential v3).  qtbase still fails --- bug report incoming.
>
> I wouldn't worry too much about making it non cross-compilable by adding
> a Python input; I had a patch making it possible to cross-compile python
> packages on old core-updates, I should revisit it.
>
> The rest looks fine to me.

That's obsolete by glib 2.83.0 on my latest gnome-team submission (bug
#74306).

-- 
Thanks,
Maxim

Previous Next

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