From: Liliana Marie Prikler <liliana.prikler@gmail.com>
To: 73127@debbugs.gnu.org
Cc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com,
vivien@planete-kraus.eu
Subject: [bug#73127] [PATCH gnome-team v2] gnu: glib: Update to 2.80.5.
Date: Sun, 8 Sep 2024 22:44:25 +0200 [thread overview]
Message-ID: <e109399d65161022198c923330aff313dc079977.1726247742.git.liliana.prikler@gmail.com> (raw)
In-Reply-To: <29a668e15846a06eeab999db38296bf45d0810a0.1725829268.git.liliana.prikler@gmail.com>
* 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
next prev parent reply other threads:[~2024-09-13 17:22 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-08 20:44 [bug#73127] [PATCH gnome-team] gnu: glib: Update to 2.80.5 Liliana Marie Prikler
2024-09-08 20:44 ` Liliana Marie Prikler [this message]
2024-09-14 13:20 ` [bug#73127] [PATCH gnome-team v2] " Maxim Cournoyer
2024-09-11 3:46 ` [bug#73127] [PATCH gnome-team] " Maxim Cournoyer
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=e109399d65161022198c923330aff313dc079977.1726247742.git.liliana.prikler@gmail.com \
--to=liliana.prikler@gmail.com \
--cc=73127@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 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.