summary refs log tree commit diff
path: root/gnu/packages
diff options
context:
space:
mode:
authorMarius Bakke <marius@gnu.org>2021-05-16 09:30:10 +0200
committerMarius Bakke <marius@gnu.org>2021-05-22 17:08:13 +0200
commit13ee1b9ea0889a94a19f73d552722f4d7669c173 (patch)
tree5d2cf3fff515abe91a1ed87f55d37b1de401f18d /gnu/packages
parentdfd6ca1908bae66eaa12ecd02bc9133e73055a77 (diff)
downloadguix-13ee1b9ea0889a94a19f73d552722f4d7669c173.tar.gz
gnu: meson: Update to 0.58.0.
* gnu/packages/build-tools.scm (meson): Update to 0.58.0.
[source](patches): New field.
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/build-tools.scm16
1 files changed, 14 insertions, 2 deletions
diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm
index 91e774f692..2e5f1223cc 100644
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@ -264,15 +264,27 @@ files and generates build instructions for the Ninja build system.")
 (define-public meson
   (package
     (name "meson")
-    (version "0.57.2")
+    (version "0.58.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://github.com/mesonbuild/meson/"
                                   "releases/download/" version  "/meson-"
                                   version ".tar.gz"))
+              (patches
+               (list (origin
+                       ;; Take a patch slated for 0.58.1 that fixes gtk-doc
+                       ;; generation: <https://github.com/mesonbuild/meson/pull/8757>.
+                       (method url-fetch)
+                       (uri (string-append
+                             "https://github.com/mesonbuild/meson/commit/"
+                             "4e312c19e693a69b0650ce6c8a8903163c959996.patch"))
+                       (file-name "meson-gtkdoc-generation.patch")
+                       (sha256
+                        (base32
+                         "1nrwcxmzq1x9609yzhmhzgbq77yrkkd90vwiydilahwzwwrp68xi")))))
               (sha256
                (base32
-                "1iac7p99zfgkznq4qlnkk7b8xwwlilcrnkf33sczm56yqnqyg0rs"))))
+                "1p9g334xnfxpgrzdcnla7p399viny6jqrbylkw0rk74npkq0v0pl"))))
     (build-system python-build-system)
     (arguments
      `(;; FIXME: Tests require many additional inputs and patching many