[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
72/135: gnu: gnome-shell: Update to 3.28.2.
From: |
guix-commits |
Subject: |
72/135: gnu: gnome-shell: Update to 3.28.2. |
Date: |
Fri, 21 Dec 2018 14:37:39 -0500 (EST) |
rekado pushed a commit to branch wip-gnome3.30
in repository guix.
commit d98d5dcc30a2722382f0e304390bc71e9a87ed9b
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; wrap also with LD_LIBRARY_PATH.
[native-inputs]: Add desktop-file-utils, sassc, and xorg-server.
[inputs]: Remove readline.
---
gnu/packages/gnome.scm | 76 ++++++++++++++++++++++++++++++++------------------
1 file changed, 49 insertions(+), 27 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index eceba79..8c9ab71 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5631,7 +5631,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 "/"
@@ -5639,41 +5639,65 @@ 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
+ '(#:glib-or-gtk? #t
+ #:configure-flags
+ (list "-Dsystemd=false"
+ ;; Otherwise, the RUNPATH will lack the final path component.
+ (string-append "-Dc_link_args=-Wl,-rpath="
+ (assoc-ref %outputs "out")
+ "/lib/gnome-shell"))
+ #: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")))))
- (add-after
- 'install 'wrap-programs
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out"))
- (gi-typelib-path (getenv "GI_TYPELIB_PATH"))
- (python-path (getenv "PYTHONPATH")))
- (wrap-program (string-append out "/bin/gnome-shell")
- `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))
- (for-each
- (lambda (prog)
- (wrap-program (string-append out "/bin/" prog)
- `("PYTHONPATH" ":" prefix (,python-path))
- `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))
- '("gnome-shell-extension-tool" "gnome-shell-perf-tool"))
- #t))))))
+ (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 inputs outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out"))
+ (gi-typelib-path (getenv "GI_TYPELIB_PATH"))
+ (python-path (getenv "PYTHONPATH")))
+ (wrap-program (string-append out "/bin/gnome-shell")
+ `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))
+ ;; FIXME: gnome-shell loads these libraries with unqualified
+ ;; names only, so they need to be on LD_LIBRARY_PATH. The
+ ;; alternative might be to patch gnome-shell.
+ `("LD_LIBRARY_PATH" ":" prefix
+ ,(map (lambda (pkg)
+ (string-append (assoc-ref inputs pkg) "/lib"))
+ '("gnome-bluetooth" "librsvg" "libgweather"))))
+ (for-each
+ (lambda (prog)
+ (wrap-program (string-append out "/bin/" prog)
+ `("PYTHONPATH" ":" prefix (,python-path))
+ `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))
+ '("gnome-shell-extension-tool" "gnome-shell-perf-tool"))
+ #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)
@@ -5704,9 +5728,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
- 97/135: gnu: five-or-more: Update to 3.30.0., (continued)
- 97/135: gnu: five-or-more: Update to 3.30.0., guix-commits, 2018/12/21
- 12/135: gnu: libusb.scm: Use license: prefix., guix-commits, 2018/12/21
- 55/135: gnu: gnome-todo: Update to 3.28.1., guix-commits, 2018/12/21
- 71/135: gnu: gnome-settings-daemon: Ensure RUNPATH contains library subdir., guix-commits, 2018/12/21
- 30/135: gnu: gnome-settings-daemon: Update to 3.28.1., guix-commits, 2018/12/21
- 57/135: gnu: gnome-screenshot: Update to 3.26.0., guix-commits, 2018/12/21
- 05/135: gnu: graphene: Remove custom autogen phase., guix-commits, 2018/12/21
- 98/135: gnu: gnome-mines: Update to 3.30.1.1., guix-commits, 2018/12/21
- 52/135: gnu: gnome-shell-extensions: Update to 3.28.1., guix-commits, 2018/12/21
- 78/135: gnu: gmime: Update to 3.2.3., guix-commits, 2018/12/21
- 72/135: gnu: gnome-shell: Update to 3.28.2.,
guix-commits <=
- 04/135: gnu: gtk-doc: Update to 1.28., guix-commits, 2018/12/21
- 34/135: gnu: libgnome-games-support: Update to 1.4.1., guix-commits, 2018/12/21
- 107/135: gnu: at-spi2-atk: Update to 2.30.0., guix-commits, 2018/12/21
- 99/135: gnu: gnome-sudoku: Update to 3.30.0., guix-commits, 2018/12/21
- 123/135: gnu: colord: Update to 1.4.3., guix-commits, 2018/12/21
- 109/135: gnu: gnome-system-monitor: Update to 3.30.0., guix-commits, 2018/12/21
- 82/135: gnu: glibmm: Update to 2.58.0., guix-commits, 2018/12/21
- 81/135: gnu: libsigc++: Update to 2.10.1., guix-commits, 2018/12/21
- 56/135: gnu: gnome-clocks: Update to 3.28.0., guix-commits, 2018/12/21
- 108/135: gnu: at-spi2-core: Update to 2.30.0., guix-commits, 2018/12/21