From unknown Sun Jun 15 08:52:55 2025 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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-Spam-Score: -1.4 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) 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 + -- 2.39.2 From unknown Sun Jun 15 08:52:55 2025 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: Mon, 29 May 2023 15:04: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: 63584@debbugs.gnu.org Received: via spool by 63584-submit@debbugs.gnu.org id=B63584.16853726367623 (code B ref 63584); Mon, 29 May 2023 15:04:02 +0000 Received: (at 63584) by debbugs.gnu.org; 29 May 2023 15:03:56 +0000 Received: from localhost ([127.0.0.1]:58887 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q3ePb-0001yt-Lw for submit@debbugs.gnu.org; Mon, 29 May 2023 11:03:55 -0400 Received: from m12.mail.163.com ([220.181.12.196]:44252) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q3ePX-0001yf-Bo for 63584@debbugs.gnu.org; Mon, 29 May 2023 11:03:55 -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=kMt/ArYpXcMg/5fcCn3l3ECuh9Rclz9H8Kbw5KQZlds=; b=OzYN1EfuomyyrFxVFA7atFCpIf29QUU06b8Pi8ezYlGofmw2MV9XRfYVXy9YwW wFRql+/URdV/PTVumEYZs5Ouca2D6LBvSt4VRuExT133ADCEGtDtxv3XAWGBEIX3 Q0be/S+Pb1DQyPG3A34xzoWMV41b7n6S3UJImEY5ChPp8= Received: from asus-laptop (unknown [119.123.70.198]) by zwqz-smtp-mta-g4-4 (Coremail) with SMTP id _____wDn7rLGvnRk0hGsAw--.43085S2; Mon, 29 May 2023 23:03:39 +0800 (CST) References: <20230519123528.5119-1-all_but_last@163.com> User-agent: mu4e 1.10.2; emacs 30.0.50 From: Zhu Zihao Date: Mon, 29 May 2023 23:02:29 +0800 In-reply-to: Message-ID: <86leh7yycf.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-CM-TRANSID: _____wDn7rLGvnRk0hGsAw--.43085S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvj4RGZXrUUUUU X-Originating-IP: [119.123.70.198] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbBaxF+r1et9A-x0QAAsK X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable ping. And this should close https://issues.guix.gnu.org/63270 =2D-=20 Retrieve my PGP public key: gpg --recv-keys B3EBC086AB0EBC0F45E0B4D433DB374BCEE4D9DC Zihao --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQT4UAIrVkIEZilSHr2K2nJqP6LM8gUCZHS+oRUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQitpyaj+izPI2jgEAsr8i83ikgbFmBELIybSL+XAoGSaC RuV/W/jw7JvudXwBAOvGh1k0R55NwtXA9Gd1WSIeYX+dNu5rw8Q+ZvQjfOYB =A6+k -----END PGP SIGNATURE----- --=-=-=-- From unknown Sun Jun 15 08:52:55 2025 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: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 29 May 2023 19:35:01 +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: Zhu Zihao , 63584@debbugs.gnu.org Received: via spool by 63584-submit@debbugs.gnu.org id=B63584.168538888123046 (code B ref 63584); Mon, 29 May 2023 19:35:01 +0000 Received: (at 63584) by debbugs.gnu.org; 29 May 2023 19:34:41 +0000 Received: from localhost ([127.0.0.1]:59186 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q3idd-0005ze-EZ for submit@debbugs.gnu.org; Mon, 29 May 2023 15:34:41 -0400 Received: from mail-ed1-f66.google.com ([209.85.208.66]:54545) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q3idb-0005zQ-9D for 63584@debbugs.gnu.org; Mon, 29 May 2023 15:34:39 -0400 Received: by mail-ed1-f66.google.com with SMTP id 4fb4d7f45d1cf-5149c76f4dbso2788051a12.1 for <63584@debbugs.gnu.org>; Mon, 29 May 2023 12:34:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685388873; x=1687980873; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=Rx5LJEG/Xg3RX3GF0Meilm8SeqhJ2Zg8xPLWqaHNjU0=; b=VwsGRh3fEFYKkbpAUB1QEyDfkV0WNj+aJzmHGsj150GQmwvpW2Zw11IvncshtvObxu LIfrtmerPlQTTBP5aX7VZwWDDOu/rAIQBRuhTrcp7eVu9aAZZTa0jiz73DBL8UySuhTl pulpFwg4CNbTYYWMvnyOvP3WdMLeRXjNqfVereIwS0xzWM8y2FS9jfk1BMtfEdJ7tzP6 8DCWPAOTLFOEBmELPNIbQIWD9G4lVmR/e4GbIww7XgqgDMoo25sDLw/Afpj1ejclCogY 5OMUQVjQq+y5XShajcTeNW8gUdOLAw2UAYtnr5Z0tPYROkzSoiJb8o8LAmZe+5FssxjU BaCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685388873; x=1687980873; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Rx5LJEG/Xg3RX3GF0Meilm8SeqhJ2Zg8xPLWqaHNjU0=; b=NpeUuOQWWvmgV0klQiBBVFl8asatd/snl7MtgS7Z87Y+efboW98v1yc5xA0xVzcmns dNwCuGG4/gNXjL/fek9hV/1YS69whKIdO7INV2dP3JmMkxq7oFALAGuCF6KqfzxrTpRY N1zGxVUsnWQXJRHWxcECvm9ruriJMdP5uNw/wdS4F4FpM50b+uuTH8KiRK9gtVB+6g1G GJCo75C0en8glBzV6A44R6E/inTjlbBT+vhsEJwYIoFuyT1BiavSZjjcYxoB4Zyy8Z0V KvzbuNkoKXuS/9T9YhU/le7aUBNjhRrIe7My9ygyBZypuKz5b9SBOoKPAvcaTFnpcaX8 Tw6Q== X-Gm-Message-State: AC+VfDyHi0/BkDTJXCKE0QluoXlE7QMdiUbhZnTxSc/A1c7sK/QC7Wga UAxKl84T/3B1R9uuZagsSDc= X-Google-Smtp-Source: ACHHUZ6rkb23n8t7NBZpoafrjPPe13B/VnyjE7qT4xjo7wHsjJmEarO+5JM0UPkYNsaq7AlT2GyeoA== X-Received: by 2002:aa7:d695:0:b0:509:f221:cee2 with SMTP id d21-20020aa7d695000000b00509f221cee2mr543273edr.32.1685388873353; Mon, 29 May 2023 12:34:33 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id p16-20020a056402045000b005147f604965sm3470961edw.24.2023.05.29.12.34.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 May 2023 12:34:33 -0700 (PDT) Message-ID: <9524d67b742a66a76f407887f250d8c8d66e2a13.camel@gmail.com> From: Liliana Marie Prikler Date: Mon, 29 May 2023 21:34:31 +0200 In-Reply-To: <86leh7yycf.fsf@163.com> References: <20230519123528.5119-1-all_but_last@163.com> <86leh7yycf.fsf@163.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Montag, dem 29.05.2023 um 23:02 +0800 schrieb Zhu Zihao: > ping. >=20 > And this should close https://issues.guix.gnu.org/63270 Note that you mentioned the wrong thread there, but anyway: the patch mixes functional and non-functional changes, which I think should be kept separate. If I count my columns correctly, you can do with -1/+2 on gnu/packages/gnome.scm Cheers=20 From unknown Sun Jun 15 08:52:55 2025 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: Wed, 31 May 2023 04:07:01 +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.168550601929343 (code B ref 63584); Wed, 31 May 2023 04:07:01 +0000 Received: (at 63584) by debbugs.gnu.org; 31 May 2023 04:06:59 +0000 Received: from localhost ([127.0.0.1]:34598 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q4D6w-0007dC-He for submit@debbugs.gnu.org; Wed, 31 May 2023 00:06:59 -0400 Received: from m12.mail.163.com ([220.181.12.216]:49822) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q4D6q-0007cw-0w for 63584@debbugs.gnu.org; Wed, 31 May 2023 00:06:56 -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=tVGTJ+qqZE+yu7roesboN+V8L+/DpoytoHZrIFkvtYY=; b=MqThnExVYi6QRTQB6SRvsNWTy/cPeqQArymcvhUbv/lbcJHEckFeEiGLcfoAsK 5GBWZdH8h+ahjpJp8dMELPmXRFuSGe16EsxDu4Q1/MjqRNrup/qPKMI6njH3g7QH sc0P5+rGw+nPiKNBOzvV8U6ak5c7YJEnzYFjOpdZW9+YQ= Received: from asus-laptop (unknown [218.18.128.188]) by zwqz-smtp-mta-g2-4 (Coremail) with SMTP id _____wAHDTHPx3ZkTkIsBA--.48647S2; Wed, 31 May 2023 12:06:45 +0800 (CST) References: <20230519123528.5119-1-all_but_last@163.com> <86leh7yycf.fsf@163.com> <9524d67b742a66a76f407887f250d8c8d66e2a13.camel@gmail.com> User-agent: mu4e 1.10.2; emacs 30.0.50 From: Zhu Zihao Date: Wed, 31 May 2023 12:05:56 +0800 In-reply-to: <9524d67b742a66a76f407887f250d8c8d66e2a13.camel@gmail.com> Message-ID: <86r0qxw3er.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-CM-TRANSID: _____wAHDTHPx3ZkTkIsBA--.48647S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjxUrNVkUUUUU X-Originating-IP: [218.18.128.188] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbBZhaAr1aEDs7TOwAAsl X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Liliana Marie Prikler writes: > Note that you mentioned the wrong thread there, but anyway: the patch > mixes functional and non-functional changes, which I think should be > kept separate. If I count my columns correctly, you can do with -1/+2 > on gnu/packages/gnome.scm Do you mean I should not change the indentation here? =2D-=20 Retrieve my PGP public key: gpg --recv-keys B3EBC086AB0EBC0F45E0B4D433DB374BCEE4D9DC Zihao --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQT4UAIrVkIEZilSHr2K2nJqP6LM8gUCZHbHvBUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQitpyaj+izPJFQwD9FANOh9t1paPble5UC/ETLG4ujgNG +wDGwSiIdjwZSPoBAMD8WZ6X+Dr/JkReS2Dqu+Z/klr94+oA4aBE1u8/9HoK =55xJ -----END PGP SIGNATURE----- --=-=-=-- From unknown Sun Jun 15 08:52:55 2025 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: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 31 May 2023 04:25:01 +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: Zhu Zihao Cc: 63584@debbugs.gnu.org Received: via spool by 63584-submit@debbugs.gnu.org id=B63584.168550706231024 (code B ref 63584); Wed, 31 May 2023 04:25:01 +0000 Received: (at 63584) by debbugs.gnu.org; 31 May 2023 04:24:22 +0000 Received: from localhost ([127.0.0.1]:34620 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q4DNm-00084K-HM for submit@debbugs.gnu.org; Wed, 31 May 2023 00:24:22 -0400 Received: from mail-ej1-f66.google.com ([209.85.218.66]:51506) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q4DNi-000844-UW for 63584@debbugs.gnu.org; Wed, 31 May 2023 00:24:21 -0400 Received: by mail-ej1-f66.google.com with SMTP id a640c23a62f3a-96f53c06babso906130366b.3 for <63584@debbugs.gnu.org>; Tue, 30 May 2023 21:24:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685507053; x=1688099053; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=NxknFaKFVR2vXZj3g4FPKTtTRNObkCVALdeI/JSb4Z0=; b=p89FTUvIFNWobcDVnrTfBiYmG2bAOyChiNBJNP1P+c3NYiNb7TpoXV5LbAHGiFPC9W x7AlC9jxmhPhmUKU/8Sf3+fkh7nAObFfCHP2982FujxtR3th8hAd7iela+e6fck2IT4N 4nx4VVg/7tT1Dt3bM4NAwaSNKI1tplKKVeZIHzYMTfyfvt0QxtT3JXwYgc0AitiTDfKz PCQFTTJ7VHg8LKtRmJk4Aw7bu2GeQ21W1k2GS4ST+EwxdvMv9pT8MtKFhBBpYE+JPrHg /nh7JS6QQHrfqgYiARs7ZqkmRaXRLjtgmdhRlwthRqwrd5xsFUKjLHkF9kQZCBtKSPeE 05XA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685507053; x=1688099053; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=NxknFaKFVR2vXZj3g4FPKTtTRNObkCVALdeI/JSb4Z0=; b=XDznYexqTrgh6TQ1p3l627CKzCYwujfNEVf+po6W+/OA3LWucdsi76J/1z5iQ8HhpT elHvY9dl5sWNeJdEPG/HoL3G5WJzH4OHlV2i+Zc3KesYIDn0X6mtmbGvC7b+WRKdcsuN nAUYyHFcoYEaJcwG1Z6fGsNPoXcnlCx0xc5ppZXI6k4JgHj1OR5J8v1wa1M72H+IpUaw 9K/SthMtGuOYhcdDzijY3ONqVB5bur2cQBm1J4Jo21X/+8UIYqZMK7pWbfbRlgd1GX8x Xf4WznPiQwOpnakMcMrMQg4ctZhr3GyXkiaUplsXi45/Z1YgVepxm/D+9V9yY2MP4HoR 04ig== X-Gm-Message-State: AC+VfDyW38g4RUiiAnJGEmECCr8zmXRmSk6lPwf3YaWtv72muS6jfeyx S/S0XM4xEGwY5FgTXw+Knwc= X-Google-Smtp-Source: ACHHUZ6TocFgtu9F/hwj8JND/qhjHdCMFPAwx4aQJ1bSVadfKnuhJAkpRGqZMtnVE1oLgM0kwP9o5g== X-Received: by 2002:a17:907:743:b0:961:be96:b0e6 with SMTP id xc3-20020a170907074300b00961be96b0e6mr3819312ejb.68.1685507052584; Tue, 30 May 2023 21:24:12 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id qo14-20020a170907212e00b0096f937b0d3esm8232664ejb.3.2023.05.30.21.24.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 May 2023 21:24:12 -0700 (PDT) Message-ID: <6394442394ce24a7ba47227314529737040b2b00.camel@gmail.com> From: Liliana Marie Prikler Date: Wed, 31 May 2023 06:24:11 +0200 In-Reply-To: <86r0qxw3er.fsf@163.com> References: <20230519123528.5119-1-all_but_last@163.com> <86leh7yycf.fsf@163.com> <9524d67b742a66a76f407887f250d8c8d66e2a13.camel@gmail.com> <86r0qxw3er.fsf@163.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Mittwoch, dem 31.05.2023 um 12:05 +0800 schrieb Zhu Zihao: >=20 > Liliana Marie Prikler writes: >=20 > > Note that you mentioned the wrong thread there, but anyway: the > > patch mixes functional and non-functional changes, which I think > > should be kept separate.=C2=A0 If I count my columns correctly, you can > > do with -1/+2 on gnu/packages/gnome.scm >=20 > Do you mean I should not change the indentation here? Exactly. If you wish to apply `guix style' or similar formatting, I recommend a follow-up commit. Cheers From unknown Sun Jun 15 08:52:55 2025 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 Content-Type: multipart/mixed; boundary="=-=-=" 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-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" --==-=-= Content-Type: text/plain 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 :) --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQT4UAIrVkIEZilSHr2K2nJqP6LM8gUCZHic3BUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQitpyaj+izPJ/+QD/RZFAFCKb3R50szefabb1UsxQIQmL b0KvMz5zGZL6clgBAOaqCKtRJXd5NcMMNAKi6oEbQ7X04nIzbeIkcHEukKoN =vp+a -----END PGP SIGNATURE----- --==-=-=-- --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-d-feet-Fix-the-build-error-when-using-Meson-1.1..patch Content-Transfer-Encoding: quoted-printable >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 =3D \ %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 =C2=A9 2023 Kaelyn Takata ;;; Copyright =C2=A9 2023 Juliana Sims ;;; Copyright =C2=A9 2023 Dominik Delgado Steuter +;;; Copyright =C2=A9 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 =3D configure_file( + ) +=20 + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: '@BASENAME@', +@@ -25,7 +24,6 @@ i18n.merge_file( + appdata =3D df_namespace + '.appdata.xml' +=20 + i18n.merge_file( +- appdata, + input: appdata + '.in', + output: '@BASENAME@', + po_dir: po_dir, +--=20 +GitLab + --=20 2.39.2 --=-=-= Content-Type: text/plain -- Retrieve my PGP public key: gpg --recv-keys B3EBC086AB0EBC0F45E0B4D433DB374BCEE4D9DC Zihao --=-=-=-- From unknown Sun Jun 15 08:52:55 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Zhu Zihao Subject: bug#63584: closed (Re: bug#63584: Acknowledgement ([PATCH] gnu: d-feet: Fix the build error when using Meson 1.1.0.)) Message-ID: References: <20230519123528.5119-1-all_but_last@163.com> X-Gnu-PR-Message: they-closed 63584 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 63584@debbugs.gnu.org Date: Sun, 04 Jun 2023 06:32:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1685860322-18117-1" This is a multi-part message in MIME format... ------------=_1685860322-18117-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #63584: [PATCH] gnu: d-feet: Fix the build error when using Meson 1.1.0. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 63584@debbugs.gnu.org. --=20 63584: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D63584 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1685860322-18117-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 63584-done) by debbugs.gnu.org; 4 Jun 2023 06:31:04 +0000 Received: from localhost ([127.0.0.1]:44751 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q5hGa-0004gy-E2 for submit@debbugs.gnu.org; Sun, 04 Jun 2023 02:31:04 -0400 Received: from mail-ed1-f66.google.com ([209.85.208.66]:58654) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q5hGX-0004gD-TH for 63584-done@debbugs.gnu.org; Sun, 04 Jun 2023 02:31:02 -0400 Received: by mail-ed1-f66.google.com with SMTP id 4fb4d7f45d1cf-5148e4a2f17so5551684a12.1 for <63584-done@debbugs.gnu.org>; Sat, 03 Jun 2023 23:31:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685860256; x=1688452256; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=23Bos1DvhB1JzzoIbSH1J8UTNr6k3lJ4n1UuZQ68Gg8=; b=Dnnv7j5J7frT0+hEgx+LKHbYqIrz3L8FY904f6Guguz0i8sQfUscQCj0VUEdXzRrdq CTS/Cbfk+eY3OpOYBrp6E4F1LIsIUWDBdYyPWufInN3ZYcuKh2sYEMEXgTFsQzxnmdcP HksTJZpwly1/aILToLCi0vSAUFkzmW+bxPKqEPt3FDnMtn6OikbRu4fwqmqm2RQ3SzEQ 8Z36x7dN27SpFmwTuLBORFj/KvjaKjJmG7FHAh/jCyCowWOnJTreE9uBMba/UX/5VdHp gqAtpJJxS7r1D5zPtUmwghP69JzBwDy9n4+GR7FoO5z7BDkp3kNaw7dJQKYN9PGBZncy aSBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685860256; x=1688452256; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=23Bos1DvhB1JzzoIbSH1J8UTNr6k3lJ4n1UuZQ68Gg8=; b=CuqQmF0+L5p/Vt5xYAhCTfxlVqT/GModAAGKwgNc+sG4YAxAG8u5knRHs7CMKLgKAi nI5HJ1ELeKUwp3C60X3BfvRrwLbelrL8zMF524+j+aXiaAJ/8ir+/siyS8e/+84AWLl9 EBIdGCIX0DwGkf0A6Yq4MfpUDCs7wnEA0ToNnVebamjsTzt9OlNUjHvPSyuXcCdpSLQ3 +8Fiii96DQwPG4XiNRUQrdOL3i0oIDC/3C6mN7dSFwRR+5nk9wjDQ0wT92MR8QriiX1x S2RsSB8h/li69DgRTNiyh6esWHDLEk02ey09ax8nW4kwdpc7vYvvd+u1nzUGfxTxLoKz 1UPA== X-Gm-Message-State: AC+VfDzSh/pebwdwxfJhBpR/Fn1eJvV+ZpsMmVkOXBjpPC3TvjrQQSx7 4P1hkfxKJ0xZfUbwQdxh2/Q= X-Google-Smtp-Source: ACHHUZ6y7L+wyUhExnYtrT7V8YrOvCORkvyevg//Be+2SdvcYZY9ov07P0ywuq6wx8+vvo+qIMVjqA== X-Received: by 2002:aa7:c586:0:b0:50b:fb85:8608 with SMTP id g6-20020aa7c586000000b0050bfb858608mr5336349edq.25.1685860255736; Sat, 03 Jun 2023 23:30:55 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id d6-20020a056402000600b0050690bc07a3sm2516286edu.18.2023.06.03.23.30.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Jun 2023 23:30:55 -0700 (PDT) Message-ID: Subject: Re: bug#63584: Acknowledgement ([PATCH] gnu: d-feet: Fix the build error when using Meson 1.1.0.) From: Liliana Marie Prikler To: Zhu Zihao Date: Sun, 04 Jun 2023 08:30:53 +0200 In-Reply-To: <86bkhzwbvn.fsf@163.com> 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> <86bkhzwbvn.fsf@163.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 63584-done Cc: 63584-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Donnerstag, dem 01.06.2023 um 21:27 +0800 schrieb Zhu Zihao: >=20 > Liliana Marie Prikler writes: >=20 > > Exactly.=C2=A0 If you wish to apply `guix style' or similar formatting, > > I recommend a follow-up commit. >=20 > Done it with -1/+3 :) +4 due to copyright, but good enough for me. Thanks ------------=_1685860322-18117-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit 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 To: guix-patches@gnu.org Subject: [PATCH] gnu: d-feet: Fix the build error when using Meson 1.1.0. 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit Cc: Zhu Zihao X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) 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 + -- 2.39.2 ------------=_1685860322-18117-1--