[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
71/77: WIP gnu: gnome-shell: Update to 3.28.2.
From: |
Ricardo Wurmus |
Subject: |
71/77: WIP gnu: gnome-shell: Update to 3.28.2. |
Date: |
Mon, 6 Aug 2018 14:29:27 -0400 (EDT) |
rekado pushed a commit to branch wip-gnome-upgrades
in repository guix.
commit ab3d4ead4f8272a893288db92d914ac354940224
Author: Ricardo Wurmus <address@hidden>
Date: Mon Aug 6 18:56:11 2018 +0200
WIP 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 tests; 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 | 37 +++++++++++++++++++++++++------------
1 file changed, 25 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index f82cc57..4259a7b 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5625,7 +5625,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 "/"
@@ -5633,19 +5633,30 @@ 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
+ '(#:tests? #f
+ ;; TODO: this is very bad. The tests segfault!
+ #: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)
@@ -5663,11 +5674,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)
@@ -5698,9 +5713,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
- 68/77: gnu: gnome-bluetooth: Update to 3.28.0., (continued)
- 68/77: gnu: gnome-bluetooth: Update to 3.28.0., Ricardo Wurmus, 2018/08/06
- 72/77: gnu: gdm: Update to 3.28.2., Ricardo Wurmus, 2018/08/06
- 64/77: gnu: gnome-todo: Update to 3.28.1., Ricardo Wurmus, 2018/08/06
- 76/77: gnu: network-manager-applet: Update to 1.8.14., Ricardo Wurmus, 2018/08/06
- 75/77: gnu: network-manager-openvpn: Update to 1.8.4., Ricardo Wurmus, 2018/08/06
- 77/77: gnu: dconf-editor: Update to 3.28.0., Ricardo Wurmus, 2018/08/06
- 73/77: gnu: evolution-data-server: Update to 3.28.3., Ricardo Wurmus, 2018/08/06
- 70/77: gnu: gnome-control-center: Update to 3.28.2., Ricardo Wurmus, 2018/08/06
- 67/77: gnu: tracker: Update to 2.0.4., Ricardo Wurmus, 2018/08/06
- 74/77: gnu: gnome-online-accounts: Update to 3.28.0., Ricardo Wurmus, 2018/08/06
- 71/77: WIP gnu: gnome-shell: Update to 3.28.2.,
Ricardo Wurmus <=