guix_mirror_bot pushed a commit to branch gnome-team
in repository guix.
commit 7f7fa073cf03839de78793d5078c000d66726df0
Author: Liliana Marie Prikler <[email protected]>
AuthorDate: Thu Oct 9 18:15:10 2025 +0200
gnu: gjs: Fix build with glib 2.86.
* gnu/packages/gnome.scm (gjs)[snippet]: Adjust for GLib 2.86.
[#:phases]: Adjust accordingly.
---
gnu/packages/gnome.scm | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index ec3735e310..e0e283a3e1 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7715,7 +7715,10 @@ configuration program to choose applications starting on
login.")
'(begin
(substitute* "installed-tests/scripts/testCommandLine.sh"
(("Valentín") "")
- (("☭") ""))))))
+ (("☭") ""))
+ (substitute* "modules/script/package.js"
+ (("type_default_interface_ref")
+ "type_default_interface_get"))))))
(build-system meson-build-system)
(arguments
'(#:configure-flags '("-Dinstalled_tests=false")
@@ -7730,11 +7733,12 @@ configuration program to choose applications starting
on login.")
;; For the missing /etc/machine-id.
(setenv "DBUS_FATAL_WARNINGS" "0")
(setenv "HOME" (getcwd))))
- (add-after 'unpack 'skip-failing-check
+ (add-after 'unpack 'skip-failing-tests
(lambda _
- ;; See <https://gitlab.gnome.org/GNOME/gjs/-/issues/681>.
- (substitute* "installed-tests/js/testGtk3.js"
- (("expect\\(frameChild\\.visible\\)\\.toBe\\(true\\);") ""))))
+ ;; Expects to test against 2.84, but we're using 2.86.
+ (substitute* "installed-tests/js/testIntrospection.js"
+ (("const skip = imports.gi.versions.GioUnix !== '2\\.0';")
+ "const skip = true;"))))
(add-after 'install 'wrap-gi
(lambda* (#:key inputs outputs #:allow-other-keys)
(wrap-program (string-append (assoc-ref outputs "out")
