From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id kDo9OZfq6mO9ZQAAbAwnHQ (envelope-from ) for ; Tue, 14 Feb 2023 02:57:44 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id 2GQ0OZfq6mN6kAAA9RJhRA (envelope-from ) for ; Tue, 14 Feb 2023 02:57:43 +0100 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 A2DD330F12 for ; Tue, 14 Feb 2023 02:57:43 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pRkZF-00028b-V0; Mon, 13 Feb 2023 20:57:13 -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 1pRkZC-00025t-0H for bug-guix@gnu.org; Mon, 13 Feb 2023 20:57:10 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pRkZ8-0003Nr-2w for bug-guix@gnu.org; Mon, 13 Feb 2023 20:57:09 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pRkZ7-0007Ye-Uz for bug-guix@gnu.org; Mon, 13 Feb 2023 20:57:05 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH 10/10] gnu: icecat: Use the locale of the system. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Tue, 14 Feb 2023 01:57:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 32026 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 32026@debbugs.gnu.org Cc: mhw@netris.org, ludo@gnu.org, Maxim Cournoyer Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.167633980528948 (code B ref 32026); Tue, 14 Feb 2023 01:57:05 +0000 Received: (at 32026) by debbugs.gnu.org; 14 Feb 2023 01:56:45 +0000 Received: from localhost ([127.0.0.1]:52074 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRkYn-0007Wk-6X for submit@debbugs.gnu.org; Mon, 13 Feb 2023 20:56:45 -0500 Received: from mail-qt1-f170.google.com ([209.85.160.170]:43703) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRkYj-0007Vr-0G for 32026@debbugs.gnu.org; Mon, 13 Feb 2023 20:56:41 -0500 Received: by mail-qt1-f170.google.com with SMTP id cr22so16065557qtb.10 for <32026@debbugs.gnu.org>; Mon, 13 Feb 2023 17:56:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=Hn8K2jCwoSKj4DXRW0hDBsjS5nsD4Wtw/OkJqypOpaM=; b=hD//TcTJxPSrs6Pm5qXx6Tc3LvkDfzOI0hZxAfo/V60gHQ96QzbpDO+W+PxIFYh29J xdyI49JH2QGV+lmAfhKJHi9QH1rfnhIrvjyDX/B9q5T2oPAmIorVSDczBruhFdHgfu6y WvSdeDtR4f5+aD4ZLtIkWq1yRaDnL8Skg711KdFQvJ9BQ4M3lCOze1K1JkFJ84hzQwGs eMRYCBA3H5IrSVREk1hAFr1Bz7dHZPdFGlusDkSqsVsfDXcwdRbMJEwAcrUWgjaDuMey uWnKbxPby4OjoKJ50lgp+jqysVcFItWur6/cfks3/xGUyjmAETpLnjFH+hD3uUHoTPT+ 7ImA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=Hn8K2jCwoSKj4DXRW0hDBsjS5nsD4Wtw/OkJqypOpaM=; b=IXbOAssolEwF38xh+4pdv+OG1pLb8Te7O/FA8qpkHyUXumFxp+GxknhlRCWEZbwDJS XQMZyAKf81/f/p6E5YgnFRuIhPbj9WUCmGXaaTKZYj2Bj2dYCfJwxAXjdYRiBD6vojV0 bcUq9huqgptCP9HTPIeD3iKwXwErk+E06xiRnQlnQSzfP7Y4j9XkRvDvP1/atWfGl8ze Kw28zLwfCZMZBnJvWQuN0mMkI3jqR/Dl0t6CmTHMQ15qZEPhgkeTgTnFjUpLXj2ZKNQZ SQ3sFgSri11uCe+IyyDqSv/QkxR3qNzwqMrpPOkjbH4xq8SBSrtNwii9X3quf6RgNq/H JEzg== X-Gm-Message-State: AO0yUKXVHjJP25zlYm/iDb30AA29P+A6DerWDsnltUnlxOYm34qEN8r5 V367GbMwn22Tk+X6Y69XWz0D/RcEmDppUIit X-Google-Smtp-Source: AK7set+W2er86oo0/yz+5mbleDySczyG8jb1FrV8RlyYgEEqI83I490jT2Z5LzAQBba3p9lg9E7LdQ== X-Received: by 2002:a05:622a:194:b0:3b9:e683:23d with SMTP id s20-20020a05622a019400b003b9e683023dmr967016qtw.38.1676339795435; Mon, 13 Feb 2023 17:56:35 -0800 (PST) Received: from localhost.localdomain (dsl-10-133-137.b2b2c.ca. [72.10.133.137]) by smtp.gmail.com with ESMTPSA id p205-20020a3742d6000000b0072a375c291csm10948798qka.30.2023.02.13.17.56.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Feb 2023 17:56:35 -0800 (PST) From: Maxim Cournoyer Date: Mon, 13 Feb 2023 20:55:55 -0500 Message-Id: <20230214015555.8643-11-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230214015555.8643-1-maxim.cournoyer@gmail.com> References: <20230214015555.8643-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1676339863; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=Hn8K2jCwoSKj4DXRW0hDBsjS5nsD4Wtw/OkJqypOpaM=; b=WZxVezz2wQAXXS+V+WzgfJzVNXbUyR/VN7Yu3GUPo4p7syuvpJ36G45qh5hfOcGkM5Eql0 P7mD6/6Ah27Qni0c/lKznuYYU4IRjTUc4cmCh1R94ABcHc3gUaErb/C8oI9ZssV5R8+3n7 LcIVwKdI0YrpDsTCA1cquOLXWHBGf5n6VkCy/RdpBgXoUV8vlSpEt5elO4DnrvFIEd7nCs 89jdCi7Xtu/IYg1HB7UkusOgm5/YrXre0Lvu0KjIzJksVglhrE64mkiaMjWhGzd++DhZ9Y pvp0iJmjn74RuFAvgMO7n926Waj6u04RwnRlnJ8jj9/cadjLwQOPVg9j7Tr6SA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b="hD//TcTJ"; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1676339863; a=rsa-sha256; cv=none; b=hm4MISx2rVta4YIyGjQ0enjKWtbYzKCQaYDTARN+blRvlz/acDvn3EuKDqSl43ls5bs6yT 3/5R+IVtZrsz5b1CMnpYWQ5NWr0E3hkxYLWo6qjpB1k7y/hfW6gCHANkTzTRueSiV730Yu qhuVNeMQVZdgS2jzWFjIaWijADOy2i37jBaREPdVMFAegHNoOzq+kuTesyw5YvXkOhr4bD RtM9OZhj0tIjR0xh8MN1XFd4xQxQExpCenIER1GUa8KQ3ksNRy5ZBWn2siJLzvEBs+BTnA vmD40bzFNA2NusyYhEAMaM7LWhu8FFpzIaa1xbObxydqteRITlJ0sVdqS7FYaA== X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -0.02 X-Spam-Score: -0.02 X-Migadu-Queue-Id: A2DD330F12 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b="hD//TcTJ"; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) X-TUID: RqxfCK+o4X5n * gnu/packages/patches/icecat-makeicecat.patch: Set the intl.locale.requested option to the empty string. --- gnu/packages/patches/icecat-makeicecat.patch | 26 +++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/gnu/packages/patches/icecat-makeicecat.patch b/gnu/packages/patches/icecat-makeicecat.patch index c46cb27ff6..bc179726b1 100644 --- a/gnu/packages/patches/icecat-makeicecat.patch +++ b/gnu/packages/patches/icecat-makeicecat.patch @@ -2,8 +2,28 @@ Make some of the changes needed to the 'makeicecat' script, to allow it to run in a snippet without network access. After this patch is applied, some additional changes will be made using 'substitute*'. +The settings.js hunk below has been submitted upstream (see: +https://issues.guix.gnu.org/61495). + +diff --git a/data/settings.js b/data/settings.js +index 0fe5956..0bb2af1 100644 +--- a/data/settings.js ++++ b/data/settings.js +@@ -30,8 +30,10 @@ pref("privacy.firstparty.isolate", true); + + // Extensions cannot be updated without permission + pref("extensions.update.enabled", false); +-// Use LANG environment variable to choose locale +-pref("intl.locale.matchOS", true); ++ ++// Set the default locale to that of the operating system. ++pref("intl.locale.requested", ""); ++ + // Allow unsigned langpacks + pref("extensions.langpacks.signatures.required", false); + // Disable default browser checking. diff --git a/makeicecat b/makeicecat -index bf2b7a6..bc3b19b 100755 +index 63eb2f0..f7d3ccd 100755 --- a/makeicecat +++ b/makeicecat @@ -58,7 +58,7 @@ readonly SOURCEDIR=icecat-${FFVERSION} @@ -15,8 +35,8 @@ index bf2b7a6..bc3b19b 100755 ############################################################################### -@@ -459,7 +459,7 @@ configure_search() - sed 's|ddg@|ddg-html@|' -i browser/components/search/extensions/ddg-html/manifest.json +@@ -473,7 +473,7 @@ configure_search() + # Process various JSON pre-configuration dumps. - python3 ../../tools/process-json-files.py . browser/components/extensions/schemas/ -- 2.39.1