[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
24/182: gnu: mutter: Update to 3.32.2.
From: |
guix-commits |
Subject: |
24/182: gnu: mutter: Update to 3.32.2. |
Date: |
Fri, 15 Nov 2019 00:01:25 -0500 (EST) |
kkebreau pushed a commit to branch wip-gnome-updates
in repository guix.
commit c2724f3e6f5c97a8f2e0017b1c621d1fa55fe050
Author: Kei Kebreau <address@hidden>
Date: Tue Jul 23 16:43:12 2019 -0400
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.
---
gnu/packages/gnome.scm | 43 +++++++++++++++++++++++++++----------------
1 file changed, 27 insertions(+), 16 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 0b3041c..7600f41 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5052,7 +5052,7 @@ to display dialog boxes from the commandline and shell
scripts.")
(define-public mutter
(package
(name "mutter")
- (version "3.30.2")
+ (version "3.32.2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -5060,39 +5060,46 @@ to display dialog boxes from the commandline and shell
scripts.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0qr3w480p31nbiad49213rj9rk6p9fl82a68pzznpz36p30dq96z"))))
+ "1h577i2ap7dpfy1jg101jvc6nzccc0csgvd55ahydlr8f94frcva"))))
;; 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
;; needed here as well.
- (build-system gnu-build-system)
+ (build-system meson-build-system)
(arguments
- '(#:configure-flags
- ;; XXX: build fails with [-Werror]:
- ;; backends/meta-cursor-renderer.c:112:5: error:
- ;; implicit declaration of function ?roundf?
- (list "--enable-compile-warnings=minimum"
-
- "--enable-native-backend"
+ '(;; XXX: All mutter tests fail with the following error:
+ ;; Settings schema 'org.gnome.mutter' is not installed
+ #:tests? #f
+ #:glib-or-gtk? #t
+ #:configure-flags
+ ;; Otherwise, the RUNPATH will lack the final path component.
+ (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
- "--enable-x11-backend=yes"
-
- (string-append "--with-xwayland-path="
+ (string-append "-Dxwayland_path="
(assoc-ref %build-inputs "xorg-server-xwayland")
"/bin/Xwayland")
;; the remaining flags are needed for the bundled cogl
- "--enable-cogl-gst"
- (string-append "--with-gl-libname="
+ (string-append "-Dopengl_libname="
(assoc-ref %build-inputs "mesa")
"/lib/libGL.so"))
#: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.
(add-before 'configure 'use-elogind
(lambda _
- (substitute* (list "configure"
+ (substitute* (list "meson.build"
"src/backends/native/meta-launcher.c"
"src/core/main.c")
(("systemd") "elogind"))
@@ -5102,6 +5109,7 @@ to display dialog boxes from the commandline and shell
scripts.")
("gobject-introspection" ,gobject-introspection)
("intltool" ,intltool)
("pkg-config" ,pkg-config)
+ ("xorg-server" ,xorg-server-for-tests)
;; For git build
("autoconf" ,autoconf)
("automake" ,automake)
@@ -5131,13 +5139,16 @@ to display dialog boxes from the commandline and shell
scripts.")
(inputs
`(("elogind" ,elogind)
("gnome-desktop" ,gnome-desktop)
+ ("gnome-settings-daemon" ,gnome-settings-daemon)
("libcanberra-gtk" ,libcanberra)
("libgudev" ,libgudev)
("libice" ,libice)
("libsm" ,libsm)
+ ("libwacom" ,libwacom)
("libxkbfile" ,libxkbfile)
("libxrandr" ,libxrandr)
("libxtst" ,libxtst)
+ ("pipewire" ,pipewire)
("startup-notification" ,startup-notification)
("upower-glib" ,upower)
("xkeyboard-config" ,xkeyboard-config)
- 16/182: gnu: grilo: Update to 0.3.9., (continued)
- 16/182: gnu: grilo: Update to 0.3.9., guix-commits, 2019/11/15
- 14/182: gnu: Add python-dbusmock., guix-commits, 2019/11/15
- 17/182: gnu: tracker: Update to 2.2.2., guix-commits, 2019/11/15
- 09/182: gnu: gsettings-desktop-schemas: Update to 3.32.0., guix-commits, 2019/11/15
- 12/182: gnu: gnome-online-accounts: Update to 3.32.0., guix-commits, 2019/11/15
- 19/182: gnu: python2-pylint: Update to 1.9.5., guix-commits, 2019/11/15
- 22/182: gnu: evolution: Update to 3.32.4., guix-commits, 2019/11/15
- 25/182: gnu: gnome-tweaks: Update to 3.32.0., guix-commits, 2019/11/15
- 27/182: gnu: nautilus: Update to 3.32.1., guix-commits, 2019/11/15
- 29/182: gnu: gnome-clocks: Update to 3.32.0., guix-commits, 2019/11/15
- 24/182: gnu: mutter: Update to 3.32.2.,
guix-commits <=
- 26/182: gnu: Add tracker-miners., guix-commits, 2019/11/15
- 33/182: gnu: gnome-disk-utility: Update to 3.32.1., guix-commits, 2019/11/15
- 32/182: gnu: gnome-system-monitor: Update to 3.32.1., guix-commits, 2019/11/15
- 15/182: gnu: gnome-control-center: Update to 3.32.2., guix-commits, 2019/11/15
- 20/182: gnu: totem: Update to 3.32.1., guix-commits, 2019/11/15
- 28/182: gnu: gnome-screenshot: Update to 3.32.0., guix-commits, 2019/11/15
- 34/182: gnu: libwnck: Update to 3.32.0., guix-commits, 2019/11/15
- 38/182: gnu: gnome-terminal: Update to 3.32.2., guix-commits, 2019/11/15
- 39/182: gnu: devhelp: Update to 3.32.0., guix-commits, 2019/11/15
- 30/182: gnu: gnome-calendar: Update to 3.32.2., guix-commits, 2019/11/15