From patchwork Thu Jun 1 13:27:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Zhu Zihao X-Patchwork-Id: 50526 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 D050727BBEA; Thu, 1 Jun 2023 14:29:14 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,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 41DC927BBE9 for ; Thu, 1 Jun 2023 14:29:12 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q4iMT-0002gU-Jc; Thu, 01 Jun 2023 09:29:05 -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 1q4iMQ-0002g3-Oq for guix-patches@gnu.org; Thu, 01 Jun 2023 09:29:02 -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 1q4iMQ-0004oD-Gx for guix-patches@gnu.org; Thu, 01 Jun 2023 09:29:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q4iMQ-0004Uq-Ad for guix-patches@gnu.org; Thu, 01 Jun 2023 09:29:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63584] Acknowledgement ([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: Thu, 01 Jun 2023 13:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63584 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Liliana Marie Prikler Cc: 63584@debbugs.gnu.org Received: via spool by 63584-submit@debbugs.gnu.org id=B63584.168562610617239 (code B ref 63584); Thu, 01 Jun 2023 13:29:02 +0000 Received: (at 63584) by debbugs.gnu.org; 1 Jun 2023 13:28:26 +0000 Received: from localhost ([127.0.0.1]:37255 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q4iLp-0004Tw-S5 for submit@debbugs.gnu.org; Thu, 01 Jun 2023 09:28:26 -0400 Received: from m12.mail.163.com ([220.181.12.199]:42992) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q4iLk-0004Tc-Sj for 63584@debbugs.gnu.org; Thu, 01 Jun 2023 09:28:24 -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=SuCnBh75Hl47Dy7MjFQGrBMTUXhniy88pgw3P7icYDo=; b=Iw9+FlVZiAi1vpdLGbqIhYUDvE11wUi68LD11ClBXCzqGYyYTpgAWKrW16Dd97 5Jrj5czYEybiTARlQg4792EL0J6byhX981Oc3bwvS12+1n8NwuLNIWwPbFqrbRIu mHA3VStBEGYKShDA5ud3mXWEwzXaoMHyRo3GTSoTB+WPM= Received: from asus-laptop (unknown [119.123.68.153]) by zwqz-smtp-mta-g2-4 (Coremail) with SMTP id _____wBHTjLknHhkPuCtBA--.63832S2; Thu, 01 Jun 2023 21:28:10 +0800 (CST) References: <20230519123528.5119-1-all_but_last@163.com> <86leh7yycf.fsf@163.com> <9524d67b742a66a76f407887f250d8c8d66e2a13.camel@gmail.com> <86r0qxw3er.fsf@163.com> <6394442394ce24a7ba47227314529737040b2b00.camel@gmail.com> User-agent: mu4e 1.10.2; emacs 30.0.50 From: Zhu Zihao Date: Thu, 01 Jun 2023 21:27:19 +0800 In-reply-to: <6394442394ce24a7ba47227314529737040b2b00.camel@gmail.com> Message-ID: <86bkhzwbvn.fsf@163.com> MIME-Version: 1.0 X-CM-TRANSID: _____wBHTjLknHhkPuCtBA--.63832S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvj4RNNVkDUUUU X-Originating-IP: [119.123.68.153] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbBoQqBr2I0Y4+X-gAAsW 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 Liliana Marie Prikler writes: > Exactly. If you wish to apply `guix style' or similar formatting, I > recommend a follow-up commit. Done it with -1/+3 :) From 954ffef03e1637048b537f704f05d78b823b5806 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Fri, 19 May 2023 19:51:41 +0800 Subject: [PATCH] gnu: d-feet: Fix the build error when using Meson 1.1.0. 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 | 5 ++- .../d-feet-drop-unused-meson-argument.patch | 36 +++++++++++++++++++ 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/d-feet-drop-unused-meson-argument.patch diff --git a/gnu/local.mk b/gnu/local.mk index 18e8235140..68dfc21df1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1034,6 +1034,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 7df18f055f..516c9f98d3 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -76,6 +76,7 @@ ;;; Copyright © 2023 Kaelyn Takata ;;; Copyright © 2023 Juliana Sims ;;; Copyright © 2023 Dominik Delgado Steuter +;;; Copyright © 2023 Zhu Zihao ;;; ;;; This file is part of GNU Guix. ;;; @@ -7199,7 +7200,9 @@ (define-public d-feet name "-" version ".tar.xz")) (sha256 (base32 - "1jqw5ndpgyb0zxh0g21ai1911lfrm56vz18xbccfqm4sk95wwcw7")))) + "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 + -- 2.39.2