From patchwork Mon Nov 11 06:16:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 70226 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 4F37727BBEA; Mon, 11 Nov 2024 06:24:14 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C481F27BBE2 for ; Mon, 11 Nov 2024 06:24:13 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tANqH-0002OA-Vk; Mon, 11 Nov 2024 01:24:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tANqG-0002Kh-8U for guix-patches@gnu.org; Mon, 11 Nov 2024 01:24:04 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tANqF-00078C-Vj for guix-patches@gnu.org; Mon, 11 Nov 2024 01:24:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=i4/qsQpwDs1xvR+LPnocOUlFqxWkkSl2Yf5BCOAG1g0=; b=VOgL/0gNGrjONqUOwALdkgXgN0jsXzjg8eJRapcYhoYdiypHaHFF38rDrDkTZ2i3jSu0p6gWuV4CIohm4q2oMTvzyLQoN8xy2Uk3l+Jy+AQabhzrTMfJ2+5isiAocD/MG2Jn2V6X0SqbTJ4XwJhEMySdyeLUBUNmG81zcfngBMfijopdkjqeu4GqRo+X0+AnAYQ6gC81LefjVo923xsR/F8503AuS/3ZWs5kvyGRN46pGM0bSymd92m/Ns/J81tXwIPPdavnS5PY4NZu8CxYRbe8wNBjGUg/hxKMnHCSBZ4h7Y6Epfmu0UoZZ9XXwGymhbKWfIR+gUgiIsyqE9UC8w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tANqF-0006HA-9R; Mon, 11 Nov 2024 01:24:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74306] [PATCH gnome-team 15/44] gnu: meson: Update to 1.5.2. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, liliana.prikler@gmail.com, vivien@planete-kraus.eu, guix-patches@gnu.org Resent-Date: Mon, 11 Nov 2024 06:24:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74306 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74306@debbugs.gnu.org Cc: Maxim Cournoyer , Maxim Cournoyer , Liliana Marie Prikler , Vivien Kraus X-Debbugs-Original-Xcc: Maxim Cournoyer , Liliana Marie Prikler , Vivien Kraus Received: via spool by 74306-submit@debbugs.gnu.org id=B74306.173130619523823 (code B ref 74306); Mon, 11 Nov 2024 06:24:03 +0000 Received: (at 74306) by debbugs.gnu.org; 11 Nov 2024 06:23:15 +0000 Received: from localhost ([127.0.0.1]:57668 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tANpT-0006C9-9x for submit@debbugs.gnu.org; Mon, 11 Nov 2024 01:23:15 -0500 Received: from mail-oa1-f47.google.com ([209.85.160.47]:44299) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tANpN-00069o-So for 74306@debbugs.gnu.org; Mon, 11 Nov 2024 01:23:10 -0500 Received: by mail-oa1-f47.google.com with SMTP id 586e51a60fabf-28cdd9d8d01so2115820fac.1 for <74306@debbugs.gnu.org>; Sun, 10 Nov 2024 22:23:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1731306124; x=1731910924; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=i4/qsQpwDs1xvR+LPnocOUlFqxWkkSl2Yf5BCOAG1g0=; b=hByarS4qoOF5yA+QyOh44mNHY+MJzNzdDJTe6lF9VYh7qQbcC4zbMdd5XCeOSjm9be 6YR50xrKr9lI8bOoRFFii+rfKXB1MEyMCngxKHUpFUGLluUmhw+EPlAS+5D0egU6EXWB JXfk0rTVx5OJ9EPxjSW8YTqBupHtfyvYGRkGr9H/sbk8faWMaSRmr3cw2VEORuDJLbWD AlO4wp17wohx7Dc2KgcMMiu2yIZLCxSmHlWhmBnems0JLUjXAMxvD91kQxA/4RdoEzIn O7aKp5FiZF5nLSwX0NeG4jHDn33uGjYbmsA4jmyxwePqKjglLCtMUZEZZaq+Fo1y2eBh oaBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731306124; x=1731910924; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=i4/qsQpwDs1xvR+LPnocOUlFqxWkkSl2Yf5BCOAG1g0=; b=PVc7Qq18BpDaDV6ncc6bQnzRUzYGQm0HlLIN8AisxZ5I15hakABJQtchV7NGC2QKdc VF0E8E2Pi4PdceXPb1aa06ZmuymU2wmTbZd5GO+21M1+MPEcVT9EV3//qEVVv0cqDp7s /TFt+AA40bRxeLm+Ve8VTBpAYPZvAs8UjvngG2XS84UvRswggw1CN/Y5XS6xRjPpkisk v61udq+z/huSSllHB9TN+6RjWbqpxeZEEc9mAB2pXCkmvfTL0ANXVtyD2WnsE9OXuhwC 2JmIj8aNrsOSxydurFQresKLumcCgT9sJdf5Li/kifFnFPyWIzdF5woaOOcrTzBawgHe UrZQ== X-Gm-Message-State: AOJu0Yyi99nu6OoE1Q74UEwxLg5ByOc7Ms9ywC9vVIy/+nswt1Y2x0/H TZ5V132TDqiXOJW3gd+sShEl4WE57inBus68tm7xzO6lV6yQDUHgWs40tA== X-Google-Smtp-Source: AGHT+IFX/08x7PRKWgx7MAJsN7YMjQw5pOdiJnxs3ZuFcrMATOidW4WBm7FeTmFexSqf1bnekCJZAA== X-Received: by 2002:a05:6870:80ca:b0:288:816a:72e6 with SMTP id 586e51a60fabf-295600333abmr8441053fac.7.1731306124004; Sun, 10 Nov 2024 22:22:04 -0800 (PST) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-7f41f5ea0d5sm7782996a12.47.2024.11.10.22.22.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Nov 2024 22:22:03 -0800 (PST) From: Maxim Cournoyer Date: Mon, 11 Nov 2024 15:16:58 +0900 Message-ID: <46eb528390f3fa5821b81d5b8c375cf842902b9c.1731303037.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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 --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")