From patchwork Mon Dec 18 16:30:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 57680 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 F120E27BBEB; Mon, 18 Dec 2023 16:32:35 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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 5D6D627BBEA for ; Mon, 18 Dec 2023 16:32:35 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rFGXR-0001pt-5T; Mon, 18 Dec 2023 11:32:17 -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 1rFGXC-0001kV-Vo for guix-patches@gnu.org; Mon, 18 Dec 2023 11:32: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 1rFGXB-0007eh-Dc for guix-patches@gnu.org; Mon, 18 Dec 2023 11:32:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rFGXD-00075C-CC for guix-patches@gnu.org; Mon, 18 Dec 2023 11:32:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67824] [PATCH core-updates v2 6/9] gnu: glibc-utf8-locales: Add the C.UTF-8 locale. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 18 Dec 2023 16:32:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67824 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67824@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 67824-submit@debbugs.gnu.org id=B67824.170291706726127 (code B ref 67824); Mon, 18 Dec 2023 16:32:03 +0000 Received: (at 67824) by debbugs.gnu.org; 18 Dec 2023 16:31:07 +0000 Received: from localhost ([127.0.0.1]:33384 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rFGWI-0006ml-Nw for submit@debbugs.gnu.org; Mon, 18 Dec 2023 11:31:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52752) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rFGW9-0006UZ-6O for 67824@debbugs.gnu.org; Mon, 18 Dec 2023 11:30:57 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rFGW1-0007Uc-Qb; Mon, 18 Dec 2023 11:30:49 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=tN+Fn29suZxK3b8EnX4BuK8bWqEj5AMsqDEwh9mq2sI=; b=Zuf2BoAr+ZwlKOi/qSHX 5Pn+12wAAPmpVDQzkpfdbNrJQXVsnHfIXBSKBSetXaCg/F78Kzu7aHi7uKOmickHn9Xjlod2qw4Uq GaNU5sXBVqVbKToeQwBtW4H0skHGr8VvuatNUn6/8izmL8uRVSSBpVtwnup+GAM/RRl2E7K4Htan/ kfBMxPzAGLSwHTociXW1LskmuBrBxCovBC3oZ9p9lYm0eV6csOJN6cbr/JLQ1WgNj3Atmaj2bLkPv 4mwu0wIc6fnN3IpombHiZuAiJsXwhcuoy/5g4uIELoqTYThz0M4afi8FcKbZ5SMwCknn9eR55shoL Ff8L/Tcd/0vtxQ==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Mon, 18 Dec 2023 17:30:17 +0100 Message-ID: <7f7ca40f6236f1456cdc5604549a60f8070d6514.1702916397.git.ludo@gnu.org> 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 * gnu/packages/base.scm (%default-utf8-locales): Add "C". (make-glibc-utf8-locales): Delete "C" from LOCALES for glibc versions lower than or equal to 2.35. Change-Id: I6a6faa68dc18bf0f87c372109a17f476d3561278 --- gnu/packages/base.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index d31c0b0772..eab9ff411d 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1396,7 +1396,8 @@ (define-public (make-glibc-locales glibc) (define %default-utf8-locales ;; These are the locales commonly used for tests---e.g., in Guile's i18n ;; tests. - '("de_DE" "el_GR" "en_US" "fr_FR" "tr_TR")) + '("C" "de_DE" "el_GR" "en_US" "fr_FR" "tr_TR")) + (define*-public (make-glibc-utf8-locales glibc #:key (locales %default-utf8-locales) (name "glibc-utf8-locales")) @@ -1444,7 +1445,14 @@ (define*-public (make-glibc-utf8-locales glibc #:key (symlink (string-append locale ".utf8") (string-append localedir "/" locale ".UTF-8"))) - '#$locales))))) + + ;; The C.UTF-8 locale was introduced in 2.35 but it + ;; fails to build there: + ;; . + '#$(if (version>? (package-version this-package) + "2.35") + locales + (delete "C" locales))))))) (native-inputs (list glibc gzip)) (synopsis (if default-locales? (P_ "Small sample of UTF-8 locales")