[bug#42828] [PATCH] gnu: meson: Update to 0.55.0. [core-updates]

[bug#42828] [PATCH] gnu: meson: Update to 0.55.0. [core-updates]

[Alexandros Theodotou]

[-- Attachment #1.1: Type: text/plain, Size: 51 bytes --]

Hi,

This patch updates meson.

Thanks,
Alex

[-- Attachment #1.2: 0001-gnu-meson-Update-to-0.55.0.patch --]
[-- Type: text/x-patch, Size: 1341 bytes --]

From fef89495e5fc3eef89e73fe0a0aad2f6fe314e53 Mon Sep 17 00:00:00 2001
From: Alexandros Theodotou <alex@zrythm.org>
Date: Wed, 12 Aug 2020 14:18:04 +0100
Subject: [PATCH] gnu: meson: Update to 0.55.0.

* gnu/packages/build-tools.scm (meson): Update to 0.55.0.
---
 gnu/packages/build-tools.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm
index 7213c1bd0b..c23aad8f44 100644
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@ -179,7 +179,7 @@ files and generates build instructions for the Ninja build system.")
 (define-public meson
   (package
     (name "meson")
-    (version "0.53.2")
+    (version "0.55.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://github.com/mesonbuild/meson/"
@@ -187,7 +187,7 @@ files and generates build instructions for the Ninja build system.")
                                   version ".tar.gz"))
               (sha256
                (base32
-                "07y2hh9dfn1m9g4bsy49nbn3vdmd0b2iwr8bxg19fhqq6c7q73ry"))))
+                "0davfjikrg42q99lqny5fnvyjygvj0rgjdrmb53sq55fwazy46ha"))))
     (build-system python-build-system)
     (arguments
      `(;; FIXME: Tests require many additional inputs, a fix for the RUNPATH
-- 
2.27.0


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#42828] [PATCH] gnu: meson: Update to 0.55.0. [core-updates]

[Tobias Geerinckx-Rice via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 287 bytes --]

Alex,

Alexandros Theodotou 写道：
> This patch updates meson.
> Thanks,

Thank you!  However, this fails to account for 
meson-for-build-rpath.patch, which is used by the (hidden) 
‘meson-for-build’ variant and all meson-build-system packages.

Kind regards,

T G-R

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]

[bug#42828] [PATCH] gnu: meson: Update to 0.55.0. [core-updates]

[Alexandros Theodotou]

[-- Attachment #1.1: Type: text/plain, Size: 762 bytes --]

Hi,

It seems that what the patch was accomplishing was fixed in version
0.55.0 of meson, so I removed it. I have rebuilt many things using this
meson-for-build (like pango, mesa etc., which use meson) and have
verified that it works.

Please find the updated patch attached. Note that the patch was created
on master since core-updates was broken for me.

Thanks,
Alex

On Wed, 2020-08-12 at 16:26 +0200, Tobias Geerinckx-Rice wrote:
> Alex,
> 
> Alexandros Theodotou 写道：
> > This patch updates meson.
> > Thanks,
> 
> Thank you!  However, this fails to account for 
> meson-for-build-rpath.patch, which is used by the (hidden) 
> ‘meson-for-build’ variant and all meson-build-system packages.
> 
> Kind regards,
> 
> T G-R

[-- Attachment #1.2: 0001-gnu-meson-Update-to-0.55.1.patch --]
[-- Type: text/x-patch, Size: 1739 bytes --]

From 10f26034fe889baa5704e182d1a37d11871b2207 Mon Sep 17 00:00:00 2001
From: Alexandros Theodotou <alex@zrythm.org>
Date: Thu, 10 Sep 2020 02:45:43 +0100
Subject: [PATCH] gnu: meson: Update to 0.55.1.

* gnu/packages/build-tools.scm (meson): Update to 0.55.1.
---
 gnu/packages/build-tools.scm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm
index 7213c1bd0b..c3bb3042a6 100644
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@ -179,7 +179,7 @@ files and generates build instructions for the Ninja build system.")
 (define-public meson
   (package
     (name "meson")
-    (version "0.53.2")
+    (version "0.55.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://github.com/mesonbuild/meson/"
@@ -187,7 +187,7 @@ files and generates build instructions for the Ninja build system.")
                                   version ".tar.gz"))
               (sha256
                (base32
-                "07y2hh9dfn1m9g4bsy49nbn3vdmd0b2iwr8bxg19fhqq6c7q73ry"))))
+                "1070kjiirxxdfppmrhi3wsc6rykay1zlciqrzayjhjg0hkw42mrv"))))
     (build-system python-build-system)
     (arguments
      `(;; FIXME: Tests require many additional inputs, a fix for the RUNPATH
@@ -216,8 +216,7 @@ resembles Python.")
     (inherit meson)
     (name "meson-for-build")
     (source (origin
-              (inherit (package-source meson))
-              (patches (search-patches "meson-for-build-rpath.patch"))))
+              (inherit (package-source meson))))
 
     ;; People should probably install "meson", not "meson-for-build".
     (properties `((hidden? . #t)))))
-- 
2.27.0


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

bug#42828: [PATCH] gnu: meson: Update to 0.55.0. [core-updates]

[Ludovic Courtès]

Hi,

Alexandros Theodotou <alex@zrythm.org> skribis:

> From 10f26034fe889baa5704e182d1a37d11871b2207 Mon Sep 17 00:00:00 2001
> From: Alexandros Theodotou <alex@zrythm.org>
> Date: Thu, 10 Sep 2020 02:45:43 +0100
> Subject: [PATCH] gnu: meson: Update to 0.55.1.
>
> * gnu/packages/build-tools.scm (meson): Update to 0.55.1.

Pushed as 1bec03df9b60f156c657a64a323ef27f4ed14b44 (core-updates).  I
also removed the patch that’s no longer used.

Thanks!

Ludo’.