02/06: gnu: meson: Update to 1.1.1 and ungraft.

[guix-commits]

civodul pushed a commit to branch core-updates
in repository guix.

commit b53a7f049a718ccb37cae8e74f0f87ec4fa3f0a7
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Wed Jan 17 11:06:04 2024 +0100

    gnu: meson: Update to 1.1.1 and ungraft.
    
    * gnu/packages/build-tools.scm (meson): Update to 1.1.1.
    [replacement]: Remove.
    (meson/newer): Remove.
    * gnu/packages/pdf.scm (capypdf)[arguments]: Remove #:meson.
    
    Change-Id: I77dd9203461e8dd635753ec742bd8046dd63e3f9
---
 gnu/packages/build-tools.scm | 18 ++----------------
 gnu/packages/pdf.scm         |  3 +--
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm
index 15d88ded80..495661d5df 100644
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@ -293,8 +293,7 @@ files and generates build instructions for the Ninja build 
system.")
 (define-public meson
   (package
     (name "meson")
-    (replacement meson/newer)
-    (version "1.1.0")
+    (version "1.1.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://github.com/mesonbuild/meson/";
@@ -302,7 +301,7 @@ files and generates build instructions for the Ninja build 
system.")
                                   version ".tar.gz"))
               (sha256
                (base32
-                "17w2zymmvrffhfpqsaj7qcbjwgv9iaawcpzhz2gnhlvcrm26qqfr"))))
+                "073vf8059nzs6p5aaqr5wva4pgl81540szdb5yw9yhyajwgm8jyh"))))
     (build-system python-build-system)
     (arguments
      (list #:tests? #f                  ;disabled to avoid extra dependencies
@@ -330,19 +329,6 @@ files}, are written in a custom domain-specific language 
(@dfn{DSL}) that
 resembles Python.")
     (license license:asl2.0)))
 
-(define-public meson/newer
-  (package
-    (inherit meson)
-    (version "1.1.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/mesonbuild/meson/";
-                                  "releases/download/" version  "/meson-"
-                                  version ".tar.gz"))
-              (sha256
-               (base32
-                "073vf8059nzs6p5aaqr5wva4pgl81540szdb5yw9yhyajwgm8jyh"))))))
-
 (define-public meson-python
   (package
     (name "meson-python")
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 667d8edba4..dff637f2d2 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -130,8 +130,7 @@
                (base32 
"15l8zwc83l65xh739s0qddlv5qv537wnx74s8fcwlm1r8y7kf2x4"))))
     (build-system meson-build-system)
     (arguments
-     (list #:meson meson/newer
-           #:configure-flags #~(list "-Dcpp_std=c++23")
+     (list #:configure-flags #~(list "-Dcpp_std=c++23")
            #:test-options '(list "plainc")
            #:phases
            #~(modify-phases %standard-phases