From patchwork Fri May 19 12:35:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Zhu Zihao X-Patchwork-Id: 50155 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 AC83427BBEA; Fri, 19 May 2023 13:37:44 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, 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 B406927BBE2 for ; Fri, 19 May 2023 13:37:42 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzzM5-00027R-HD; Fri, 19 May 2023 08:37:09 -0400 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 1pzzLz-00026S-LP for guix-patches@gnu.org; Fri, 19 May 2023 08:37:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pzzLz-0003w2-6i for guix-patches@gnu.org; Fri, 19 May 2023 08:37:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pzzLy-0007oM-Iv for guix-patches@gnu.org; Fri, 19 May 2023 08:37:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63584] [PATCH] gnu: d-feet: Fix the build error when using Meson 1.1.0. Resent-From: Zhu Zihao Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 19 May 2023 12:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 63584 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63584@debbugs.gnu.org Cc: Zhu Zihao X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168449980529996 (code B ref -1); Fri, 19 May 2023 12:37:02 +0000 Received: (at submit) by debbugs.gnu.org; 19 May 2023 12:36:45 +0000 Received: from localhost ([127.0.0.1]:55665 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzzLg-0007nk-Lm for submit@debbugs.gnu.org; Fri, 19 May 2023 08:36:45 -0400 Received: from lists.gnu.org ([209.51.188.17]:52708) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzzLd-0007nZ-9w for submit@debbugs.gnu.org; Fri, 19 May 2023 08:36:43 -0400 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 1pzzLa-000243-Uf for guix-patches@gnu.org; Fri, 19 May 2023 08:36:39 -0400 Received: from m12.mail.163.com ([220.181.12.214]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzzLV-0003sQ-Nl for guix-patches@gnu.org; Fri, 19 May 2023 08:36:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version: Content-Type; bh=cCQBCWUiF8dTsH8+23xOtShYRLe00Cv8KodjZ1Xdd/I=; b=BwFkuY+UkQZjBCG5uy6zbD7E2KPAygIAD5nv+2yTqeS/OCBxRbi82paBtyvPlL q3UaQcA6tHNzFgb6sVAU3ZSHjMfRpEOWLhDqwbmD02+eWlBrf6SD7T6K6/Q08EHD JmpMTbaTKY4V9xJ9/lr3uIai10wKdjWs69Fh7KzzUcIwk= Received: from localhost.localdomain (unknown [119.123.67.172]) by zwqz-smtp-mta-g5-1 (Coremail) with SMTP id _____wCXfeI5bWdkIBJSAA--.24919S2; Fri, 19 May 2023 20:36:15 +0800 (CST) From: Zhu Zihao Date: Fri, 19 May 2023 20:35:28 +0800 Message-Id: <20230519123528.5119-1-all_but_last@163.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-CM-TRANSID: _____wCXfeI5bWdkIBJSAA--.24919S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxGFW3ZF4DKFykWr13GFyrXrb_yoWrXrWrp3 4ktr1a9w48GrWfGrs3Ar13tr4fZ397WF1Du3ZrJw1fCw4S9Fy0kFWfta1ayF47Ww18ua4f WF1Igr1rKF4rJaDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0piWSodUUUUU= X-Originating-IP: [119.123.67.172] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/1tbiFAB0r1aEB7zQRQAAsz Received-SPF: pass client-ip=220.181.12.214; envelope-from=all_but_last@163.com; helo=m12.mail.163.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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 Fix the build error: data/meson.build:15:0: ERROR: Function does not take positional arguments. data/meson.build:27:0: ERROR: Function does not take positional arguments. * gnu/packages/patches/d-feet-drop-unused-meson-argument.patch: New file. * gnu/local.mk (dist_patch_DATA): Add new entry. * gnu/packages/gnome.scm (d-feet)[source]: Apply the patch. --- gnu/local.mk | 1 + gnu/packages/gnome.scm | 19 +++++----- .../d-feet-drop-unused-meson-argument.patch | 36 +++++++++++++++++++ 3 files changed, 48 insertions(+), 8 deletions(-) create mode 100644 gnu/packages/patches/d-feet-drop-unused-meson-argument.patch diff --git a/gnu/local.mk b/gnu/local.mk index d31b40f3bf..f44192b28f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1033,6 +1033,7 @@ dist_patch_DATA = \ %D%/packages/patches/cvs-CVE-2017-12836.patch \ %D%/packages/patches/c++-gsl-find-system-gtest.patch \ %D%/packages/patches/c++-gsl-move-array-bounds-tests.patch \ + %D%/packages/patches/d-feet-drop-unused-meson-argument.patch \ %D%/packages/patches/date-output-pkg-config-files.patch \ %D%/packages/patches/datefudge-gettimeofday.patch \ %D%/packages/patches/dbacl-include-locale.h.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 754bb668ba..5a0259d5ab 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -74,6 +74,7 @@ ;;; Copyright © 2022 Alexandros Theodotou ;;; Copyright © 2022 Arjan Adriaanse ;;; Copyright © 2023 Kaelyn Takata +;;; Copyright © 2023 Zhu Zihao ;;; ;;; This file is part of GNU Guix. ;;; @@ -7190,14 +7191,16 @@ (define-public d-feet (package (name "d-feet") (version "0.3.16") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1jqw5ndpgyb0zxh0g21ai1911lfrm56vz18xbccfqm4sk95wwcw7")))) + (source + (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1jqw5ndpgyb0zxh0g21ai1911lfrm56vz18xbccfqm4sk95wwcw7")) + (patches (search-patches "d-feet-drop-unused-meson-argument.patch")))) (build-system meson-build-system) (arguments (list diff --git a/gnu/packages/patches/d-feet-drop-unused-meson-argument.patch b/gnu/packages/patches/d-feet-drop-unused-meson-argument.patch new file mode 100644 index 0000000000..5d728d7d60 --- /dev/null +++ b/gnu/packages/patches/d-feet-drop-unused-meson-argument.patch @@ -0,0 +1,36 @@ +From 05465d486afdba116dbc22fc22c1e6573aea4f22 Mon Sep 17 00:00:00 2001 +From: Jan Beich +Date: Mon, 24 Jan 2022 12:11:57 +0000 +Subject: [PATCH] meson: drop unused argument for i18n.merge_file() + +Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0. + +data/meson.build:15:0: ERROR: Function does not take positional arguments. +data/meson.build:27:0: ERROR: Function does not take positional arguments. +--- + data/meson.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index 026bd80..3b03b94 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -13,7 +13,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: '@BASENAME@', +@@ -25,7 +24,6 @@ i18n.merge_file( + appdata = df_namespace + '.appdata.xml' + + i18n.merge_file( +- appdata, + input: appdata + '.in', + output: '@BASENAME@', + po_dir: po_dir, +-- +GitLab +