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.