guix_mirror_bot pushed a commit to branch gnome-team
in repository guix.
commit 844b282704b1320b90eb07bd8d20a196a0dda4fc
Author: Liliana Marie Prikler <[email protected]>
AuthorDate: Wed Nov 19 01:08:39 2025 +0100
gnu: mutter: Update to 48.6.
* gnu/packages/gnome.scm (mutter): Update to 48.6.
[arguments]<#:configure-flags>: Remove “-Dc_link_args=…”,
“-Dnative_tests=false” and “-Dsystemd=false”.
Add “-Dlogind=true” and “-Dbash_completion=false”.
<#:phases>{check}: Remove “--setup=plain”.
Add “--no-suite=mutter/backend” and “--no-suite=mutter/backends/native”.
{wrap-pythonpath}: New phase.
[native-inputs]: Add python-docutils and zenity.
Replace python-dbus-1.2 with python-dbus.
[inputs]: Add python.
Move colord egl-wayland, elogind, gnome-settings-daemon, graphene,
libcanberra, libdisplayinfo, libgudev, libice, libsm, libwacom, libxkbfile,
libxrand, libxtst, pipewire, startup-notification, and sysprof from here…
[propagated-inputs]: … to here.
Co-authored-by: Ada Stevenson <[email protected]>
---
gnu/packages/gnome.scm | 110 +++++++++++++++++++++++++------------------------
1 file changed, 57 insertions(+), 53 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index f6e7d82cd7..850941adf3 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7910,7 +7910,7 @@ to display dialog boxes from the commandline and shell
scripts.")
(define-public mutter
(package
(name "mutter")
- (version "46.9")
+ (version "48.6")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -7918,7 +7918,7 @@ to display dialog boxes from the commandline and shell
scripts.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0ab4xbh72kd28zvhawkdfl04dkdcy57xapy977mx6q605zv1y1xm"))))
+ "1y4l2kvmydy8ncif5rd5rk9fnfhs1p3r10qj205c56x0h47gw695"))))
;; NOTE: Since version 3.21.x, mutter now bundles and exports forked
;; versions of cogl and clutter. As a result, many of the inputs,
;; propagated-inputs, and configure flags used in cogl and clutter are
@@ -7927,20 +7927,16 @@ to display dialog boxes from the commandline and shell
scripts.")
(arguments
(list
#:modules '((guix build meson-build-system)
+ ((guix build python-build-system) #:prefix python:)
(guix build utils)
(ice-9 match))
+ #:imported-modules `(,@%meson-build-system-modules
+ (guix build python-build-system))
#:glib-or-gtk? #t
#:configure-flags
#~(list
- ;; Otherwise, the RUNPATH will lack the final path component.
- (string-append "-Dc_link_args=-Wl,-rpath="
- #$output "/lib,-rpath="
- #$output "/lib/mutter-14")
- ;; Disable systemd support.
- "-Dsystemd=false"
- ;; The native-unit test suite appears flaky (see:
- ;; https://gitlab.gnome.org/GNOME/mutter/-/issues/3909).
- "-Dnative_tests=false"
+ "-Dlogind=true"
+ "-Dbash_completion=false"
;; Don't install tests.
"-Dinstalled_tests=false"
;; The following flags are needed for the bundled clutter
@@ -8035,8 +8031,10 @@ to display dialog boxes from the commandline and shell
scripts.")
"/src/tests/meta-dbus-runner.py")
"--launch=wireplumber"
"meson" "test" "-t" "0"
- "--setup=plain"
"--no-suite=mutter/kvm"
+ ;; XXX: monitor-unit and monitor-dbus fail.
+ "--no-suite=mutter/backend"
+ "--no-suite=mutter/backends/native"
"--no-rebuild"
"--print-errorlogs"
test-options)))))))
@@ -8056,50 +8054,56 @@ to display dialog boxes from the commandline and shell
scripts.")
libxcursor ;for XCURSOR_PATH
pipewire
python
- python-dbus-1.2
+ python-dbus
python-dbusmock
- wireplumber-minimal))
+ python-docutils
+ wireplumber-minimal
+ zenity))
(propagated-inputs
- (list gsettings-desktop-schemas ;required by libmutter-14.pc
- ;; mutter-clutter-14.pc and mutter-cogl-14.pc refer to these:
- at-spi2-core
- cairo
- eudev
- gdk-pixbuf
- glib
- json-glib
- libinput
- libx11
- libxcomposite
- libxcvt
- libxdamage
- libxext
- libxfixes
- libxkbcommon
- libxml2
- libxrandr
- mesa
- pango
- xinput))
+ (list
+ ;; required by libmutter-16.pc
+ colord
+ elogind
+ egl-wayland ;for wayland-eglstream-protocols
+ graphene
+ libdisplay-info
+ libei
+ libcanberra
+ libgudev
+ libinput
+ libice
+ libsm
+ libxkbfile
+ libxrandr
+ libwacom
+ libxtst
+ gsettings-desktop-schemas
+ gnome-settings-daemon
+ pipewire
+ startup-notification
+ ;; mutter-clutter-16.pc and mutter-cogl-16.pc refer to these:
+ at-spi2-core
+ cairo
+ eudev
+ gdk-pixbuf
+ glib
+ json-glib
+ libx11
+ libxcomposite
+ libxcvt
+ libxdamage
+ libxext
+ libxfixes
+ libxkbcommon
+ libxml2
+ libxrandr
+ mesa
+ pango
+ sysprof
+ xinput))
(inputs
- (list colord
- egl-wayland ;for wayland-eglstream-protocols
- elogind
- gnome-desktop
- gnome-settings-daemon
- graphene
- libcanberra
- libdisplay-info
- libgudev
- libice
- libsm
- libwacom
- libxkbfile
- libxrandr
- libxtst
- pipewire
- startup-notification
- sysprof
+ (list gnome-desktop
+ python ; for gdctl
upower
xkeyboard-config
xorg-server-xwayland))
