[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
73/74: gnu: gnome-shell: Update to 3.28.2.
From: |
guix-commits |
Subject: |
73/74: gnu: gnome-shell: Update to 3.28.2. |
Date: |
Fri, 30 Nov 2018 09:07:28 -0500 (EST) |
rekado pushed a commit to branch wip-gnome-upgrades
in repository guix.
commit 60d8c0af899e608162fed6dd31385aa53ea30b55
Author: Ricardo Wurmus <address@hidden>
Date: Mon Aug 6 18:56:11 2018 +0200
gnu: gnome-shell: Update to 3.28.2.
* gnu/packages/gnome.scm (gnome-shell): Update to 3.28.2.
[build-system]: Use meson-build-system.
[arguments]: Disable systemd; add build phases "fix-keysdir"
and "pre-check"; remove custom "install" phase.
[native-inputs]: Add desktop-file-utils, sassc, and xorg-server.
[inputs]: Remove readline.
---
gnu/packages/gnome.scm | 35 +++++++++++++++++++++++------------
1 file changed, 23 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 2c0d900..a2d1fd6 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5637,7 +5637,7 @@ properties, screen resolution, and other GNOME
parameters.")
(define-public gnome-shell
(package
(name "gnome-shell")
- (version "3.24.3")
+ (version "3.28.2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -5645,19 +5645,28 @@ properties, screen resolution, and other GNOME
parameters.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1f20x36ymkp1j667hb7s7byly2gqc4m0anldy3qwp38vm8437caq"))))
- (build-system glib-or-gtk-build-system)
+ "1b9n89ij2g5nqaqp7a13jnqcd8qa2v9p55rbi71al3xvqk091ri7"))))
+ (build-system meson-build-system)
(arguments
- '(#:phases
+ '(#:configure-flags
+ (list "-Dsystemd=false")
+ #:phases
(modify-phases %standard-phases
- (replace 'install
+ (add-after 'unpack 'fix-keysdir
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(keysdir (string-append
out "/share/gnome-control-center/keybindings")))
- (zero? (system* "make"
- (string-append "keysdir=" keysdir)
- "install")))))
+ (substitute* "meson.build"
+ (("keysdir =.*")
+ (string-append "keysdir = '" keysdir "'\n")))
+ #t)))
+ (add-before 'check 'pre-check
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; Tests require a running X server.
+ (system "Xvfb :1 &")
+ (setenv "DISPLAY" ":1")
+ #t))
(add-after
'install 'wrap-programs
(lambda* (#:key outputs #:allow-other-keys)
@@ -5675,11 +5684,15 @@ properties, screen resolution, and other GNOME
parameters.")
#t))))))
(native-inputs
`(("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc.
+ ("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database
("gobject-introspection" ,gobject-introspection)
("intltool" ,intltool)
("pkg-config" ,pkg-config)
("python" ,python)
- ("xsltproc" ,libxslt)))
+ ("sassc" ,sassc)
+ ("xsltproc" ,libxslt)
+ ;; For tests
+ ("xorg-server" ,xorg-server)))
(inputs
`(("accountsservice" ,accountsservice)
("caribou" ,caribou)
@@ -5710,9 +5723,7 @@ properties, screen resolution, and other GNOME
parameters.")
;; XXX: These requirements were added in 3.24, but no mention in NEWS.
;; Missing propagation? See also: <https://bugs.gnu.org/27264>
("librsvg" ,librsvg)
- ("geoclue" ,geoclue)
- ;; XXX: required by libgjs.la.
- ("readline" ,readline)))
+ ("geoclue" ,geoclue)))
(synopsis "Desktop shell for GNOME")
(home-page "https://wiki.gnome.org/Projects/GnomeShell")
(description
- 36/74: gnu: gnome-keyring: Update to 3.28.2., (continued)
- 36/74: gnu: gnome-keyring: Update to 3.28.2., guix-commits, 2018/11/30
- 37/74: gnu: gvfs: Update to 1.36.2., guix-commits, 2018/11/30
- 35/74: gnu: libgnome-games-support: Update to 1.4.1., guix-commits, 2018/11/30
- 12/74: gnu: gedit: Use gtksourceview-3., guix-commits, 2018/11/30
- 01/74: gnu: Add umockdev., guix-commits, 2018/11/30
- 17/74: gnu: glibmm: Update to 2.56.0., guix-commits, 2018/11/30
- 52/74: gnu: libgnomekbd: Update to 3.26.0., guix-commits, 2018/11/30
- 31/74: gnu: gnome-settings-daemon: Update to 3.28.1., guix-commits, 2018/11/30
- 30/74: gnu: libgweather: Update to 3.28.2., guix-commits, 2018/11/30
- 48/74: gnu: python-pyatspi: Update to 2.26.0., guix-commits, 2018/11/30
- 73/74: gnu: gnome-shell: Update to 3.28.2.,
guix-commits <=
- 54/74: gnu: Add libdazzle., guix-commits, 2018/11/30
- 58/74: gnu: gnome-screenshot: Update to 3.26.0., guix-commits, 2018/11/30
- 40/74: gnu: devhelp: Update to 3.28.1., guix-commits, 2018/11/30
- 50/74: gnu: gucharmap: Update to 10.0.4., guix-commits, 2018/11/30
- 70/74: gnu: libimobiledevice: Do not hardcode Python version., guix-commits, 2018/11/30
- 61/74: gnu: nautilus: Update to 3.28.1., guix-commits, 2018/11/30
- 62/74: gnu: gnome-control-center: Update to 3.28.2., guix-commits, 2018/11/30
- 47/74: gnu: mutter: Update to 3.28.2., guix-commits, 2018/11/30
- 65/74: gnu: gnome-online-accounts: Update to 3.28.0., guix-commits, 2018/11/30
- 14/74: gnu: Add libplist., guix-commits, 2018/11/30