diff options
| author | Marius Bakke <marius@gnu.org> | 2020-06-27 10:23:11 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-06-27 10:23:11 +0200 |
| commit | 425fd7eb6a5f07eb9b854a5a29488e6f0b0acf3c (patch) | |
| tree | 44479010890dd9aaf8bc52cab73f7c241a2fd9ea /gnu/packages/mate.scm | |
| parent | fe9f2d150019b9fc17f08f5a002d7ca932fc3eb0 (diff) | |
| parent | 88dbef3b9868a565da1eba37c9d409cce972becc (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/mate.scm')
| -rw-r--r-- | gnu/packages/mate.scm | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 8b548b5d8e..8afd3be152 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2019 Guy Fleury Iteriteka <hoonandon@gmail.com> ;;; Copyright © 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de> +;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -75,7 +76,7 @@ (define-public mate-common (package (name "mate-common") - (version "1.22.0") + (version "1.24.1") (source (origin (method url-fetch) @@ -83,7 +84,7 @@ name "-" version ".tar.xz")) (sha256 (base32 - "11lwckndizawbq993ws8lqp59vsc873zri0m8s1i5zyc4qx9f69z")))) + "1dgp6k2l6dz7x2lnqk4y5xfkld376726hda3mrc777f821kk99nr")))) (build-system gnu-build-system) (home-page "https://mate-desktop.org/") (synopsis "Common files for development of MATE packages") @@ -264,7 +265,16 @@ desktop and the mate-about program.") name "-" version ".tar.xz")) (sha256 (base32 - "094mnlczxq9crjj8z7dzs1zmwscdkbp54l3qjaf4a4bhd8lihv8d")))) + "094mnlczxq9crjj8z7dzs1zmwscdkbp54l3qjaf4a4bhd8lihv8d")) + (modules '((guix build utils))) + ;; This is fixed by commit ea13e065 upstream. Remove this once 1.25.0 + ;; is out. + (snippet + '(begin + (substitute* "data/Locations.xml.in" + (("Godthab") + "Nuuk")) + #t)))) (build-system gnu-build-system) (arguments '(#:configure-flags @@ -1596,10 +1606,6 @@ used to bring up authentication dialogs.") ("shared-mime-info" ,shared-mime-info) ("yelp" ,yelp) ("zenity" ,zenity))) - ;; FIXME: Propagating glib:bin fixes http://issues.guix.gnu.org/issue/38135 - ;; The proper fix is in core-updates. So we can remove this after next merge. - (propagated-inputs - `(("glib:bin" ,glib "bin"))) (synopsis "The MATE desktop environment") (home-page "https://mate-desktop.org/") (description |