Maxim Cournoyer <maxim.cournoyer@HIDDEN>
to control <at> debbugs.gnu.org.
Full text available.Received: (at 63483) by debbugs.gnu.org; 1 Sep 2023 12:49:37 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Fri Sep 01 08:49:37 2023 Received: from localhost ([127.0.0.1]:60038 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qc3ai-000225-V6 for submit <at> debbugs.gnu.org; Fri, 01 Sep 2023 08:49:37 -0400 Received: from mail-qv1-xf30.google.com ([2607:f8b0:4864:20::f30]:54751) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <maxim.cournoyer@HIDDEN>) id 1qc3ag-00021k-Ao; Fri, 01 Sep 2023 08:49:34 -0400 Received: by mail-qv1-xf30.google.com with SMTP id 6a1803df08f44-649921ec030so9936036d6.1; Fri, 01 Sep 2023 05:49:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693572559; x=1694177359; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=V4Dzm/AebLWoLtKqlVFYAaqRAJ6oDVHuIvO5wigj1FQ=; b=JqOYAUq0GWGxekgwH7dTM/n4Aq6ECibkfCVGxiC8WXWqpWUyFynWekt2AIcy5nPmmH ZWBdm7wZIRIQpEzgWfoBz+OujdronG4CC4KOfGpDW9xgnGBg+bfARgazm9uSaaiGqWF1 qJZH1qOJBm881L4OPaoE82KvCftC5YUz69hYYLDOlDbixa3W+dHQnsB49heE5mfGJ+jC /J/HJNWFK4/qhq6dKw65SJR5YhLw8yc0I0uPgqh/2xyGWSJIgOto/7VNiM+DJB1gJTwd hvOuhRRA1QiT8wwAuo5Rx7BsKlgek4r3AaftQLt9CzAdsW43eWYTtWay3V3vdsnA4HvC KhyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693572559; x=1694177359; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=V4Dzm/AebLWoLtKqlVFYAaqRAJ6oDVHuIvO5wigj1FQ=; b=BD/DLbn7cR+Z8H3kBrzFGCcTVlZbVPr1oxvcYVOkTkVmIgcEHKepQUI0jyUvvZqFkH 98abHCWtmzfW58F8/OIswlNs31AIc+iwstEsvaOuueba80waIEkmEstIzwSJF9rDsATo 3WaKQI7UC7eups/7+N0H1bKu7Rgbvv52vgxErYqEE4xHDAhNCGGi3aKNjloTSTgzvVfq VC10bAWmeb8D+ddF7gSMink36h5aH4/PSKStqXjudJA13NbwPbUeY6/HVu5ZqHGZv6gL MjyWj+KCbcVLdnkZDBSOU2WfG5ueewaRPbNQdjqSVwH1YVPKN+lesNtgxnVrWp9xEqxv v/Rg== X-Gm-Message-State: AOJu0YzGr8hNZDkRl5hegJY8k6BrMAkdpjm+5XUiGzTZ8mOiqc5ClCK4 2TFt6qjPDi7kgNpt1/TG9ryqRoI4Dx3gsw== X-Google-Smtp-Source: AGHT+IFqPCPTkoYA/223eClvernOLHPu/G9J7a9vEXjf9kyzVVorAQQR3LLe5HcY5eOYaiMn73v/nw== X-Received: by 2002:a05:6214:3d09:b0:651:67bd:7501 with SMTP id ol9-20020a0562143d0900b0065167bd7501mr2057527qvb.37.1693572559250; Fri, 01 Sep 2023 05:49:19 -0700 (PDT) Received: from hurd (dsl-154-228.b2b2c.ca. [66.158.154.228]) by smtp.gmail.com with ESMTPSA id q18-20020a0cf5d2000000b0064743dd0633sm1403227qvm.106.2023.09.01.05.49.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Sep 2023 05:49:18 -0700 (PDT) From: Maxim Cournoyer <maxim.cournoyer@HIDDEN> To: gemmaro <gemmaro.dev@HIDDEN> Subject: Re: bug#63483: [PATCH 0/4] build: Update po4a process. References: <cover.1683969802.git.gemmaro.dev@HIDDEN> <73f5f10031a59733dbb450627c61b16983b5cfc5.1683969802.git.gemmaro.dev@HIDDEN> Date: Fri, 01 Sep 2023 08:49:17 -0400 In-Reply-To: <73f5f10031a59733dbb450627c61b16983b5cfc5.1683969802.git.gemmaro.dev@HIDDEN> (gemmaro's message of "Sat, 13 May 2023 19:36:16 +0900") Message-ID: <87sf7y3voy.fsf_-_@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 63483 Cc: GNU Debbugs <control <at> debbugs.gnu.org>, 63483 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) tags 63483 + moreinfo quit Hi gemmaro, Thanks for doing this! I have surveyed the series, and I'll need to dive into the details to see if everything adds up, but it looks good! We include a GNU ChangeLog in our git commit messages, as mentioned in info '(guix) Submitting Patches'. There's a cross-reference to 'info (standards)Change Logs', which is made available upon installing the 'standards' Guix package (and 'info-reader'). This changelog should be a high level description of the changes, which is handy when reviewing. I hope this helps! I hope to see a v2 soon :-) -- Thanks, Maxim
guix-patches@HIDDEN:bug#63483; Package guix-patches.
Full text available.
Received: (at 63483) by debbugs.gnu.org; 13 May 2023 10:37:18 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat May 13 06:37:17 2023
Received: from localhost ([127.0.0.1]:36060 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1pxmcn-000530-JF
for submit <at> debbugs.gnu.org; Sat, 13 May 2023 06:37:17 -0400
Received: from mail-pg1-f181.google.com ([209.85.215.181]:45067)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <gemmaro.dev@HIDDEN>) id 1pxmck-00052H-CH
for 63483 <at> debbugs.gnu.org; Sat, 13 May 2023 06:37:14 -0400
Received: by mail-pg1-f181.google.com with SMTP id
41be03b00d2f7-5304d0d1eddso2809855a12.2
for <63483 <at> debbugs.gnu.org>; Sat, 13 May 2023 03:37:14 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20221208; t=1683974228; x=1686566228;
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=+dw+wR5FcdkjXfaeypAUhKo7BYGjqe4+AlPCcewzGVI=;
b=RXGap5o3/H57zh1moYJ/am3xtJQGgPj/tcUP3OqYXsEmEHOiYFAapRUyDyPfnhwvUT
H9Gq/Unms5fjtpLOyUbaxsTV2pLNb6Yqohqmn4Gn62LjPtiXd7UBLwSyxaXb5NFMj9Yl
M776IQ5pXc0lAPvky1Xq/xwcr0G8thyWVFSSgS7lJtxsI8DwVo/tmLIvX/TRHasGgaVf
9q7lK+jhJX+99s9oByRVkTW/4SPdqDgecepUxrySLM5uB5uZer7nX5Z42WrLdquvEgXa
NIwhajLh9IzWVDDYFY8Wukld7U8cflJtOKFZ9CXZmGdNg6MwyeBLpwrr+xCnmlqFxf6F
yMjg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20221208; t=1683974228; x=1686566228;
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=+dw+wR5FcdkjXfaeypAUhKo7BYGjqe4+AlPCcewzGVI=;
b=iwcw69hfsFDUZTBlyOZiD5firuxg/2duGs8B9zina1f/lVHRrK47119MypkdB+SjJx
/vI5stvyWNFaOlGedHINbxdMBr83GqY66vGC5S10iW/+0aH1fX4CbtznhhMEXR01Z/N6
4QP9b9+P6f6mkwjClc38uv/wEB44v37flKS33AlxQaiEgJNyojhFXkAcmpXmGLtrdeDn
PnEMnytra4Fm1I9hYO776Pc8ctg8QhowCiimpYAXa5tlSQP4Q1Si597erSw43XnkTaLx
MDGcTVXUwXRGhchFe6ASz3IO260MN9Rsiut+dvNZor8A+QlLhqvpM4U3jRbDxictLVcV
y5wg==
X-Gm-Message-State: AC+VfDwU2fVehfA7oKeACzh4DLbZekzmdQ3+INT8A8O1LefluqhEiCrf
4Rsl0Ikz77RmRKSJBnz/zon5EOxSUqv0UQ==
X-Google-Smtp-Source: ACHHUZ5K+YQ1W5rOGbOodGDNe2X0gezq2L4IGISnP8OUU659CoHgL+CH8LZycwXLYr2ohPK/jYhufA==
X-Received: by 2002:a17:902:ec8c:b0:1ac:3d1c:83c9 with SMTP id
x12-20020a170902ec8c00b001ac3d1c83c9mr37540185plg.13.1683974228644;
Sat, 13 May 2023 03:37:08 -0700 (PDT)
Received: from mac.gemmaro.name ([240f:74:d1f0:1:ba1:e787:c9e:b1dc])
by smtp.gmail.com with ESMTPSA id
3-20020a170902c10300b001aaed524541sm9483236pli.227.2023.05.13.03.37.07
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sat, 13 May 2023 03:37:08 -0700 (PDT)
From: gemmaro <gemmaro.dev@HIDDEN>
To: 63483 <at> debbugs.gnu.org
Subject: [PATCH 4/4] doc: Update documentation about translation languages.
Date: Sat, 13 May 2023 19:36:16 +0900
Message-Id: <73f5f10031a59733dbb450627c61b16983b5cfc5.1683969802.git.gemmaro.dev@HIDDEN>
X-Mailer: git-send-email 2.39.2
In-Reply-To: <cover.1683969802.git.gemmaro.dev@HIDDEN>
References: <cover.1683969802.git.gemmaro.dev@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 63483
Cc: gemmaro <gemmaro.dev@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
---
doc/contributing.texi | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/doc/contributing.texi b/doc/contributing.texi
index 7bf350ee0dc..4c76641d7cc 100644
--- a/doc/contributing.texi
+++ b/doc/contributing.texi
@@ -2270,15 +2270,15 @@ Translating Guix
@item New po files for the @code{documentation-manual} component must be
registered by adding the file name to @code{DOC_PO_FILES} in
@file{po/doc/local.mk}, the generated @file{%D%/guix.xx.texi} manual to
- @code{info_TEXINFOS} in @file{doc/local.mk} and the generated
- @file{%D%/guix.xx.texi} and @file{%D%/contributing.xx.texi} to
- @code{TRANSLATED_INFO} also in @file{doc/local.mk}.
+ @code{TRANSLATED_INFO_TEXINFOS} in @file{doc/local.mk}, the generated
+ @file{%D%/contributing.xx.texi} to @code{TRANSLATED_GUIX_TEXINFOS} also
+ in @file{doc/local.mk}, and @code{po4a_langs} section in
+ @file{po/doc/po4a.cfg}.
@item New po files for the @code{documentation-cookbook} component must be
- registered by adding the file name to @code{DOC_COOKBOOK_PO_FILES} in
+ registered by adding the file name to @code{DOC_PO_FILES} in
@file{po/doc/local.mk}, the generated @file{%D%/guix-cookbook.xx.texi}
- manual to @code{info_TEXINFOS} in @file{doc/local.mk} and the generated
- @file{%D%/guix-cookbook.xx.texi} to @code{TRANSLATED_INFO} also
- in @file{doc/local.mk}.
+ manual to @code{TRANSLATED_INFO_TEXINFOS} in @file{doc/local.mk}, and
+ @code{po4a_langs} section in @file{po/doc/po4a.cfg}.
@item New po files for the @code{website} component must be added to the
@code{guix-artwork} repository, in @file{website/po/}.
@file{website/po/LINGUAS} and @file{website/po/ietf-tags.scm} must
--
2.39.2
guix-patches@HIDDEN:bug#63483; Package guix-patches.
Full text available.
Received: (at 63483) by debbugs.gnu.org; 13 May 2023 10:37:17 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat May 13 06:37:17 2023
Received: from localhost ([127.0.0.1]:36058 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1pxmcn-00052y-4c
for submit <at> debbugs.gnu.org; Sat, 13 May 2023 06:37:17 -0400
Received: from mail-pl1-f171.google.com ([209.85.214.171]:61891)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <gemmaro.dev@HIDDEN>) id 1pxmci-00052D-NI
for 63483 <at> debbugs.gnu.org; Sat, 13 May 2023 06:37:13 -0400
Received: by mail-pl1-f171.google.com with SMTP id
d9443c01a7336-1ab1b79d3a7so75335065ad.3
for <63483 <at> debbugs.gnu.org>; Sat, 13 May 2023 03:37:12 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20221208; t=1683974227; x=1686566227;
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=Rdv2lDxmW3NGtxHGlECRTeDMJJvqZDfGNnmLOSmIr08=;
b=jnHoYVaMx57eLtWsS/m0X23olg19oO+8vvcXZ5+9VowU7/3dEGMOv8JZ3phE+w926q
pRPqQeD66QujNpIbYteZ6yjwHHpGRO0jdHFUxVDbV8wDoez0YcwzAl7cqBI3JS+1tEcj
EofwAO7zU/RGSS85QPSzxUMrDaIUaU/R/DQ5yp9O9UQ9B0it59qXX9CR9mvpx4JHRcPE
T9JiywMtwP/aOaISjcucdJmbXQOmU4hCw1pGfQGuU2yc+pqnXh5tJC3SECeXbkC6hwAj
nnWsz/Tx0pjAE5QXUkA9dIDguAGUrmRe8qy8toIaZ1XS22RURAfDWHk5F0+lHgl3GkNq
cCsw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20221208; t=1683974227; x=1686566227;
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=Rdv2lDxmW3NGtxHGlECRTeDMJJvqZDfGNnmLOSmIr08=;
b=g8ELz6/3HhMFOu7VcM4Y7SuaoLNq9K2149XqYUpwUmX8xwkaW/iquLWW+S3479C+/m
kwZUB3/Yrec1HvPZJg5cwSNiDVxZUx5L9XU+gBF/j/UIE4oGG+0TI83IfLh5C+1uYWka
7djpbnrPdtiHBhO9bZvs5lsSV5RE4AIGgSwV/7bMAkG00fR3L8nos6NXHDUwIZlb46qt
3UZUtzqeahOfeghDCul3jrJ2eeXjeYBaTlqbSlndYGxSXsNuv8Stxer9k9Y/uamCjGMP
c973XDL1OFHW8i0ycdv/uvtaRlcsplSp1/9G13iDB9IidY6KiQgYB71GKDswLz1hIOj+
8aiA==
X-Gm-Message-State: AC+VfDzDjAiKcB9wmTBuWe9lYSDj7I5nU9sAN5cxeaSo3UOkk+fuqLdx
hL+AyPyC6XNblsWoEIUyGpVryMpsemKf5w==
X-Google-Smtp-Source: ACHHUZ7HgwX8cFpJoL4l0Xa29Mqx8lVTurKbNGoAAm+webxthl347ZLwqHeIOtkFXbyCcqa2F5PlZw==
X-Received: by 2002:a17:903:230e:b0:1ad:164:74ee with SMTP id
d14-20020a170903230e00b001ad016474eemr15288680plh.15.1683974226982;
Sat, 13 May 2023 03:37:06 -0700 (PDT)
Received: from mac.gemmaro.name ([240f:74:d1f0:1:ba1:e787:c9e:b1dc])
by smtp.gmail.com with ESMTPSA id
3-20020a170902c10300b001aaed524541sm9483236pli.227.2023.05.13.03.37.05
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sat, 13 May 2023 03:37:06 -0700 (PDT)
From: gemmaro <gemmaro.dev@HIDDEN>
To: 63483 <at> debbugs.gnu.org
Subject: [PATCH 3/4] self: Update po4a process.
Date: Sat, 13 May 2023 19:36:15 +0900
Message-Id: <4f073db4782e3250c3988c7129938765ffe0e0ee.1683969802.git.gemmaro.dev@HIDDEN>
X-Mailer: git-send-email 2.39.2
In-Reply-To: <cover.1683969802.git.gemmaro.dev@HIDDEN>
References: <cover.1683969802.git.gemmaro.dev@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Christopher Baines <mail@HIDDEN>, Josselin Poiret <dev@HIDDEN>, Ludovic Courtès <ludo@HIDDEN>, Mathieu Othacehe <othacehe@HIDDEN>, Ricardo Wurmus <rekado@HIDDEN>, Simon Tournier <zimon.toutoune@HIDDEN>, Tobias Geerinckx-Rice <me@HIDDEN>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 63483
Cc: gemmaro <gemmaro.dev@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
---
guix/self.scm | 39 +++++++++++++++++++--------------------
1 file changed, 19 insertions(+), 20 deletions(-)
diff --git a/guix/self.scm b/guix/self.scm
index 74c953bd50e..c9fedae0ea3 100644
--- a/guix/self.scm
+++ b/guix/self.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017-2022 Ludovic Courtès <ludo@HIDDEN>
;;; Copyright © 2020 Martin Becze <mjbecze@HIDDEN>
+;;; Copyright © 2023 gemmaro <gemmaro.dev@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -307,12 +308,14 @@ (define (translate-texi-manuals source)
(ice-9 vlist) (ice-9 threads)
(srfi srfi-1))
- (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))
+ (define (translate-tmp-texi)
+ "Translate Texinfo files using messages from PO, except for cross
+references."
+ (invoke #+(file-append po4a "/bin/po4a")
+ "--no-update"
+ (string-append "--srcdir=" #$source)
+ "--destdir=."
+ #+(file-append documentation-po "/po4a.cfg")))
(define (canonicalize-whitespace str)
;; Change whitespace (newlines, etc.) in STR to #\space.
@@ -322,17 +325,11 @@ (define (translate-texi-manuals source)
chr))
str))
- (define* (translate-texi prefix po lang
- #:key (extras '()))
- "Translate the manual for one language LANG using the PO file.
-PREFIX must be the prefix of the manual, 'guix' or 'guix-cookbook'. EXTRAS is
-a list of extra files, such as '(\"contributing\")."
- (for-each (lambda (file)
- (translate-tmp-texi po (string-append file ".texi")
- (string-append file "." lang
- ".texi.tmp")))
- (cons prefix extras))
-
+ (define* (translate-texi-xrefs prefix po lang
+ #:key (extras '()))
+ "Translate cross references in the manual for one language LANG using the
+PO file. PREFIX must be the prefix of the manual, 'guix' or 'guix-cookbook'. EXTRAS
+is a list of extra files, such as '(\"contributing\")."
(for-each (lambda (file)
(let* ((texi (string-append file "." lang ".texi"))
(tmp (string-append texi ".tmp")))
@@ -374,17 +371,19 @@ (define (translate-texi-manuals source)
(setenv "LC_ALL" "en_US.UTF-8")
(setlocale LC_ALL "en_US.UTF-8")
+ (translate-tmp-texi)
+
(n-par-for-each parallel-jobs
(match-lambda
((language . po)
- (translate-texi "guix" po language
- #:extras '("contributing"))))
+ (translate-texi-xrefs "guix" po language
+ #:extras '("contributing"))))
(available-translations "." "guix-manual"))
(n-par-for-each parallel-jobs
(match-lambda
((language . po)
- (translate-texi "guix-cookbook" po language)))
+ (translate-texi-xrefs "guix-cookbook" po language)))
(available-translations "." "guix-cookbook"))
(for-each (lambda (file)
--
2.39.2
mail@HIDDEN, dev@HIDDEN, ludo@HIDDEN, othacehe@HIDDEN, rekado@HIDDEN, zimon.toutoune@HIDDEN, me@HIDDEN, guix-patches@HIDDEN:bug#63483; Package guix-patches.
Full text available.
Received: (at 63483) by debbugs.gnu.org; 13 May 2023 10:37:15 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat May 13 06:37:15 2023
Received: from localhost ([127.0.0.1]:36055 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1pxmck-00052j-6U
for submit <at> debbugs.gnu.org; Sat, 13 May 2023 06:37:15 -0400
Received: from mail-pl1-f170.google.com ([209.85.214.170]:54782)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <gemmaro.dev@HIDDEN>) id 1pxmch-00052B-4O
for 63483 <at> debbugs.gnu.org; Sat, 13 May 2023 06:37:12 -0400
Received: by mail-pl1-f170.google.com with SMTP id
d9443c01a7336-1ab13da70a3so105078545ad.1
for <63483 <at> debbugs.gnu.org>; Sat, 13 May 2023 03:37:11 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20221208; t=1683974225; x=1686566225;
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=v7s18vUnpIxW6b1W0EKqsUc3DUTo030BipSRr0f2pDQ=;
b=BpDCCVGALsr7AjcgSOwA00Z2S2egx7voI/vRuN0Nj3RsG6ndje/s6K4sXpgKPARbE5
OQBTrBUGEA9QjYNuYwoqXFIhbBTnnwaKGN5c2uy/3kkADmR2QPajpzoT80BAsKurgO6U
A3voGdySo4ypjKF7TRpB9ki9Kk8934n8UdobgRURdn9H4PGfff/Zlc9g5W+vpXxaDlNr
xIYRH7tgL8ZLd1VkzwPQvUdqtYJ8i444YV4eiXc9mUd2Pu3ruWNZ2dq7aoye0FrYCvMK
nbwMyTpglCnVEkBzwEmc6XGVxZNmOw9LuN9o6e5rWqyaT5XsZ00KwumH+KCYYXziPraT
8dtQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20221208; t=1683974225; x=1686566225;
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=v7s18vUnpIxW6b1W0EKqsUc3DUTo030BipSRr0f2pDQ=;
b=TqphbN4ODYbuSLhFp2ZMmlYzADU5/wDeAe2CDqkAeKS0+Xtap34p8jwQ6U3Q3uHrPI
VYgzOwfCxt4fhNffWmCsuyn9KhaUannQub2cKW7MRzqAo9kaJEgbyEBIZ84hBn9xSxtg
6+aEOhCk8By/euHZWjKWKZbv3kBm3YjltlxHFc94bDxGl/8KNH6YlZsA97ZA/oDdGNb/
C+zLza7j8m1WbF7UQzvJOn1sV+KZ4qwH+wAG+XjWGtmwdzTv/PIn+Ek9zDfhaZqFfjxL
U+Wc/Yxawt8ViqSXDsqfu3XRbFbxGWzDtkxnaVuoBwtsmKXsfWyZHpmJubJC5ETdq2wa
ESAg==
X-Gm-Message-State: AC+VfDw9ejevWuMMWp80/BMs0wwjZ3l+uDRIPXsRGDWkWUN0KwMZtYeG
ayzo4zh068ZJAYhWYrpkKE3IXN/FIUO4Wg==
X-Google-Smtp-Source: ACHHUZ610ZeeI6/CCgOsZKoecseFaKAsFyy/Z1n+a4UFDmg+MIWGWt9nq8HvtnU4za5sRV/Ssy0zuQ==
X-Received: by 2002:a17:902:c14b:b0:1aa:fdab:24a5 with SMTP id
11-20020a170902c14b00b001aafdab24a5mr7282911plj.10.1683974225347;
Sat, 13 May 2023 03:37:05 -0700 (PDT)
Received: from mac.gemmaro.name ([240f:74:d1f0:1:ba1:e787:c9e:b1dc])
by smtp.gmail.com with ESMTPSA id
3-20020a170902c10300b001aaed524541sm9483236pli.227.2023.05.13.03.37.04
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sat, 13 May 2023 03:37:04 -0700 (PDT)
From: gemmaro <gemmaro.dev@HIDDEN>
To: 63483 <at> debbugs.gnu.org
Subject: [PATCH 2/4] build: Update po4a process for Makefiles.
Date: Sat, 13 May 2023 19:36:14 +0900
Message-Id: <82eab96fe2d17ab13beea1bdcd8aea8a3d1e325c.1683969802.git.gemmaro.dev@HIDDEN>
X-Mailer: git-send-email 2.39.2
In-Reply-To: <cover.1683969802.git.gemmaro.dev@HIDDEN>
References: <cover.1683969802.git.gemmaro.dev@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Florian Pelz <pelzflorian@HIDDEN>,
Julien Lepiller <julien@HIDDEN>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 63483
Cc: gemmaro <gemmaro.dev@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
---
po4a adds deprecation warnings for po4a-updatepo and po4a-translate as of
version 0.68[1].
Since po4a supports split mode[2] for POT files, intermediate POT files
po/doc/guix.pot and po/doc/contributing.pot are no longer generated.
Note that the po4a option translate-only can't be used here, because po4a
doesn't support it in this split mode.
In the po4a.cfg file, the destdir option is used to override it with the po4a
command line flag, which is needed by the translate-texi-manuals function in
guix/self.scm (see also third patch).
[1] mquinson/po4a: The High Hopes release
https://github.com/mquinson/po4a/releases/tag/v0.68
[2] po4a(1): Centralized or split PO files?
https://po4a.org/man/man1/po4a.1.php
configure.ac | 3 +--
doc/local.mk | 67 ++++++++++++++++++++++++++++---------------------
po/doc/local.mk | 49 +++++++++++++++---------------------
po/doc/po4a.cfg | 42 +++++++++++++++++++++++++++++++
4 files changed, 101 insertions(+), 60 deletions(-)
create mode 100644 po/doc/po4a.cfg
diff --git a/configure.ac b/configure.ac
index 92dede80141..a9488967c3f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -255,8 +255,7 @@ dnl Manual pages.
AM_MISSING_PROG([HELP2MAN], [help2man])
dnl Documentation translation.
-AM_MISSING_PROG([PO4A_TRANSLATE], [po4a-translate])
-AM_MISSING_PROG([PO4A_UPDATEPO], [po4a-updatepo])
+AM_MISSING_PROG([PO4A], [po4a])
case "$storedir" in
/gnu/store)
diff --git a/doc/local.mk b/doc/local.mk
index 89285b9f35a..68e518a4933 100644
--- a/doc/local.mk
+++ b/doc/local.mk
@@ -5,6 +5,7 @@
# Copyright © 2016 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@HIDDEN>
# Copyright © 2016, 2018 Mathieu Lirzin <mthl@HIDDEN>
# Copyright © 2018, 2021 Julien Lepiller <julien@HIDDEN>
+# Copyright © 2023 gemmaro <gemmaro.dev@HIDDEN>
#
# This file is part of GNU Guix.
#
@@ -21,32 +22,43 @@
# You should have received a copy of the GNU General Public License
# along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
-# If adding a language, update the following variables, and info_TEXINFOS.
-MANUAL_LANGUAGES = de es fr pt_BR ru zh_CN
-COOKBOOK_LANGUAGES = de fr ko sk
+info_TEXINFOS = \
+ %D%/guix.texi \
+ %D%/guix-cookbook.texi \
+ $(TRANSLATED_INFO_TEXINFOS)
-# Arg1: A list of languages codes.
-# Arg2: The file name stem.
-lang_to_texinfo = $(foreach lang,$(1),%D%/$(2).$(lang).texi)
+%C%_guix_TEXINFOS = \
+ %D%/contributing.texi \
+ $(TRANSLATED_GUIX_TEXINFOS) \
+ %D%/fdl-1.3.texi
+# If adding a language, update the following and po4a_langs section in
+# po/doc/po4a.cfg. And if the file name is guix.xx.texi, also update
+# TRANSLATED_GUIX_TEXINFOS.
+#
# Automake does not understand GNU Make non-standard extensions,
-# unfortunately, so we cannot use the above patsubst-based function here.
-info_TEXINFOS = %D%/guix.texi \
+# unfortunately, so we cannot use the patsubst-based function here.
+TRANSLATED_INFO_TEXINFOS = \
%D%/guix.de.texi \
%D%/guix.es.texi \
%D%/guix.fr.texi \
%D%/guix.pt_BR.texi \
%D%/guix.ru.texi \
%D%/guix.zh_CN.texi \
- %D%/guix-cookbook.texi \
%D%/guix-cookbook.de.texi \
%D%/guix-cookbook.fr.texi \
%D%/guix-cookbook.ko.texi \
%D%/guix-cookbook.sk.texi
-%C%_guix_TEXINFOS = \
- %D%/contributing.texi \
- %D%/fdl-1.3.texi
+TRANSLATED_GUIX_TEXINFOS = \
+ %D%/contributing.de.texi \
+ %D%/contributing.es.texi \
+ %D%/contributing.fr.texi \
+ %D%/contributing.pt_BR.texi \
+ %D%/contributing.ru.texi \
+ %D%/contributing.zh_CN.texi
+
+TRANSLATED_INFO = $(TRANSLATED_INFO_TEXINFOS) $(TRANSLATED_GUIX_TEXINFOS)
DOT_FILES = \
%D%/images/bootstrap-graph.dot \
@@ -76,19 +88,13 @@ OS_CONFIG_EXAMPLES_TEXI = \
%D%/os-config-lightweight-desktop.texi \
%D%/he-config-bare-bones.scm
-TRANSLATED_INFO = \
- $(call lang_to_texinfo,$(MANUAL_LANGUAGES),guix) \
- $(call lang_to_texinfo,$(MANUAL_LANGUAGES),contributing) \
- $(call lang_to_texinfo,$(COOKBOOK_LANGUAGES),guix-cookbook)
-
# Bundle this file so that makeinfo finds it in out-of-source-tree builds.
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
+$(foreach texi,$(TRANSLATED_INFO),$(texi).tmp) &: $(DOC_PO_FILES)
+ -$(AM_V_PO4A)$(PO4A) --no-update $(srcdir)/po/doc/po4a.cfg
# When a change to guix.texi occurs, it is not translated immediately.
# Because @pxref and @xref commands are references to sections by name, they
@@ -101,22 +107,25 @@ $(top_srcdir)/pre-inst-env $(GUILE) --no-auto-compile \
$@.tmp $<
endef
-$(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"
+$(srcdir)/%D%/guix.%.texi: po/doc/guix-manual.%.po \
+ $(srcdir)/%D%/guix.%.texi.tmp \
+ guix/build/po.go
-sed -i "s|guix\.info|$$(basename "$@" | sed 's|texi$$|info|')|" "$@.tmp"
-$(AM_V_POXREF)LC_ALL=en_US.UTF-8 $(xref_command)
- -mv "$@.tmp" "$@"
+ -cp "$@.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"
+$(srcdir)/%D%/guix-cookbook.%.texi: po/doc/guix-cookbook.%.po \
+ $(srcdir)/%D%/guix-cookbook.%.texi.tmp \
+ guix/build/po.go
-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" "$@"
+ -cp "$@.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"
+$(srcdir)/%D%/contributing.%.texi: po/doc/guix-manual.%.po \
+ $(srcdir)/%D%/contributing.%.texi.tmp \
+ guix/build/po.go
-$(AM_V_POXREF)LC_ALL=en_US.UTF-8 $(xref_command)
- -mv "$@.tmp" "$@"
+ -cp "$@.tmp" "$@"
%D%/os-config-%.texi: gnu/system/examples/%.tmpl
$(AM_V_GEN)$(MKDIR_P) "`dirname $@`"; \
diff --git a/po/doc/local.mk b/po/doc/local.mk
index 49258cbb97c..eacd7d8c922 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 <julien@HIDDEN>
# Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@HIDDEN>
+# Copyright © 2023 gemmaro <gemmaro.dev@HIDDEN>
#
# This file is part of GNU Guix.
#
@@ -17,38 +18,28 @@
# You should have received a copy of the GNU General Public License
# along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
-DOC_PO_FILES = \
- %D%/guix-manual.de.po \
- %D%/guix-manual.es.po \
- %D%/guix-manual.fr.po \
- %D%/guix-manual.pt_BR.po \
- %D%/guix-manual.ru.po \
- %D%/guix-manual.zh_CN.po
+DOC_POT_FILES = %D%/guix-manual.pot %D%/guix-cookbook.pot
-DOC_COOKBOOK_PO_FILES = \
- %D%/guix-cookbook.de.po \
- %D%/guix-cookbook.fr.po \
- %D%/guix-cookbook.ko.po \
+DOC_PO_FILES = \
+ %D%/guix-manual.de.po \
+ %D%/guix-manual.es.po \
+ %D%/guix-manual.fr.po \
+ %D%/guix-manual.pt_BR.po \
+ %D%/guix-manual.ru.po \
+ %D%/guix-manual.zh_CN.po \
+ %D%/guix-cookbook.de.po \
+ %D%/guix-cookbook.fr.po \
+ %D%/guix-cookbook.ko.po \
%D%/guix-cookbook.sk.po
-EXTRA_DIST = \
- %D%/guix-manual.pot \
- %D%/guix-cookbook.pot \
- $(DOC_PO_FILES) \
- $(DOC_COOKBOOK_PO_FILES)
+EXTRA_DIST = $(DOC_POT_FILES) $(DOC_PO_FILES)
-POT_OPTIONS = \
- --package-name "guix manual" --package-version "$(VERSION)" \
- --copyright-holder "the authors of Guix (msgids)" \
- --msgid-bugs-address "bug-guix@HIDDEN"
+$(DOC_POT_FILES) &: $(srcdir)/doc/guix.texi \
+ $(srcdir)/doc/guix-cookbook.texi \
+ $(srcdir)/doc/contributing.texi
+ $(AM_V_PO4A)$(PO4A) --no-translations \
+ --package-version "$(VERSION)" \
+ %D%/po4a.cfg
-%D%/%.pot: $(srcdir)/doc/%.texi
- $(AM_V_PO4A)$(PO4A_UPDATEPO) -M UTF-8 -f texinfo -m "$<" \
- -p "$@" $(POT_OPTIONS) && \
- touch $@
-
-%D%/guix-manual.pot: %D%/guix.pot %D%/contributing.pot
- msgcat $^ > $@
-
-doc-pot-update: %D%/guix-manual.pot %D%/guix-cookbook.pot
+doc-pot-update: $(DOC_POT_FILES)
.PHONY: doc-pot-update
diff --git a/po/doc/po4a.cfg b/po/doc/po4a.cfg
new file mode 100644
index 00000000000..27a7599d9aa
--- /dev/null
+++ b/po/doc/po4a.cfg
@@ -0,0 +1,42 @@
+# GNU Guix --- Functional package management for GNU
+# Copyright © 2023 gemmaro <gemmaro.dev@HIDDEN>
+#
+# 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 <http://www.gnu.org/licenses/>.
+
+# --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@HIDDEN" \
+ --keep 0 \
+ --master-charset=UTF-8 \
+ --localized-charset=UTF-8 \
+ --destdir=doc
+
+[po4a_langs] de es fr pt_BR ru zh_CN ko sk
+
+[po4a_paths] po/doc/$master.pot $lang:po/doc/$master.$lang.po
+
+[type:texinfo] doc/guix-cookbook.texi \
+ $lang:guix-cookbook.$lang.texi.tmp \
+ pot=guix-cookbook
+
+[type:texinfo] doc/guix.texi \
+ $lang:guix.$lang.texi.tmp \
+ pot=guix-manual
+
+[type:texinfo] doc/contributing.texi \
+ $lang:contributing.$lang.texi.tmp \
+ pot=guix-manual
--
2.39.2
pelzflorian@HIDDEN, julien@HIDDEN, guix-patches@HIDDEN:bug#63483; Package guix-patches.
Full text available.Received: (at 63483) by debbugs.gnu.org; 13 May 2023 10:37:12 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sat May 13 06:37:12 2023 Received: from localhost ([127.0.0.1]:36052 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1pxmch-00052P-MT for submit <at> debbugs.gnu.org; Sat, 13 May 2023 06:37:12 -0400 Received: from mail-pl1-f181.google.com ([209.85.214.181]:61900) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <gemmaro.dev@HIDDEN>) id 1pxmcf-000528-HF for 63483 <at> debbugs.gnu.org; Sat, 13 May 2023 06:37:10 -0400 Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-1ab1b79d3a7so75334935ad.3 for <63483 <at> debbugs.gnu.org>; Sat, 13 May 2023 03:37:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683974224; x=1686566224; 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=6g5ZY7gBsJ9uVVaGQBx1WlAUpV98KcCDZ1B9f9Ob0fM=; b=MKAUtDTlfvL/Dgc/w+/Wz0W3wILY30QeEaYw6pz0k2TQrL7l2kDJbbJlKl227qtaxE V13qf6Jmt0kBj3KxqaKPrpnOuAC0KqQ7w3gQEBJM/pDr2Cmvq7uJlUjKcfu3KqLvFi1F zCzje5lFballbA7n46OhLDYCKueu+I9e8c2vG9XY/1bo1RwRYxIuvrqF+/13FP7+830v M16Ei2MULm7xR2kPVJQhqmsrDcdj/ielsIoax7KEw9lUTtLiUkmDbnfrNbSvFlMNjicE +J1VcwpRaMt4f7GOgJRGKRMFI4uAU68RX6WftdJarbK85ulW5wPCbXiPsUuv5O6jgZYL WR2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683974224; x=1686566224; 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=6g5ZY7gBsJ9uVVaGQBx1WlAUpV98KcCDZ1B9f9Ob0fM=; b=CnrZ8ZT9jvqm6Jf5t+MNZ01xGQWzGn6w9fB5k0V8V+eoTCBmB3FKpobMdEYdHTHsoY q4OQJI2f5TOZ90LlbkntaEa3anAZWN5qBGYeZIjheqtWZkbDr3ZJhbEUTf+dHkRoOtIm O9ZC6AOOGKPFLQfIoVhypYcseaMFMY2nc7ZpVUCMwA6Ub2OtRLJh0Bnu3y4RDmnyXhyN ZlViMlIoW+XywsR8epuK8iKihnLnv3CsBlTOK3IvWW8yiBESvIWLflQ+6RCxCU9fwANA L7fyyxDivkZd+TVp9luJNw30EjeqbfJeZU3HR+ESYDQuJavteUbnx0JSIWxXZRJfeMkG irbA== X-Gm-Message-State: AC+VfDz8LA3gAp1TWlhcD4k4PGQGyQUma+ut7pnrI2dWUoIJLvymuL3H 1k2FHEp7P529mYD74egpFfmGZvExdVSGRw== X-Google-Smtp-Source: ACHHUZ7Pcu6+BNKqWtZxseqpAr0ffGGARN+Ff/j2vbKp6HPDChF1W/HPxzurV61B8h/mU3toV1Bltw== X-Received: by 2002:a17:903:1208:b0:1a6:4606:6e06 with SMTP id l8-20020a170903120800b001a646066e06mr32430759plh.17.1683974223625; Sat, 13 May 2023 03:37:03 -0700 (PDT) Received: from mac.gemmaro.name ([240f:74:d1f0:1:ba1:e787:c9e:b1dc]) by smtp.gmail.com with ESMTPSA id 3-20020a170902c10300b001aaed524541sm9483236pli.227.2023.05.13.03.37.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 May 2023 03:37:03 -0700 (PDT) From: gemmaro <gemmaro.dev@HIDDEN> To: 63483 <at> debbugs.gnu.org Subject: [PATCH 1/4] build: Align Automake status lines of po4a and PO xref. Date: Sat, 13 May 2023 19:36:13 +0900 Message-Id: <9f604573c558026da2546fad2e1b6f3b41edba12.1683969802.git.gemmaro.dev@HIDDEN> X-Mailer: git-send-email 2.39.2 In-Reply-To: <cover.1683969802.git.gemmaro.dev@HIDDEN> References: <cover.1683969802.git.gemmaro.dev@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 63483 Cc: gemmaro <gemmaro.dev@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) --- Makefile.am | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 13718e4353a..1c7dc667311 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,6 +17,7 @@ # Copyright © 2020, 2021, 2023 Maxim Cournoyer <maxim.cournoyer@HIDDEN> # Copyright © 2021 Chris Marusich <cmmarusich@HIDDEN> # Copyright © 2021 Andrew Tropin <andrew@HIDDEN> +# Copyright © 2023 gemmaro <gemmaro.dev@HIDDEN> # # This file is part of GNU Guix. # @@ -1186,8 +1187,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 " $@; -- 2.39.2
guix-patches@HIDDEN:bug#63483; Package guix-patches.
Full text available.
Received: (at submit) by debbugs.gnu.org; 13 May 2023 10:32:06 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat May 13 06:32:06 2023
Received: from localhost ([127.0.0.1]:36046 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1pxmXl-0004v4-Qy
for submit <at> debbugs.gnu.org; Sat, 13 May 2023 06:32:06 -0400
Received: from lists.gnu.org ([209.51.188.17]:57352)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <gemmaro.dev@HIDDEN>) id 1pxmXk-0004uw-A8
for submit <at> debbugs.gnu.org; Sat, 13 May 2023 06:32: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 <gemmaro.dev@HIDDEN>)
id 1pxmXi-0007qn-R6
for guix-patches@HIDDEN; Sat, 13 May 2023 06:32:03 -0400
Received: from mail-pf1-x432.google.com ([2607:f8b0:4864:20::432])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <gemmaro.dev@HIDDEN>)
id 1pxmXg-0000WM-Ax
for guix-patches@HIDDEN; Sat, 13 May 2023 06:32:01 -0400
Received: by mail-pf1-x432.google.com with SMTP id
d2e1a72fcca58-643a1fed360so6502870b3a.3
for <guix-patches@HIDDEN>; Sat, 13 May 2023 03:31:59 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20221208; t=1683973918; x=1686565918;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:from:to:cc:subject:date:message-id:reply-to;
bh=x4rpqNf0yuUEmr9mmqRRU3KdkBGN9egkPIMCppVlJBQ=;
b=H/Gzq4cql+US6Q/yYYqXQmiKjYffhnLFLl2EGHl3Xh0oWWqooeIGryk5Caj9xLhIMD
Bit1w8dsxKH5Q0Mi385ZocdcsguLVcoTuOBUnrKuawxor0X6bJ8cERUz0iZwyymN4nz1
52BUcdHSwMXH/93Nlu1pVFx2iAAKmjI5l+bQqMRar+iqEItlc9hP8xFlnKQtsDp+N4Sn
p9hAClyzZquPkZmZAWij/x4FycEusGSl6h+aRW34CfzOgq46nr7AusSFtw4h8BM+nORl
8RNCLg+et1fPYYSCkhRXiOkEUUH3JaocVQQESktHkr/prcLYkylxMgspBCrXZJoXO08l
cMfA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20221208; t=1683973918; x=1686565918;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:x-gm-message-state:from:to:cc:subject:date:message-id
:reply-to;
bh=x4rpqNf0yuUEmr9mmqRRU3KdkBGN9egkPIMCppVlJBQ=;
b=g+wgoyQh8ZE5waENoNDCo5tKKl/WhaNnMOMx/iJGiq0ZZyg+2fP6+i/qVnZlLQgLm1
JIzxXOeBllvDDx8n0hG+UCHh+l3VY8QH/pjcQmSdXnTqcm+IPiQ53IJHUdVNNW34xjGN
PUIVyylfwMqDhHl8Jowi87BCrvfdTrJFF5OdhhcEukrSrbRIVeraTgCbYGJJ1KpwOATB
96aJKYDjLIQcDsFII2Fqn9Lx5kG8DW7+HzkoUD2jyqDeyAXFY/VosorAG5egY0aipoWU
Dj9NKMtm5FJTKix44ZlwJr2P/SW/qh1vIrkGFz1+XrWw3vtaGMxSZRC0SkuL8Z2wOFaw
ZSGg==
X-Gm-Message-State: AC+VfDy4ga99Pd2kP3V/XT1myKWnVhvkICf3EVCAV+LJiz/l/p2y/fjX
29ollJOGifTz6mA0UPnsnXPEi/MeKFoOLA==
X-Google-Smtp-Source: ACHHUZ61ntBAtX+eLf/Ak8mvDuoeFxSZOS4awKN5iYm7jFT16pbuFzlbnHyG7sRhHLfYR17GRKyHdg==
X-Received: by 2002:a05:6a00:b82:b0:649:450f:3231 with SMTP id
g2-20020a056a000b8200b00649450f3231mr13461830pfj.9.1683973918633;
Sat, 13 May 2023 03:31:58 -0700 (PDT)
Received: from mac.gemmaro.name ([240f:74:d1f0:1:ba1:e787:c9e:b1dc])
by smtp.gmail.com with ESMTPSA id
p21-20020aa78615000000b00638965d4248sm8395687pfn.184.2023.05.13.03.31.57
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sat, 13 May 2023 03:31:58 -0700 (PDT)
From: gemmaro <gemmaro.dev@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH 0/4] build: Update po4a process.
Date: Sat, 13 May 2023 19:17:47 +0900
Message-Id: <cover.1683969802.git.gemmaro.dev@HIDDEN>
X-Mailer: git-send-email 2.39.2
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=2607:f8b0:4864:20::432;
envelope-from=gemmaro.dev@HIDDEN; helo=mail-pf1-x432.google.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, 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.3 (-)
X-Debbugs-Envelope-To: submit
Cc: gemmaro <gemmaro.dev@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.3 (--)
Hello,
This patchset updates the po4a build process and is a follow-up to [1].
In particular, it now uses po4a command instead of po4a-updatepo and
po4a-translate in both Make tasks and `guix build -f doc/build.scm`. So no
more warnings like "po4a-translate is deprecated. The unified po4a(1) program
is more convenient and less error prone."
I have checked that the updated process works with `make`, `make dist`, `make
as-derivation` and `guix build -f doc/build.scm`, and there seem to be no
errors. I don't think this affects other components like Weblate either
(Weblate components use po/doc/guix-manual.xx.po and
po/doc/guix-cookbook.xx.po, and these files are still to be generated).
Sorry for the delay in submitting this. I hope there are no major mistakes
and that I'll no longer feel guilty every time I see po4a warnings.
[1] [PATCH 0/6] gnu: po4a: Update to 0.68
https://issues.guix.gnu.org/60448
Best,
gemmaro.
gemmaro (4):
build: Align Automake status lines of po4a and PO xref.
build: Update po4a process for Makefiles.
self: Update po4a process.
doc: Update documentation about translation languages.
Makefile.am | 5 ++--
configure.ac | 3 +-
doc/contributing.texi | 14 ++++-----
doc/local.mk | 67 ++++++++++++++++++++++++-------------------
guix/self.scm | 39 ++++++++++++-------------
po/doc/local.mk | 49 +++++++++++++------------------
po/doc/po4a.cfg | 42 +++++++++++++++++++++++++++
7 files changed, 130 insertions(+), 89 deletions(-)
create mode 100644 po/doc/po4a.cfg
base-commit: cf89a215cec346bc4d6622cbe353c058452b29b2
--
2.39.2
gemmaro <gemmaro.dev@HIDDEN>:guix-patches@HIDDEN.
Full text available.guix-patches@HIDDEN:bug#63483; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.