From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id GGQuLWsKj2DzAgAAgWs5BA (envelope-from ) for ; Sun, 02 May 2021 22:24:11 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id +N/RKGsKj2DFXQAAB5/wlQ (envelope-from ) for ; Sun, 02 May 2021 20:24:11 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 534DC156F3 for ; Sun, 2 May 2021 22:24:11 +0200 (CEST) Received: from localhost ([::1]:56714 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldIdO-00040H-0z for larch@yhetil.org; Sun, 02 May 2021 16:24:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41620) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldIdH-0003wG-RY for guix-patches@gnu.org; Sun, 02 May 2021 16:24:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32983) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ldIdH-00035C-JX for guix-patches@gnu.org; Sun, 02 May 2021 16:24:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ldIdG-0000Nh-FI for guix-patches@gnu.org; Sun, 02 May 2021 16:24:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48165] [PATCH] nls: Do not update po files on first make invocation. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 02 May 2021 20:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 48165 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48165@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16199870141455 (code B ref -1); Sun, 02 May 2021 20:24:02 +0000 Received: (at submit) by debbugs.gnu.org; 2 May 2021 20:23:34 +0000 Received: from localhost ([127.0.0.1]:44526 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ldIcl-0000NP-Dw for submit@debbugs.gnu.org; Sun, 02 May 2021 16:23:34 -0400 Received: from lists.gnu.org ([209.51.188.17]:56566) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ldIcg-0000NI-Vc for submit@debbugs.gnu.org; Sun, 02 May 2021 16:23:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41500) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldIcg-0003Hg-Fh for guix-patches@gnu.org; Sun, 02 May 2021 16:23:26 -0400 Received: from lepiller.eu ([2a00:5884:8208::1]:53460) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldIcZ-0002bu-MK for guix-patches@gnu.org; Sun, 02 May 2021 16:23:26 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 754f6e33 for ; Sun, 2 May 2021 20:23:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date:from :to:subject:message-id:mime-version:content-type; s=dkim; bh=K6o y0/TPZCzUQxBRAzB3blkQl2mgUfeJAULnPp1a9fE=; b=gWyxEk8XFXlySiqDL4p iTza+7Zz4x6aogsR+IABzwv2hiU1nVhuvRPvQgt6Naoha8PV5Blod+xjiyry39gJ v/99GNi0CK03+o5kyXF1voUg09ksRKeFmaY77AjH7hnxwl5fLQuRBzE/+EdIVAK2 Hal3d8KGLopGWQJCGlVuEvfEJpa9AmS1Qn2SQqbgawQhbpPbZkEambNXkPzuowA8 gAXxneaHjLLxMYHH6KPPi3VQ1bVl6RPeu3cNdl5LvSjPEpFK/DyYf7rb+tnY01p0 PMhS/NiAP4qhRJvH0iLDqu8EK7YyauMCye4k1UNwKwlKgSzRK0iRnw32bWdJeMZM IOA== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 234409db (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for ; Sun, 2 May 2021 20:23:11 +0000 (UTC) Date: Sun, 2 May 2021 22:23:05 +0200 From: Julien Lepiller Message-ID: <20210502222305.56a357f1@tachikoma.lepiller.eu> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/yk04EmJF9iZ+fi4NpDtyRmL" Received-SPF: pass client-ip=2a00:5884:8208::1; envelope-from=julien@lepiller.eu; helo=lepiller.eu 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, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1619987051; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:list-id:list-help:list-unsubscribe:list-subscribe: list-post:dkim-signature; bh=m6KrRT/B2zufKmgTBvQn2Haxgbnu3WNoFAF165bLC8k=; b=KNHf6di34CdXdasbVps+pzvXlJCrMW0a8mLvFNq9s0ntATkgr+w+2JFoxYP9VU4COr3ZS7 LZ+GD+2C4GbGrGCoHAJTJ2UEEXqObMfAASeI80wNy06W8nGhl1HdqyJ5sXeHlCx0GnHtuy 6lJ+P0UWL/MxKg0q6h/M80+m1SC/0ibb57wUh46jzNHxzN5/iEnAse1jU0qRn6DcnVCjtP 96JO/yspdxgw4pPl5js+4gnISkR1LsdkHG6+CMzrH954XFT06ivqQ8AfgcQG5dTAK9C6fc bs5pvwiBypM5PZRjraszxpLj2/5bAejV2oKVOPLsOkhOGIxaSfEp9vDKclASZg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1619987051; a=rsa-sha256; cv=none; b=uebpPxFpGgOobejpHtxIvOsKUE9PPVfD50pF0j4+yO1Rf+HybjexvhS62EEFL8L/kj7B2V WFpB9xfMqBhkS2xPjRtAxBRuU2hwIyha28Z3IO30BihQH1tO8R/UuwQR4NxQGklPg8yT5v 0c9E7a67FCLNSEcbm+euTVV1FvJSE2iwXVhjMxP6DZpjEsTatL/ukgAD31kdAFuejJmwOV cnhCPbXB8xPQxehUFDtmHSV+HUc4teO+gAqYDM1GxAhtQK0Q5RT8i8UgeM+bavuAtLkUR8 7MvKm17Sn9xcjvsS0QcvlH+07aoh4gIkYvoDYwxdaQyjMbhqd1MSArVkY+YcOg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lepiller.eu header.s=dkim header.b=gWyxEk8X; dmarc=fail reason="SPF not aligned (relaxed)" header.from=lepiller.eu (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -1.36 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lepiller.eu header.s=dkim header.b=gWyxEk8X; dmarc=fail reason="SPF not aligned (relaxed)" header.from=lepiller.eu (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 534DC156F3 X-Spam-Score: -1.36 X-Migadu-Scanner: scn0.migadu.com X-TUID: xJ4rzcU+RXwz --MP_/yk04EmJF9iZ+fi4NpDtyRmL Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline Hi Guix, As you probably know, after the first make in a clean checkout of the guix repository, po files are dirty and we advertise to run "git checkout po" to get them clean again. This was caused by the gettext generated makefile that wanted to build the mo (compiled po) files, and these po files depend on the pot that needs to be generated. In newer versions of gettext (at least 0.19.1 from 4 years ago), there is an option, PO_DEPENDS_ON_POT that I set to "no", so this patch updates the minimal gettext version to 0.19.1 and makes use of that variable, that removes the dependency from the po files to the pot file. This means that when make tries to generate the mo files, it can do so immediately, without needing to generate the pot file nor update the po files that depended on the pot. As this patch updates the minimal requirement for gettext to 0.19.1, I'm not sure what's the impact. This is a version from 4 years ago (0.18.1 was from 6 years ago). We currently have gettext 0.20.1, and debian jessie has 0.19.3, so I don't think this change will negatively affect our users: - developpers should already use guix environment guix which provides a good version. - packagers of guix on other distros might have a harder time, but even debian seems to have a recent enough version WDYT? --MP_/yk04EmJF9iZ+fi4NpDtyRmL Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0001-nls-Do-not-update-po-files-on-first-make-invocation.patch >From cc0549322000a319ecdb82b6cbcfd209a134e507 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 2 May 2021 22:12:16 +0200 Subject: [PATCH] nls: Do not update po files on first make invocation. We need to update the minimal gettext version to take advantage of new features. Before this patch, the first make invocation would modify po/guix and po/packages po files, and we advised to run `git checkout po` to clean the changes. * configure.ac (AM_GNU_GETTEXT_VERSION): Update to 0.19.1. * po/guix/Makevars: Set PO_DEPENDS_ON_POT to no. * po/packages/Makevars: Set PO_DEPENDS_ON_POT to no. --- configure.ac | 2 +- po/guix/Makevars | 5 +++++ po/packages/Makevars | 5 +++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index e5d339f6ec..c64993f4a7 100644 --- a/configure.ac +++ b/configure.ac @@ -21,7 +21,7 @@ dnl For the C++ code. This must be used early. AC_USE_SYSTEM_EXTENSIONS AM_GNU_GETTEXT([external]) -AM_GNU_GETTEXT_VERSION([0.18.1]) +AM_GNU_GETTEXT_VERSION([0.19.1]) GUIX_SYSTEM_TYPE GUIX_ASSERT_SUPPORTED_SYSTEM diff --git a/po/guix/Makevars b/po/guix/Makevars index 363bf98dfd..88a4e8c7bc 100644 --- a/po/guix/Makevars +++ b/po/guix/Makevars @@ -26,3 +26,8 @@ EXTRA_LOCALE_CATEGORIES = # "make distcheck -j4". # See . DIST_DEPENDS_ON_UPDATE_PO = no + +# Ignore the timestamp of the .pot file, as .po files are updated by +# `make download-po` only. This ensures po files are not modified on the +# first `make` invocation. +PO_DEPENDS_ON_POT = no diff --git a/po/packages/Makevars b/po/packages/Makevars index 39366fbee9..4cdb98d8fe 100644 --- a/po/packages/Makevars +++ b/po/packages/Makevars @@ -22,3 +22,8 @@ EXTRA_LOCALE_CATEGORIES = # "make distcheck -j4". # See . DIST_DEPENDS_ON_UPDATE_PO = no + +# Ignore the timestamp of the .pot file, as .po files are updated by +# `make download-po` only. This ensures po files are not modified on the +# first `make` invocation. +PO_DEPENDS_ON_POT = no -- 2.31.1 --MP_/yk04EmJF9iZ+fi4NpDtyRmL--