From patchwork Sun Apr 14 07:18:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: gemmaro X-Patchwork-Id: 62962 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 9021C27BBE9; Sun, 14 Apr 2024 08:21:13 +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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 851CC27BBE2 for ; Sun, 14 Apr 2024 08:21:09 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rvuAb-0004Cn-I2; Sun, 14 Apr 2024 03:20:57 -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 1rvuAW-0004BT-7T for guix-patches@gnu.org; Sun, 14 Apr 2024 03:20:53 -0400 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 1rvuAV-0007Ev-VJ for guix-patches@gnu.org; Sun, 14 Apr 2024 03:20:51 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rvuAg-0003uV-Jg for guix-patches@gnu.org; Sun, 14 Apr 2024 03:21:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63483] [PATCH v2 1/4] build: Align the Automake status lines of the po4a and the PO xref. Resent-From: gemmaro Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 14 Apr 2024 07:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63483 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: moreinfo patch To: 63483@debbugs.gnu.org Cc: gemmaro Received: via spool by 63483-submit@debbugs.gnu.org id=B63483.171307921114499 (code B ref 63483); Sun, 14 Apr 2024 07:21:02 +0000 Received: (at 63483) by debbugs.gnu.org; 14 Apr 2024 07:20:11 +0000 Received: from localhost ([127.0.0.1]:34173 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rvu9j-0003js-11 for submit@debbugs.gnu.org; Sun, 14 Apr 2024 03:20:10 -0400 Received: from mail-pg1-x534.google.com ([2607:f8b0:4864:20::534]:46305) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rvu9d-0003il-QQ for 63483@debbugs.gnu.org; Sun, 14 Apr 2024 03:20:01 -0400 Received: by mail-pg1-x534.google.com with SMTP id 41be03b00d2f7-5cddfe0cb64so1193897a12.0 for <63483@debbugs.gnu.org>; Sun, 14 Apr 2024 00:19:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713079181; x=1713683981; 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=aRGlPQe0BWXVZCvLP4+gpjQL/GJYT9TOPyDrjkOJynE=; b=mMRLEtAN0iWuCZ2KwkVW2ssXmTooxt854ndTwPOwtWyGfaX+gm18Iy9/qrYf6DbusU AR0iIhsx/imQYcoc39EtWJR/WOqTMAKSRl3UbM5JfDueAEOdTVjwWh5YRsxUfH79bGME 79NINzZL6m/qmpsYq1Rkh6zNSfE1FPU8m8n575puq0naNq28nW3qicHHV9i/4xd/soSh y1tg0Nhqo3q6GpMNxz5JZLBTUbaZTu6nss5puZ5NOfkHf0XrzzwZ5QCW7M3lD0qqi+0+ /SiJxXh0kPGOD377MpjDyHqhrIkXLuNVdq6hdpCyillpsJEV1CazCb+HKCCgQkqPnV3y Ic7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713079181; x=1713683981; 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=aRGlPQe0BWXVZCvLP4+gpjQL/GJYT9TOPyDrjkOJynE=; b=nWVBqmdgtLjtoe749kFEEQgdzWGzcbe5DvpKayIead1CSI/VeRqcRjdFnKoRSNJX14 +pndSTPl0GLKVXuCnuv6PblNrpdn3AUMokzdOQ72ru0OSiToWlGeEdAHvtKi3gX1N/AR Pp2BqcswxBXEOO8Owya72cfxmu/e+/uFbSMkBbw5+S3IWxqFpMh+wBmG18kGNid69BAu ObfIsLS/+Q2QRjPN/eMsXMkPSuWv+n7CWCVuhGAVCU+TX19WsG8sbkPSCIrZwFuufXBK up/cjKy9z7Y/9pTPQMr4NGrPuT4cZCzJon5HFgCYZw/f/ZmFu3/Yqq+ZrxJ/iPGTVah2 q5yg== X-Gm-Message-State: AOJu0YwOAsWBYG06b9T5q6b1hIe73vpJbm9fPBgso0nQRF/o172/v1df sUtGE25CfwroURaSdwG1a38+uho9g5Cwg6PzA9OySURIAy9A1KCRRsfG5g== X-Google-Smtp-Source: AGHT+IGeRaMSZyBvqw7LGLhx+YVABF3sOVYO9wNoxSbBY1CpmgZHrncMo859YMknTEg4/bdD8/wW3A== X-Received: by 2002:a17:902:c94b:b0:1e4:54d1:a159 with SMTP id i11-20020a170902c94b00b001e454d1a159mr7190111pla.47.1713079180941; Sun, 14 Apr 2024 00:19:40 -0700 (PDT) Received: from mac.gemmaro.name ([240f:74:d1f0:1:1883:f3d1:907f:a2e3]) by smtp.gmail.com with ESMTPSA id j14-20020a170902da8e00b001e2bbc0a66fsm5557125plx.234.2024.04.14.00.19.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Apr 2024 00:19:40 -0700 (PDT) From: gemmaro Date: Sun, 14 Apr 2024 16:18:50 +0900 Message-ID: <57afeead3bff93c5343e327126656d64da236002.1713073114.git.gemmaro.dev@gmail.com> X-Mailer: git-send-email 2.41.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 * Makefile.am (AM_V_PO4A_0, AM_V_POXREF_0): Align the Automake status lines of the po4a and the PO xref, since the common width is 10 characters. Change-Id: Ic8c32f73294ba6e4ca71ab4aa889a558e4d7fcee --- Makefile.am | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 1c5688ac13..faf16defc9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,6 +19,7 @@ # Copyright © 2021 Andrew Tropin # Copyright © 2023 Clément Lassieur # Copyright © 2023, 2024 Wilko Meyer +# Copyright © 2024 gemmaro # # This file is part of GNU Guix. # @@ -1263,8 +1264,8 @@ AM_V_HELP2MAN_0 = @echo " HELP2MAN" $@; AM_V_PO4A = $(AM_V_PO4A_$(V)) AM_V_PO4A_ = $(AM_V_PO4A_$(AM_DEFAULT_VERBOSITY)) -AM_V_PO4A_0 = @echo " PO4A" $@; +AM_V_PO4A_0 = @echo " PO4A " $@; AM_V_POXREF = $(AM_V_POXREF_$(V)) AM_V_POXREF_ = $(AM_V_POXREF_$(AM_DEFAULT_VERBOSITY)) -AM_V_POXREF_0 = @echo " POXREF" $@; +AM_V_POXREF_0 = @echo " POXREF " $@; From patchwork Sun Apr 14 07:18:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: gemmaro X-Patchwork-Id: 62964 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 3EE6627BBE9; Sun, 14 Apr 2024 08:21:34 +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_ADSP_CUSTOM_MED, 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 C27F827BBEA for ; Sun, 14 Apr 2024 08:21:32 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rvuAd-0004Dv-KU; Sun, 14 Apr 2024 03:21:00 -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 1rvuAa-0004CB-L0 for guix-patches@gnu.org; Sun, 14 Apr 2024 03:20:56 -0400 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 1rvuAZ-0007FX-9P for guix-patches@gnu.org; Sun, 14 Apr 2024 03:20:56 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rvuAh-0003um-I9; Sun, 14 Apr 2024 03:21:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63483] [PATCH v2 2/4] build: Update the POT creation task with the po4a command. Resent-From: gemmaro Original-Sender: "Debbugs-submit" Resent-CC: pelzflorian@pelzflorian.de, julien@lepiller.eu, guix-patches@gnu.org Resent-Date: Sun, 14 Apr 2024 07:21:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63483 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: moreinfo patch To: 63483@debbugs.gnu.org Cc: gemmaro , Florian Pelz , Julien Lepiller X-Debbugs-Original-Xcc: Florian Pelz , Julien Lepiller Received: via spool by 63483-submit@debbugs.gnu.org id=B63483.171307922114607 (code B ref 63483); Sun, 14 Apr 2024 07:21:03 +0000 Received: (at 63483) by debbugs.gnu.org; 14 Apr 2024 07:20:21 +0000 Received: from localhost ([127.0.0.1]:34176 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rvu9x-0003n2-1R for submit@debbugs.gnu.org; Sun, 14 Apr 2024 03:20:20 -0400 Received: from mail-pg1-x533.google.com ([2607:f8b0:4864:20::533]:61786) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rvu9f-0003j4-Hb for 63483@debbugs.gnu.org; Sun, 14 Apr 2024 03:20:03 -0400 Received: by mail-pg1-x533.google.com with SMTP id 41be03b00d2f7-5f415fd71f8so1777168a12.3 for <63483@debbugs.gnu.org>; Sun, 14 Apr 2024 00:19:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713079183; x=1713683983; 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=SBcSmfwkGbuOcJPXkSCYDDqAXHpiRLthjwUUYhpEO8Q=; b=FY360oOyX+BHiEtmuONLnXYXlX2sGRm5V0k04zSEqpf8ntRUUlPpluWLD3MZnqYjME MJAOl0/fHfW6rTlR2EezjVum/Ca499kdv2xswx0DZsMgH/pn7twW+Dlc+yIAH83FPlXl CUiS5PDsK199ERu2vUGsMmNQEy3RNRZkhZ5loxUX7L+xvGk4mvvVlRrzm4mq7PIG6yWe u04XVWBtcwtAQuiaG+ZMcRUYl5XgcVeLWTHtUvdWhOyMO1moNlDneoad5HJgOaXG+6h6 /8+DfwAZg2/kHw0fQtrD8DV7TbXgAdGIKxsrLqGvUPJFjkFDbq2fMkFoeF89BOmR4Hjy nA9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713079183; x=1713683983; 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=SBcSmfwkGbuOcJPXkSCYDDqAXHpiRLthjwUUYhpEO8Q=; b=AJFCwBOD011/HhZXiXPkRXRfIa9qTD7IZm98RDlYxNniF1fx9kRoXpTPEIc24YUJzh wFWf4mmjV4+r+kLdDV9pbW+ZbGJvik0Ii/Q0W7aoShNCke7Cb8gEbb573JhF62E8/2up ouHiWaTZEVTD7iofZeRMU4+mrzkGo6ko43Zq8VdU0OsZlK48HLrER1gLloukS1X/SCuD YqvIxEaJPgHZUogmbJRnABktqIrUFRKT0ZLV7nfGTp942NEd8d5oNWpixvG4TbewKF/H 40gg9NxOaK9+V1S4xtfeBXMHit7oU8znMpAH0Nx5EtYRxyQCz025UEds+Bdq+wUREtLL mmNw== X-Gm-Message-State: AOJu0YwKDtuBQGoyImT1BNN5x6UuLw+QuPwmjH0gAi66SAzAsLqVzhmW PSO67W3z1jnpq+ScTAybYOKWK9ptEcXA0G3nZuR9N05U+ilTb1jjUJOokw== X-Google-Smtp-Source: AGHT+IHPsHgECx9EOnlbipL2/mK6y4ASw0O3ju53i+lDrPmQy20JVCQZBq0fgliqzVDO66aud3XtUQ== X-Received: by 2002:a17:902:6f16:b0:1e5:3c5:55a5 with SMTP id w22-20020a1709026f1600b001e503c555a5mr5441563plk.8.1713079182780; Sun, 14 Apr 2024 00:19:42 -0700 (PDT) Received: from mac.gemmaro.name ([240f:74:d1f0:1:1883:f3d1:907f:a2e3]) by smtp.gmail.com with ESMTPSA id j14-20020a170902da8e00b001e2bbc0a66fsm5557125plx.234.2024.04.14.00.19.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Apr 2024 00:19:42 -0700 (PDT) From: gemmaro Date: Sun, 14 Apr 2024 16:18:51 +0900 Message-ID: <1fc791a888ce4bc45b6dabf0b7274b31fc0198c8.1713073114.git.gemmaro.dev@gmail.com> X-Mailer: git-send-email 2.41.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 * configure.ac (Documentation translation): Add the po4a program and remove the po4a-updatepo program. The PO4A defined here can be used in Makefiles (e.g. po/doc/local.mk below). The po4a command integrates the functionality of po4a-updatepo and is currently recommended for use [1]. The po4a-updatepo command has been replaced by the po4a command and are not used from anywhere. * po/doc/local.mk (%D%/%.pot): Use a po4a command instead of the po4a-updatepo for the POT generation. This eliminates the warning of po4a-updatepo; "po4a-updatepo is deprecated. The unified po4a(1) program is more convenient and less error prone." Here, the file paths are passed using variables. This is because the po4a command needs to be executed for each language and each file. Dummy values are passed for those that are not needed to update the POT file. * po/doc/po4a.cfg: Add a po4a config file for the POT generation. The po4a command requires a configulation file. [1] https://po4a.org/man/man7/po4a.7.php.en#lbAS Change-Id: Ica39a0d1f77b6a64d37c592ac2e693319443d3c5 --- configure.ac | 2 +- po/doc/local.mk | 10 ++++++++-- po/doc/po4a.cfg | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 po/doc/po4a.cfg diff --git a/configure.ac b/configure.ac index ecbd596a34..68542f0348 100644 --- a/configure.ac +++ b/configure.ac @@ -262,8 +262,8 @@ dnl Manual pages. AM_MISSING_PROG([HELP2MAN], [help2man]) dnl Documentation translation. +AM_MISSING_PROG([PO4A], [po4a]) AM_MISSING_PROG([PO4A_TRANSLATE], [po4a-translate]) -AM_MISSING_PROG([PO4A_UPDATEPO], [po4a-updatepo]) case "$storedir" in /gnu/store) diff --git a/po/doc/local.mk b/po/doc/local.mk index dd6ba30133..8a78fb23f8 100644 --- a/po/doc/local.mk +++ b/po/doc/local.mk @@ -1,6 +1,7 @@ # GNU Guix --- Functional package management for GNU # Copyright © 2018 Julien Lepiller # Copyright © 2021 Maxim Cournoyer +# Copyright © 2024 gemmaro # # This file is part of GNU Guix. # @@ -44,8 +45,13 @@ POT_OPTIONS = \ --msgid-bugs-address "bug-guix@gnu.org" %D%/%.pot: $(srcdir)/doc/%.texi - $(AM_V_PO4A)$(PO4A_UPDATEPO) -M UTF-8 -f texinfo -m "$<" \ - -p "$@" $(POT_OPTIONS) && \ + $(AM_V_PO4A)$(PO4A) --no-translations -M UTF-8 \ + --package-version "$(VERSION)" \ + --variable master="$<" \ + --variable pot="$@" \ + --variable po=/dev/null \ + --variable localized=/dev/null \ + $(POT_OPTIONS) %D%/po4a.cfg touch $@ %D%/guix-manual.pot: %D%/guix.pot %D%/contributing.pot diff --git a/po/doc/po4a.cfg b/po/doc/po4a.cfg new file mode 100644 index 0000000000..7d2ef71773 --- /dev/null +++ b/po/doc/po4a.cfg @@ -0,0 +1,32 @@ +# GNU Guix --- Functional package management for GNU +# Copyright © 2024 gemmaro +# +# This file is part of GNU Guix. +# +# GNU Guix is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or (at +# your option) any later version. +# +# GNU Guix is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Guix. If not, see . + +# "--keep 0": produce an output even if the translation is not complete +[options] \ + --package-name "guix manual" \ + --copyright-holder "the authors of Guix (msgids)" \ + --msgid-bugs-address "bug-guix@gnu.org" \ + --master-charset UTF-8 \ + --localized-charset UTF-8 \ + --keep 0 + +[po4a_langs] de es fr pt_BR ru zh_CN ko sk + +[po4a_paths] $(pot) $lang:$(po) + +[type:texinfo] $(master) $lang:$(localized) From patchwork Sun Apr 14 07:18:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: gemmaro X-Patchwork-Id: 62965 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 9E83927BBE9; Sun, 14 Apr 2024 08:21:35 +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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 6C46727BBE2 for ; Sun, 14 Apr 2024 08:21:31 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rvuAd-0004DG-EI; Sun, 14 Apr 2024 03:20:59 -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 1rvuAa-0004CC-L3 for guix-patches@gnu.org; Sun, 14 Apr 2024 03:20:56 -0400 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 1rvuAY-0007FS-Or for guix-patches@gnu.org; Sun, 14 Apr 2024 03:20:56 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rvuAj-0003vJ-I1; Sun, 14 Apr 2024 03:21:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63483] [PATCH v2 3/4] build: Use the po4a command for the translation generation. Resent-From: gemmaro Original-Sender: "Debbugs-submit" Resent-CC: pelzflorian@pelzflorian.de, julien@lepiller.eu, guix-patches@gnu.org Resent-Date: Sun, 14 Apr 2024 07:21:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63483 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: moreinfo patch To: 63483@debbugs.gnu.org Cc: gemmaro , Florian Pelz , Julien Lepiller X-Debbugs-Original-Xcc: Florian Pelz , Julien Lepiller Received: via spool by 63483-submit@debbugs.gnu.org id=B63483.171307922514657 (code B ref 63483); Sun, 14 Apr 2024 07:21:05 +0000 Received: (at 63483) by debbugs.gnu.org; 14 Apr 2024 07:20:25 +0000 Received: from localhost ([127.0.0.1]:34178 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rvuA0-0003nY-Gm for submit@debbugs.gnu.org; Sun, 14 Apr 2024 03:20:24 -0400 Received: from mail-pg1-x532.google.com ([2607:f8b0:4864:20::532]:61629) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rvu9h-0003j8-EF for 63483@debbugs.gnu.org; Sun, 14 Apr 2024 03:20:03 -0400 Received: by mail-pg1-x532.google.com with SMTP id 41be03b00d2f7-53fa455cd94so1819455a12.2 for <63483@debbugs.gnu.org>; Sun, 14 Apr 2024 00:19:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713079185; x=1713683985; 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=EzEwjl5DtDs5dK2gddRO7Hc/6OcfrHGdWlJAsPfYOd8=; b=C9q0E9u18cwX88553+m2+Db8GCXs8rTmOo8i7GcaUqUCRCWgej527MbXlE5O/gfmXl j9pt3DNSomzwFm1l6erbOecLj9f5lAbEBf7f+zgP/pBA3DNpWi7VcRYa9WBM8oMPPAFn DwooCnUwWeLrsPLBTue0hBqU0291ESHzzFjw58Rh/wHLnwoEmZFAs9BQH0U4Unl9dzbT sebcUd8YsWW2k7Oaw6jFDQu3T1Ll79ToezSdSuzyYwDam4cd8QWJCTvoYvt9aOectZEm Mmv0xNfSQWoltuhptm8R1VJBKGUdxz9/nAs3qkGxj3wzzHWKYRK8b604Klqq9it9cLbv IodQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713079185; x=1713683985; 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=EzEwjl5DtDs5dK2gddRO7Hc/6OcfrHGdWlJAsPfYOd8=; b=MY70GeGvA7dYa58h3Zo/CWHvwxH5XxzVufwc31J5fDmXr2iXtggug1KrHZclWTIVfr 59XXHdTT4Jj5o4+HSQNQ+g4D/fHxj097ICJYrOtMoKtBy4bIno4BFZQZW9qH0iGYz8W2 zbpbIrRgWGkwRdO9ux6BsJDhi2lufeDRng/setctAU6ADwA7bSGQUbcxgtE/gEhxgdBX uc+3ewgMaqD48V3iI69gFZde+oILdbTR301CcNVNjkP01W0V2oOtoRyOBcim5IPoZgM5 vm/dXEEBiJw7eeMaSfnxYP1IL41PChu8eWFjC6iMBqXAhsF5F+k94tPUEk9y80g3tqfs UcCA== X-Gm-Message-State: AOJu0Yx3JiSWE2MJtrTtUgH9T5MTz8Yut+Uw54hkulVtl0LZzQXPBcot ELiJVnJwVDu2gTIdBpfVksmGpL9Kqg5GkUwDTpwav7AcnfNqwzeN24ZOEg== X-Google-Smtp-Source: AGHT+IEAJq2HOUerGmxI3HJOLM/BXxlF3e9TbjhKTqPaY/DzVwkaZ9KzXkw40EqIMK1c6Y/4at5F/Q== X-Received: by 2002:a17:902:b906:b0:1e3:e256:44e0 with SMTP id bf6-20020a170902b90600b001e3e25644e0mr5396099plb.31.1713079184631; Sun, 14 Apr 2024 00:19:44 -0700 (PDT) Received: from mac.gemmaro.name ([240f:74:d1f0:1:1883:f3d1:907f:a2e3]) by smtp.gmail.com with ESMTPSA id j14-20020a170902da8e00b001e2bbc0a66fsm5557125plx.234.2024.04.14.00.19.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Apr 2024 00:19:44 -0700 (PDT) From: gemmaro Date: Sun, 14 Apr 2024 16:18:52 +0900 Message-ID: <1c856bb1f6ec8a648775a919f360d3ec878b6575.1713073114.git.gemmaro.dev@gmail.com> X-Mailer: git-send-email 2.41.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 * configure.ac (Documentation translation): Remove the po4a-translate command. This command has been replaced by the po4a command and are not used from anywhere. * doc/local.mk ($(srcdir)/%D%/guix.%.texi, $(srcdir)/%D%/guix-cookbook.%.texi) ($(srcdir)/%D%/contributing.%.texi): Use the po4a command instead of the po4a-translate for the translation generation. This eliminates the warning of po4a-translate; "po4a-translate is deprecated. The unified po4a(1) program is more convenient and less error prone." (PO4A_PARAMS): Remove the Texinfo format option. This option is specified in the configuration file (po/doc/po4a.cfg). (dummy_pot): Add a variable for the temporary POT file location. Change-Id: I542b934c3c03b8701e9f86823191224f8b0ccf81 --- configure.ac | 1 - doc/local.mk | 30 +++++++++++++++++++++++------- po/doc/local.mk | 5 ----- 3 files changed, 23 insertions(+), 13 deletions(-) diff --git a/configure.ac b/configure.ac index 68542f0348..ad148f33b6 100644 --- a/configure.ac +++ b/configure.ac @@ -263,7 +263,6 @@ AM_MISSING_PROG([HELP2MAN], [help2man]) dnl Documentation translation. AM_MISSING_PROG([PO4A], [po4a]) -AM_MISSING_PROG([PO4A_TRANSLATE], [po4a-translate]) case "$storedir" in /gnu/store) diff --git a/doc/local.mk b/doc/local.mk index 8df003b891..a6234b2e3e 100644 --- a/doc/local.mk +++ b/doc/local.mk @@ -5,6 +5,7 @@ # Copyright © 2016 Taylan Ulrich Bayırlı/Kammer # Copyright © 2016, 2018 Mathieu Lirzin # Copyright © 2018, 2021 Julien Lepiller +# Copyright © 2024 gemmaro # # This file is part of GNU Guix. # @@ -87,10 +88,6 @@ BUILT_SOURCES += $(OS_CONFIG_EXAMPLES_TEXI) $(TRANSLATED_INFO) EXTRA_DIST += $(OS_CONFIG_EXAMPLES_TEXI) $(TRANSLATED_INFO) MAINTAINERCLEANFILES = $(OS_CONFIG_EXAMPLES_TEXI) $(TRANSLATED_INFO) -PO4A_PARAMS := -M UTF-8 -L UTF-8 #master and localized encoding -PO4A_PARAMS += -k 0 # produce an output even if the translation is not complete -PO4A_PARAMS += -f texinfo # texinfo format - # When a change to guix.texi occurs, it is not translated immediately. # Because @pxref and @xref commands are references to sections by name, they # should be translated. If a modification adds a reference to a section, this @@ -102,20 +99,39 @@ $(top_srcdir)/pre-inst-env $(GUILE) --no-auto-compile \ $@.tmp $< endef +# If /dev/null is used for this POT file path, a warning will be issued +# because the path extension is not 'pot'. +dummy_pot = $(shell mktemp --suffix=.pot) + $(srcdir)/%D%/guix.%.texi: po/doc/guix-manual.%.po $(srcdir)/%D%/contributing.%.texi guix/build/po.go - -$(AM_V_PO4A)$(PO4A_TRANSLATE) $(PO4A_PARAMS) -m "%D%/guix.texi" -p "$<" -l "$@.tmp" + -$(AM_V_PO4A)$(PO4A) --no-update \ + --variable localized="$@.tmp" \ + --variable master="%D%/guix.texi" \ + --variable po="$<" \ + --variable pot=$(dummy_pot) \ + po/doc/po4a.cfg -sed -i "s|guix\.info|$$(basename "$@" | sed 's|texi$$|info|')|" "$@.tmp" -$(AM_V_POXREF)LC_ALL=en_US.UTF-8 $(xref_command) -mv "$@.tmp" "$@" $(srcdir)/%D%/guix-cookbook.%.texi: po/doc/guix-cookbook.%.po guix/build/po.go - -$(AM_V_PO4A)$(PO4A_TRANSLATE) $(PO4A_PARAMS) -m "%D%/guix-cookbook.texi" -p "$<" -l "$@.tmp" + -$(AM_V_PO4A)$(PO4A) --no-update \ + --variable localized="$@.tmp" \ + --variable master="%D%/guix-cookbook.texi" \ + --variable po="$<" \ + --variable pot=$(dummy_pot) \ + po/doc/po4a.cfg -sed -i "s|guix-cookbook\.info|$$(basename "$@" | sed 's|texi$$|info|')|" "$@.tmp" -$(AM_V_POXREF)LC_ALL=en_US.UTF-8 $(xref_command) -mv "$@.tmp" "$@" $(srcdir)/%D%/contributing.%.texi: po/doc/guix-manual.%.po guix/build/po.go - -$(AM_V_PO4A)$(PO4A_TRANSLATE) $(PO4A_PARAMS) -m "%D%/contributing.texi" -p "$<" -l "$@.tmp" + -$(AM_V_PO4A)$(PO4A) --no-update \ + --variable localized="$@.tmp" \ + --variable master="%D%/contributing.texi" \ + --variable po="$<" \ + --variable pot=$(dummy_pot) \ + po/doc/po4a.cfg -$(AM_V_POXREF)LC_ALL=en_US.UTF-8 $(xref_command) -mv "$@.tmp" "$@" diff --git a/po/doc/local.mk b/po/doc/local.mk index 8a78fb23f8..a1f1875623 100644 --- a/po/doc/local.mk +++ b/po/doc/local.mk @@ -39,11 +39,6 @@ EXTRA_DIST = \ $(DOC_PO_FILES) \ $(DOC_COOKBOOK_PO_FILES) -POT_OPTIONS = \ - --package-name "guix manual" --package-version "$(VERSION)" \ - --copyright-holder "the authors of Guix (msgids)" \ - --msgid-bugs-address "bug-guix@gnu.org" - %D%/%.pot: $(srcdir)/doc/%.texi $(AM_V_PO4A)$(PO4A) --no-translations -M UTF-8 \ --package-version "$(VERSION)" \ From patchwork Sun Apr 14 07:18:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gemmaro X-Patchwork-Id: 62963 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 E35CE27BBEA; Sun, 14 Apr 2024 08:21: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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS 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 7594527BBE2 for ; Sun, 14 Apr 2024 08:21:14 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rvuAh-0004Ew-UE; Sun, 14 Apr 2024 03:21:04 -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 1rvuAd-0004DM-5H for guix-patches@gnu.org; Sun, 14 Apr 2024 03:20:59 -0400 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 1rvuAc-0007GI-T4; Sun, 14 Apr 2024 03:20:58 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rvuAl-0003vq-OZ; Sun, 14 Apr 2024 03:21:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63483] [PATCH v2 4/4] self: Use po4a instead of po4a-translate. Resent-From: gemmaro Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Sun, 14 Apr 2024 07:21:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63483 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: moreinfo patch To: 63483@debbugs.gnu.org Cc: gemmaro , Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 63483-submit@debbugs.gnu.org id=B63483.171307922914725 (code B ref 63483); Sun, 14 Apr 2024 07:21:07 +0000 Received: (at 63483) by debbugs.gnu.org; 14 Apr 2024 07:20:29 +0000 Received: from localhost ([127.0.0.1]:34182 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rvuA7-0003p8-GP for submit@debbugs.gnu.org; Sun, 14 Apr 2024 03:20:28 -0400 Received: from mail-oo1-xc36.google.com ([2607:f8b0:4864:20::c36]:47509) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rvu9j-0003jD-9s for 63483@debbugs.gnu.org; Sun, 14 Apr 2024 03:20:06 -0400 Received: by mail-oo1-xc36.google.com with SMTP id 006d021491bc7-5aa2a74c238so1708961eaf.3 for <63483@debbugs.gnu.org>; Sun, 14 Apr 2024 00:19:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713079186; x=1713683986; 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=9RqS2/t4WyP6w1d8wSxF/UI24jnXZRAn44RF3OIX9Vc=; b=AS139x9hhabjDVfF/52GUm89Ti+fPxbdUntAO6at55i3+KCPZtXMKDgE0lLepCQ4x7 RwfmHwrqZAQkLnfBu8OJFDJ0LfppzWQ1r842T7J3znn165R+bxdtCmvbbMNY04T9iaLj npozNlZpzvYF7URXbsLtLd3yFGgzfSHoYeJgXNGGUEUwnW4VLtnGRWuJQcSS/QJIZKOr nsC2/MqZh1Dgt7M28JKd243E7bz4wWnqvYUKEf0SyoQlYloi6/hNbvegrvfXslC5S3FA FrhBbwGBPoiziKAkMr25H5DrP7lz7h/S8QmqPyiFj2GTuzFl5d15T4ejLYh8IBnGHqRa Sz+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713079186; x=1713683986; 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=9RqS2/t4WyP6w1d8wSxF/UI24jnXZRAn44RF3OIX9Vc=; b=lYRTqf6px7RE0nKvxEcb0QJz71L0sP6dSpWnCkj0kFUs+mtefOGbytoZNSmWr2W/SP q6C28nWkTB0+cA3a5ckr5mlZqZeFeZpbVfHqBeDt+LGZbIWNNBWn3U2JAj57Ohd7npHP 4dtwuYMAREm+/RjaV813M2EMTA1+C43WGXOT3qRLNF3B9e2CcAuDJvYdFhAaSBF5psF3 jFAFZU2irHR3mUoDsgnqpHP7l1SFcVJFy4tBWjrZig17FY2k4SGHJPkNCi330YzJjGLr 1vXWUQoSNSp4J8XNPlgksSXClO+SPlABopUMxquYoFfNRHWQxH9CmSfD8Kx/NnCgNrNn qiuw== X-Gm-Message-State: AOJu0YyxMT02dY9Kf0sHKrhEq73UpOIzPJLtVksehnhuCLWr9IiUe1RZ YIwOqSjqy5jAysY6EGawp3E1Cs5HxithTsYI2anmUOerVGSUvTFF23s7Gg== X-Google-Smtp-Source: AGHT+IH5aN3e88yKAtQM/wufH0GJBOO32ZEeOW4c6ulDjxeAF6D/GOAaqZTCTMdJ0Gk9o61d4W0vOw== X-Received: by 2002:a05:6358:9814:b0:183:f7cb:af75 with SMTP id y20-20020a056358981400b00183f7cbaf75mr7440936rwa.32.1713079186480; Sun, 14 Apr 2024 00:19:46 -0700 (PDT) Received: from mac.gemmaro.name ([240f:74:d1f0:1:1883:f3d1:907f:a2e3]) by smtp.gmail.com with ESMTPSA id j14-20020a170902da8e00b001e2bbc0a66fsm5557125plx.234.2024.04.14.00.19.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Apr 2024 00:19:46 -0700 (PDT) From: gemmaro Date: Sun, 14 Apr 2024 16:18:53 +0900 Message-ID: <476279958a6c834565cc23952f2cdb2451bd383e.1713073114.git.gemmaro.dev@gmail.com> X-Mailer: git-send-email 2.41.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 * guix/self.scm (translate-tmp-texi): Use po4a instead of po4a-translate. This eliminates the po4a-translate warning; "po4a-translate is deprecated. The unified po4a(1) program is more convenient and less error prone." Change-Id: Id85c7478b1b237f31010994fcd2d38765993c1ad --- guix/self.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/guix/self.scm b/guix/self.scm index 19c6d08e01..153cdec7ad 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -317,9 +317,15 @@ (define (translate-texi-manuals source) (define (translate-tmp-texi po source output) "Translate Texinfo file SOURCE using messages from PO, and write the result to OUTPUT." - (invoke #+(file-append po4a "/bin/po4a-translate") - "-M" "UTF-8" "-L" "UTF-8" "-k" "0" "-f" "texinfo" - "-m" source "-p" po "-l" output)) + (invoke #+(file-append po4a "/bin/po4a") + "--no-update" + "--variable" (string-append "localized=" output) + "--variable" (string-append "master=" source) + "--variable" (string-append "po=" po) + "--variable" (string-append "pot=" (string-append (tmpnam) ".pot")) + (string-append "--srcdir=" #$source) + "--destdir=." + #+(file-append documentation-po "/po4a.cfg"))) (define (canonicalize-whitespace str) ;; Change whitespace (newlines, etc.) in STR to #\space.