diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2024-06-06 22:21:02 +0200 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2024-06-06 22:21:02 +0200 |
| commit | b8780f7397dd46b5e382e48db87b8648f769d738 (patch) | |
| tree | 906b8afa0457d4e05930b6305aa7f5e6afa929f8 /gnu/packages/gnome.scm | |
| parent | 6eb07c78a909be30c4643a794ec0df6e9b56daeb (diff) | |
| parent | ad7505d16f882e69926008a22f9c12c37b32f4ee (diff) | |
| download | guix-b8780f7397dd46b5e382e48db87b8648f769d738.tar.gz | |
Merge branch 'gnome-team'
Diffstat (limited to 'gnu/packages/gnome.scm')
| -rw-r--r-- | gnu/packages/gnome.scm | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b9676ffd57..e910e125d2 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4553,7 +4553,7 @@ passwords in the GNOME keyring.") (define-public vala (package (name "vala") - (version "0.56.14") + (version "0.56.16") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/vala/" @@ -4561,7 +4561,7 @@ passwords in the GNOME keyring.") "vala-" version ".tar.xz")) (sha256 (base32 - "0mzmldhf6474dp2jkxj160kkafdz32c2l5f8xnm05p4vr9lc50lk")))) + "16yaiff5nl2dfyvs3bj8y7wvzh9riz6wqlx7csgg1lpm01b7nj05")))) (build-system glib-or-gtk-build-system) (arguments (list @@ -13420,6 +13420,14 @@ libraries. Applications do not need to be recompiled--or even restarted.") #:configure-flags #~(list "-Dnetwork_tests=false" "-Ddocs=true") #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda _ + ;; With Gnome 4.14, GtkStackPage has an autoptr already, so it'd + ;; get redefined. Drop this phase when updating gnome-builder to + ;; 46.0 or newer. See also + ;; <https://gitlab.gnome.org/GNOME/gnome-builder/-/commit/7aaaecefc2ea8a37eaeae8b4d726d119d4eb8fa3> + (substitute* "src/libide/tweaks/ide-tweaks-window.c" + (("G_DEFINE_AUTOPTR_CLEANUP_FUNC \\(GtkStackPage, .*\\)") "")))) (add-after 'unpack 'patch-meson (lambda* (#:key inputs #:allow-other-keys) (substitute* "meson.build" |