From patchwork Sun Nov 17 23:48:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "pelzflorian (Florian Pelz)" X-Patchwork-Id: 70491 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 B7C1E27BBE2; Sun, 17 Nov 2024 23:49:23 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 A9F2927BBEA for ; Sun, 17 Nov 2024 23:49:22 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tCp0q-0001Rr-LG; Sun, 17 Nov 2024 18:49:04 -0500 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 1tCp0q-0001Rh-04 for guix-patches@gnu.org; Sun, 17 Nov 2024 18:49:04 -0500 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 1tCp0p-0001c6-NY for guix-patches@gnu.org; Sun, 17 Nov 2024 18:49:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=amJk9z7bkypC0MsBLwHuKdz5RyhA+FTcTjTjhLJIhpI=; b=ITTSiPRGr4hRUxqtLxoVFp+3NqTTI+c0H/Uu6R3tGuIP/BamAfNKTj0n9ilBG5qi+Z9IR8Ia2VBpm7wJUj9oeRF109P6KS6P4H1MKdbdRe3CzbRYqJHdBc0/4ly/P9VtxKp2l4JzNLK6zjzqjw/jTpiZJq6VE3q/bTIUHIQn3oVSTqS5Ibac/c7QjZfGxmfPNwt2h8eJEVRqefsGeWtmcbDCJHMoH0uUXqPvkrekP9K29lzEBoMqgPMt/Q5Z/NNHpxZjMEk2abnM/d716hOGE9ikzq9UsIOSYhah4+ksWi4+9vRCD3SKv0QNu/54hUK0Y/pWSTs4i5gXjNLdj7BWaw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tCp0o-0005wA-K6 for guix-patches@gnu.org; Sun, 17 Nov 2024 18:49:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74190] [PATCH v2 1/3] install: Open info manuals that have region codes. Resent-From: Florian Pelz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 Nov 2024 23:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74190 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74190@debbugs.gnu.org Cc: Florian Pelz Received: via spool by 74190-submit@debbugs.gnu.org id=B74190.173188730022752 (code B ref 74190); Sun, 17 Nov 2024 23:49:02 +0000 Received: (at 74190) by debbugs.gnu.org; 17 Nov 2024 23:48:20 +0000 Received: from localhost ([127.0.0.1]:59113 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tCp07-0005us-Ko for submit@debbugs.gnu.org; Sun, 17 Nov 2024 18:48:20 -0500 Received: from relay.yourmailgateway.de ([46.38.247.119]:51061) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tCp04-0005ue-Lf for 74190@debbugs.gnu.org; Sun, 17 Nov 2024 18:48:18 -0500 Received: from mors-relay-8404.netcup.net (localhost [127.0.0.1]) by mors-relay-8404.netcup.net (Postfix) with ESMTPS id 4Xs6rv5wH2z83DS for <74190@debbugs.gnu.org>; Mon, 18 Nov 2024 00:48:15 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=pelzflorian.de; s=key2; t=1731887295; bh=JfHGZAMwWt5r6yI8DnDRsGpctX8c3LKWwtpbZ221m6g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VSEsiy6HAQSJXOnvVIs0svoGE4OQxUhOL34nBk+kDEybcU8UQhU4TwjJ6s8U02Fuz A873VNZksZ+GeHfpncAkp6FIDp2dx9Q1UITo2qxmtBkUqQVWP6TtbfnSM5LadalFbx K3anLAcMrfhPfi3EwYF2SSoKUHKgmuIDnwtMLqODj7VRpz81M0nyQUiUc6SueV4Gec /gfuAW1Wymx8zxTnwJRfrUVH6MV2SaDjcfXynCv1FJTXwgJjFxFcUm4XxjPthh3/2A vNtd1FKEoJP+7q/f87nUMFSKYthFYQH2GGqwquz4a2lR/80lNgVtIrg5lQnsrmW/bf /n0kMJh6auvMg== Received: from policy02-mors.netcup.net (unknown [46.38.225.35]) by mors-relay-8404.netcup.net (Postfix) with ESMTPS id 4Xs6rv5YBQz4xHn for <74190@debbugs.gnu.org>; Mon, 18 Nov 2024 00:48:15 +0100 (CET) Received: from mxe217.netcup.net (unknown [10.243.12.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by policy02-mors.netcup.net (Postfix) with ESMTPS id 4Xs6rv43RSz8sWQ for <74190@debbugs.gnu.org>; Mon, 18 Nov 2024 00:48:14 +0100 (CET) Received: from florianhp.fritz.box (ipb218687b.dynamic.kabel-deutschland.de [178.24.104.123]) by mxe217.netcup.net (Postfix) with ESMTPSA id 78903841DA; Mon, 18 Nov 2024 00:48:09 +0100 (CET) From: Florian Pelz Date: Mon, 18 Nov 2024 00:48:16 +0100 Message-ID: <7f9cc4f5378a22f2fb2891403fbc4714bb5b8f34.1731881786.git.pelzflorian@pelzflorian.de> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Queue-Id: 78903841DA X-Rspamd-Server: rspamd-worker-8404 X-NC-CID: YBnJdVTXYC8DE1uxBh8YOCmsAClJfocHZzebFD0oJ1OHw2cGKrgWhcU8 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 Because pt_PT and pt_BR have many differences, such as how the word “file” gets translated, Guix’ pt_BR info manual is called (guix.pt_BR) instead of (guix.pt). * gnu/system/install.scm (log-to-info): Try region coded manual file names. (%installation-node-names): Add node names for pt_BR and zh_CN. Change-Id: I89beebd323ee69ca83c22321c9d9e664b32cf6f3 --- gnu/system/install.scm | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/gnu/system/install.scm b/gnu/system/install.scm index 78a3cdaaec..4de903c59b 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016 Andreas Enge ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice -;;; Copyright © 2020 Florian Pelz +;;; Copyright © 2020, 2024 Florian Pelz ;;; Copyright © 2020 Efraim Flashner ;;; Copyright © 2022 Josselin Poiret ;;; Copyright © 2023 Herman Rimm @@ -31,11 +31,9 @@ (define-module (gnu system install) #:use-module (gnu bootloader u-boot) #:use-module (guix gexp) #:use-module (guix store) - #:use-module (guix monads) #:use-module (guix modules) #:use-module ((guix packages) #:select (package-version supported-package?)) #:use-module (guix platform) - #:use-module ((guix store) #:select (%store-prefix)) #:use-module (guix utils) #:use-module (gnu installer) #:use-module (gnu system locale) @@ -47,7 +45,6 @@ (define-module (gnu system install) #:use-module (gnu packages admin) #:use-module (gnu packages bash) #:use-module (gnu packages bootloaders) - #:use-module (gnu packages certs) #:use-module (gnu packages compression) #:use-module (gnu packages cryptsetup) #:use-module (gnu packages disk) @@ -60,7 +57,6 @@ (define-module (gnu system install) #:use-module (gnu packages texinfo) #:use-module (gnu packages xorg) #:use-module (ice-9 match) - #:use-module (srfi srfi-26) #:export (installation-os a20-olinuxino-lime-installation-os a20-olinuxino-lime2-emmc-installation-os @@ -100,7 +96,9 @@ (define %installation-node-names ("en" . "System Installation") ("es" . "Instalación del sistema") ("fr" . "Installation du système") - ("ru" . "Установка системы"))) + ("pt_BR" . "Instalação do sistema") + ("ru" . "Установка системы") + ("zh_CN" . "系统安装"))) (define (log-to-info tty user) "Return a script that spawns the Info reader on the right section of the @@ -111,13 +109,22 @@ (define (log-to-info tty user) (locale (cadr (command-line))) (language (string-take locale (string-index locale #\_))) + (with-region (string-take locale + (string-index + locale + (char-set #\. #\/ #\@)))) (infodir "/run/current-system/profile/share/info") - (per-lang (string-append infodir "/guix." language - ".info.gz")) - (file (if (file-exists? per-lang) - per-lang - (string-append infodir "/guix.info"))) + (per-lang (lambda (code) + (string-append infodir "/guix." code + ".info.gz"))) + (file ((@ (srfi srfi-1) find) file-exists? + (list (per-lang with-region) + (per-lang language) + (string-append infodir + "/guix.info.gz")))) (node (or (assoc-ref '#$%installation-node-names + with-region) + (assoc-ref '#$%installation-node-names language) "System Installation"))) (redirect-port tty (current-output-port)) From patchwork Sun Nov 17 23:48:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "pelzflorian (Florian Pelz)" X-Patchwork-Id: 70490 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 23A3527BBEC; Sun, 17 Nov 2024 23:49:23 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 8EFAD27BBE2 for ; Sun, 17 Nov 2024 23:49:22 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tCp0t-0001TG-JF; Sun, 17 Nov 2024 18:49:07 -0500 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 1tCp0r-0001Rz-6d for guix-patches@gnu.org; Sun, 17 Nov 2024 18:49:05 -0500 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 1tCp0q-0001c9-6J; Sun, 17 Nov 2024 18:49:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=3LIMpSVGQTjk6vc3MXMxGIY11tcnlELxt0pblQUrmQQ=; b=FdDrJUWb7oYjcosUSdoIeADFXA1HvdVnSBezCwRR5BGIYvq1epbipHkJmAfu3QppxjjIjRhlGsu6W6XmjgRMmu+n0oQGx7CHnk8L6gTFbmBXDdY+jrUOnPWEbYp3dZ38BKvrSrVqRCm+PWFcTsSG+MhQIIyPVLX0Qs0PZukxjOqEe+YZV8KwQlfE+6vOINdeUfjUISlTvcJjH3TsHUuOTUrlTwa3ESXTwHnMbzMaIxjUO6bL9FFk+l9mR6ykO9A+KrFtX9cvO//F3Ryl+yrtG0kDaF+/PZsCrPc0fL3f+o8EtQdX0dbrXnpnmUtPj2NzwR2OjoCE75va1yHHDdWb0A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tCp0p-0005wH-23; Sun, 17 Nov 2024 18:49:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74190] [PATCH v2 2/3] install: Change the territory when we have learned it. Resent-From: Florian Pelz Original-Sender: "Debbugs-submit" Resent-CC: dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, guix-patches@gnu.org Resent-Date: Sun, 17 Nov 2024 23:49:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74190 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74190@debbugs.gnu.org Cc: Florian Pelz , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe X-Debbugs-Original-Xcc: Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe Received: via spool by 74190-submit@debbugs.gnu.org id=B74190.173188732422792 (code B ref 74190); Sun, 17 Nov 2024 23:49:03 +0000 Received: (at 74190) by debbugs.gnu.org; 17 Nov 2024 23:48:44 +0000 Received: from localhost ([127.0.0.1]:59119 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tCp0W-0005vY-B4 for submit@debbugs.gnu.org; Sun, 17 Nov 2024 18:48:44 -0500 Received: from relay.yourmailgateway.de ([188.68.63.162]:59215) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tCp0U-0005vP-4I for 74190@debbugs.gnu.org; Sun, 17 Nov 2024 18:48:42 -0500 Received: from mors-relay-8201.netcup.net (localhost [127.0.0.1]) by mors-relay-8201.netcup.net (Postfix) with ESMTPS id 4Xs6sP3Dt1z3wCb for <74190@debbugs.gnu.org>; Mon, 18 Nov 2024 00:48:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=pelzflorian.de; s=key2; t=1731887321; bh=r+2yZ5t8NwcD2Z22g8fUwQWx7M6kMA1BoMZAqCj5VAo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WvFOPIIRAYn2+4KSPwU9qXlR3BwsiM6Hn5DUauiF1wMph3NtMWM0NWyHMSS4/GHQe xq0+SGgn8lo36Kl2WzUKg6lE18JWpi8K+Ve9wkzzKPtYukaWlrn/zEreUL0K66Rs2/ PZFH1H0W8Whio2jtKb+nURjdhV0Fwhd+lm+mO9aXFz/RMNB6wBV79lexsaUqFTPbm+ 7q4dj1/y4a0iXBnXx9rgwvBMVuoSHfDTOXIRh6KAY2yIc+GIaaAXpS2mk6pFnEF0qM ow5hhUhCYg7AWNVpVjS1Sjg4G7G2FSAcMIS+UWL6EOvsEcoOBydLGrr2kN9WqqULvs i1CmyB2gFuUxw== Received: from policy01-mors.netcup.net (unknown [46.38.225.35]) by mors-relay-8201.netcup.net (Postfix) with ESMTPS id 4Xs6sP2474z3qcN for <74190@debbugs.gnu.org>; Mon, 18 Nov 2024 00:48:41 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at policy01-mors.netcup.net Received: from mxe217.netcup.net (unknown [10.243.12.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by policy01-mors.netcup.net (Postfix) with ESMTPS id 4Xs6sN56b7z8t4M for <74190@debbugs.gnu.org>; Mon, 18 Nov 2024 00:48:40 +0100 (CET) Received: from florianhp.fritz.box (ipb218687b.dynamic.kabel-deutschland.de [178.24.104.123]) by mxe217.netcup.net (Postfix) with ESMTPSA id 88A1B841DA; Mon, 18 Nov 2024 00:48:35 +0100 (CET) From: Florian Pelz Date: Mon, 18 Nov 2024 00:48:46 +0100 Message-ID: <03b8e561289d30b4af84ff1392eb27a51609dba3.1731881786.git.pelzflorian@pelzflorian.de> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Queue-Id: 88A1B841DA X-Rspamd-Server: rspamd-worker-8404 X-NC-CID: XQCFIkbNPuJDbcwW9/if4GZzUFfJ/ogWy/mO54fuK9dXFoTvyHuCNp8n 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 Typically, the LANGUAGE has already been set in the run-language-page step. But for languages like pt, we must know the territory. * gnu/installer/newt/locale.scm (run-territory-page): Call ‘setenv’ for the ‘LANGUAGE’ variable. Change-Id: Ie6308c359e0bdb2d37fac0c844cfd879e96e231a --- Note: I’ve tested this in QEMU and with it, a zh_CN, pt_BR locale gets applied visibly. Also, it repeats exactly what was done in ‘run-language-page’. Context: when the installer enters the encompassing ‘run-locale-page’ procedure, it runs the installer sub-steps ‘run-language-page’ and ‘run-territory-page’ in immediate succession with no way to go back just one sub-step. Esperanto does not go through ‘run-territory-page’ and is not broken by this change. gnu/installer/newt/locale.scm | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/gnu/installer/newt/locale.scm b/gnu/installer/newt/locale.scm index 0be9db449e..df168baca9 100644 --- a/gnu/installer/newt/locale.scm +++ b/gnu/installer/newt/locale.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2018 Mathieu Othacehe ;;; Copyright © 2019 Ludovic Courtès ;;; Copyright © 2024 Janneke Nieuwenhuizen +;;; Copyright © 2024 Florian Pelz ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,9 +25,6 @@ (define-module (gnu installer newt locale) #:use-module (gnu installer newt page) #:use-module (guix i18n) #:use-module (srfi srfi-1) - #:use-module (srfi srfi-26) - #:use-module (srfi srfi-34) - #:use-module (srfi srfi-35) #:use-module (ice-9 match) #:export (run-locale-page)) @@ -52,16 +50,22 @@ (define (run-language-page languages language->text) result) (define (run-territory-page territories territory->text) - (let ((title (G_ "Locale location"))) + (define result (run-listbox-selection-page - #:title title + #:title (G_ "Locale location") #:info-text (G_ "Choose a territory for this language.") #:listbox-items territories #:listbox-item->text territory->text #:button-text (G_ "Back") #:button-callback-procedure (lambda _ - (abort-to-prompt 'installer-step 'abort))))) + (abort-to-prompt 'installer-step 'abort)))) + + ;; Some languages, such as pt, cannot be installed early in the + ;; run-language-page step. Install them now, when we know the territory. + (setenv "LANGUAGE" (string-append (getenv "LANGUAGE") "_" result)) + + result) (define (run-codeset-page codesets) (let ((title (G_ "Locale codeset"))) From patchwork Sun Nov 17 23:49:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "pelzflorian (Florian Pelz)" X-Patchwork-Id: 70492 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 0730927BBEA; Sun, 17 Nov 2024 23:50:12 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 A713527BBE2 for ; Sun, 17 Nov 2024 23:50:11 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tCp1o-0001ax-7d; Sun, 17 Nov 2024 18:50:04 -0500 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 1tCp1n-0001aI-2Q for guix-patches@gnu.org; Sun, 17 Nov 2024 18:50:03 -0500 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 1tCp1m-0001gm-Ny for guix-patches@gnu.org; Sun, 17 Nov 2024 18:50:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=OU3mCLJbvgfQmwkUEmUGMSDF/YqG47/BKaDUB2yI33U=; b=GGyoIYByd3/iXNaMPoFgbcqRtES8i30GC/z5f2ZVGAKrp6Y378p8eDZtsHR/v1m1fQq69h/m5XifBFtpgWnmWfGZdIkCAX/frlxxBlxuhasFviXzLFptlpGFTIqt2tQ1HoOz00heju1e6qT4Nl6iZtxC42YrBsjhR7AA0yXY8u2AlWkDyA5XctISU4SPsyhzOZkBFjdMN183GvMUqs60UbMeE1Fryy5mcSOw6OL/ym/F7Q1mKIXzaicarnB5L7Ws5fLKV7SC60bekCJTkdrtWhPKOg23LkBWECf3PGeLDhQ3h+h8aqe2Z0m8B/zyxaXv6bv7xOF4AOJzZAK6yYHKyQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tCp1m-0005yF-JB for guix-patches@gnu.org; Sun, 17 Nov 2024 18:50:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74190] [PATCH v2 3/3] gnu: info-reader: Inherit from texinfo-7. Resent-From: Florian Pelz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 Nov 2024 23:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74190 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74190@debbugs.gnu.org Cc: Florian Pelz Received: via spool by 74190-submit@debbugs.gnu.org id=B74190.173188739422926 (code B ref 74190); Sun, 17 Nov 2024 23:50:02 +0000 Received: (at 74190) by debbugs.gnu.org; 17 Nov 2024 23:49:54 +0000 Received: from localhost ([127.0.0.1]:59128 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tCp1d-0005xh-Rx for submit@debbugs.gnu.org; Sun, 17 Nov 2024 18:49:54 -0500 Received: from relay.yourmailgateway.de ([188.68.63.98]:41481) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tCp1b-0005xY-JC for 74190@debbugs.gnu.org; Sun, 17 Nov 2024 18:49:52 -0500 Received: from mors-relay-2501.netcup.net (localhost [127.0.0.1]) by mors-relay-2501.netcup.net (Postfix) with ESMTPS id 4Xs6tk6VGhz63yP for <74190@debbugs.gnu.org>; Mon, 18 Nov 2024 00:49:50 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=pelzflorian.de; s=key2; t=1731887390; bh=RRZCPC5bqr0CQvroGAUlQYVX9pPFNs3157rNPHOfZgk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=T7DnBdx5nrO87LauaLC/aF3MTC1y75H2tvKnL3Kc//fB2qcS0HsRO+p+CzmkjxLZ9 hix9E0gZeWwfgP8LLYcpedgYTJS4Ehxlyljy0XkoDrgXSJdJFvnK92Vo04K5z7tKyR D2YO8cNUme3saImtgs6fgOpg+sMb3XVsaFwWvJqYZvE64f/VmcULz2zY9YBwjEN/Oa WhK6VEOulpK0F5AvJjO/phQNIpwV6hVdcp+iug9WVG8Ba1saf1Gflu2OBINlpynUSF pRWuJyrqupW99vJRwT0TX+VhofbEXoI3v5n8qLUYpuQhxvPZWh62e3FwiQfw1TsMYz 3f8mjuxM0NxYA== Received: from policy01-mors.netcup.net (unknown [46.38.225.35]) by mors-relay-2501.netcup.net (Postfix) with ESMTPS id 4Xs6tk5pZ0z4xYc for <74190@debbugs.gnu.org>; Mon, 18 Nov 2024 00:49:50 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at policy01-mors.netcup.net Received: from mxe217.netcup.net (unknown [10.243.12.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by policy01-mors.netcup.net (Postfix) with ESMTPS id 4Xs6tj20dFz8tY0 for <74190@debbugs.gnu.org>; Mon, 18 Nov 2024 00:49:49 +0100 (CET) Received: from florianhp.fritz.box (ipb218687b.dynamic.kabel-deutschland.de [178.24.104.123]) by mxe217.netcup.net (Postfix) with ESMTPSA id 22B6783C4E; Mon, 18 Nov 2024 00:49:44 +0100 (CET) From: Florian Pelz Date: Mon, 18 Nov 2024 00:49:12 +0100 Message-ID: <91d3941d6e1e895eb6770f6bc477d5363fd9047f.1731881786.git.pelzflorian@pelzflorian.de> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Queue-Id: 22B6783C4E X-Rspamd-Server: rspamd-worker-8404 X-NC-CID: 6HVd1LZaBYTe+hLz3iHRH4GG6L9ybLJxWERP5BsDV6kGlYlBAoUQO4nP 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 Otherwise `LC_ALL=pt_BR.utf8 info` crashes. * gnu/packages/texinfo.scm (info-reader): Inherit from texinfo-7. Change-Id: I9eb5873fbc115e0c45f96a16aa05dbca76b92c57 --- A Web search points at the cause of the Texinfo crash being a typo in Texinfo’s own po file translations. If so, Texinfo 6 could be patched alternatively. gnu/packages/texinfo.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index 81afdaf7a7..cd474bb566 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -194,7 +194,9 @@ (define-public texinfo-4 (define-public info-reader ;; The idea of this package is to have the standalone Info reader without ;; the dependency on Perl that 'makeinfo' drags. - (package/inherit texinfo + ;; Texinfo version must be at least 7.0, which fixed crashes in a pt_BR + ;; locale; see . + (package/inherit texinfo-7 (name "info-reader") (arguments `(,@(substitute-keyword-arguments (package-arguments texinfo)