diff mbox series

[bug#74306,gnome-team,15/44] gnu: meson: Update to 1.5.2.

Message ID 46eb528390f3fa5821b81d5b8c375cf842902b9c.1731303037.git.maxim.cournoyer@gmail.com
State New
Headers show
Series gstreamer, GTK, fontmanager updates | expand

Commit Message

Maxim Cournoyer Nov. 11, 2024, 6:16 a.m. UTC 
* gnu/packages/build-tools.scm (meson): Update to 1.5.2.
(meson-1.5): Delete variable.
* gnu/packages/gnome.scm (gitg) [arguments]: Delete #:meson argument.
* gnu/packages/gtk.scm (cairo): Likewise.
* gnu/packages/gl.scm (mesa): Likewise.

Change-Id: Ic8dba9f4d0f52b1ba5761764d5bf4413cc190250
---
 gnu/packages/build-tools.scm | 17 ++---------------
 gnu/packages/gl.scm          |  1 -
 gnu/packages/gnome.scm       |  1 -
 gnu/packages/gtk.scm         |  1 -
 4 files changed, 2 insertions(+), 18 deletions(-)
diff mbox series

Patch

diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm
index 21df25e4f5..05a305ccc1 100644
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@ -293,7 +293,7 @@  (define-public gn
 (define-public meson
   (package
     (name "meson")
-    (version "1.2.1")
+    (version "1.5.2")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://github.com/mesonbuild/meson/"
@@ -301,7 +301,7 @@  (define-public meson
                                   version ".tar.gz"))
               (sha256
                (base32
-                "1x9rnrbwvzhnzmz4zqag44w06khks8wckcajxsbr8m4760akmnxi"))))
+                "02wi62k9w7716xxdgrrx68q89vaq3ncnbpw5ms0g27npn2df0mgr"))))
     (build-system python-build-system)
     (arguments
      (list #:tests? #f                  ;disabled to avoid extra dependencies
@@ -329,19 +329,6 @@  (define-public meson
 resembles Python.")
     (license license:asl2.0)))
 
-(define-public meson-1.5
-  (package
-    (inherit meson)
-    (version "1.5.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/mesonbuild/meson/"
-                                  "releases/download/" version  "/meson-"
-                                  version ".tar.gz"))
-              (sha256
-               (base32
-                "1vab706pw1q17vh9rbsmlirgiji3k6wljl735lxffp95vwx56zjn"))))))
-
 (define-public meson-python
   (package
     (name "meson-python")
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 0a285dfc30..15e11061e4 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -373,7 +373,6 @@  (define-public mesa
     (outputs '("out" "bin"))
     (arguments
      (list
-      #:meson meson-1.5
       #:configure-flags
       #~(list
          #$@(cond
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 3000b8193e..b2722ebe04 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -12444,7 +12444,6 @@  (define-public gitg
     (build-system meson-build-system)
     (arguments
      (list
-      #:meson meson-1.5                 ; XXX: breaks with Meson 1.2
       #:glib-or-gtk? #t
       #:build-type "release"            ; don't look at -Wformat…
       #:phases
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 6aa1ce003e..9e3df74ff6 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -182,7 +182,6 @@  (define cairo
     (build-system meson-build-system)
     (arguments
      `(#:tests? #f ; see http://lists.gnu.org/archive/html/bug-guix/2013-06/msg00085.html
-       #:meson ,meson-1.5               ; 1.3 or higher required
        #:glib-or-gtk? #t
        #:configure-flags
        ,#~(list "-Dtests=disabled")