diff options
Diffstat (limited to 'gnu/packages/gnome.scm')
| -rw-r--r-- | gnu/packages/gnome.scm | 114 |
1 files changed, 52 insertions, 62 deletions
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 87b860f9d9..a86ddc34b3 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3474,7 +3474,7 @@ for dealing with different structured file formats.") (define-public librsvg (package (name "librsvg") - (version "2.54.5") + (version "2.56.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/librsvg/" @@ -3482,10 +3482,7 @@ for dealing with different structured file formats.") "librsvg-" version ".tar.xz")) (sha256 (base32 - "0vmfgihhf35bxn7giqiskgsflr0zxp6xyy9aynhiyk9j8l7ij0sg")) - (modules '((guix build utils))) - (snippet - '(begin (delete-file-recursively "vendor"))))) + "1xa0cxdvc6vis5ssh1i0vi2rwgcx3bll6k5i135qyd2ra77zv1za")))) (build-system cargo-build-system) (outputs '("out" "doc" "debug")) (arguments @@ -3496,55 +3493,61 @@ for dealing with different structured file formats.") (guix build utils) ((guix build gnu-build-system) #:prefix gnu:)) #:cargo-inputs - `(("rust-byteorder" ,rust-byteorder-1) - ("rust-cairo-rs" ,rust-cairo-rs-0.15) + `(("rust-anyhow" ,rust-anyhow-1) + ("rust-byteorder" ,rust-byteorder-1) + ("rust-cairo-rs" ,rust-cairo-rs-0.17) ("rust-cast" ,rust-cast-0.3) ("rust-chrono" ,rust-chrono-0.4) - ("rust-clap" ,rust-clap-2) - ("rust-cssparser" ,rust-cssparser-0.28) - ("rust-data-url" ,rust-data-url-0.1) - ("rust-encoding" ,rust-encoding-0.2) + ("rust-clap" ,rust-clap-4) + ("rust-clap-complete" ,rust-clap-complete-4) + ("rust-cssparser" ,rust-cssparser-0.29) + ("rust-data-url" ,rust-data-url-0.2) + ("rust-encoding-rs" ,rust-encoding-rs-0.8) ("rust-float-cmp" ,rust-float-cmp-0.9) - ("rust-gdk-pixbuf" ,rust-gdk-pixbuf-0.15) - ("rust-gio" ,rust-gio-0.15) - ("rust-glib" ,rust-glib-0.15) + ("rust-gdk-pixbuf" ,rust-gdk-pixbuf-0.17) + ("rust-gio" ,rust-gio-0.17) + ("rust-glib" ,rust-glib-0.17) ("rust-itertools" ,rust-itertools-0.10) ("rust-language-tags" ,rust-language-tags-0.3) ("rust-libc" ,rust-libc-0.2) ("rust-locale-config" ,rust-locale-config-0.3) - ("rust-markup5ever" ,rust-markup5ever-0.10) - ("rust-nalgebra" ,rust-nalgebra-0.29) + ("rust-markup5ever" ,rust-markup5ever-0.11) + ("rust-nalgebra" ,rust-nalgebra-0.32) ("rust-num-traits" ,rust-num-traits-0.2) ("rust-once-cell" ,rust-once-cell-1) - ("rust-pango" ,rust-pango-0.15) - ("rust-pangocairo" ,rust-pangocairo-0.15) + ("rust-pango" ,rust-pango-0.17) + ("rust-pangocairo" ,rust-pangocairo-0.17) ("rust-rayon" ,rust-rayon-1) - ("rust-rctree" ,rust-rctree-0.4) - ("rust-rgb" ,rust-rgb-0.8) + ("rust-rctree" ,rust-rctree-0.5) ("rust-regex" ,rust-regex-1) - ("rust-selectors" ,rust-selectors-0.23) + ("rust-rgb" ,rust-rgb-0.8) + ("rust-selectors" ,rust-selectors-0.24) ("rust-string-cache" ,rust-string-cache-0.8) + ("rust-system-deps" ,rust-system-deps-6) + ("rust-thiserror" ,rust-thiserror-1) ("rust-tinyvec" ,rust-tinyvec-1) ("rust-url" ,rust-url-2) - ("rust-xml5ever" ,rust-xml5ever-0.16)) + ("rust-xml5ever" ,rust-xml5ever-0.17)) #:cargo-development-inputs `(("rust-anyhow" ,rust-anyhow-1) ("rust-assert-cmd" ,rust-assert-cmd-2) - ("rust-cairo-rs" ,rust-cairo-rs-0.15) + ("rust-cairo-rs" ,rust-cairo-rs-0.17) + ("rust-cast" ,rust-cast-0.3) ("rust-chrono" ,rust-chrono-0.4) - ("rust-criterion" ,rust-criterion-0.3) - ("rust-glib" ,rust-glib-0.15) + ("rust-criterion" ,rust-criterion-0.4) + ("rust-glib" ,rust-glib-0.17) ("rust-libc" ,rust-libc-0.2) - ("rust-lopdf" ,rust-lopdf-0.26) + ("rust-lopdf" ,rust-lopdf-0.29) ("rust-matches" ,rust-matches-0.1) + ("rust-pango" ,rust-pango-0.17) + ("rust-pangocairo" ,rust-pangocairo-0.17) ("rust-png" ,rust-png-0.17) ("rust-predicates" ,rust-predicates-2) ("rust-proptest" ,rust-proptest-1) ("rust-serde" ,rust-serde-1) ("rust-serde-json" ,rust-serde-json-1) ("rust-tempfile" ,rust-tempfile-3) - ("rust-test-generator" ,rust-test-generator-0.3) - ("rust-yeslogic-fontconfig-sys" ,rust-yeslogic-fontconfig-sys-2)) + ("rust-yeslogic-fontconfig-sys" ,rust-yeslogic-fontconfig-sys-4)) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-gdk-pixbuf-thumbnailer @@ -3568,12 +3571,9 @@ for dealing with different structured file formats.") ;; Increase reftest tolerance a bit to account for different ;; harfbuzz, pango, etc. (setenv "RSVG_TEST_TOLERANCE" "20") - ;; These two tests even fail after loosening the tolerance. - (for-each delete-file - '("tests/fixtures/reftests/bugs/730-font-scaling.svg" - "tests/fixtures/reftests/bugs/730-font-scaling-ref.png" - "tests/fixtures/reftests/svg1.1/text-text-03-b.svg" - "tests/fixtures/reftests/svg1.1/text-text-03-b-ref.png")))) + ;; This test fails even after loosening the tolerance. + (substitute* "tests/src/reference.rs" + ((".*svg1_1_text_align_03_b_svg.*") "")))) (add-before 'configure 'pre-configure (lambda* (#:key outputs #:allow-other-keys) (substitute* "gdk-pixbuf-loader/Makefile.in" @@ -7807,10 +7807,7 @@ to display dialog boxes from the commandline and shell scripts.") (build-system meson-build-system) (arguments (list - #:imported-modules `(,@%meson-build-system-modules - (guix build syscalls)) #:modules '((guix build meson-build-system) - (guix build syscalls) (guix build utils) (ice-9 match)) #:glib-or-gtk? #t @@ -7904,22 +7901,22 @@ to display dialog boxes from the commandline and shell scripts.") "1")) (match (primitive-fork) (0 ;child process - (set-child-subreaper!) - ;; Use tini so that signals are properly handled and - ;; doubly-forked processes get reaped; otherwise, - ;; python-dbusmock would waste time polling for the dbus - ;; processes it spawns to be reaped, in vain. - (apply execlp "tini" "--" - "dbus-run-session" "--" + (apply execlp "dbus-run-session" "dbus-run-session" "xvfb-run" "-a" "-s" (getenv "XVFB_SERVER_ARGS") "meson" "test" "-t" "0" "--print-errorlogs" test-options)) - (pid - (match (waitpid pid) - ((_ . status) - (unless (zero? status) - (error "`meson test' exited with status" - status)))))))))))) + (dbus-pid + (let loop () + ;; Reap child processes; otherwise, python-dbusmock would + ;; waste time polling for the dbus processes it spawns to + ;; be reaped, in vain. + (match (waitpid WAIT_ANY) + ((pid . status) + (if (= pid dbus-pid) + (unless (zero? status) + (error "`meson test' exited with status" + status)) + (loop))))))))))))) (native-inputs (list desktop-file-utils ;for update-desktop-database `(,glib "bin") ;for glib-compile-schemas, etc. @@ -7940,8 +7937,7 @@ to display dialog boxes from the commandline and shell scripts.") pipewire python python-dbus - python-dbusmock - tini)) ;acting as init (zombie reaper) + python-dbusmock)) (propagated-inputs (list gsettings-desktop-schemas ;required by libmutter.pc gtk+ ;required by libmutter.pc @@ -8287,6 +8283,7 @@ users.") "-Ddhcpcanon=no" "-Dcrypto=gnutls" "-Diwd=true" + "-Dnm_cloud_setup=false" "-Dlibaudit=yes" "-Dqt=false" "-Ddocs=true" @@ -8296,19 +8293,12 @@ users.") #$output "/lib/udev") (string-append "-Ddbus_conf_dir=" #$output "/etc/dbus-1/system.d") - + (string-append "-Dmodprobe=" (search-input-file %build-inputs + "bin/modprobe")) (string-append "-Ddhclient=" (search-input-file %build-inputs - "/sbin/dhclient"))) + "sbin/dhclient"))) #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'patch-modprobe-path - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "src/libnm-platform/nm-platform-utils.c" - ;; The modprobe command location is not configurable (see: - ;; https://gitlab.freedesktop.org/NetworkManager/ - ;; NetworkManager/-/issues/1257). - (("/sbin/modprobe") - (search-input-file inputs "bin/modprobe"))))) (add-after 'unpack 'patch-dlopen-call-to-libjansson.so (lambda* (#:key inputs #:allow-other-keys) (substitute* "src/libnm-glib-aux/nm-json-aux.c" |