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

  • Done
  • quality assurance status badge
Details
3 participants
  • Alexandros Theodotou
  • Ludovic Courtès
  • Tobias Geerinckx-Rice
Owner
unassigned
Submitted by
Alexandros Theodotou
Severity
normal
A
A
Alexandros Theodotou wrote on 12 Aug 2020 15:21
(name . Guix patches)(address . guix-patches@gnu.org)
389a6d84ef21830cb673d8355b5c46ceccb6686f.camel@zrythm.org
Hi,

This patch updates meson.

Thanks,
Alex
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(-)

Toggle diff (24 lines)
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
-----BEGIN PGP SIGNATURE-----

iQEzBAABCAAdFiEESBMjhK0999huJUuDAi6uQjE9cPMFAl8z7PYACgkQAi6uQjE9
cPOHjQf/fmUwwsiAr/xJhl7Nz9rly5cqM5zbhpjkBlCS0Pl/v65ECydQqrDbJXa8
I6ptA2OIG6j1R8PKWdUDDGWkrQ63B6dmkV10pUDYePF4ONwbk7I0XXY+UUyZChVa
Sfilo+Pfskot5ZVpLbcXpBR6ErlV+2pb8QT2jhoOvIru3LqB3wsBaIEBK9q1rxg0
iKdlYmyseEyXKV6GWDWa6+b0K/BUeVXQM/VT3Q2Uq+7+969z2MCeJOxhcuob0QP1
oEKApo8Vr+1NgW8JvV+zs2oaEBHR1LDdp1KhQ44SJReWNKrNeTgT0gzySs6ajG62
FlNhbg0DVy43BdniorQh57wXWjePOQ==
=6pTK
-----END PGP SIGNATURE-----


T
T
Tobias Geerinckx-Rice wrote on 12 Aug 2020 16:26
(name . Alexandros Theodotou)(address . alex@zrythm.org)(address . 42828@debbugs.gnu.org)
875z9olz36.fsf@nckx
Alex,

Alexandros Theodotou ???
Toggle quote (3 lines)
> 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
-----BEGIN PGP SIGNATURE-----

iHUEARYKAB0WIQT12iAyS4c9C3o4dnINsP+IT1VteQUCXzP8HQAKCRANsP+IT1Vt
eYzWAP9S1zuJz3VisX/vEt4TpQ2Utsr36eD5kRT0nMwfJawkFQEA4pmU/xswMe55
fClzLzYN7fzgctgTpgJlCRO5n7EunAQ=
=tk+j
-----END PGP SIGNATURE-----

A
A
Alexandros Theodotou wrote on 10 Sep 2020 03:46
(name . Tobias Geerinckx-Rice)(address . me@tobias.gr)(address . 42828@debbugs.gnu.org)
6459efe223353b52cd7262d55944a99b31ab6e6d.camel@zrythm.org
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:
Toggle quote (13 lines)
> 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
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(-)

Toggle diff (34 lines)
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
-----BEGIN PGP SIGNATURE-----

iQEzBAABCAAdFiEESBMjhK0999huJUuDAi6uQjE9cPMFAl9ZhYgACgkQAi6uQjE9
cPMRHgf+KZ/tgekKaaNo2GIwRny1qZqy9qEznXD7XRD05IKZVqXxte6tXCaRzK8i
tnmdpRdtT9oQt0k4aHJ2qJVsCqdm7aG9FAe+Fcw4poaazjPzqkaMrNlFRWcpo5pP
uH1x2OIJjzAGqvhLGvyK51XNOtprlZCeoxniHJjVPabGDqa2jWfS8loAufygw1li
mTIZZ6x5Q53xLI9bJW3fBWSNpHURNw2oAct9+BLC2LwVSIOgA5F+/NIbh2HSWdVN
UOPmxJLVTh9KrcJqkq42mS7y+JxwYAtsLMtiXE5ZT8oMI3mc1p+K9/OzPPI06iT2
jK5ffpi78o3OrbaQ7CNJdmUsVcFYzQ==
=GksP
-----END PGP SIGNATURE-----


L
L
Ludovic Courtès wrote on 10 Sep 2020 12:24
(name . Alexandros Theodotou)(address . alex@zrythm.org)
87imcmgca7.fsf@gnu.org
Hi,

Alexandros Theodotou <alex@zrythm.org> skribis:

Toggle quote (7 lines)
> 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’.
Closed
?