me
/
guix
Archived
1
0
Fork 0
Code

gnu: mutter: Update to 3.32.2. 

* gnu/packages/gnome.scm (mutter): Update to 3.32.2.
[build-system]: Use meson-build-system.
[arguments]: Disable tests.  Set #:glib-or-gtk? flag.  Add $out/lib and
$out/lib/mutter-4 to RUNPATH.  Adjust configure flags.  Add 'disable-werror'
phase and update 'use-elogind' phase.
[native-inputs]: Add xorg-server-for-tests.
[inputs]: Add gnome-settings-daemon, libwacom and pipewire.
master
Kei Kebreau 2019-07-23 16:43:12 -04:00
parent 8c6c97dee0
commit edf43f6876
No known key found for this signature in database
GPG Key ID: E6A5EE3C19467A0D
1 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
gnu/packages/gnome.scm
View File

@ -5304,7 +5304,7 @@ to display dialog boxes from the commandline and shell scripts.")
(define-public mutter (define-public mutter
(package (package
(name "mutter") (name "mutter")
(version "3.30.2") (version "3.32.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
@ -5312,39 +5312,46 @@ to display dialog boxes from the commandline and shell scripts.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0qr3w480p31nbiad49213rj9rk6p9fl82a68pzznpz36p30dq96z")))) "1h577i2ap7dpfy1jg101jvc6nzccc0csgvd55ahydlr8f94frcva"))))
;; NOTE: Since version 3.21.x, mutter now bundles and exports forked ;; NOTE: Since version 3.21.x, mutter now bundles and exports forked
;; versions of cogl and clutter. As a result, many of the inputs, ;; versions of cogl and clutter. As a result, many of the inputs,
;; propagated-inputs, and configure flags used in cogl and clutter are ;; propagated-inputs, and configure flags used in cogl and clutter are
;; needed here as well. ;; needed here as well.
(build-system gnu-build-system) (build-system meson-build-system)
(arguments (arguments
'(#:configure-flags '(;; XXX: All mutter tests fail with the following error:
;; XXX: build fails with [-Werror]: ;; Settings schema 'org.gnome.mutter' is not installed
;; backends/meta-cursor-renderer.c:112:5: error: #:tests? #f
;; implicit declaration of function ?roundf? #:glib-or-gtk? #t
(list "--enable-compile-warnings=minimum" #:configure-flags
;; Otherwise, the RUNPATH will lack the final path component.
"--enable-native-backend" (list (string-append "-Dc_link_args=-Wl,-rpath="
(assoc-ref %outputs "out") "/lib:"
(assoc-ref %outputs "out") "/lib/mutter-4")
;; The following flags are needed for the bundled clutter ;; The following flags are needed for the bundled clutter
"--enable-x11-backend=yes" (string-append "-Dxwayland_path="
(string-append "--with-xwayland-path="
(assoc-ref %build-inputs "xorg-server-xwayland") (assoc-ref %build-inputs "xorg-server-xwayland")
"/bin/Xwayland") "/bin/Xwayland")
;; the remaining flags are needed for the bundled cogl ;; the remaining flags are needed for the bundled cogl
"--enable-cogl-gst" (string-append "-Dopengl_libname="
(string-append "--with-gl-libname="
(assoc-ref %build-inputs "mesa") (assoc-ref %build-inputs "mesa")
"/lib/libGL.so")) "/lib/libGL.so"))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'disable-werror
(lambda _
;; XXX: build fails with [-Werror]:
;; backends/meta-cursor-renderer.c:112:5: error:
;; implicit declaration of function ?roundf?
(substitute* "meson.build"
(("'-Werror=.*',") ""))
#t))
;; Replace references to systemd libraries to elogind references. ;; Replace references to systemd libraries to elogind references.
(add-before 'configure 'use-elogind (add-before 'configure 'use-elogind
(lambda _ (lambda _
(substitute* (list "configure" (substitute* (list "meson.build"
"src/backends/native/meta-launcher.c" "src/backends/native/meta-launcher.c"
"src/core/main.c") "src/core/main.c")
(("systemd") "elogind")) (("systemd") "elogind"))
@ -5354,6 +5361,7 @@ to display dialog boxes from the commandline and shell scripts.")
("gobject-introspection" ,gobject-introspection) ("gobject-introspection" ,gobject-introspection)
("intltool" ,intltool) ("intltool" ,intltool)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("xorg-server" ,xorg-server-for-tests)
;; For git build ;; For git build
("autoconf" ,autoconf) ("autoconf" ,autoconf)
("automake" ,automake) ("automake" ,automake)
@ -5383,13 +5391,16 @@ to display dialog boxes from the commandline and shell scripts.")
(inputs (inputs
`(("elogind" ,elogind) `(("elogind" ,elogind)
("gnome-desktop" ,gnome-desktop) ("gnome-desktop" ,gnome-desktop)
("gnome-settings-daemon" ,gnome-settings-daemon)
("libcanberra-gtk" ,libcanberra) ("libcanberra-gtk" ,libcanberra)
("libgudev" ,libgudev) ("libgudev" ,libgudev)
("libice" ,libice) ("libice" ,libice)
("libsm" ,libsm) ("libsm" ,libsm)
("libwacom" ,libwacom)
("libxkbfile" ,libxkbfile) ("libxkbfile" ,libxkbfile)
("libxrandr" ,libxrandr) ("libxrandr" ,libxrandr)
("libxtst" ,libxtst) ("libxtst" ,libxtst)
("pipewire" ,pipewire)
("startup-notification" ,startup-notification) ("startup-notification" ,startup-notification)
("upower-glib" ,upower) ("upower-glib" ,upower)
("xkeyboard-config" ,xkeyboard-config) ("xkeyboard-config" ,xkeyboard-config)