From patchwork Thu Sep 10 01:46:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alexandros Theodotou X-Patchwork-Id: 23981 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8F93B27BBE8; Thu, 10 Sep 2020 02:47:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3A28127BBE7 for ; Thu, 10 Sep 2020 02:47:12 +0100 (BST) Received: from localhost ([::1]:52100 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kGBg7-0002LY-Ad for patchwork@mira.cbaines.net; Wed, 09 Sep 2020 21:47:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59390) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kGBfy-0002LS-8J for guix-patches@gnu.org; Wed, 09 Sep 2020 21:47:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52228) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kGBfx-0006J3-VZ for guix-patches@gnu.org; Wed, 09 Sep 2020 21:47:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kGBfx-0002x7-TX for guix-patches@gnu.org; Wed, 09 Sep 2020 21:47:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42828] [PATCH] gnu: meson: Update to 0.55.0. [core-updates] Resent-From: Alexandros Theodotou Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Sep 2020 01:47:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42828 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Tobias Geerinckx-Rice Cc: 42828@debbugs.gnu.org Received: via spool by 42828-submit@debbugs.gnu.org id=B42828.159970242111342 (code B ref 42828); Thu, 10 Sep 2020 01:47:01 +0000 Received: (at 42828) by debbugs.gnu.org; 10 Sep 2020 01:47:01 +0000 Received: from localhost ([127.0.0.1]:35541 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kGBfw-0002ws-QP for submit@debbugs.gnu.org; Wed, 09 Sep 2020 21:47:01 -0400 Received: from mout01.posteo.de ([185.67.36.141]:60666) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kGBfu-0002wd-Ef for 42828@debbugs.gnu.org; Wed, 09 Sep 2020 21:46:59 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id BD35F16005C for <42828@debbugs.gnu.org>; Thu, 10 Sep 2020 03:46:51 +0200 (CEST) Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Bn1vt3SFrz9rxT; Thu, 10 Sep 2020 03:46:49 +0200 (CEST) Message-ID: <6459efe223353b52cd7262d55944a99b31ab6e6d.camel@zrythm.org> From: Alexandros Theodotou Date: Thu, 10 Sep 2020 02:46:48 +0100 In-Reply-To: <875z9olz36.fsf@nckx> References: <389a6d84ef21830cb673d8355b5c46ceccb6686f.camel@zrythm.org> <875z9olz36.fsf@nckx> User-Agent: Evolution 3.34.2 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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 From 10f26034fe889baa5704e182d1a37d11871b2207 Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou 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