From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: IceCat locales are missing? Resent-From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sun, 01 Jul 2018 20:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 32026 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 32026@debbugs.gnu.org X-Debbugs-Original-To: bug-guix@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.153047662323611 (code B ref -1); Sun, 01 Jul 2018 20:24:02 +0000 Received: (at submit) by debbugs.gnu.org; 1 Jul 2018 20:23:43 +0000 Received: from localhost ([127.0.0.1]:42403 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fZisp-00068l-AX for submit@debbugs.gnu.org; Sun, 01 Jul 2018 16:23:43 -0400 Received: from eggs.gnu.org ([208.118.235.92]:56603) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fZisl-00068R-UT for submit@debbugs.gnu.org; Sun, 01 Jul 2018 16:23:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZisg-0006Ur-3Q for submit@debbugs.gnu.org; Sun, 01 Jul 2018 16:23:34 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:35591) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fZisg-0006Uj-0v for submit@debbugs.gnu.org; Sun, 01 Jul 2018 16:23:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47574) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZisf-0007FG-7J for bug-guix@gnu.org; Sun, 01 Jul 2018 16:23:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZise-0006TU-Al for bug-guix@gnu.org; Sun, 01 Jul 2018 16:23:33 -0400 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:45534) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZise-0006TO-7K for bug-guix@gnu.org; Sun, 01 Jul 2018 16:23:32 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=50538 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1fZisd-0007J1-Rr for bug-guix@gnu.org; Sun, 01 Jul 2018 16:23:32 -0400 From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 13 Messidor an 226 de la =?UTF-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Sun, 01 Jul 2018 22:23:30 +0200 Message-ID: <87po06puwt.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -6.0 (------) Hello Guix, As of e96ba83faed499b7d6fc4ed984d40a6f74d549cc, IceCat appears to lack localized message catalogs altogether. ISTR Mozilla distributes them separately. Perhaps we should package them somehow? Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 11 08:45:55 2020 Received: (at control) by debbugs.gnu.org; 11 Dec 2020 13:45:55 +0000 Received: from localhost ([127.0.0.1]:40537 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1knik6-0000db-W9 for submit@debbugs.gnu.org; Fri, 11 Dec 2020 08:45:55 -0500 Received: from mail-wm1-f47.google.com ([209.85.128.47]:36690) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1knik2-0000dJ-L1 for control@debbugs.gnu.org; Fri, 11 Dec 2020 08:45:53 -0500 Received: by mail-wm1-f47.google.com with SMTP id y23so8654854wmi.1 for ; Fri, 11 Dec 2020 05:45:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:to:from:subject:mime-version :content-transfer-encoding; bh=1IlEuGIWPWlPp2oA2JrGHNuK8ffR8ZeLsGxwSe9MW18=; b=A2sscu2cxIL6O80J6TtV0qUJsIngq8NNRjSR4dtPWGHbmCv7nvPCnMHQD07nN1XoGF hfNxrSy93Ii/ZRDk2kg05ro8V5a99uwOuc2QKpYIhvs5v+t5gahr3bfKQDFX66GofAIk jwZasHYv9AjZEgHqs4EYJJHRx9HP8BU8ghrli4RUMhVCqWIMSzfVl5ntd1VuKnoWy2jT oA5E732jxPB6JfsQ3YsmhnEC+QjJLogbvKjZiArKtPykO1289vz25DWIWSjyg+Hq52/V phw50+LF1FPW08azYCpVkVcAQC7uX1Jz8+9/yZVfLfOxoJnt/IqkuMHkMxPdUuy3t7hD cCIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:to:from:subject:mime-version :content-transfer-encoding; bh=1IlEuGIWPWlPp2oA2JrGHNuK8ffR8ZeLsGxwSe9MW18=; b=o6Ny1UkqhwKJcX2Sbld0hfGb8jUDFr+UCaTcx5mUTceSuBlWTlYny34U5LpTpjm2uj p/UkVSIehsF4inGG01dFbdb10LKVbuef3mhQoBrx/HXjuu+4Y4yXzL3zMHsd5Va0jg6+ 7XAdaZyt7XVQ6RqiYpLD72NA82ZAU3xSJYNBdlIW4y1OplwYSmep6euD62jClmQxpXdU 8fpxifafY9V4QjKq1jkceVfc1M+EXDcKEKFFKlDN+HTMabYNq1IRunSssCIUNMB3DoVC HoPGbSG5DPYEfpsJk1MACoY2dqA+5Luo5ZPCrvB2ZcFPUNc2GTDdrH1Xo/g3tbZ/W35r DeWQ== X-Gm-Message-State: AOAM530rigQ/u5iA3STj0H0EdtG7OwmQo1oBXkmJv8idYro37fIdCp73 XzmS2EwTfJmvRF+6HWbWBlgJSs0RUGY= X-Google-Smtp-Source: ABdhPJzz+fDPSQ3YGMqQjWN6kPJ+KNCKfF1fyMsy7xfuUwLij2shLAzMuxQPaTlHiKYduECHeXp19w== X-Received: by 2002:a1c:63d4:: with SMTP id x203mr13030340wmb.28.1607694344095; Fri, 11 Dec 2020 05:45:44 -0800 (PST) Received: from unfall (36.193.158.146.dynamic.jazztel.es. [146.158.193.36]) by smtp.gmail.com with ESMTPSA id r2sm15075743wrn.83.2020.12.11.05.45.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Dec 2020 05:45:43 -0800 (PST) Date: Fri, 11 Dec 2020 14:45:42 +0100 Message-Id: <874kksfoc9.fsf@gmail.com> To: control@debbugs.gnu.org From: =?utf-8?Q?Miguel_=C3=81ngel_Arruga_Vivas?= Subject: control message for bug #32026 MIME-version: 1.0 Content-type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.8 (/) merge 32026 25504 quit From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH 00/10] Add proper locale support to IceCat and Icedove References: <87po06puwt.fsf@gnu.org> In-Reply-To: <87po06puwt.fsf@gnu.org> Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Tue, 14 Feb 2023 01:57:02 +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, Jonathan Brielmaier , Maxim Cournoyer Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.167633978428801 (code B ref 32026); Tue, 14 Feb 2023 01:57:02 +0000 Received: (at 32026) by debbugs.gnu.org; 14 Feb 2023 01:56:24 +0000 Received: from localhost ([127.0.0.1]:52044 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRkYR-0007UN-IR for submit@debbugs.gnu.org; Mon, 13 Feb 2023 20:56:24 -0500 Received: from mail-qt1-f179.google.com ([209.85.160.179]:34614) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRkYO-0007U6-W3 for 32026@debbugs.gnu.org; Mon, 13 Feb 2023 20:56:22 -0500 Received: by mail-qt1-f179.google.com with SMTP id f10so16110616qtv.1 for <32026@debbugs.gnu.org>; Mon, 13 Feb 2023 17:56:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Eqz9YBAR1YdIneXfe898i8Z0cM1/Q96nQxBG15piWiI=; b=RGjCPlpylAlzk0Y/ZLbzK26mzCo3LO2DSJ/WWMBLvkXSwpLEz8/iNJSxl1lW+zqSwr wnycV+sRGRU/LiCr99Eob2fjHGFL7IMRdVdkUeeC0aO6OpXte7dBjo4Zvf5IUUbupzVN plUAlLPu/KReb7m0+UvuyffYIs5+Z1SQcAhxthTlX0zuJEoWNVuk268zbpbM5+bCxIxn gj3U6vN+Vpm6PokBafnmPHt0Nu/lt2x6dh4PPxvSibcho+FCt2UtsnBDjruRqG9xa4z0 5kDr8+nYefukmP9sKmEcp/rKQSmk2M73fiioaiS1FODvHLwhkadPxQossDKDHvZWwJci /z4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Eqz9YBAR1YdIneXfe898i8Z0cM1/Q96nQxBG15piWiI=; b=PbklL8peylBfpaPNaNrhRLX/oz+v7JWCZQpYJymDttwm5dlL60fHpM96ujJZpLJFf7 0YylxmQfr7SHrNwHyGJxPE0QCU7wDzZj3CjBnXRcjUkqd8BaTtc4fm0iAWpz/wBrmhvA WKTwcra7O7ACyhsHPgnDH1d5eS8khl7GaxIN6fN7SdPQH4GTqpcZ5mZj0ACbXf0fVyc3 hSW7smom9qXvzFqu/om+CZUKD5liuwz1qzYgdAaV/1JUmn9kd+T7xPkW0UvYThf2UnR9 f7fKnZBRZy3M9Wr+AvFi0R4SUXta8Y22hZHLP/jj5D9b9A4IDcy9PVsFdkNCCg13HQA7 q6xQ== X-Gm-Message-State: AO0yUKUE3ZazW/JuDnhlDw+iBkLct0ew8ZcI077eVwyZGkIbIDlBnLoI jMa6WknxSpxT+6SQKRotfZbNV8kJDl9uBIZV X-Google-Smtp-Source: AK7set+hbxIgz3jo2sehbkqg1Xt7aCeNPxiz2KD4Ko9F9e1rk6r/1mWBFsc27/iHwBcRb8pUfnBipg== X-Received: by 2002:ac8:7fc4:0:b0:3b9:b6e8:8670 with SMTP id b4-20020ac87fc4000000b003b9b6e88670mr891900qtk.51.1676339775134; Mon, 13 Feb 2023 17:56:15 -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.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Feb 2023 17:56:14 -0800 (PST) From: Maxim Cournoyer Date: Mon, 13 Feb 2023 20:55:45 -0500 Message-Id: <20230214015555.8643-1-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, This series adds the localization data packages (language packs) for IceCat and Icedove, and have them used out of the box, per your operating system defined locale (as for normal applications that didn't try didn't reinventing the wheel!). Thanks, Maxim Cournoyer (10): gnu: Add a 'update-mozilla-locales' helper for maintenance. gnu: icedove: Compute a self-contained source. gnu: Define UPSTREAM-FIREFOX-SOURCE at the top level. gnu: icecat: Update the "ach" locale. gnu: icecat: Add a patch that makes building language packs reproducible. gnu: Add icecat-l10n and icedove-l10n. gnu: icedove: Automatically load system-provided extensions. gnu: Add language packs to icecat and icedove. gnu: icedove: Use the locale of the system. gnu: icecat: Use the locale of the system. gnu/local.mk | 1 + gnu/packages/gnuzilla.scm | 514 ++++++++++++++---- gnu/packages/patches/icecat-makeicecat.patch | 26 +- .../icecat-reproducible-langpacks.patch | 43 ++ 4 files changed, 484 insertions(+), 100 deletions(-) create mode 100644 gnu/packages/patches/icecat-reproducible-langpacks.patch base-commit: 67d2f688fb89553df53e73a4c584b1b9eb7d5c24 -- 2.39.1 From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH 01/10] gnu: Add a 'update-mozilla-locales' helper for maintenance. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Tue, 14 Feb 2023 01:57:02 +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, Jonathan Brielmaier , Maxim Cournoyer Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.167633978628818 (code B ref 32026); Tue, 14 Feb 2023 01:57:02 +0000 Received: (at 32026) by debbugs.gnu.org; 14 Feb 2023 01:56:26 +0000 Received: from localhost ([127.0.0.1]:52047 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRkYU-0007Ud-3o for submit@debbugs.gnu.org; Mon, 13 Feb 2023 20:56:26 -0500 Received: from mail-qv1-f49.google.com ([209.85.219.49]:46672) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRkYR-0007U9-Du for 32026@debbugs.gnu.org; Mon, 13 Feb 2023 20:56:23 -0500 Received: by mail-qv1-f49.google.com with SMTP id o42so7142425qvo.13 for <32026@debbugs.gnu.org>; Mon, 13 Feb 2023 17:56:23 -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=VIhOIp0cMmMH2uxQv8KXAemLEBobf9gak+TFHXt2Ppw=; b=L9m2WktOfLlk8Tq8bpSQdLbTeXKqQ+cnS+cKREPLnegBW2rw5AGgEHork6zbNlIiBC ikO3HmCCQTQpiwMFWegeHvnsVSGdSw+OUNHlm00vAHcaggr+xZk9HKOaPZA8VoKgcbHw +aaHQo2ddaZKvv/xXyNyGg9Ciz5M0cCxCh4/BACYyDXr0FGOuA1a+O727lfQDAUTfcuO V9ejmDeGQ+l/op1S867p9xhSIk39U/0RhsMGQ8yEVODQ+3beDHF5y2HDi6tTjYqJyim9 FUe/hUKFzF1WopGix2EDUXyeUy/2S22iKWfuvTnDM0S8u4H/c1Oc8EINRFnO6LZP2tYN Y7LA== 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=VIhOIp0cMmMH2uxQv8KXAemLEBobf9gak+TFHXt2Ppw=; b=Y1vaLzh7/XL+aduaWDnbzX6aDew+mYkrK/3S7K1e3p/GC0jaRY8sMIl7MKx0HmqTAa cO+evAYZGkzKUJuAaMRpE1+RVmVFR0vaEmM6ed1x4UVrVL7PeXQiPrB1BkezWdYYbYki MFB/VpSd9Mvq+b6Vl9iEtl/HbB6WXii89OjdNnUVLuoEmGBg1aPy0iO4CCnL9+frOTWE oKZqXWThT0FU1OsBJCt6pSM+W4yJM7vUmlUfzMrORbBLrvKRI9XJ8Z+/DvSUnoKUDIgJ YY+xY4ILz9hUox4J0DctfL1Tv5ZZsGvCBWGw04lU4IzipEgg6QkXWQDdOKdll5kX0aZo AdOw== X-Gm-Message-State: AO0yUKUtOJonVVHKNxZivooKi5vtUy4XT8E5HP1p53qTioKpqJwSVk7K uz2SWIU7nJKSb8DjV6coyYtz/CBcu1EdpNrI X-Google-Smtp-Source: AK7set801AooDjC3HgXxAqDxlBVK33F1PXS14C/kPyRpz+w6/8854SQah6QynHXBDgKCX8ycN1y9eg== X-Received: by 2002:a05:6214:5016:b0:56e:9c74:74b7 with SMTP id jo22-20020a056214501600b0056e9c7474b7mr1912888qvb.23.1676339777718; Mon, 13 Feb 2023 17:56:17 -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.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Feb 2023 17:56:17 -0800 (PST) From: Maxim Cournoyer Date: Mon, 13 Feb 2023 20:55:46 -0500 Message-Id: <20230214015555.8643-2-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-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gnuzilla.scm (update-mozilla-locales): New procedure. (all-mozilla-locales): Comment how to proceed to update it. --- gnu/packages/gnuzilla.scm | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 33b5744c17..7e549d93e6 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -37,6 +37,7 @@ (define-module (gnu packages gnuzilla) #:use-module ((srfi srfi-1) #:hide (zip)) + #:use-module (ice-9 format) #:use-module (ice-9 match) #:use-module (gnu packages) #:use-module ((guix licenses) #:prefix license:) @@ -91,7 +92,8 @@ (define-module (gnu packages gnuzilla) #:use-module (gnu packages xiph) #:use-module (gnu packages xdisorg) #:use-module (gnu packages readline) - #:use-module (gnu packages sqlite)) + #:use-module (gnu packages sqlite) + #:autoload (json parser) (json->scm)) (define-public mozjs (package @@ -348,6 +350,10 @@ (define-public mozjs-78 (inputs (list icu4c readline zlib)))) + +;;; +;;; Localization helper procedures. +;;; (define mozilla-compare-locales (origin (method hg-fetch) @@ -371,6 +377,27 @@ (define-syntax-rule (mozilla-locales (hash-string changeset locale) ...) (list (mozilla-locale locale changeset hash-string) ...)) +(define (update-mozilla-locales changesets.json) + "Output a new list of Mozilla locales, to update the ALL-MOZILLA-LOCALES +variable defined bellow. It requires guile-json to be installed." + ;; To extract the file used as argument, do: + ;; tar -xf $(./pre-inst-env guix build \ + ;; -e '(@@ (gnu packages gnuzilla) upstream-firefox-source)') \ + ;; --strip-components=3 \ + ;; --wildcards '*/browser/locales/l10n-changesets.json' + (match (call-with-input-file changesets.json json->scm) + (((lang ("revision" . revision) platforms pin) ...) + (let ((data (reverse (map (lambda (rev lang) + `(,(list->string (make-list 40 #\0)) + ,(string-take rev 12) ,lang)) + revision lang)))) + (format #t "~{~s~%~}" data) + data)))) + +;;; This list must be maintained by hand by comparing with the entries in the +;;; browser/locales/l10n-changesets.json file in the Firefox source (see the +;;; 'update-mozilla-locales' procedure above which aims to make this a bit +;;; easier). (define all-mozilla-locales (mozilla-locales ;; sha256 changeset locale -- 2.39.1 From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH 02/10] gnu: icedove: Compute a self-contained source. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Tue, 14 Feb 2023 01:57:02 +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, Jonathan Brielmaier , Maxim Cournoyer Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.167633979128849 (code B ref 32026); Tue, 14 Feb 2023 01:57:02 +0000 Received: (at 32026) by debbugs.gnu.org; 14 Feb 2023 01:56:31 +0000 Received: from localhost ([127.0.0.1]:52053 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRkYY-0007V8-FP for submit@debbugs.gnu.org; Mon, 13 Feb 2023 20:56:31 -0500 Received: from mail-qv1-f42.google.com ([209.85.219.42]:38484) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRkYT-0007UC-JC for 32026@debbugs.gnu.org; Mon, 13 Feb 2023 20:56:26 -0500 Received: by mail-qv1-f42.google.com with SMTP id k28so9574277qve.5 for <32026@debbugs.gnu.org>; Mon, 13 Feb 2023 17:56:25 -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=4d8/exqvyHTxbMMruQ59/rYx11Xa6zQrzisfEpnrLC0=; b=Qaug3AE52/adojOL6EYJ03avOmpuJC4SXHu9FUUDHI4LoRHc2oFP1aHiqurjOga+4g 34IQjUNvV59REKqorPV40MXeh0doJxitO2MjCCiGBfa/9HUATVmQfC3xHzGJgah/ZYoL X7SrZmyY0LezqH398pmOQ4blmzI5s0fatUwD7QPDAU51ox3yC1tOf4xmfotQGEKNFTh3 nw9yCI/OBhrNc0rqMrHB5U60piSC2I7FPWI0aYoyGw6FWYc+0yiQYc3Wh10KTGVfF0AW nykvPqyeV4TY+0MJObDjZtb6CIPQR15xZ5sqPLeQhtOD2WENXZfAs/cvR8VUF2I8MOrG +dwA== 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=4d8/exqvyHTxbMMruQ59/rYx11Xa6zQrzisfEpnrLC0=; b=rIl6NUxCbR9EtFNlNkG99yuSIpy9X4Z+fHatQblsZVMJOov6QMs9gTtZhdMVdN3FR0 us0tYRgl1vqkR8KGyustYW9Mg0KkbWsM9JsX0NXXZWIGTyP01Lli1cNRPvpFPIQ/xdHf I1/wnHEyxa8PpLINHCbVxZMpdrawVtfVGlYvbET0MhSj/l2UHUU71SxkXxVIIKPQs6Kb JCpoLNmPN4fFXst2YKJyopvYgiWzhZkcbZWLMzmfyn80ee9TWpIIdR3f195xrjdlgNqB KCDnFyXskabG2fTtOBboItWL/A9RdBW21G4NEpNO9MhYVB7i9DjB4ZNkQJmBnHy8RoEg axfQ== X-Gm-Message-State: AO0yUKWpgdTffe8MR1hm9+qc49qHzpTu6D/GjmJwWmGNNKE8tIl+VUBn oUp838fX2Yr5XcLkgzdksUmw8Tn0daH4yEj4 X-Google-Smtp-Source: AK7set+4EQhtUL6bWevnypOKdkW3nyUYCjO7OIyQjCYTqzDGwCHQ/NCHZso2squSl1uDlsr5aV6sjA== X-Received: by 2002:ad4:5bae:0:b0:53d:3816:d79f with SMTP id 14-20020ad45bae000000b0053d3816d79fmr1878186qvq.35.1676339779720; Mon, 13 Feb 2023 17:56:19 -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.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Feb 2023 17:56:19 -0800 (PST) From: Maxim Cournoyer Date: Mon, 13 Feb 2023 20:55:47 -0500 Message-Id: <20230214015555.8643-3-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-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This refactoring work is to prepare for adding a icedove-l10n package, which will reuse that source. * gnu/packages/gnuzilla.scm (comm-source->locales+changset): New procedure. (thunderbird-source): Rename to... (thunderbird-comm-source): ... here. (icedove-source): New variable. (icedove) [source]: Use it. [phases]: Remove the prepare-thunderbird-sources and rename-to-icedove phases. --- gnu/packages/gnuzilla.scm | 210 +++++++++++++++++++++++++------------- 1 file changed, 140 insertions(+), 70 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 7e549d93e6..8be41c2832 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -47,6 +47,7 @@ (define-module (gnu packages gnuzilla) #:use-module (guix hg-download) #:use-module (guix gexp) #:use-module (guix store) + #:use-module (guix modules) #:use-module (guix monads) #:use-module (guix utils) #:use-module (guix build-system gnu) @@ -1129,7 +1130,7 @@ (define %icedove-version "102.7.2") ;; Provides the "comm" folder which is inserted into the icecat source. ;; Avoids the duplication of Icecat's source tarball. -(define thunderbird-source +(define thunderbird-comm-source (origin (method hg-fetch) (uri (hg-reference @@ -1140,11 +1141,148 @@ (define thunderbird-source (base32 "071q0pcfvfpzx741ly1sl8anlmzx02h17w4ylfnrkwrpaclq3p6p")))) +(define (comm-source->locales+changset source) + "Given SOURCE, a checkout of the Thunderbird 'comm' component, return the +list of languages supported as well as the currently used changeset." + (match (update-mozilla-locales + (string-append source "/mail/locales/l10n-changesets.json")) + (((_ changeset locale) ...) + (values locale (first changeset))))) + +;;; To find out which changeset to use for the comm-l10n repo, use the +;;; 'comm-source->locales+changeset' procedure on the thunderbird-comm-source +;;; checkout directory. The complete localization data will be released as a +;;; tarball starting with 102.2.8 (see: +;;; https://bugzilla.mozilla.org/show_bug.cgi?id=1810727). When this tarball +;;; is available, it should replace the complete 'l10n' directory at the root +;;; of the IceCat source, instead of only the 'calendar', chat and mail +;;; directories that it provides. +(define thunderbird-comm-l10n + (let* ((changeset "5b6788295358") + (version (git-version %icedove-version "0" changeset))) + (origin + (method hg-fetch) + (uri (hg-reference + (url "https://hg.mozilla.org/projects/comm-l10n") + (changeset changeset))) + (file-name (git-file-name "comm-l10n" version)) + (sha256 + (base32 + "1jrsmkscjjllcfawi3788vwm53wn25inbhdis5nk4vfpr7wk5ill"))))) + +(define icedove-source + (let ((name (string-append "icedove-" %icedove-version))) + (origin + (method computed-origin-method) + (file-name (string-append name ".tar.xz")) + (sha256 #f) + (uri + (delay + (with-imported-modules (source-module-closure '((guix build utils))) + #~(begin + (use-modules (guix build utils) + (sxml simple)) + + (set-path-environment-variable + "PATH" '("bin") + (list #+(canonical-package tar) + #+(canonical-package xz))) + + ;; Extract the base Icecat tarball, renaming its top-level + ;; directory. + (invoke "tar" "--transform" (string-append "s,[^/]*," #$name ",") + "-xf" #$icecat-source) + (chdir #$name) + + ;; Merge the Thunderdbird localization data. + (copy-recursively #$thunderbird-comm-l10n "l10n") + + ;; Add the Thunderbird-specific "comm" directory.. + (mkdir "comm") + (copy-recursively #$thunderbird-comm-source "comm") + (delete-file "sourcestamp.txt") + + ;; Adjust the application name. + (substitute* "comm/mail/confvars.sh" + (("MOZ_APP_NAME=thunderbird") + "MOZ_APP_NAME=icedove") + (("MOZ_UPDATER=1") + "MOZ_UPDATER=0")) + + ;; Remove branding to comply with Mozilla's trademark policy + (with-directory-excursion "comm/mail/branding/nightly" + (delete-file "content/about-wordmark.svg") + (call-with-output-file "content/about-wordmark.svg" + (lambda (port) + (sxml->xml '(svg (@ (xmlns "http://www.w3.org/2000/svg") + (viewBox "0 0 789.1 90.78") + (width "333") + (height "48") + (fill "#fff")) + (text (@ (x "400") (y "70") + (text-anchor "middle") + (font-size "90")) + "Icedove Daily")) + port))) + (substitute* '("locales/en-US/brand.properties" + "locales/en-US/brand.ftl" + "locales/en-US/brand.dtd" + "configure.sh") + (("Thunderbird") "Icedove") + (("mozilla.org") "guix.gnu.org"))) + ;; Remove other mentions of Thunderbird in user-visible text. + (with-directory-excursion "comm/mail/base/content" + (substitute* '("overrides/app-license-name.html") + (("Thunderbird") "Icedove"))) + (with-directory-excursion "comm/mail/components/" + (substitute* '("MailGlue.jsm" + "extensions/schemas/addressBook.json" + "extensions/schemas/tabs.json" + "extensions/schemas/cloudFile.json" + "extensions/schemas/chrome_settings_overrides.json" + "extensions/schemas/windows.json" + "extensions/parent/ext-mail.js" + "im/messages/mail/Info.plist" + "enterprisepolicies/moz.build" + "enterprisepolicies/helpers/moz.build" + "enterprisepolicies/schemas/moz.build") + (("Thunderbird") "Icedove"))) + (substitute* '("comm/mailnews/base/prefs/content/accountUtils.js" + "comm/mail/base/content/customizeToolbar.js" + "comm/suite/components/customizeToolbar.js") + (("AppConstants.MOZ_APP_NAME (.)= \"thunderbird" _ e) + (format #f "AppConstants.MOZ_APP_NAME ~a= \"icedove" e))) + + ;; Override addon URLs and settings + (substitute* "comm/mail/app/profile/all-thunderbird.js" + (("(pref\\(\"extensions.webservice.discoverURL\").*" _ m) + (string-append m ", \"https://directory.fsf.org/wiki/Icedove\");")) + (("(pref\\(\"extensions.getAddons.search.url\").*" _ m) + (string-append m ", \"https://guix.gnu.org/packages\");")) + (("(pref\\(\"extensions.update.enabled\").*" _ m) + (string-append m ", false);")) + (("(pref\\(\"extensions.systemAddon.update.enabled\").*" _ m) + (string-append m ", false);")) + (("(pref\\(\"lightweightThemes.update.enabled\").*" _ m) + (string-append m ", false);"))) + + ;; Step out of the directory and create the tarball. + (chdir "..") + (format #t "Packing Icedove source tarball...~%") + (force-output) + (setenv "XZ_DEFAULTS" (string-join (%xz-parallel-args))) + (invoke "tar" "cfa" #$output + "--mtime=@315619200" ;1980-01-02 UTC + "--owner=root:0" + "--group=root:0" + "--sort=name" + #$name)))))))) + (define-public icedove (package (name "icedove") (version %icedove-version) - (source icecat-source) + (source icedove-source) (properties `((cpe-name . "thunderbird_esr"))) (build-system gnu-build-system) @@ -1158,11 +1296,6 @@ (define-public icedove ,@%gnu-build-system-modules) #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'prepare-thunderbird-sources - (lambda _ - (mkdir "comm") - (copy-recursively #$thunderbird-source "comm") - (delete-file "sourcestamp.txt"))) (add-after 'patch-source-shebangs 'patch-cargo-checksums (lambda _ (use-modules (guix build cargo-utils)) @@ -1192,69 +1325,6 @@ (define-public icedove (substitute* "comm/mail/moz.configure" (("MOZ_DEDICATED_PROFILES, True") "MOZ_DEDICATED_PROFILES, False")))) - (add-after 'prepare-thunderbird-sources 'rename-to-icedove - (lambda _ - (substitute* "comm/mail/confvars.sh" - (("MOZ_APP_NAME=thunderbird") - "MOZ_APP_NAME=icedove") - (("MOZ_UPDATER=1") - "MOZ_UPDATER=0")) - ;; Remove branding to comply with Mozilla's trademark policy - (with-directory-excursion "comm/mail/branding/nightly" - (delete-file "content/about-wordmark.svg") - (call-with-output-file "content/about-wordmark.svg" - (lambda (port) - (sxml->xml '(svg (@ (xmlns "http://www.w3.org/2000/svg") - (viewBox "0 0 789.1 90.78") - (width "333") - (height "48") - (fill "#fff")) - (text (@ (x "400") (y "70") - (text-anchor "middle") - (font-size "90")) - "Icedove Daily")) - port))) - (substitute* '("locales/en-US/brand.properties" - "locales/en-US/brand.ftl" - "locales/en-US/brand.dtd" - "configure.sh") - (("Thunderbird") "Icedove") - (("mozilla.org") "guix.gnu.org"))) - ;; Remove other mentions of Thunderbird in user-visible text. - (with-directory-excursion "comm/mail/base/content" - (substitute* '("overrides/app-license-name.html") - (("Thunderbird") "Icedove"))) - (with-directory-excursion "comm/mail/components/" - (substitute* '("MailGlue.jsm" - "extensions/schemas/addressBook.json" - "extensions/schemas/tabs.json" - "extensions/schemas/cloudFile.json" - "extensions/schemas/chrome_settings_overrides.json" - "extensions/schemas/windows.json" - "extensions/parent/ext-mail.js" - "im/messages/mail/Info.plist" - "enterprisepolicies/moz.build" - "enterprisepolicies/helpers/moz.build" - "enterprisepolicies/schemas/moz.build") - (("Thunderbird") "Icedove"))) - (substitute* '("comm/mailnews/base/prefs/content/accountUtils.js" - "comm/mail/base/content/customizeToolbar.js" - "comm/suite/components/customizeToolbar.js") - (("AppConstants.MOZ_APP_NAME (.)= \"thunderbird" _ e) - (format #f "AppConstants.MOZ_APP_NAME ~a= \"icedove" e))) - - ;; Override addon URLs and settings - (substitute* "comm/mail/app/profile/all-thunderbird.js" - (("(pref\\(\"extensions.webservice.discoverURL\").*" _ m) - (string-append m ", \"https://directory.fsf.org/wiki/Icedove\");")) - (("(pref\\(\"extensions.getAddons.search.url\").*" _ m) - (string-append m ", \"https://guix.gnu.org/packages\");")) - (("(pref\\(\"extensions.update.enabled\").*" _ m) - (string-append m ", false);")) - (("(pref\\(\"extensions.systemAddon.update.enabled\").*" _ m) - (string-append m ", false);")) - (("(pref\\(\"lightweightThemes.update.enabled\").*" _ m) - (string-append m ", false);"))))) (add-after 'build 'neutralize-store-references (lambda _ ;; Mangle the store references to compilers & other build tools in -- 2.39.1 From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH 03/10] gnu: Define UPSTREAM-FIREFOX-SOURCE at the top level. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Tue, 14 Feb 2023 01:57:03 +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, Jonathan Brielmaier , Maxim Cournoyer Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.167633979328863 (code B ref 32026); Tue, 14 Feb 2023 01:57:03 +0000 Received: (at 32026) by debbugs.gnu.org; 14 Feb 2023 01:56:33 +0000 Received: from localhost ([127.0.0.1]:52056 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRkYZ-0007VG-L3 for submit@debbugs.gnu.org; Mon, 13 Feb 2023 20:56:33 -0500 Received: from mail-qt1-f177.google.com ([209.85.160.177]:35511) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRkYV-0007UK-BT for 32026@debbugs.gnu.org; Mon, 13 Feb 2023 20:56:27 -0500 Received: by mail-qt1-f177.google.com with SMTP id q13so16111064qtx.2 for <32026@debbugs.gnu.org>; Mon, 13 Feb 2023 17:56:27 -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=Ypa9TCbbUvyEF/Ux7404e89FnVfkmrnBcv9kAhRbFDc=; b=JGiQUJCFD5Amdgrk5R18qM21qVWq0co5gWCJkK2efoFYXXrgs/q3e9hvPhM5bWREOx HH8RRxDfjb/r4l4CNvh8XzSip8pnQScWHLPQ1zaSUn/QxMi7TFlV/73m3uPxvatbExNu Xm53y50S+e+DrGkK3/98KnOp7HwMpxfKNocAQCHr/9scgODgWj7kvV7zMYHqETfRtdga Oga/x5GFLgs171Uqt1DSt3xyAV+G6VD9E/ZoCyzCETeaWo0hTsg3MIV0be6XD10yepoQ 9C0yJXrjEjoRB5Uq6EdXQJmsT1TFp7BM1OlWtstuBdy0q4KhRtVHTTrFkfTQoPcF8cl6 4IoQ== 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=Ypa9TCbbUvyEF/Ux7404e89FnVfkmrnBcv9kAhRbFDc=; b=hpqm6jE3M0/g+f6fJmrzEhXJO8D+AoAj5VTrl9B4QYI0IiGsVsHroxp272Sa9dHRYO 2fwOuAKtljypK1t6Ixj/vTtrZf+Vd4B/QQi6SbjmT5PMGu71z08slJ91MDZwppCa7yNH BYtrRjuexAx5jIQAzK5m/q7ETSGb6OlxWPQ4nJW3V2jjA6os3sFwdCTcsP+dtt1hATu2 gQ7drVQfgtC2dVPvDMEoc3dhKPAXMsyZ24awtDhPhsPG+3KUi3GGkKhQOLwOLUGhESMy YCOQJETcrgboba78vyCb8NWjl/GSSKcVZoN/VxU2FYq4gC5AXLPX/GecvpECIRS7IsE8 IUPQ== X-Gm-Message-State: AO0yUKU2cALAXVWj9EMh4pzLGc+6Hc7SL5vfsAXF8qeoWhoaQ0Gsw6dM CQq6vqesf8oONo4ykLUo4RADXRVrGdYTe8sR X-Google-Smtp-Source: AK7set+V0P/Wg3rTFkoAW5REwmZCGX8gWCAaGWzy4306huVmM23KIuOeJoocig+gq9lMOU7Pvc+l/w== X-Received: by 2002:a05:622a:1896:b0:3b9:a4cf:313f with SMTP id v22-20020a05622a189600b003b9a4cf313fmr938690qtc.29.1676339781780; Mon, 13 Feb 2023 17:56:21 -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.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Feb 2023 17:56:21 -0800 (PST) From: Maxim Cournoyer Date: Mon, 13 Feb 2023 20:55:48 -0500 Message-Id: <20230214015555.8643-4-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-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gnuzilla.scm (%icecat-base-version): New variable. (%upstream-firefox-version): Likewise. (%icecat-version): Define in terms of %icecat-base-version. (upstream-firefox-source): New variable. (icecat-source): Adjust to use the above newly introduced variables. --- gnu/packages/gnuzilla.scm | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 8be41c2832..8f18c50dde 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -505,31 +505,29 @@ (define all-mozilla-locales ;; XXXX: Workaround 'snippet' limitations. (define computed-origin-method (@@ (guix packages) computed-origin-method)) -(define %icecat-version "102.7.0-guix0-preview1") +(define %icecat-base-version "102.7.0") +(define %upstream-firefox-version (string-append %icecat-base-version "esr")) +(define %icecat-version (string-append %icecat-base-version "-guix0-preview1")) (define %icecat-build-id "20230117000000") ;must be of the form YYYYMMDDhhmmss +(define upstream-firefox-source + (origin + (method url-fetch) + (uri (string-append + "https://ftp.mozilla.org/pub/firefox/releases/" + %upstream-firefox-version "/source/" + "firefox-" %upstream-firefox-version ".source.tar.xz")) + (sha256 + (base32 + "1ahl66x8chnsz80capqa5ivyrqhc50s91zrcgz1jxd7w2ws61957")))) + ;; 'icecat-source' is a "computed" origin that generates an IceCat tarball ;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat' ;; script from the upstream IceCat project. (define icecat-source - (let* ((base-version (first (string-split %icecat-version #\-))) - - (major-version (first (string-split base-version #\.))) - (minor-version (second (string-split base-version #\.))) - (sub-version (third (string-split base-version #\.))) - - (upstream-firefox-version (string-append base-version "esr")) - (upstream-firefox-source - (origin - (method url-fetch) - (uri (string-append - "https://ftp.mozilla.org/pub/firefox/releases/" - upstream-firefox-version "/source/" - "firefox-" upstream-firefox-version ".source.tar.xz")) - (sha256 - (base32 - "1ahl66x8chnsz80capqa5ivyrqhc50s91zrcgz1jxd7w2ws61957")))) - + (let* ((major-version (first (string-split %icecat-base-version #\.))) + (minor-version (second (string-split %icecat-base-version #\.))) + (sub-version (third (string-split %icecat-base-version #\.))) (upstream-icecat-base-version "102.7.0") ; maybe older than base-version ;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version)) (gnuzilla-commit "7f76da3cfd5d04fa38d894f6ea6ac5f2fd0ea837") @@ -562,7 +560,7 @@ (define icecat-source #~(begin (use-modules (guix build utils)) (let ((firefox-dir - (string-append "firefox-" #$base-version)) + (string-append "firefox-" #$%icecat-base-version)) (icecat-dir (string-append "icecat-" #$%icecat-version))) -- 2.39.1 From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH 04/10] gnu: icecat: Update the "ach" locale. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Tue, 14 Feb 2023 01:57:03 +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, Jonathan Brielmaier , Maxim Cournoyer Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.167633979328872 (code B ref 32026); Tue, 14 Feb 2023 01:57:03 +0000 Received: (at 32026) by debbugs.gnu.org; 14 Feb 2023 01:56:33 +0000 Received: from localhost ([127.0.0.1]:52058 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRkYb-0007VZ-5d for submit@debbugs.gnu.org; Mon, 13 Feb 2023 20:56:33 -0500 Received: from mail-qv1-f46.google.com ([209.85.219.46]:34491) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRkYX-0007UT-2i for 32026@debbugs.gnu.org; Mon, 13 Feb 2023 20:56:29 -0500 Received: by mail-qv1-f46.google.com with SMTP id nd22so6990550qvb.1 for <32026@debbugs.gnu.org>; Mon, 13 Feb 2023 17:56:29 -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=5zYo9LQAaeLAiqcIyapcZKCuPpX8Ea3tIYh4eBe/lsM=; b=hldQmg0Y1uUI12FwmX4vcuMz6/7lte7PELR0s/dTMfYnGMOj4krBpoeXYIjeXRpj1X 3JtgRHL1lWoXTV89r4A12+WsglHGO75iJX4Yf5CXCAX7gUbbwC6qyONij78E1mTTLer8 Lck0qUEwNKUVX7N4DuNwezq/SWlh2uI9GZzhp2JWyrS1Eq43oYR5FC1Szs9I5UEvPmy5 Q7X2iPs9NneZjBgiBQ7d4WQETAlRSBWoicueq5nn94NX09pjmBO2FuUrdBHEMYSXOVD3 Qc7w16E0t4NAeNWtquQ+X1jwk7nGfhbIAWh4NFnXM11VUC55phY+70Oye2qsWONiHaNF DTuQ== 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=5zYo9LQAaeLAiqcIyapcZKCuPpX8Ea3tIYh4eBe/lsM=; b=wMnJYMZHD9KIK3MrxArT+aWlCpKaoiOAay8xGTuHqye3K7uRcMwRzGiu8atuN0MNF7 1sMvwF0ZaKFN1YOvdxMZcWT0iewU2CYiEm6c+EC8h7yj7x1/N9+wZwhEyzfEvwCok+oh kWrcOPZwlUpovT4biJjGrhrrP7k6wxijFHMTvXWOwQxW5N2TcsDctNWDMX20olpd8KpB gcxQ4S9d3kEdyyRO2jgv8ndWDiQoHxPQeUBbhoI/SmzWfSLLQ6p3p0oC/Lzu1+Bf+QPL zWI/dzQ0/8O16hdPhliIIdKGsI6ke9y6f2AiWSG2AdH1t3khO/VAd6YcRdB8dTuy53Th tC0Q== X-Gm-Message-State: AO0yUKVmPnJyecDZPTFzM3flTYLhKTaI/NhYCNYf3B4CBmb7YBVcXYyS 3qvLan5XOrbwt0bxKRrpNN87AIJUT1ySOG9S X-Google-Smtp-Source: AK7set+i2GAstU7HdeRr6AI4lftxYUIpf/onvJhKpvkUPU1l9myCMJ0wiJ/J6bdvB0OwuY7CQ//+3w== X-Received: by 2002:a05:6214:1254:b0:53c:9354:9721 with SMTP id r20-20020a056214125400b0053c93549721mr2232558qvv.21.1676339783501; Mon, 13 Feb 2023 17:56:23 -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.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Feb 2023 17:56:23 -0800 (PST) From: Maxim Cournoyer Date: Mon, 13 Feb 2023 20:55:49 -0500 Message-Id: <20230214015555.8643-5-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-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) The currently captured changeset didn't match what the manifest in the source specifies. This was discovered by running 'update-mozilla-locales'. * gnu/packages/gnuzilla.scm (all-mozilla-locales) [ach]: Update revision and hash. --- gnu/packages/gnuzilla.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 8f18c50dde..28cb16554d 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -403,7 +403,7 @@ (define all-mozilla-locales (mozilla-locales ;; sha256 changeset locale ;;--------------------------------------------------------------------------- - ("1y562h0dg33vhhhwfk6jl7xbr67gng21vcf3rpm96zzcgbnf8rjj" "503a7baec899" "ach") + ("1s59ihmj8x6z0ssq4xav689jb5azrpdnay8csgjm1b9pw7wmvcli" "a6940ae1a02f" "ach") ("1cqixlk9f8p63jz20wzsvnfb7xa82ba725gzdydlwz2axgp09c26" "4e2c7d1ddbed" "af") ("19r1yhmfxqasyslc8gr9as5w1scscz1xr8iqy9zi4b90fdjzs0ac" "06897e40a7ea" "an") ("0nfknb1p03j9fgmkwlm1mzdyh10g0l33x34ab39kc072apziyv0n" "9272819b09e2" "ar") -- 2.39.1 From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH 07/10] gnu: icedove: Automatically load system-provided extensions. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Tue, 14 Feb 2023 01:57:03 +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, Jonathan Brielmaier , Maxim Cournoyer Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.167633979628890 (code B ref 32026); Tue, 14 Feb 2023 01:57:03 +0000 Received: (at 32026) by debbugs.gnu.org; 14 Feb 2023 01:56:36 +0000 Received: from localhost ([127.0.0.1]:52061 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRkYe-0007Vs-Hm for submit@debbugs.gnu.org; Mon, 13 Feb 2023 20:56:36 -0500 Received: from mail-qv1-f49.google.com ([209.85.219.49]:46672) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRkYY-0007U9-Ch for 32026@debbugs.gnu.org; Mon, 13 Feb 2023 20:56:30 -0500 Received: by mail-qv1-f49.google.com with SMTP id o42so7142696qvo.13 for <32026@debbugs.gnu.org>; Mon, 13 Feb 2023 17:56:30 -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=xTqr0tsIvrhEyrL+2iApDHeG0sRg+zWfeckcwb28LL8=; b=jNAcfVg5juoMFtQVbqjOjGSdOFBuA1tPDgHs6KGC34NvbltlZSgSgB9gNe9Lh8gW6D 7ZVPvtnsHsf8c37zTlH9amstSTyF3ERA1zjcxOtvsVcf2mJOq9L9zFfsvqyi8SIFz5gl JshbsLG/r3F69GavRfwvmU42Bpo53gik1CoqbQdIat0IgcqtDwO44DRoHwiWcjX/RdWw 6kK+cNXLamI4hJCnnBKCCnlVuX2Bol3hHc/hghQ95rxc0leQzVEm9faV1adnMxFOJS5j RcpUQFgCldjQBaljStP9RcSmwBwCuHms61D2zxMkMdSEC0ZT8vymLBq+Ie4Uo7zQr6MR kyiQ== 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=xTqr0tsIvrhEyrL+2iApDHeG0sRg+zWfeckcwb28LL8=; b=u0DWkHCHxgz1IgIZlsWqvUGxY/CY+qS0UGkG46LG5v7O9ATqQID57tsTjgrEKC+dhQ BFW5qaDAjQ+R7pwv8XoX/+EuplDLofvwmFxwH/jiqUcyMk4Oruc38K/ifM56AMbhZ3G1 5Y3BQkcA4ofGuof++Lch+7BSbehNd+Zt50IKrrqOW6I0KddNhLxFFKjoe/5SdUC5/iGs IOfU9m4J86WQvHbTSaq5xY9ZVFmNPHaVWEEIWsiS4gfUykzRkbGNpl8dU4NL9rh4zmwM sUAKQp282HtAzMU20MszcISdhksaeo59gJPmyckAq/XunKKw8ZGNwuyvKrEpHzezgWVz A62w== X-Gm-Message-State: AO0yUKVERQx60ew1ZZQvxooKc1WZINkZEF3Qrg4GZHRwCo6Exzbuob6h XLR6TmftJpn0TIvtXwx76WmMzYGqmMGBfJEV X-Google-Smtp-Source: AK7set+DDIDvF2dWm3EvubL9r0hk37Cb9nBnNuXMT4xpI1czsuNfOMkTwyLOp2TuOt0uuAJQtxJAkA== X-Received: by 2002:a05:6214:1d2c:b0:56e:b347:8dfd with SMTP id f12-20020a0562141d2c00b0056eb3478dfdmr2317306qvd.25.1676339789927; Mon, 13 Feb 2023 17:56:29 -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.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Feb 2023 17:56:29 -0800 (PST) From: Maxim Cournoyer Date: Mon, 13 Feb 2023 20:55:52 -0500 Message-Id: <20230214015555.8643-8-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-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gnuzilla.scm (icedove-source): Set the extensions.autoDisableScopes preference value to 3. (icedove-minimal) [phases]: Add the --allow-addon-sideload and --with-unsigned-addon-scopes=app,system ac options to the configure phase. --- gnu/packages/gnuzilla.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index d7c4d6013c..2c83323c64 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1282,7 +1282,15 @@ (define icedove-source (("(pref\\(\"extensions.systemAddon.update.enabled\").*" _ m) (string-append m ", false);")) (("(pref\\(\"lightweightThemes.update.enabled\").*" _ m) - (string-append m ", false);"))) + (string-append m ", false);")) + + ;; XXX: The autoDisableScopes is tweaked by the makeicecat + ;; script, but it doesn't know about Thunderbird. This is + ;; necessary to allow picking up the extensions found in the + ;; system global application directory, such as the language + ;; packs. + (("\"extensions.autoDisableScopes\", 15") + "\"extensions.autoDisableScopes\", 3")) ;; Step out of the directory and create the tarball. (chdir "..") @@ -1395,6 +1403,8 @@ (define-public icedove (lambda () (display (string-append + "ac_add_options --allow-addon-sideload\n" + "ac_add_options --with-unsigned-addon-scopes=app,system\n" "ac_add_options --disable-crashreporter\n" "ac_add_options --disable-debug\n" "ac_add_options --disable-debug-symbols\n" -- 2.39.1 From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH 05/10] gnu: icecat: Add a patch that makes building language packs reproducible. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Tue, 14 Feb 2023 01:57:04 +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, Jonathan Brielmaier , Maxim Cournoyer Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.167633979728897 (code B ref 32026); Tue, 14 Feb 2023 01:57:04 +0000 Received: (at 32026) by debbugs.gnu.org; 14 Feb 2023 01:56:37 +0000 Received: from localhost ([127.0.0.1]:52063 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRkYe-0007Vw-Sp for submit@debbugs.gnu.org; Mon, 13 Feb 2023 20:56:37 -0500 Received: from mail-qv1-f45.google.com ([209.85.219.45]:34492) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRkYZ-0007Uc-6Z for 32026@debbugs.gnu.org; Mon, 13 Feb 2023 20:56:32 -0500 Received: by mail-qv1-f45.google.com with SMTP id nd22so6990593qvb.1 for <32026@debbugs.gnu.org>; Mon, 13 Feb 2023 17:56:31 -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=m8GBX1C8X5XeV2N47GOZCXGA9gvfT0E1SElEB8ST+cs=; b=p/wXFkzDq0krxQXqsK4uBlaG/tYAHhv06BH/9q/MrDb+UA4QMOsApCYOOmNyFyD9Ps 4UdzX5NxXZ+hVYZ3FZC1U0/kCN3oYR5eH9Httn22WYRggJyTO85hSD9wiwHd9ud1uvce O3OeVFz6g7NfjNJCP72q7caqMhS2KzNOPSoXQsAhgMUe6dB7eybEPa0rJ8STRi74wv7o p46qlIJc3ZZaO/IOuZgNx829K90IZLQd4XTCUOswtzgIilzDMjOLdUIzl2hfjiM+mpd1 YenD++neGTN5RmEWxgl4H1GjgkkEzrovemv5x5uep1UW+VfkPbjJkktCZdmif4uCNUVK tmUw== 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=m8GBX1C8X5XeV2N47GOZCXGA9gvfT0E1SElEB8ST+cs=; b=Y/kcjXOgkjoH/7L2MsTFXSemQvH+RjBOxiID466t3wsEpQVstkVbnbztaZhqpAmvQW BPhVmjWpy8Bgcf6wnWWOi8jTKBy13k9ynmB0Cs/HWx/h2uBE7AkpKk6XfBtpGe9k6HxB RN1pNJLTDEIcKMW803X4zL36/He86M0rK1/QY5D6Jfs7bvdQgDrn/GxZv3ZL7bMWySJP sTLsWnlPWQG4KzMwf/pLMiZdRyWvxuIzpTtscq59ukx9KZfwm3/GibZuE84VbWFsQEHg 0+89NsO7Ry52p15l1sdObR4TmswqsqX0DLcY9g5Zzw1avZRd5Ltr3N3tcpIS6jrgkuV0 G2RQ== X-Gm-Message-State: AO0yUKW2EvIla63BHqizlstGqH1bzqvyHACBsVLYV1aVxVwVCdlCiCKy JTxzdMxNPDbySwfsgF7Gpw54JHPWWzU9JisM X-Google-Smtp-Source: AK7set+/OOWdLQVgaeY2u40YPl1iparweKiqs98ZFr1GvNcEsSXm5GnTdAW4qdw0WH8EO54wZ547dg== X-Received: by 2002:a05:6214:2aa2:b0:56e:bb5b:3dfc with SMTP id js2-20020a0562142aa200b0056ebb5b3dfcmr1409974qvb.38.1676339785500; Mon, 13 Feb 2023 17:56:25 -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.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Feb 2023 17:56:25 -0800 (PST) From: Maxim Cournoyer Date: Mon, 13 Feb 2023 20:55:50 -0500 Message-Id: <20230214015555.8643-6-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-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/patches/icecat-reproducible-langpacks.patch: New file. * gnu/local.mk (dist_patch_DATA): Register. it. * gnu/packages/gnuzilla.scm (icecat-source): Apply it. --- gnu/local.mk | 1 + gnu/packages/gnuzilla.scm | 1 + .../icecat-reproducible-langpacks.patch | 43 +++++++++++++++++++ 3 files changed, 45 insertions(+) create mode 100644 gnu/packages/patches/icecat-reproducible-langpacks.patch diff --git a/gnu/local.mk b/gnu/local.mk index cdb99813d0..96787661ac 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1327,6 +1327,7 @@ dist_patch_DATA = \ %D%/packages/patches/i7z-gcc-10.patch \ %D%/packages/patches/icecat-makeicecat.patch \ %D%/packages/patches/icecat-avoid-bundled-libraries.patch \ + %D%/packages/patches/icecat-reproducible-langpacks.patch \ %D%/packages/patches/icecat-use-system-graphite2+harfbuzz.patch \ %D%/packages/patches/icecat-use-system-media-libs.patch \ %D%/packages/patches/icedtea-7-hotspot-aarch64-use-c++98.patch\ diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 28cb16554d..db7ca5ceb2 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -554,6 +554,7 @@ (define icecat-source (method computed-origin-method) (file-name (string-append "icecat-" %icecat-version ".tar.xz")) (sha256 #f) + (patches (search-patches "icecat-reproducible-langpacks.patch")) (uri (delay (with-imported-modules '((guix build utils)) diff --git a/gnu/packages/patches/icecat-reproducible-langpacks.patch b/gnu/packages/patches/icecat-reproducible-langpacks.patch new file mode 100644 index 0000000000..376345d085 --- /dev/null +++ b/gnu/packages/patches/icecat-reproducible-langpacks.patch @@ -0,0 +1,43 @@ +Prevent the extension manifests from embedding the current date. + +This is inspired by the Debian +"Use-build-id-as-langpack-version-for-reproducibility.patch" maintained for +their Firefox package as well as reproducible-builds.org guidelines from +https://reproducible-builds.org/docs/source-date-epoch/. + +--- ./python/mozbuild/mozbuild/action/langpack_manifest.py.old 2023-02-13 11:01:21.051537347 -0500 ++++ ./python/mozbuild/mozbuild/action/langpack_manifest.py 2023-02-13 11:04:33.141817330 -0500 +@@ -36,6 +36,15 @@ + pushlog_api_url = "{0}/json-rev/{1}" + + ++import os ++import time ++import datetime ++ ++def get_build_date(): ++ """Honor SOURCE_DATE_EPOCH for reproducibility.""" ++ return datetime.datetime.utcfromtimestamp( ++ int(os.environ.get('SOURCE_DATE_EPOCH', time.time()))) ++ + ### + # Retrievers a UTC datetime of the push for the current commit + # from a mercurial clone directory. +@@ -54,7 +63,7 @@ + with mozversioncontrol.get_repository_object(path=path) as repo: + phase = repo._run("log", "-r", ".", "-T" "{phase}") + if phase.strip() != "public": +- return datetime.datetime.utcnow() ++ return get_build_date() + repo_url = repo._run("paths", "default") + repo_url = repo_url.strip().replace("ssh://", "https://") + repo_url = repo_url.replace("hg://", "https://") +@@ -105,7 +114,7 @@ + dt = get_dt_from_hg(path) + + if dt is None: +- dt = datetime.datetime.utcnow() ++ dt = get_build_date() + + dt = dt.replace(microsecond=0) + return dt.strftime("%Y%m%d%H%M%S") -- 2.39.1 From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH 06/10] gnu: Add icecat-l10n and icedove-l10n. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Tue, 14 Feb 2023 01:57:04 +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, Jonathan Brielmaier , Maxim Cournoyer Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.167633979828904 (code B ref 32026); Tue, 14 Feb 2023 01:57:04 +0000 Received: (at 32026) by debbugs.gnu.org; 14 Feb 2023 01:56:38 +0000 Received: from localhost ([127.0.0.1]:52065 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRkYf-0007W2-BG for submit@debbugs.gnu.org; Mon, 13 Feb 2023 20:56:38 -0500 Received: from mail-qt1-f169.google.com ([209.85.160.169]:43004) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRkYb-0007Uy-9k for 32026@debbugs.gnu.org; Mon, 13 Feb 2023 20:56:34 -0500 Received: by mail-qt1-f169.google.com with SMTP id 5so16073334qtp.9 for <32026@debbugs.gnu.org>; Mon, 13 Feb 2023 17:56:33 -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=32sjDwXvy22m8tQDs7s+aN1UxuNe4MMt7+OlOANAi54=; b=JoL+m7vQCeGc40aVEpWFhW4OH78i9GIKh1IfNl8GKt5ShTULnPtrP13sFhHcaz9kiq 4XkMSn/v78zmYfyKHZhvR4shWXxRg1rbAOPsSo2RoNIpByjyvYKYsO4CHQfD7l2ibnaD Zop83b48sFppiyoRrkAXcYUqAHIANNeruBsuDSV+jIz4SDABAvdsapcI66xEMQSQQVPh G1MIeVJDoZgVP306vGbxQE1jjn3M+oZx+HPX+a53/9S2draGHf4vMVBX5/wnxmHzHwRl RrMUh1xnahg84zfvi2myOffSkaHL5rwhY5Ql1EhY9QCFoWO9EVpz2TZ25GZE7w0EDFdB lU4w== 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=32sjDwXvy22m8tQDs7s+aN1UxuNe4MMt7+OlOANAi54=; b=n+4V1qj52KUuRUMFyo7+4YLOPkr5K8VjjbKubXCARo3h+PhdpWQtIcOnhvZszdo4Ny KFZsd7qlpTjf+chwslPXTw2mOZzo0m3KuDl+32YydFe31OPyRVuI7p7H3E8biiCgN69x 7OFV++XTfOT3nqE7hI2nJ9CDx396yZW/THPaLE7TJsokFhgGt0VnGIHWZspg3fCP1FB1 prGjEhScpHgpV+7X5COCUIWUCWBlZitgJ+NiuqxNxINvjUpE7EVQBJBNKfCyOubP+px7 C3u7ntLlSgw045Yonm2vKDQ/VhiCifuzTXwhfcO2UQumfDAvUewqtzy+oTMQn6eGuTIU UzxA== X-Gm-Message-State: AO0yUKVO3uOVcgFSwj3hRP+cBZWlTpSawHpvDt86TK2BhWDpsWh1viwR 5NM99vYxseDTrZwYMIcrDWw1aFWd6yyrC5aS X-Google-Smtp-Source: AK7set9NowKesR1zOKqIx/+XtHJoo+vu+7KsdJ6rimj+XvqBvkPLpmyU3i43TzIr/xMiYbWO9ptmyQ== X-Received: by 2002:a05:622a:1cf:b0:3b6:30ac:e887 with SMTP id t15-20020a05622a01cf00b003b630ace887mr968007qtw.64.1676339787552; Mon, 13 Feb 2023 17:56:27 -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.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Feb 2023 17:56:27 -0800 (PST) From: Maxim Cournoyer Date: Mon, 13 Feb 2023 20:55:51 -0500 Message-Id: <20230214015555.8643-7-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-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gnuzilla.scm (%icecat-locales, %icedove-locales): New variable. (make-l10n-package): New procedure. (icecat-l10n, icedove-l10n): New variables. --- gnu/packages/gnuzilla.scm | 146 +++++++++++++++++++++++++++++++++++++- 1 file changed, 145 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index db7ca5ceb2..d7c4d6013c 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -17,7 +17,7 @@ ;;; Copyright © 2020, 2022 Marius Bakke ;;; Copyright © 2021 Brice Waegeneire ;;; Copyright © 2021 Maxime Devos -;;; Copyright © 2021, 2022 Maxim Cournoyer +;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer ;;; Copyright © 2021 Baptiste Strazzul ;;; ;;; This file is part of GNU Guix. @@ -1124,6 +1124,16 @@ (define (runpaths-of-input label) (cpe-name . "firefox_esr") (cpe-version . ,(first (string-split version #\-))))))) +(define %icecat-locales + '("ach" "af" "an" "ar" "ast" "az" "be" "bg" "bn" "br" "bs" "ca" "cak" + "ca-valencia" "cs" "cy" "da" "de" "dsb" "el" "en-CA" "en-GB" "eo" "es-AR" + "es-CL" "es-ES" "es-MX" "et" "eu" "fa" "ff" "fi" "fr" "fy-NL" "ga-IE" "gd" + "gl" "gn" "gu-IN" "he" "hi-IN" "hr" "hsb" "hu" "hy-AM" "ia" "id" "is" "it" + "ja" "ja-JP-mac" "ka" "kab" "kk" "km" "kn" "ko" "lij" "lt" "lv" "mk" "mr" "ms" + "my" "nb-NO" "ne-NP" "nl" "nn-NO" "oc" "pa-IN" "pl" "pt-BR" "pt-PT" "rm" "ro" + "ru" "sco" "si" "sk" "sl" "son" "sq" "sr" "sv-SE" "szl" "ta" "te" "th" "tl" + "tr" "trs" "uk" "ur" "uz" "vi" "xh" "zh-CN" "zh-TW")) + (define %icedove-build-id "20230207000000") ;must be of the form YYYYMMDDhhmmss (define %icedove-version "102.7.2") @@ -1148,6 +1158,15 @@ (define (comm-source->locales+changset source) (((_ changeset locale) ...) (values locale (first changeset))))) +;;; Generated with comm-source->locales+changeset. +(define %icedove-locales + '("af" "ar" "ast" "be" "bg" "br" "ca" "cak" "cs" "cy" "da" "de" "dsb" "el" + "en-CA" "en-GB" "es-AR" "es-ES" "es-MX" "et" "eu" "fi" "fr" "fy-NL" "ga-IE" + "gd" "gl" "he" "hr" "hsb" "hu" "hy-AM" "id" "is" "it" "ja" "ja-JP-mac" "ka" + "kab" "kk" "ko" "lt" "lv" "ms" "nb-NO" "nl" "nn-NO" "pa-IN" "pl" "pt-BR" + "pt-PT" "rm" "ro" "ru" "sk" "sl" "sq" "sr" "sv-SE" "th" "tr" "uk" "uz" "vi" + "zh-CN" "zh-TW")) + ;;; To find out which changeset to use for the comm-l10n repo, use the ;;; 'comm-source->locales+changeset' procedure on the thunderbird-comm-source ;;; checkout directory. The complete localization data will be released as a @@ -1556,6 +1575,131 @@ (define-public icedove/wayland (native-inputs '()) (inputs '()))) +(define (make-l10n-package project) + "Return a package for PROJECT, a symbol (either icecat or icedove). +It assumes the %PROJECT-VERSION, PROJECT-SOURCE and %PROJECT-LOCALES variables +already exist." + (unless (member project '(icecat icedove)) + (error "only icecat or icedove components are currently supported")) + + (let ((name (if (eq? 'icecat project) + "IceCat" + "Icedove"))) + + (package + (name (format #f "~a-l10n" project)) + (version (module-ref (current-module) + (symbol-append '% project '-version))) + (source (module-ref (current-module) + (symbol-append project '-source))) + (outputs (cons "out" (module-ref (current-module) + (symbol-append '% project '-locales)))) + (build-system gnu-build-system) + (arguments + (list + #:modules '((guix build gnu-build-system) + (guix build utils) + (ice-9 format) + (ice-9 ftw) + (srfi srfi-1) + (srfi srfi-26)) + #:tests? #f ;no tests, this is data + #:phases + #~(modify-phases %standard-phases + (delete 'bootstrap) + (delete 'install) + (replace 'configure + (lambda _ + ;; The following configuration is inspired by guidance at + ;; https://firefox-source-docs.mozilla.org/build/buildsystem/locales.html. + (call-with-output-file ".mozconfig" + (lambda (p) + (format p "~{~a~%~}" + (list (if (eq? 'icecat '#$project) + "ac_add_options --enable-project=browser" + "ac_add_options --enable-project=comm/mail") + "ac_add_options --disable-compile-environment" + (string-append + "ac_add_options --with-l10n-base=" + (getcwd) "/l10n") + ;; Hack, otherwise the build system throws: + ;; 'RuntimeError: File "brand.dtd" not found'. + "ac_add_options --enable-official-branding" + "mk_add_options MOZ_OBJDIR=obj")))) + (setenv "CONFIG_SHELL" (which "bash")) + (setenv "MOZBUILD_STATE_PATH" + (string-append (getcwd) "/mach_state")) + (setenv "MOZCONFIG" (string-append (getcwd) "/.mozconfig")) + (setenv "MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE" "system") + (setenv "BUILD_BACKENDS" "FasterMake,RecursiveMake"))) + (replace 'build ;build and install data files + (lambda* (#:key outputs #:allow-other-keys) + (define (find-file dir name) + (let ((files (find-files dir name))) + (when (null? files) + (error "could not find file in dir" name dir)) + (car files))) + + (for-each + (lambda (l) + (let* ((out (assoc-ref outputs l)) + ;; The older lib/$project/distribution/extensions + ;; directory is deprecated. Use the newer app-global + ;; directory, which is lib/$project/extensions. + (ext-dir-prefix + (format + #f "lib/~a/~:[~;browser/~]extensions" + '#$project (eq? 'icecat '#$project))) + (all-ext (string-append #$output "/" ext-dir-prefix)) + (ext-dir (string-append out "/" ext-dir-prefix)) + ;; XXX: Because Icedove doesn't have a makeicedove + ;; script that substitutes all the Thunderbird + ;; references to Icedove, the MOZ_LANGPACK_EID + ;; defined in comm/mail/locales/Makefile.in uses + ;; 'thunderbird' in its ID extension rather than + ;; 'icedove'. + (name (format #f "langpack-~a@~a.mozilla.org.xpi" + l (if (eq? 'icedove '#$project) + 'thunderbird + '#$project)))) + (format #t "processing locale `~a'...~%" l) + (if (eq? 'icecat '#$project) + ;; XXX: For some reasons, for IceCat, there are some + ;; parsing errors that cause the build system to + ;; return an unclean exit code; use system* to ignore + ;; errors. + (system* "./mach" "build" (string-append "langpack-" l)) + (invoke "./mach" "build" (string-append "langpack-" l))) + (mkdir-p ext-dir) + (let ((xpi (find-file "obj" (string-append + "\\." l "\\.langpack\\.xpi$")))) + (copy-file xpi (string-append ext-dir "/" name)) + ;; Symlink to the main output so that a user can + ;; install all of the language packs at once. + (mkdir-p all-ext) + (symlink (string-append ext-dir "/" name) + (string-append all-ext "/" name))))) + (if (eq? 'icedove '#$project) + '#$%icedove-locales + '#$%icecat-locales))))))) + (native-inputs + (list m4 + perl + python-wrapper + node + unzip)) + (home-page "https://www.mozilla.org/") + (synopsis (string-append "Language localization data for " name)) + (description (string-append "This package contains the various language +localization data files (language pack extensions) for " name ". The +individual localization packages can be installed by using the output +associated with their name.")) + (license license:mpl2.0)))) + +(define-public icecat-l10n (make-l10n-package 'icecat)) + +(define-public icedove-l10n (make-l10n-package 'icedove)) + (define-public firefox-decrypt (package (name "firefox-decrypt") -- 2.39.1 From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH 08/10] gnu: Add language packs to icecat and icedove. 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, Jonathan Brielmaier , Maxim Cournoyer Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.167633980528934 (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]:52070 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRkYm-0007Wa-9r for submit@debbugs.gnu.org; Mon, 13 Feb 2023 20:56:44 -0500 Received: from mail-qt1-f169.google.com ([209.85.160.169]:37685) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRkYf-0007VT-GR for 32026@debbugs.gnu.org; Mon, 13 Feb 2023 20:56:38 -0500 Received: by mail-qt1-f169.google.com with SMTP id m12so16092855qth.4 for <32026@debbugs.gnu.org>; Mon, 13 Feb 2023 17:56:37 -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=t9QdyA+wihyTJMMBmgbIX/HzUlMYg78Q80MTZdKCPsU=; b=pZnwCIcf/7RK50MYnz6LMYPSZQC5n96fWYPpmSj3MuTZLPDSMOtUzEVEOJuOKCN3E7 T/+sRCOi3NmD2zP+CUIDd9J3SndeMUdEldCZpm3BWmz1No90wr5zc+fp7SwcOI59nWZw +olX0nPIiT2EAbyfty+LGsUosBwDwxgv/DJLfRWk2PZC9ADiZ9aiJZdXCOqiO50JSbhV 8ugb/P2uFRbqeeQci2sVTDoRytLDx1AJZppDCm48Rs3g1CyU548CVrjdcKMaXLEUjEcy C9TDFvX/v212dKtBBKkqR7u7eVrnBf5ucJRV0gPPVbP8DoCmxsDcHKTxtfe8wnszxQx0 2PpQ== 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=t9QdyA+wihyTJMMBmgbIX/HzUlMYg78Q80MTZdKCPsU=; b=r9EtDBDFSgoBEBIxXLApSGyejKZA+3JWe94i+pnXYCvRLdw6D3eFlBTbV3ZMbcAgLG 5YaIDqA+3J+cu47AyhFT2azGptKBmzPyOsudcKz8gkVKyyqIFkcWL/BEmiwXukNme2UF 56VmLjkiqNRFir8XnCdKQvQVFFVHj2urxsECbjLqfUSMNiUYC9uRNimx5S2C9LACKBjd cc4gdLD9EFqDRA19yHePLpw6eWL3WN03FCMzBG6857baTqU1YVeSfiJiVQdqgflmdlsg d8dUiPJCKN2y9Do74XLUdEKKxJegfTyaQ4EY82tdSxy9qv7+xQ24I4Y+YLKMFTu1InEz Y/3Q== X-Gm-Message-State: AO0yUKVjjw2V4lCqODahClmH/t6Iu2FEa9BOjLm7MWkkwmTXQoMwoQzL 8St1cqqtEOCRbO/Fg83FNNse41rS5geb/zsh X-Google-Smtp-Source: AK7set9GQ3MW9AHWr4Y7h/nAQFaf8M2xgbcQv333ukBMa1u5NTLF5jJ+d2QqIbiq0PgzfsGQo7aBzA== X-Received: by 2002:a05:622a:11c4:b0:3b8:57a7:7836 with SMTP id n4-20020a05622a11c400b003b857a77836mr1016472qtk.46.1676339791880; Mon, 13 Feb 2023 17:56:31 -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.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Feb 2023 17:56:31 -0800 (PST) From: Maxim Cournoyer Date: Mon, 13 Feb 2023 20:55:53 -0500 Message-Id: <20230214015555.8643-9-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-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Fixes . * gnu/packages/gnuzilla.scm (icecat): Rename to... (icecat-minimal): ... this. (icedove: Rename to... (icedove-minimal): ... this. (make-mozilla-with-l10n): New procedure. (icecat, icedove): New variables. --- gnu/packages/gnuzilla.scm | 135 ++++++++++++++++++++++++++++---------- 1 file changed, 100 insertions(+), 35 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 2c83323c64..05f96c9622 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -680,9 +680,9 @@ (define icecat-source "--sort=name" icecat-dir))))))))) -(define-public icecat +(define-public icecat-minimal (package - (name "icecat") + (name "icecat-minimal") (version %icecat-version) (source icecat-source) (build-system gnu-build-system) @@ -1304,9 +1304,9 @@ (define icedove-source "--sort=name" #$name)))))))) -(define-public icedove +(define-public icedove-minimal (package - (name "icedove") + (name "icedove-minimal") (version %icedove-version) (source icedove-source) (properties @@ -1556,35 +1556,6 @@ (define-public icedove Thunderbird. It supports email, news feeds, chat, calendar and contacts.") (license license:mpl2.0))) -(define-public icedove/wayland - (package - (inherit icedove) - (name "icedove-wayland") - (build-system trivial-build-system) - (arguments - (list - #:modules '((guix build utils)) - #:builder - #~(begin - (use-modules (guix build utils)) - (let* ((exe (string-append #$output "/bin/icedove"))) - (mkdir-p (dirname exe)) - (call-with-output-file exe - (lambda (port) - (format port "#!~a - MOZ_ENABLE_WAYLAND=1 exec ~a $@" - #$(file-append bash-minimal "/bin/bash") - #$(file-append icedove "/bin/icedove")))) - (chmod exe #o555) - ;; Provide the manual and .desktop file. - (copy-recursively (string-append #$icedove "/share") - (string-append #$output "/share")) - (substitute* (string-append #$output - "/share/applications/icedove.desktop") - ((#$icedove) #$output)))))) - (native-inputs '()) - (inputs '()))) - (define (make-l10n-package project) "Return a package for PROJECT, a symbol (either icecat or icedove). It assumes the %PROJECT-VERSION, PROJECT-SOURCE and %PROJECT-LOCALES variables @@ -1706,9 +1677,103 @@ (define (find-file dir name) associated with their name.")) (license license:mpl2.0)))) -(define-public icecat-l10n (make-l10n-package 'icecat)) +(define icecat-l10n (make-l10n-package 'icecat)) + +(define icedove-l10n (make-l10n-package 'icedove)) + +;;; This hack exists because there's no way to configure extra extension +;;; search paths for IceCat or Icedove. The global extensions directory is +;;; constructed relatively to the executable file name. +(define (make-mozilla-with-l10n project) + (let ((base (module-ref (current-module) + (symbol-append project '-minimal))) + (l10n-package (module-ref (current-module) + (symbol-append project '-l10n))) + (name (symbol->string project)) + (icecat? (eq? 'icecat project))) + (package + (inherit base) + (name (symbol->string project)) + (build-system trivial-build-system) + (arguments + (list + #:modules '((guix build union) + (guix build utils)) + #:builder + #~(begin + (use-modules (guix build union) + (guix build utils)) + + (union-build #$output (list #$base #$l10n-package) + #:create-all-directories? #t) + + (define* (expose name #:optional (proc copy-file) + #:key (source #$base)) + (let ((dest (string-append #$output "/" name))) + (mkdir-p (dirname dest)) + (proc (string-append source "/" name) dest))) + + (let ((wrapper (string-append "lib/" #$name "/" #$name)) + (real-binary (string-append "lib/" #$name "/." #$name + "-real")) + (desktop-file (string-append "share/applications/" + #$name ".desktop"))) + ;; Copy wrapper file. + (delete-file (string-append #$output "/" wrapper)) + (expose wrapper) + + ;; Recreate bin symlink. + (delete-file (string-append #$output "/bin/" #$name)) + (symlink (string-append #$output "/" wrapper) + (string-append #$output "/bin/" #$name)) + + ;; Copy actual binary. + (delete-file (string-append #$output "/" real-binary)) + (expose real-binary) + + ;; Copy desktop file. + (delete-file (string-append #$output "/" desktop-file)) + (expose desktop-file) + + ;; Adjust the references in the desktop file and wrapper. + (substitute* (list (string-append #$output "/" desktop-file) + (string-append #$output "/" wrapper)) + ((#$base) #$output)))))) + (native-inputs '()) + (inputs '())))) + +(define-public icecat (make-mozilla-with-l10n 'icecat)) + +(define-public icedove (make-mozilla-with-l10n 'icedove)) -(define-public icedove-l10n (make-l10n-package 'icedove)) +(define-public icedove/wayland + (package + (inherit icedove) + (name "icedove-wayland") + (build-system trivial-build-system) + (arguments + (list + #:modules '((guix build utils)) + #:builder + #~(begin + (use-modules (guix build utils)) + (let* ((exe (string-append #$output "/bin/icedove"))) + (mkdir-p (dirname exe)) + (call-with-output-file exe + (lambda (port) + (format port "#!~a + MOZ_ENABLE_WAYLAND=1 exec ~a $@" + #$(file-append bash-minimal "/bin/bash") + #$(file-append icedove "/bin/icedove")))) + (chmod exe #o555) + ;; Provide the manual and .desktop file. + (copy-recursively (string-append #$icedove "/share") + (string-append #$output "/share")) + (substitute* (string-append #$output + "/share/applications/icedove.desktop") + ((#$icedove) #$output)))))) + (native-inputs '()) + (inputs '()))) (define-public firefox-decrypt (package -- 2.39.1 From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH 09/10] gnu: icedove: 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, Jonathan Brielmaier , Maxim Cournoyer Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.167633980528941 (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]:52072 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRkYm-0007Wd-Tp for submit@debbugs.gnu.org; Mon, 13 Feb 2023 20:56:45 -0500 Received: from mail-qt1-f174.google.com ([209.85.160.174]:41930) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRkYh-0007Vj-9Y for 32026@debbugs.gnu.org; Mon, 13 Feb 2023 20:56:39 -0500 Received: by mail-qt1-f174.google.com with SMTP id z5so16064612qtn.8 for <32026@debbugs.gnu.org>; Mon, 13 Feb 2023 17:56:39 -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=Gm1XSOyXvLTE2yCsknWNGf2PW7RJ6W/3wYvuad3Irq4=; b=Z6Y+gFUI5XROHGRrcCr9f44gRz/Qo7mPF/egz1sGSGX3xSSLxLR97xgCw3N5C7p7Y+ suqBe4HyupPG9nVxT8XwgZiwib9pYHZuIyxaO1ziyhwfVwDlaZW9kW2XxABG++qJxA/4 wckT1dUGuiPwIKvrHWh45OmAaKzM9UM2oL0HJEvtuNTLQRD6kXCeEeMsCP1xHpCbsIf1 +n29MaEAmz2q4VT02BJPjMyEcuybDSpDdWcnXQYRzfKL1yMZBXeDcimzq4Gyl7/sccLn WKUROaThe5h7w5vdsRgO9PGH2fBtdSWQoHDIyQTg3Q6lo8BKhtLzy4PseQGRQpHy4s7z SiqQ== 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=Gm1XSOyXvLTE2yCsknWNGf2PW7RJ6W/3wYvuad3Irq4=; b=CEabPs+ACGhZ9JR9rs9DqDrq5qg1kciPOP+YVVeegURtJIngt7afMh7v4a/WvOhfiN 1yIvzATZi4DtludSvmHumCuU8SsyP+5NdP5TevuQuyDaUDJR3MK5fxEsJeBMOEyIgr97 YAMxZNujtfd0lfra4bE4n+ROZ3YiCYi4rnMGTI/zi+azXFSBApxhzwzMkt23RNTHJ6dV 74S9YmhxdjWWk50KlvGv2uT5hk+ZveuT4Jgnl7y8N49IlxMchG/RrqNakBJb6+xqhS3Y nBo8rml5rez7d0OUyjfSn4ZUcD7h5HlQfqHDYpJ47j3XuXnpOJQb6IEg1wauelvH+aQa IeLQ== X-Gm-Message-State: AO0yUKVaESZmukTsFQH9ZvfZbnPeBvEus5KSrA+sAv3csPWvyl5gP7ZO NasQmLZHq97PZSW6hzeTFYBpIh3FsSGuKi0L X-Google-Smtp-Source: AK7set9fcGgVTiAweAOrgMwDYyf/aAPw6U/qkNV1G2mFIMJ/HF08dA3g8AgS1MDnLLf55jM2F0cv3w== X-Received: by 2002:ac8:5a8d:0:b0:3af:ba3b:db80 with SMTP id c13-20020ac85a8d000000b003afba3bdb80mr912484qtc.33.1676339793614; Mon, 13 Feb 2023 17:56:33 -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.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Feb 2023 17:56:33 -0800 (PST) From: Maxim Cournoyer Date: Mon, 13 Feb 2023 20:55:54 -0500 Message-Id: <20230214015555.8643-10-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-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gnuzilla.scm (icedove-source): Set the intl.locale.requested option to the empty string. --- gnu/packages/gnuzilla.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 05f96c9622..f2ae8f72a9 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1290,7 +1290,12 @@ (define icedove-source ;; system global application directory, such as the language ;; packs. (("\"extensions.autoDisableScopes\", 15") - "\"extensions.autoDisableScopes\", 3")) + "\"extensions.autoDisableScopes\", 3") + + ;; Set the default locale to that of the operating system. + ((".*extensions.autoDisableScopes.*" anchor) + (string-append anchor + "pref(\"intl.locale.requested\", \"\");\n"))) ;; Step out of the directory and create the tarball. (chdir "..") -- 2.39.1 From unknown Tue Sep 09 00:44:18 2025 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-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH 05/10] gnu: icecat: Add a patch that makes building language packs reproducible. Resent-From: Mark H Weaver Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Tue, 14 Feb 2023 08:00:02 +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: Maxim Cournoyer , 32026@debbugs.gnu.org Cc: ludo@gnu.org, Jonathan Brielmaier , Maxim Cournoyer Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.167636156622258 (code B ref 32026); Tue, 14 Feb 2023 08:00:02 +0000 Received: (at 32026) by debbugs.gnu.org; 14 Feb 2023 07:59:26 +0000 Received: from localhost ([127.0.0.1]:52414 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRqDm-0005mw-HM for submit@debbugs.gnu.org; Tue, 14 Feb 2023 02:59:26 -0500 Received: from world.peace.net ([64.112.178.59]:34982) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRqDk-0005mi-Lu for 32026@debbugs.gnu.org; Tue, 14 Feb 2023 02:59:25 -0500 Received: from mhw by world.peace.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pRqDa-0004sa-FP; Tue, 14 Feb 2023 02:59:14 -0500 From: Mark H Weaver In-Reply-To: <20230214015555.8643-6-maxim.cournoyer@gmail.com> References: <20230214015555.8643-1-maxim.cournoyer@gmail.com> <20230214015555.8643-6-maxim.cournoyer@gmail.com> Date: Tue, 14 Feb 2023 02:58:21 -0500 Message-ID: <87mt5g7k5j.fsf@netris.org> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Maxim, Maxim Cournoyer writes: > * gnu/packages/patches/icecat-reproducible-langpacks.patch: New file. > * gnu/local.mk (dist_patch_DATA): Register. it. > * gnu/packages/gnuzilla.scm (icecat-source): Apply it. Let's make this change in upstream IceCat instead of in Guix. What do you think? Thanks, Mark From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH 10/10] gnu: icecat: Use the locale of the system. Resent-From: Mark H Weaver Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Tue, 14 Feb 2023 09:25:01 +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: Maxim Cournoyer , 32026@debbugs.gnu.org Cc: ludo@gnu.org, Maxim Cournoyer Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.167636667231229 (code B ref 32026); Tue, 14 Feb 2023 09:25:01 +0000 Received: (at 32026) by debbugs.gnu.org; 14 Feb 2023 09:24:32 +0000 Received: from localhost ([127.0.0.1]:52560 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRrY7-00087d-ON for submit@debbugs.gnu.org; Tue, 14 Feb 2023 04:24:31 -0500 Received: from world.peace.net ([64.112.178.59]:36570) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRrY5-00087R-Um for 32026@debbugs.gnu.org; Tue, 14 Feb 2023 04:24:30 -0500 Received: from mhw by world.peace.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pRrXy-0008C1-FW; Tue, 14 Feb 2023 04:24:22 -0500 From: Mark H Weaver In-Reply-To: <20230214015555.8643-11-maxim.cournoyer@gmail.com> References: <20230214015555.8643-1-maxim.cournoyer@gmail.com> <20230214015555.8643-11-maxim.cournoyer@gmail.com> Date: Tue, 14 Feb 2023 04:23:30 -0500 Message-ID: <87ilg47g7m.fsf@netris.org> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Maxim, Maxim Cournoyer writes: > * gnu/packages/patches/icecat-makeicecat.patch: Set the intl.locale.requested > option to the empty string. Let's fix this in upstream IceCat. I see that you've already posted a proposed patch to bug-gnuzilla. I'll followup there. Thanks! Mark From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH 05/10] gnu: icecat: Add a patch that makes building language packs reproducible. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Tue, 14 Feb 2023 13:59:02 +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: Mark H Weaver Cc: 32026@debbugs.gnu.org, ludo@gnu.org, Jonathan Brielmaier Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.16763831415945 (code B ref 32026); Tue, 14 Feb 2023 13:59:02 +0000 Received: (at 32026) by debbugs.gnu.org; 14 Feb 2023 13:59:01 +0000 Received: from localhost ([127.0.0.1]:52936 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRvpk-0001Xo-WC for submit@debbugs.gnu.org; Tue, 14 Feb 2023 08:59:01 -0500 Received: from mail-qt1-f171.google.com ([209.85.160.171]:42844) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRvpj-0001Xa-IJ for 32026@debbugs.gnu.org; Tue, 14 Feb 2023 08:59:00 -0500 Received: by mail-qt1-f171.google.com with SMTP id 5so17411237qtp.9 for <32026@debbugs.gnu.org>; Tue, 14 Feb 2023 05:58:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=czlWgHxXmS7JUdUU/KyJ2goTgHpDP9dP7/5u8yftzOA=; b=la2z3G2IViWcY+uecn6/37vkc+mp7f9RZTYjaet9FTWXpW7q9kLBYn4ijPf1dBcQ7+ 96hW8ONmVizVl7MToy+0tmsGnwot9HdwsEuKzftqwYTgVQ5QE6fD8B0EXOX3onEI8RuX QPqegz5ZSBDssA+lXrDSQdH2tVYBsJUjJ41+OSYzASNYEVJDrTKhO6xtEUPfbi47XJ6n pU2xuveWo1lkMReUPjmPRSb9OqrPHS1tLjI5MrKwo65y7hqBgomm3x4JLf6FrdiDshZQ 3ZLxsbqwgll5A3HpvyHnQ8n6jkGhU63BcJeTlJMGg8rs6mX5Hzl9gmuDwgJ+nCOY2W1j Wz1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=czlWgHxXmS7JUdUU/KyJ2goTgHpDP9dP7/5u8yftzOA=; b=5womhzuurkfbJydl8kx75UvhGTWZNMmFXpRsUMnjRsg5jDOWsm0uo/uL0G6n1+05qD stXB9Zs4W41wsmRzMkHCYjaXHodP2x4XHs8k6CwaIzOSgpEmsLzU+tfeVQMZl9eXUASo 4KmLzzll3qdDEujm3D6YwzCDJ671cGu1d3LXKxGcYzp1KTVxkMsfxciuX/ITcsAQJpYx Et95w89+WUY6HFo0aOV8HnGLbzqf6PEE/Yaky9A7HlS92UdeifOCqK2/Ifk5Da7Y+IHg 0Ymvt5yRFlbCGC4CWQquLLefKPfWrRJi6EGEUXc4rev5scX6p6O5GwVn3/Xe2giNDPhr 5UjQ== X-Gm-Message-State: AO0yUKXlBSJ4uwe49xd1wvBMmMekXR0q888U2k0RKkQpY1g1ZOFzsyr9 GWmOjVgqr+7g906UNTmMluA= X-Google-Smtp-Source: AK7set8DWeJPGTIueIt0XLvHZBr/s5ngBwLPvtWFRF10qfQ98wWSS/XcSxzqCYFLYHgbGe3HT8cwMg== X-Received: by 2002:ac8:5788:0:b0:3ba:3409:4860 with SMTP id v8-20020ac85788000000b003ba34094860mr3730825qta.4.1676383133874; Tue, 14 Feb 2023 05:58:53 -0800 (PST) Received: from hurd (dsl-155-109.b2b2c.ca. [66.158.155.109]) by smtp.gmail.com with ESMTPSA id b20-20020ac86794000000b003b2957fb45bsm11329590qtp.8.2023.02.14.05.58.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Feb 2023 05:58:53 -0800 (PST) From: Maxim Cournoyer References: <20230214015555.8643-1-maxim.cournoyer@gmail.com> <20230214015555.8643-6-maxim.cournoyer@gmail.com> <87mt5g7k5j.fsf@netris.org> Date: Tue, 14 Feb 2023 08:58:52 -0500 In-Reply-To: <87mt5g7k5j.fsf@netris.org> (Mark H. Weaver's message of "Tue, 14 Feb 2023 02:58:21 -0500") Message-ID: <87cz6ccpr7.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Mark, Mark H Weaver writes: > Hi Maxim, > > Maxim Cournoyer writes: > >> * gnu/packages/patches/icecat-reproducible-langpacks.patch: New file. >> * gnu/local.mk (dist_patch_DATA): Register. it. >> * gnu/packages/gnuzilla.scm (icecat-source): Apply it. > > Let's make this change in upstream IceCat instead of in Guix. > What do you think? Or in Firefox upstream itself? I can check if they think it'd be reasonable to apply it there. -- Thanks, Maxim From unknown Tue Sep 09 00:44:18 2025 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 14:01:02 +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: Mark H Weaver Cc: 32026@debbugs.gnu.org, ludo@gnu.org Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.16763832276214 (code B ref 32026); Tue, 14 Feb 2023 14:01:02 +0000 Received: (at 32026) by debbugs.gnu.org; 14 Feb 2023 14:00:27 +0000 Received: from localhost ([127.0.0.1]:52942 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRvr9-0001c9-Dj for submit@debbugs.gnu.org; Tue, 14 Feb 2023 09:00:27 -0500 Received: from mail-qv1-f43.google.com ([209.85.219.43]:41945) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRvr6-0001bm-R8 for 32026@debbugs.gnu.org; Tue, 14 Feb 2023 09:00:25 -0500 Received: by mail-qv1-f43.google.com with SMTP id d13so10455297qvj.8 for <32026@debbugs.gnu.org>; Tue, 14 Feb 2023 06:00:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=pTfL5hBMMPJZRYxsw9uDw99Yjay7f8XuNoNXjpVjqD8=; b=Nff3Zviv7QhqlDKRMZbkDTO3LI8QFL/w76sB+fwz8mkgZYNjb/FrOS+tiCxXWraAeW 5YMJEKOF8z8QCyJ27fRyLd1pMrHP7rmGM60ix0uRA2D40LtGhjCB5Pr78dQapsJT7+H7 2Ako6z2VO2fyOZ66CZTW8Ss0CGWg01O1e73tNZ/IVewb4UegYoAGcQOUn5cdTBaZZQzP ufyafRNv9ML/iYcpTBfGebhlyWJVlMEDU+JePSPI3XuOvWqzhFjHyX+CmBgtjLxBU04b kNPIEea2YwtuobEJbym8qRymkwzB9Qavt6yGK2FehWllKz5gFOL0lDRFe0mCamgQLVB9 xMrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=pTfL5hBMMPJZRYxsw9uDw99Yjay7f8XuNoNXjpVjqD8=; b=0QbHw5jTIEN8VD2Rwzrpul3460YWBvBmyb645M5vRq1nG2TT3C5MQbupUsZX6p2kQB /W01eGXZbbARS4vypQTve/fXhq18qXTJ7UaoD/mTs+Visk7AoWwqV4jCSzgbsv1OUT0o k7IPiLyPn3bhkC2jbGec4uKd0tCf5xOQmDrjwUjFhTZszeYNNi6hVpRR/qOZjj+XY5GK HPK7XXXom1+uSmbfS8GTKAkBRnqRcOdvUyWJoWcZ7fGDPKLxPAt/xmKZH4yV5nB+5FXD fStsSqQEa+fLz4QyReW0opbSIl2zyHlGVNDd8IBdU5t2+TfH/OLr5ZHdNoPNdvUbcswX 26Hw== X-Gm-Message-State: AO0yUKUf4dNnKfBdRSKfT7fpfush71GzRy0kxHQirCllW4bU2f2XdJ2+ qfPIGSCiqE/pV34trd2UFzM= X-Google-Smtp-Source: AK7set8BxUetZ7d/b5vSTIzoX+kHQzs7lRcvSG+w0+IxRrYxyQMMMprBoNDHkQY/5Qry25yCVrqBaw== X-Received: by 2002:a05:6214:4102:b0:56e:a756:919 with SMTP id kc2-20020a056214410200b0056ea7560919mr4426313qvb.47.1676383219171; Tue, 14 Feb 2023 06:00:19 -0800 (PST) Received: from hurd (dsl-155-109.b2b2c.ca. [66.158.155.109]) by smtp.gmail.com with ESMTPSA id q205-20020a3743d6000000b0073b338b4eb1sm5215529qka.133.2023.02.14.06.00.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Feb 2023 06:00:18 -0800 (PST) From: Maxim Cournoyer References: <20230214015555.8643-1-maxim.cournoyer@gmail.com> <20230214015555.8643-11-maxim.cournoyer@gmail.com> <87ilg47g7m.fsf@netris.org> Date: Tue, 14 Feb 2023 09:00:17 -0500 In-Reply-To: <87ilg47g7m.fsf@netris.org> (Mark H. Weaver's message of "Tue, 14 Feb 2023 04:23:30 -0500") Message-ID: <878rh0cpou.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Mark, Mark H Weaver writes: > Hi Maxim, > > Maxim Cournoyer writes: >> * gnu/packages/patches/icecat-makeicecat.patch: Set the intl.locale.requested >> option to the empty string. > > Let's fix this in upstream IceCat. I see that you've already posted a > proposed patch to bug-gnuzilla. I'll followup there. Yes, the one I sent is the exact same, but applied to the gnuzilla tree instead. So this one is temporary until it appears upstream :-). -- Thanks, Maxim From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH 05/10] gnu: icecat: Add a patch that makes building language packs reproducible. Resent-From: Mark H Weaver Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Tue, 14 Feb 2023 21:08:02 +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: Maxim Cournoyer Cc: 32026@debbugs.gnu.org, ludo@gnu.org, Jonathan Brielmaier Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.167640882815078 (code B ref 32026); Tue, 14 Feb 2023 21:08:02 +0000 Received: (at 32026) by debbugs.gnu.org; 14 Feb 2023 21:07:08 +0000 Received: from localhost ([127.0.0.1]:57161 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pS2W3-0003v8-PX for submit@debbugs.gnu.org; Tue, 14 Feb 2023 16:07:08 -0500 Received: from world.peace.net ([64.112.178.59]:40782) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pS2W1-0003ud-Lf for 32026@debbugs.gnu.org; Tue, 14 Feb 2023 16:07:06 -0500 Received: from mhw by world.peace.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pS2Vt-0001S9-5D; Tue, 14 Feb 2023 16:06:57 -0500 From: Mark H Weaver In-Reply-To: <87cz6ccpr7.fsf@gmail.com> References: <20230214015555.8643-1-maxim.cournoyer@gmail.com> <20230214015555.8643-6-maxim.cournoyer@gmail.com> <87mt5g7k5j.fsf@netris.org> <87cz6ccpr7.fsf@gmail.com> Date: Tue, 14 Feb 2023 16:06:04 -0500 Message-ID: <87r0usnei0.fsf@netris.org> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Maxim, Maxim Cournoyer writes: > Mark H Weaver writes: > >> Maxim Cournoyer writes: >> >>> * gnu/packages/patches/icecat-reproducible-langpacks.patch: New file. >>> * gnu/local.mk (dist_patch_DATA): Register. it. >>> * gnu/packages/gnuzilla.scm (icecat-source): Apply it. >> >> Let's make this change in upstream IceCat instead of in Guix. >> What do you think? > > Or in Firefox upstream itself? I can check if they think it'd be > reasonable to apply it there. Sure, that would be even better. If they don't apply it to the ESR branch immediately, I can include the patch in upstream IceCat in the meantime. Thanks, Mark From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH 02/10] gnu: icedove: Compute a self-contained source. Resent-From: Jonathan Brielmaier Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Tue, 14 Feb 2023 21:33:02 +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: Maxim Cournoyer , 32026@debbugs.gnu.org Cc: mhw@netris.org, ludo@gnu.org Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.167641036317700 (code B ref 32026); Tue, 14 Feb 2023 21:33:02 +0000 Received: (at 32026) by debbugs.gnu.org; 14 Feb 2023 21:32:43 +0000 Received: from localhost ([127.0.0.1]:57187 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pS2up-0004bQ-A7 for submit@debbugs.gnu.org; Tue, 14 Feb 2023 16:32:43 -0500 Received: from mout.web.de ([212.227.17.12]:42169) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pS2un-0004bB-Lq for 32026@debbugs.gnu.org; Tue, 14 Feb 2023 16:32:42 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=s29768273; t=1676410354; bh=qeL/1RNK+BC+grBrTjoYYCeC1QDhhVo2h4eqq7AI9LE=; h=X-UI-Sender-Class:Date:Subject:To:Cc:References:From:In-Reply-To; b=ZK17b0+BIhbxKSm3qVd5C9CuzsM774VeTKgJ3/QuZMR7NfdBlxR5tUTLECB6F2oae CnNWoIv9A3ZNi+AntdBHc2L1+gS0fPBbEE3CbpCHi18NQPa0i2RGTxRZ2OXFpVu7QX 3Y7YTFtC6nvS5yuxLRpeejUDvBaDaH8EpMoMnTnm/QsR5l1TnzsITxZJWkOmItn+FU jsyA+CLHMC+g5skbF34ocyov9091jPJS3gZilT7VFqr/frLyH6eLZu9rKg2wh+N/cD nuSz7OgFYG8DPgXmAwsa0yMJS7/57khF4L9KpmuqZpbD00iBn1CRkP6p58TOvSc5JR rPP3SG5d2G9rw== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from [192.168.178.23] ([77.182.64.72]) by smtp.web.de (mrweb106 [213.165.67.124]) with ESMTPSA (Nemesis) id 1Melax-1otWuV2v6z-00akYn; Tue, 14 Feb 2023 22:32:34 +0100 Message-ID: Date: Tue, 14 Feb 2023 22:32:33 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.7.0 Content-Language: de-DE References: <20230214015555.8643-1-maxim.cournoyer@gmail.com> <20230214015555.8643-3-maxim.cournoyer@gmail.com> From: Jonathan Brielmaier In-Reply-To: <20230214015555.8643-3-maxim.cournoyer@gmail.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K1:zv5il32wmoCsyApNtM/WTW7HBKTDV4yhotJeVYQuf6DmAHvctwL j7AcA1ZRTIH0x+/q4VE4ug0wyf06XhJb6W2X7QseNKJfTV9dNbkrpH13VwTG0NTJScbndJ1 ZF7/yXUQyqUED3fPHr2qu/9Cugv+lrVvD1lY+C4I0kPutoQrYyeeQPtNdCCu4IrLuJom62s k2QjniQjCdkxopUiO6mfg== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:rttauW9DVpU=;psFuDhzvwd8FQJgragRhnEvzLaw EsxJmyzQjebXoL7EpVTdMsnBspjr+yse28CBDUVYNHb1pEBIUbVRTmEZLDOOf4xsTQlK2ug2s BGz7qgaPrirUyce46prL6UMW1S+f3XtEP2LA2rFxD7RXTkYHGaDRhah+/Oj2CFp5Yggq0NngT hjBi1oHtVdQhVqwDc+32DBBVdJICrWetH/+44dQGgdyLX7I5XEKMQOsj9Z91RAfhT5Xhdp0AU rXl4uKPDCDD5loPOG0tRPOzPkEjXgbBt5OcMxXudskjYCSO5CS/hGUG/oYJbsRGZ7hyX/ybOw +/BwaG5TfY4azrkDoYKGNrBpUeR+aPDNi5IP8GB4KPBZ1OVtao7I08I4NmNpuTr/Au8/gpelQ AwRz2w3XNzW1d8yZEu3hKoW87VEeEiaYK5AJIKUeXNq58KsNofOISC0vnN1DtzXGswnDxvTgT TFLSxo3UYE6b3OAAD4lZmNW4szehUTQMkPkuWcmNoEq9j2/+X9Dfi8GUfO2aLT+OmuZOh3Giz D1hnZTgnZAlty2ZNF95zzFG8NWzaDPgwSpo5805+qz1MzFMrZkb8F9E8oqvWIeK3vdgfZUzoc ozE/tHf0vJXZnBsezPLsZrdnkfZpqhudrRUqPan7mT4VyUpN91pA3W6WoSzbWxK4k/vsXMoGp cL9MVv3MFmjCX2+qLYndaU6PvGVtPj0CcpggBhLHMIsxgfUfsF7QNaiOK8Vu+82bZ3XtUf/Om c8gxa/uoXfGGB1kQE2obheU5cqY37fCrb2xzg0Ze63ft+Ty2gQejPSdErE4dEUh3f0w4D5JJt SvLGvXw+QQqifow0LLxm2Xo1Ltw0cZVxjjhYXOTUDzk/+nxyaWZabJKp620wUjiajhRZY44mT PNqZv0j8avfzOUR/QcDCt/fuUgg2k4LRnt6CpbQjFqOzDGF3AX0auvXNbZ8wiXnMfxsX3E/mN sksN8RoRxm25MTbUVJjtIvEp/AU= X-Spam-Score: -1.1 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.1 (--) On 14.02.23 02:55, Maxim Cournoyer wrote: > +;;; To find out which changeset to use for the comm-l10n repo, use the > +;;; 'comm-source->locales+changeset' procedure on the thunderbird-comm-source > +;;; checkout directory. The complete localization data will be released as a > +;;; tarball starting with 102.2.8 (see: > +;;; https://bugzilla.mozilla.org/show_bug.cgi?id=1810727). When this tarball Version 102.8.0 is it called. From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH 04/10] gnu: icecat: Update the "ach" locale. Resent-From: Mark H Weaver Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Wed, 15 Feb 2023 06:41:02 +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: Maxim Cournoyer , 32026@debbugs.gnu.org Cc: ludo@gnu.org, Jonathan Brielmaier , Maxim Cournoyer Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.16764432543959 (code B ref 32026); Wed, 15 Feb 2023 06:41:02 +0000 Received: (at 32026) by debbugs.gnu.org; 15 Feb 2023 06:40:54 +0000 Received: from localhost ([127.0.0.1]:57621 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSBTK-00011n-7y for submit@debbugs.gnu.org; Wed, 15 Feb 2023 01:40:54 -0500 Received: from world.peace.net ([64.112.178.59]:45518) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSBTI-00011Z-25 for 32026@debbugs.gnu.org; Wed, 15 Feb 2023 01:40:52 -0500 Received: from mhw by world.peace.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pSBTA-0001Ib-JD; Wed, 15 Feb 2023 01:40:44 -0500 From: Mark H Weaver In-Reply-To: <20230214015555.8643-5-maxim.cournoyer@gmail.com> References: <20230214015555.8643-1-maxim.cournoyer@gmail.com> <20230214015555.8643-5-maxim.cournoyer@gmail.com> Date: Wed, 15 Feb 2023 01:39:50 -0500 Message-ID: <87fsb7sa7i.fsf@netris.org> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 3.6 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi Maxim, Maxim Cournoyer writes: > The currently captured changeset didn't match what the manifest in the source > specifies. This was discovered by running 'update-mozilla-locales' [...] Content analysis details: (3.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_SBL_CSS RBL: Received via a relay in Spamhaus SBL-CSS [64.112.178.59 listed in zen.spamhaus.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.6 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi Maxim, Maxim Cournoyer writes: > The currently captured changeset didn't match what the manifest in the source > specifies. This was discovered by running 'update-mozilla-locales' [...] Content analysis details: (2.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_SBL_CSS RBL: Received via a relay in Spamhaus SBL-CSS [64.112.178.59 listed in zen.spamhaus.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager Hi Maxim, Maxim Cournoyer writes: > The currently captured changeset didn't match what the manifest in the source > specifies. This was discovered by running 'update-mozilla-locales'. > > * gnu/packages/gnuzilla.scm (all-mozilla-locales) [ach]: Update revision and > hash. I took the liberty of pushing this commit, with a slightly modified commit log, to the 'master' branch, together with the IceCat 102.8.0 update. It's commit c44149de9702743b866e5bae2e0773c31d9bc29d. Thank you! Mark From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH 05/10] gnu: icecat: Add a patch that makes building language packs reproducible. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Wed, 15 Feb 2023 21:33:02 +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: Mark H Weaver Cc: 32026@debbugs.gnu.org, ludo@gnu.org, Jonathan Brielmaier Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.167649674423217 (code B ref 32026); Wed, 15 Feb 2023 21:33:02 +0000 Received: (at 32026) by debbugs.gnu.org; 15 Feb 2023 21:32:24 +0000 Received: from localhost ([127.0.0.1]:34163 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSPO4-00062P-7d for submit@debbugs.gnu.org; Wed, 15 Feb 2023 16:32:24 -0500 Received: from mail-qt1-f174.google.com ([209.85.160.174]:45010) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSPO0-000624-1i for 32026@debbugs.gnu.org; Wed, 15 Feb 2023 16:32:22 -0500 Received: by mail-qt1-f174.google.com with SMTP id ch10so114131qtb.11 for <32026@debbugs.gnu.org>; Wed, 15 Feb 2023 13:32:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=Aa7nOqL58vo0FkDlK/0/hqfmbuO6U8DgFHyuptQ0olc=; b=LOAIeaME2To2FXxDw+wHmmKz5aAejTognypSAhYp6lF0JNbI9f2/ugguntQLsBi/75 zp9XF89YTEe9o95UIKtpfo/MdUjkbmcJKyfxKEU1nQmm6gZLPftVKIQMMaQ/UlbWTQhM eLxJ3DvYof7DsRnt4oHWuogYt9w/NCkjfH/0LfDym26udHDWXWT7o2N4ECwuVnLiRkBe ZsrvEu26UHi1g0Ps6cIfi/LMTzMRu6S6Ch15hjdfKuPeQG9SUYZhWTwa5uElHdHG/HxS VAvAB2VxcX+KvI7Z6jOuidSwrgsZTlCtxliiOsJrPIDdB+z293zwgmzXtuZLMCLiyOh4 EFJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=Aa7nOqL58vo0FkDlK/0/hqfmbuO6U8DgFHyuptQ0olc=; b=MZ8M7vlLcK54pQ91JHMV5PW/ut+smlrKouXtxinEjrHZCFCH08p8+4k1a+bBNlVjsE bN8IWoRoy9hzJvFhuNchAUqHLpbKVSI6GfzBmUxEVf8H6VQb2xwtboLatj1g7VU7xh4j ksUyaqbLgqE4nNr35Js5+MUrXpn7kTh7vEUKbUO1B6B9FWRnhwk+LC7JfOzB5WFCH+K0 oWZkavHzke/Beajqs5Be/rANGID7Ppe4j8ulTzMNbzOfBzCf3rwCFl0e40m+oUmwQUTa oQT3gMjTKvXMRVGEw1phxipTDKt8qMOCdFYawWtSI7tb5VwCT1NUyQUbhFUAZRI0KiE5 Gw9Q== X-Gm-Message-State: AO0yUKXZOphrt4Si/nNtoYvprEwPi/c2YHuAqSqy8gecdYwsA1LGOXzC 2jpQkymCcGeDk76Wh4Dq3IU= X-Google-Smtp-Source: AK7set9Jg+7RgOTTPeBFRwz/JcKF7XUzqgSK7SYz4NUcC9J+8OeAqchFBz1kYSx6fvJrRGESyFWG8g== X-Received: by 2002:a05:622a:8a:b0:3b8:6a90:ece5 with SMTP id o10-20020a05622a008a00b003b86a90ece5mr5986552qtw.62.1676496734479; Wed, 15 Feb 2023 13:32:14 -0800 (PST) Received: from hurd (dsl-155-109.b2b2c.ca. [66.158.155.109]) by smtp.gmail.com with ESMTPSA id a64-20020a379843000000b0073b8451e678sm658645qke.37.2023.02.15.13.32.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Feb 2023 13:32:13 -0800 (PST) From: Maxim Cournoyer References: <20230214015555.8643-1-maxim.cournoyer@gmail.com> <20230214015555.8643-6-maxim.cournoyer@gmail.com> <87mt5g7k5j.fsf@netris.org> <87cz6ccpr7.fsf@gmail.com> <87r0usnei0.fsf@netris.org> Date: Wed, 15 Feb 2023 16:32:12 -0500 In-Reply-To: <87r0usnei0.fsf@netris.org> (Mark H. Weaver's message of "Tue, 14 Feb 2023 16:06:04 -0500") Message-ID: <87o7puaa3n.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.2 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.8 (/) Hello, Mark H Weaver writes: > Hi Maxim, > > Maxim Cournoyer writes: > >> Mark H Weaver writes: >> >>> Maxim Cournoyer writes: >>> >>>> * gnu/packages/patches/icecat-reproducible-langpacks.patch: New file. >>>> * gnu/local.mk (dist_patch_DATA): Register. it. >>>> * gnu/packages/gnuzilla.scm (icecat-source): Apply it. >>> >>> Let's make this change in upstream IceCat instead of in Guix. >>> What do you think? >> >> Or in Firefox upstream itself? I can check if they think it'd be >> reasonable to apply it there. > > Sure, that would be even better. If they don't apply it to the ESR > branch immediately, I can include the patch in upstream IceCat in the > meantime. Done: https://phabricator.services.mozilla.com/D169979 -- Thanks, Maxim From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH 02/10] gnu: icedove: Compute a self-contained source. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Thu, 16 Feb 2023 00:56:02 +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: Jonathan Brielmaier Cc: mhw@netris.org, 32026@debbugs.gnu.org, ludo@gnu.org Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.167650894822470 (code B ref 32026); Thu, 16 Feb 2023 00:56:02 +0000 Received: (at 32026) by debbugs.gnu.org; 16 Feb 2023 00:55:48 +0000 Received: from localhost ([127.0.0.1]:34479 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSSYu-0005qM-DD for submit@debbugs.gnu.org; Wed, 15 Feb 2023 19:55:48 -0500 Received: from mail-qt1-f177.google.com ([209.85.160.177]:46924) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSSYr-0005pz-Lp for 32026@debbugs.gnu.org; Wed, 15 Feb 2023 19:55:47 -0500 Received: by mail-qt1-f177.google.com with SMTP id b21so596092qtr.13 for <32026@debbugs.gnu.org>; Wed, 15 Feb 2023 16:55:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=uRFnhtpBz/SQ/sWMqoIqXoRkUpfbd5na7D/CabFHcWU=; b=SIITmiIILU2kLKHJET0xDP67wPD4YG9+k6x4uZ3BzzO/iZv3cCX1auamGJLhQUr7zp KtHHNMLPZegcMeMtPJkTQEJdwH6D8Qb4GHo/udEe3tAudziG7gyBsp+D2eHI2pDt61v1 kzIbqtUoJRNr2n6PDrnhxD9k0ZJ8J3cg3xy8nLYAY3CHRwFjbQA6lLwa+dBwbPBNuMac J00YOwxyqfYUaO/z/lB/kzmqsSWS3WxWy6fGo6U/SocWYJgKuYx/fDeSZlH1FFH7keVI soCa8G0u6zyQXYNVZXJ6VKsaDplqjRrAuqLzxkEwdyrKq9RbrkRIG65ctGkxnzZzBG2Y BU2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=uRFnhtpBz/SQ/sWMqoIqXoRkUpfbd5na7D/CabFHcWU=; b=iPTYxV4D7KQjv9U1FKuoO/cllXe/fWVmEdxi23LjKOVXU61CjSz48cVsuD/vSbSXlw rklSRDBSt5nlsIxVZl0UDH6kZxBv/cJmJTpn2DsJXYa0TVFGkx9YH8VUsn0hCZEqe9F3 fMUtWWvMEqOwEGofpNTewrutMHcKYovqLjBOQYLe+9EbUdvQ90NNYtFJHfEWMNzazZEh cRkHxGhmiJLK0tTwMsLyjYTNzs5IVvWAKKwoNoNCS/QS24RCKPs0a6OjjZNZRgFjoa2D 8wYjk8OuqHc2CapoW5GNSksHEEoDiH//J2sqkFX9qnnmWxfXz0K7XikUMAqI8In5UbqR kVuQ== X-Gm-Message-State: AO0yUKUauWVB4cxRDYFrueeUXlKxJPFlzGQ/+kzBP3+qsFBwjNpaE1Eh QQmFzvBgjj7ll+TXqxad5rE= X-Google-Smtp-Source: AK7set8guIzaxPi4//Gz+wL3WReYnfit9FbT2oIxlpvIvaTy27ZwGy6CMUd1HLQXki2EhhR2mUGmNA== X-Received: by 2002:ac8:5784:0:b0:3b9:bc8c:c204 with SMTP id v4-20020ac85784000000b003b9bc8cc204mr1012480qta.15.1676508939859; Wed, 15 Feb 2023 16:55:39 -0800 (PST) Received: from hurd (dsl-155-109.b2b2c.ca. [66.158.155.109]) by smtp.gmail.com with ESMTPSA id q8-20020a05620a024800b0073b8745fd39sm116791qkn.110.2023.02.15.16.55.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Feb 2023 16:55:39 -0800 (PST) From: Maxim Cournoyer References: <20230214015555.8643-1-maxim.cournoyer@gmail.com> <20230214015555.8643-3-maxim.cournoyer@gmail.com> Date: Wed, 15 Feb 2023 19:55:38 -0500 In-Reply-To: (Jonathan Brielmaier's message of "Tue, 14 Feb 2023 22:32:33 +0100") Message-ID: <87k00ia0ol.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello, Jonathan Brielmaier writes: > On 14.02.23 02:55, Maxim Cournoyer wrote: >> +;;; To find out which changeset to use for the comm-l10n repo, use the >> +;;; 'comm-source->locales+changeset' procedure on the thunderbird-comm-source >> +;;; checkout directory. The complete localization data will be released as a >> +;;; tarball starting with 102.2.8 (see: >> +;;; https://bugzilla.mozilla.org/show_bug.cgi?id=1810727). When this tarball > > Version 102.8.0 is it called. Thanks. I've reworded the comment. -- Thanks, Maxim From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH 02/10] gnu: icedove: Compute a self-contained source. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Thu, 16 Feb 2023 04:38:02 +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, Jonathan Brielmaier , Maxim Cournoyer Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.167652222912815 (code B ref 32026); Thu, 16 Feb 2023 04:38:02 +0000 Received: (at 32026) by debbugs.gnu.org; 16 Feb 2023 04:37:09 +0000 Received: from localhost ([127.0.0.1]:34574 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSW16-0003KS-2r for submit@debbugs.gnu.org; Wed, 15 Feb 2023 23:37:09 -0500 Received: from mail-qt1-f171.google.com ([209.85.160.171]:37595) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSW14-0003Jq-KF for 32026@debbugs.gnu.org; Wed, 15 Feb 2023 23:37:07 -0500 Received: by mail-qt1-f171.google.com with SMTP id m12so1031331qth.4 for <32026@debbugs.gnu.org>; Wed, 15 Feb 2023 20:37:06 -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=L7o16M0aRhJYxSYlR8y8xTDQbleRuaMYbVcGXXf9/n8=; b=Q+MlHQEKz+93Y1M3aDfgyWfDb3uzo2K9ldYjGszeYaD1T246apG1ZMsoDlMEbdPbez ITjOW0xhyHWycxcchIpIEO0Lfo8pOKmg/P9f0jJbKI+Cu2pN0WEebyOyVUZATnQZdYdI fCdCSEp+jl8mP/OxJBhXDfP5aq2rf+os/ihRrhqsJwcdtEKAtZKA/w7ZqWu8e5GxJEIJ PZOE4X3sYRjyLCiusZjaibMcSPplqICZJqFG/YdbdG3YWydE0YYbYzEzDOOQ5EhnUOdb 0xRsKohOgChRjlYSgSZ9tyJX0SBKZqcQyYgYiE4ZDRF0p5V9ss0GfWuiA0wh5nurEayt b6NQ== 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=L7o16M0aRhJYxSYlR8y8xTDQbleRuaMYbVcGXXf9/n8=; b=kNAw72BpLNvQ9ViqAir2lAth13feZ8Btw6Ip4sM6xES6n3ENVMezw46ANQ4LGKdMhk YC2GL6u6nkJ2751E2g0Nkp5avIWnkIv1kH+tgMT4nagfyhTFyeraT+WF4gcGToKryhyL ldINwXkGIGwV/Paw0ubzJuziiaGG/dK8gAXpCa7pKN/+jUQ/hkPj39YmbTEfJx4tf04s hANwMNwy7MWV/2xy/WlSyfTKRN7itWQc7Mgu3hT4d6oPqll85YApWg3MUhS2T48AfnwI 9AEruTeMjTPFtmNEQqpdgPAWXaHlQEui01U6lu1mbHS6PFm02XQLLRsRGIXgwellDAm6 FVbQ== X-Gm-Message-State: AO0yUKVOHeyvjoaoS1MexY9abTznE102dXlZe9lxdDRxM+LX6OgfoBa+ FaLjfZUfWfu8EXW1V9NFAnEVXdXnfVkBcTui X-Google-Smtp-Source: AK7set+sUH0q5F6sys5nblzigzdgqfrqzXzz3UWqdeyu8q55vfEW608LMRVIKM/l9YpTuRQ2Dw27Xg== X-Received: by 2002:a05:622a:2d5:b0:3b6:30ea:e95 with SMTP id a21-20020a05622a02d500b003b630ea0e95mr7829928qtx.18.1676522220827; Wed, 15 Feb 2023 20:37:00 -0800 (PST) Received: from localhost.localdomain (dsl-155-109.b2b2c.ca. [66.158.155.109]) by smtp.gmail.com with ESMTPSA id t85-20020a374658000000b007186c9e167esm452992qka.52.2023.02.15.20.37.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Feb 2023 20:37:00 -0800 (PST) From: Maxim Cournoyer Date: Wed, 15 Feb 2023 23:36:40 -0500 Message-Id: <20230216043649.32119-2-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230216043649.32119-1-maxim.cournoyer@gmail.com> References: <20230216043649.32119-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This refactoring work is to prepare for adding a icedove-l10n package, which will reuse that source. * gnu/packages/gnuzilla.scm (comm-source->locales+changset): New procedure. (thunderbird-source): Rename to... (thunderbird-comm-source): ... here. (icedove-source): New variable. (icedove) [source]: Use it. [phases]: Remove the prepare-thunderbird-sources and rename-to-icedove phases. --- Changes in v2: - Fix typo in comm-source->locales+changset - Reword comment gnu/packages/gnuzilla.scm | 210 +++++++++++++++++++++++++------------- 1 file changed, 140 insertions(+), 70 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 2011555d47..1ed52c68e9 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -47,6 +47,7 @@ (define-module (gnu packages gnuzilla) #:use-module (guix hg-download) #:use-module (guix gexp) #:use-module (guix store) + #:use-module (guix modules) #:use-module (guix monads) #:use-module (guix utils) #:use-module (guix build-system gnu) @@ -1128,7 +1129,7 @@ (define %icedove-version "102.7.2") ;; Provides the "comm" folder which is inserted into the icecat source. ;; Avoids the duplication of Icecat's source tarball. -(define thunderbird-source +(define thunderbird-comm-source (origin (method hg-fetch) (uri (hg-reference @@ -1139,11 +1140,148 @@ (define thunderbird-source (base32 "071q0pcfvfpzx741ly1sl8anlmzx02h17w4ylfnrkwrpaclq3p6p")))) +(define (comm-source->locales+changeset source) + "Given SOURCE, a checkout of the Thunderbird 'comm' component, return the +list of languages supported as well as the currently used changeset." + (match (update-mozilla-locales + (string-append source "/mail/locales/l10n-changesets.json")) + (((_ changeset locale) ...) + (values locale (first changeset))))) + +;;; To find out which changeset to use for the comm-l10n repo, use the +;;; 'comm-source->locales+changeset' procedure on the thunderbird-comm-source +;;; checkout directory. The complete localization data should be released as +;;; a tarball in the next release (see: +;;; https://bugzilla.mozilla.org/show_bug.cgi?id=1817086). When this tarball +;;; is available, it should replace the complete 'l10n' directory at the root +;;; of the IceCat source, instead of only the 'calendar', chat and mail +;;; directories that it provides. +(define thunderbird-comm-l10n + (let* ((changeset "5b6788295358") + (version (git-version %icedove-version "0" changeset))) + (origin + (method hg-fetch) + (uri (hg-reference + (url "https://hg.mozilla.org/projects/comm-l10n") + (changeset changeset))) + (file-name (git-file-name "comm-l10n" version)) + (sha256 + (base32 + "1jrsmkscjjllcfawi3788vwm53wn25inbhdis5nk4vfpr7wk5ill"))))) + +(define icedove-source + (let ((name (string-append "icedove-" %icedove-version))) + (origin + (method computed-origin-method) + (file-name (string-append name ".tar.xz")) + (sha256 #f) + (uri + (delay + (with-imported-modules (source-module-closure '((guix build utils))) + #~(begin + (use-modules (guix build utils) + (sxml simple)) + + (set-path-environment-variable + "PATH" '("bin") + (list #+(canonical-package tar) + #+(canonical-package xz))) + + ;; Extract the base Icecat tarball, renaming its top-level + ;; directory. + (invoke "tar" "--transform" (string-append "s,[^/]*," #$name ",") + "-xf" #$icecat-source) + (chdir #$name) + + ;; Merge the Thunderdbird localization data. + (copy-recursively #$thunderbird-comm-l10n "l10n") + + ;; Add the Thunderbird-specific "comm" directory.. + (mkdir "comm") + (copy-recursively #$thunderbird-comm-source "comm") + (delete-file "sourcestamp.txt") + + ;; Adjust the application name. + (substitute* "comm/mail/confvars.sh" + (("MOZ_APP_NAME=thunderbird") + "MOZ_APP_NAME=icedove") + (("MOZ_UPDATER=1") + "MOZ_UPDATER=0")) + + ;; Remove branding to comply with Mozilla's trademark policy + (with-directory-excursion "comm/mail/branding/nightly" + (delete-file "content/about-wordmark.svg") + (call-with-output-file "content/about-wordmark.svg" + (lambda (port) + (sxml->xml '(svg (@ (xmlns "http://www.w3.org/2000/svg") + (viewBox "0 0 789.1 90.78") + (width "333") + (height "48") + (fill "#fff")) + (text (@ (x "400") (y "70") + (text-anchor "middle") + (font-size "90")) + "Icedove Daily")) + port))) + (substitute* '("locales/en-US/brand.properties" + "locales/en-US/brand.ftl" + "locales/en-US/brand.dtd" + "configure.sh") + (("Thunderbird") "Icedove") + (("mozilla.org") "guix.gnu.org"))) + ;; Remove other mentions of Thunderbird in user-visible text. + (with-directory-excursion "comm/mail/base/content" + (substitute* '("overrides/app-license-name.html") + (("Thunderbird") "Icedove"))) + (with-directory-excursion "comm/mail/components/" + (substitute* '("MailGlue.jsm" + "extensions/schemas/addressBook.json" + "extensions/schemas/tabs.json" + "extensions/schemas/cloudFile.json" + "extensions/schemas/chrome_settings_overrides.json" + "extensions/schemas/windows.json" + "extensions/parent/ext-mail.js" + "im/messages/mail/Info.plist" + "enterprisepolicies/moz.build" + "enterprisepolicies/helpers/moz.build" + "enterprisepolicies/schemas/moz.build") + (("Thunderbird") "Icedove"))) + (substitute* '("comm/mailnews/base/prefs/content/accountUtils.js" + "comm/mail/base/content/customizeToolbar.js" + "comm/suite/components/customizeToolbar.js") + (("AppConstants.MOZ_APP_NAME (.)= \"thunderbird" _ e) + (format #f "AppConstants.MOZ_APP_NAME ~a= \"icedove" e))) + + ;; Override addon URLs and settings + (substitute* "comm/mail/app/profile/all-thunderbird.js" + (("(pref\\(\"extensions.webservice.discoverURL\").*" _ m) + (string-append m ", \"https://directory.fsf.org/wiki/Icedove\");")) + (("(pref\\(\"extensions.getAddons.search.url\").*" _ m) + (string-append m ", \"https://guix.gnu.org/packages\");")) + (("(pref\\(\"extensions.update.enabled\").*" _ m) + (string-append m ", false);")) + (("(pref\\(\"extensions.systemAddon.update.enabled\").*" _ m) + (string-append m ", false);")) + (("(pref\\(\"lightweightThemes.update.enabled\").*" _ m) + (string-append m ", false);"))) + + ;; Step out of the directory and create the tarball. + (chdir "..") + (format #t "Packing Icedove source tarball...~%") + (force-output) + (setenv "XZ_DEFAULTS" (string-join (%xz-parallel-args))) + (invoke "tar" "cfa" #$output + "--mtime=@315619200" ;1980-01-02 UTC + "--owner=root:0" + "--group=root:0" + "--sort=name" + #$name)))))))) + (define-public icedove (package (name "icedove") (version %icedove-version) - (source icecat-source) + (source icedove-source) (properties `((cpe-name . "thunderbird_esr"))) (build-system gnu-build-system) @@ -1157,11 +1295,6 @@ (define-public icedove ,@%gnu-build-system-modules) #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'prepare-thunderbird-sources - (lambda _ - (mkdir "comm") - (copy-recursively #$thunderbird-source "comm") - (delete-file "sourcestamp.txt"))) (add-after 'patch-source-shebangs 'patch-cargo-checksums (lambda _ (use-modules (guix build cargo-utils)) @@ -1191,69 +1324,6 @@ (define-public icedove (substitute* "comm/mail/moz.configure" (("MOZ_DEDICATED_PROFILES, True") "MOZ_DEDICATED_PROFILES, False")))) - (add-after 'prepare-thunderbird-sources 'rename-to-icedove - (lambda _ - (substitute* "comm/mail/confvars.sh" - (("MOZ_APP_NAME=thunderbird") - "MOZ_APP_NAME=icedove") - (("MOZ_UPDATER=1") - "MOZ_UPDATER=0")) - ;; Remove branding to comply with Mozilla's trademark policy - (with-directory-excursion "comm/mail/branding/nightly" - (delete-file "content/about-wordmark.svg") - (call-with-output-file "content/about-wordmark.svg" - (lambda (port) - (sxml->xml '(svg (@ (xmlns "http://www.w3.org/2000/svg") - (viewBox "0 0 789.1 90.78") - (width "333") - (height "48") - (fill "#fff")) - (text (@ (x "400") (y "70") - (text-anchor "middle") - (font-size "90")) - "Icedove Daily")) - port))) - (substitute* '("locales/en-US/brand.properties" - "locales/en-US/brand.ftl" - "locales/en-US/brand.dtd" - "configure.sh") - (("Thunderbird") "Icedove") - (("mozilla.org") "guix.gnu.org"))) - ;; Remove other mentions of Thunderbird in user-visible text. - (with-directory-excursion "comm/mail/base/content" - (substitute* '("overrides/app-license-name.html") - (("Thunderbird") "Icedove"))) - (with-directory-excursion "comm/mail/components/" - (substitute* '("MailGlue.jsm" - "extensions/schemas/addressBook.json" - "extensions/schemas/tabs.json" - "extensions/schemas/cloudFile.json" - "extensions/schemas/chrome_settings_overrides.json" - "extensions/schemas/windows.json" - "extensions/parent/ext-mail.js" - "im/messages/mail/Info.plist" - "enterprisepolicies/moz.build" - "enterprisepolicies/helpers/moz.build" - "enterprisepolicies/schemas/moz.build") - (("Thunderbird") "Icedove"))) - (substitute* '("comm/mailnews/base/prefs/content/accountUtils.js" - "comm/mail/base/content/customizeToolbar.js" - "comm/suite/components/customizeToolbar.js") - (("AppConstants.MOZ_APP_NAME (.)= \"thunderbird" _ e) - (format #f "AppConstants.MOZ_APP_NAME ~a= \"icedove" e))) - - ;; Override addon URLs and settings - (substitute* "comm/mail/app/profile/all-thunderbird.js" - (("(pref\\(\"extensions.webservice.discoverURL\").*" _ m) - (string-append m ", \"https://directory.fsf.org/wiki/Icedove\");")) - (("(pref\\(\"extensions.getAddons.search.url\").*" _ m) - (string-append m ", \"https://guix.gnu.org/packages\");")) - (("(pref\\(\"extensions.update.enabled\").*" _ m) - (string-append m ", false);")) - (("(pref\\(\"extensions.systemAddon.update.enabled\").*" _ m) - (string-append m ", false);")) - (("(pref\\(\"lightweightThemes.update.enabled\").*" _ m) - (string-append m ", false);"))))) (add-after 'build 'neutralize-store-references (lambda _ ;; Mangle the store references to compilers & other build tools in -- 2.39.1 From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH 01/10] gnu: Add a 'update-mozilla-locales' helper for maintenance. References: <87po06puwt.fsf@gnu.org> In-Reply-To: <87po06puwt.fsf@gnu.org> Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Thu, 16 Feb 2023 04:38:03 +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, Jonathan Brielmaier , Maxim Cournoyer Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.167652222912824 (code B ref 32026); Thu, 16 Feb 2023 04:38:03 +0000 Received: (at 32026) by debbugs.gnu.org; 16 Feb 2023 04:37:09 +0000 Received: from localhost ([127.0.0.1]:34576 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSW17-0003Kj-8b for submit@debbugs.gnu.org; Wed, 15 Feb 2023 23:37:09 -0500 Received: from mail-qv1-f43.google.com ([209.85.219.43]:43859) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSW13-0003Jo-Jz for 32026@debbugs.gnu.org; Wed, 15 Feb 2023 23:37:08 -0500 Received: by mail-qv1-f43.google.com with SMTP id q10so558516qvt.10 for <32026@debbugs.gnu.org>; Wed, 15 Feb 2023 20:37:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=3HM2SlWcaLJl4uPkNKwZF9dfqtjZ1EOZ4SUuySBpSVo=; b=F40ogX9LcqT06/XbxUZSBMNKP0oLy2PEjauslgqkoKJ522lfb+K/pX0MYngg4ouyOh EeB4pU2Rc95tVYnd66ZTEOgk3zMiwz7YLqXQjqp63kFMveD6pe0FgG98dHJRnge96Oqb A6IiXZzyrcjb3aSovSv6AmQYp/OfZHefbqGxEAevTC+C609iU3vx8hy+68EaS5F8tLXG yDlt2f99U4+/vnIN7PcF3u9g1baLh7b2523otdtXbKXFAbNbGfBboh3Qyf6NLzao0K3H Vb873wLcfBofZK1oIV7rrlXDQgQ9PWJAF7SKFPY40Nd9hYeiyPoIMQBqJtSLNIhhFmF8 3whw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=3HM2SlWcaLJl4uPkNKwZF9dfqtjZ1EOZ4SUuySBpSVo=; b=kFBYC/PlJY8drV9gHychMWxqxcp6+5cWR8y8HlDqnxQCdMJtMhP/kJ+p/f8Cy09DNf HfOTKvyXOhqqq5zzvghF+QfVcNb3ncUpaNULJTk04jwQy9zId+BQVrNc4N1N4dn6A7l9 mhkI6C2PCUrecBNNZrBdJSagxqgmKfKnHoGRSHkl0A+DyL6K7vqxosyiQnCeYAM5ZzLa Xri2UaCqugg5MUMaznOIOArkTuh/+QLAsnCRP5y8/ejpzoEEo2lNnpqQ2NhKLObJd3gh mmroWB47ODu1BYaM5ZKO5xYDxJYLDdkOfcym52iDn1WzysAbdfppafqAgni3ytf0DLeC J3iQ== X-Gm-Message-State: AO0yUKXtohwULpIdvWnpq0vWjSED8Hf9ma/OA2cZYIybuqqt2n7Vp9ZE U/y1zDQ2OQcg4XOKMjWsR5JMnAvBtdCwBGE6 X-Google-Smtp-Source: AK7set8BAhX67wUdC1DrsS/lKY7orzFb+ig72+KUo5jpwnS6POZh8aSHh5MbchZE1TdgS4r3IP43Ew== X-Received: by 2002:a05:6214:410f:b0:56e:9f19:71f9 with SMTP id kc15-20020a056214410f00b0056e9f1971f9mr1731942qvb.17.1676522219525; Wed, 15 Feb 2023 20:36:59 -0800 (PST) Received: from localhost.localdomain (dsl-155-109.b2b2c.ca. [66.158.155.109]) by smtp.gmail.com with ESMTPSA id t85-20020a374658000000b007186c9e167esm452992qka.52.2023.02.15.20.36.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Feb 2023 20:36:59 -0800 (PST) From: Maxim Cournoyer Date: Wed, 15 Feb 2023 23:36:39 -0500 Message-Id: <20230216043649.32119-1-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gnuzilla.scm (update-mozilla-locales): New procedure. (all-mozilla-locales): Comment how to proceed to update it. --- (no changes since v1) gnu/packages/gnuzilla.scm | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index b2e0870fea..2011555d47 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -37,6 +37,7 @@ (define-module (gnu packages gnuzilla) #:use-module ((srfi srfi-1) #:hide (zip)) + #:use-module (ice-9 format) #:use-module (ice-9 match) #:use-module (gnu packages) #:use-module ((guix licenses) #:prefix license:) @@ -91,7 +92,8 @@ (define-module (gnu packages gnuzilla) #:use-module (gnu packages xiph) #:use-module (gnu packages xdisorg) #:use-module (gnu packages readline) - #:use-module (gnu packages sqlite)) + #:use-module (gnu packages sqlite) + #:autoload (json parser) (json->scm)) (define-public mozjs (package @@ -348,6 +350,10 @@ (define-public mozjs-78 (inputs (list icu4c readline zlib)))) + +;;; +;;; Localization helper procedures. +;;; (define mozilla-compare-locales (origin (method hg-fetch) @@ -371,6 +377,27 @@ (define-syntax-rule (mozilla-locales (hash-string changeset locale) ...) (list (mozilla-locale locale changeset hash-string) ...)) +(define (update-mozilla-locales changesets.json) + "Output a new list of Mozilla locales, to update the ALL-MOZILLA-LOCALES +variable defined bellow. It requires guile-json to be installed." + ;; To extract the file used as argument, do: + ;; tar -xf $(./pre-inst-env guix build \ + ;; -e '(@@ (gnu packages gnuzilla) upstream-firefox-source)') \ + ;; --strip-components=3 \ + ;; --wildcards '*/browser/locales/l10n-changesets.json' + (match (call-with-input-file changesets.json json->scm) + (((lang ("revision" . revision) platforms pin) ...) + (let ((data (reverse (map (lambda (rev lang) + `(,(list->string (make-list 40 #\0)) + ,(string-take rev 12) ,lang)) + revision lang)))) + (format #t "~{~s~%~}" data) + data)))) + +;;; This list must be maintained by hand by comparing with the entries in the +;;; browser/locales/l10n-changesets.json file in the Firefox source (see the +;;; 'update-mozilla-locales' procedure above which aims to make this a bit +;;; easier). (define all-mozilla-locales (mozilla-locales ;; sha256 changeset locale base-commit: 47439697aeed1d8788e7fc4c02ef1c610e0b4151 -- 2.39.1 From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH 03/10] gnu: Define UPSTREAM-FIREFOX-SOURCE at the top level. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Thu, 16 Feb 2023 04:38:04 +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, Jonathan Brielmaier , Maxim Cournoyer Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.167652223012836 (code B ref 32026); Thu, 16 Feb 2023 04:38:04 +0000 Received: (at 32026) by debbugs.gnu.org; 16 Feb 2023 04:37:10 +0000 Received: from localhost ([127.0.0.1]:34579 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSW17-0003Kn-J8 for submit@debbugs.gnu.org; Wed, 15 Feb 2023 23:37:10 -0500 Received: from mail-qt1-f177.google.com ([209.85.160.177]:33426) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSW15-0003K9-O9 for 32026@debbugs.gnu.org; Wed, 15 Feb 2023 23:37:08 -0500 Received: by mail-qt1-f177.google.com with SMTP id h24so1080996qtr.0 for <32026@debbugs.gnu.org>; Wed, 15 Feb 2023 20:37:07 -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=csZZWbIIG6nivsnOnivxKMYKBMEZJ8NrVSmye9r+48g=; b=q5cwY454VdKHPRD0Qrs6ygMt79t58feEXYmfyNSt/n/Dp4UO/xAIh4lo/5IB0DAkE/ K3N0urrFuGrf2cGtgHrQ0cCPQlPBcle9jNf6VNfn6WbarBeREctTdpWc9K0FXxe1oP96 o07TBJ7dVv9nIetFeodYKVAVKriUNG5VdzUyJMgRPCGp5VQWpEyr+zOUssfzXGdzZ2sQ 79qsgWhqXwqsTZfPZoD4dh7gv2ulhma73OX8naNDDPOTaEwWt8PQqxAtHStsNOXcdjkv 2+7xU5AmsQyjkuDtGCAlhlmbH2NRKC9sQpLauPJcTgChJXL0Kp85Ay0Gkzwum3944g7X bkcw== 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=csZZWbIIG6nivsnOnivxKMYKBMEZJ8NrVSmye9r+48g=; b=5r4dxnEIXtxG8Nnv6T5YfN6RAPcLKBc15zbeyIwZEmMD2oaNd61Wc+33nD9Xwvzsvr JZLZftQ2aArfxMWt9N8h8sAVxI2znyvSuu4nZO2D1HBLA2d+qIgrychL6YG7wH5m35E7 X/q1LWpksNlTcbOSrgBGoa4oWIaOuJGH4LB53629tH2iYg00zxZrEKUO+qOOwMqotQ8j OqFcPlQOrkoS6Tr9VsHQEnzEkIXUkYWnldYVWT35iZHfn3v3RRQTdXMi9YvPKvadbOls MMPHGVNiaRVRNmcbMqn5IoBNQl3lEVHyrdmsL9Jf4pKW+rSXntiByElbT63/YwyQOKtz gbqw== X-Gm-Message-State: AO0yUKWV60ml5KpAcYtuzlFPksu2lrX4U8AUEc8ScUL7wvskDBL+1g1a umSexZ51e+1T/I+FOaad/JpwVY7pbC33e4Hd X-Google-Smtp-Source: AK7set9HMwaBjgpaytka1Cxsc20mKc8SA4hZF+h93t+0FdFOFPCDQ6mQnLUbd/FPaAlXRYiQNfAjUA== X-Received: by 2002:a05:622a:314:b0:3b8:429e:c6f5 with SMTP id q20-20020a05622a031400b003b8429ec6f5mr8076179qtw.30.1676522222108; Wed, 15 Feb 2023 20:37:02 -0800 (PST) Received: from localhost.localdomain (dsl-155-109.b2b2c.ca. [66.158.155.109]) by smtp.gmail.com with ESMTPSA id t85-20020a374658000000b007186c9e167esm452992qka.52.2023.02.15.20.37.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Feb 2023 20:37:01 -0800 (PST) From: Maxim Cournoyer Date: Wed, 15 Feb 2023 23:36:41 -0500 Message-Id: <20230216043649.32119-3-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230216043649.32119-1-maxim.cournoyer@gmail.com> References: <20230216043649.32119-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gnuzilla.scm (%icecat-base-version): New variable. (%upstream-firefox-version): Likewise. (%icecat-version): Define in terms of %icecat-base-version. (upstream-firefox-source): New variable. (icecat-source): Adjust to use the above newly introduced variables. --- (no changes since v1) gnu/packages/gnuzilla.scm | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 1ed52c68e9..1bafa92377 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -505,31 +505,29 @@ (define all-mozilla-locales ;; XXXX: Workaround 'snippet' limitations. (define computed-origin-method (@@ (guix packages) computed-origin-method)) -(define %icecat-version "102.8.0-guix0-preview1") +(define %icecat-base-version "102.8.0") +(define %upstream-firefox-version (string-append %icecat-base-version "esr")) +(define %icecat-version (string-append %icecat-base-version "-guix0-preview1")) (define %icecat-build-id "20230214000000") ;must be of the form YYYYMMDDhhmmss +(define upstream-firefox-source + (origin + (method url-fetch) + (uri (string-append + "https://ftp.mozilla.org/pub/firefox/releases/" + %upstream-firefox-version "/source/" + "firefox-" %upstream-firefox-version ".source.tar.xz")) + (sha256 + (base32 + "0j6afrgfsmd0adbbmffw4p1f2hznpck9d36z3bsjx36f7cjgdy27")))) + ;; 'icecat-source' is a "computed" origin that generates an IceCat tarball ;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat' ;; script from the upstream IceCat project. (define icecat-source - (let* ((base-version (first (string-split %icecat-version #\-))) - - (major-version (first (string-split base-version #\.))) - (minor-version (second (string-split base-version #\.))) - (sub-version (third (string-split base-version #\.))) - - (upstream-firefox-version (string-append base-version "esr")) - (upstream-firefox-source - (origin - (method url-fetch) - (uri (string-append - "https://ftp.mozilla.org/pub/firefox/releases/" - upstream-firefox-version "/source/" - "firefox-" upstream-firefox-version ".source.tar.xz")) - (sha256 - (base32 - "0j6afrgfsmd0adbbmffw4p1f2hznpck9d36z3bsjx36f7cjgdy27")))) - + (let* ((major-version (first (string-split %icecat-base-version #\.))) + (minor-version (second (string-split %icecat-base-version #\.))) + (sub-version (third (string-split %icecat-base-version #\.))) (upstream-icecat-base-version "102.8.0") ; maybe older than base-version ;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version)) (gnuzilla-commit "03d9e3db5affe21db077c410ec08c313d6aa280e") @@ -562,7 +560,7 @@ (define icecat-source #~(begin (use-modules (guix build utils)) (let ((firefox-dir - (string-append "firefox-" #$base-version)) + (string-append "firefox-" #$%icecat-base-version)) (icecat-dir (string-append "icecat-" #$%icecat-version))) -- 2.39.1 From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH 04/10] gnu: icecat: Make language packs reproducible. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Thu, 16 Feb 2023 04:38: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, Jonathan Brielmaier , Maxim Cournoyer Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.167652223812903 (code B ref 32026); Thu, 16 Feb 2023 04:38:05 +0000 Received: (at 32026) by debbugs.gnu.org; 16 Feb 2023 04:37:18 +0000 Received: from localhost ([127.0.0.1]:34587 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSW1F-0003Lw-2k for submit@debbugs.gnu.org; Wed, 15 Feb 2023 23:37:17 -0500 Received: from mail-qv1-f42.google.com ([209.85.219.42]:33553) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSW17-0003KC-7a for 32026@debbugs.gnu.org; Wed, 15 Feb 2023 23:37:09 -0500 Received: by mail-qv1-f42.google.com with SMTP id j9so634648qvt.0 for <32026@debbugs.gnu.org>; Wed, 15 Feb 2023 20:37:09 -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=C8tAC0gLN223JcRUZxcLMJJFMyu8tkdoxKUnuFEAyfc=; b=ErTJUJVvFySzp57Uu9kIcaIUe/NfbcJY4Is8FOvYLO/Fea/jDSMOy4S3hjqB5Eptn6 As+HuRLzVRSKH6B8dzfsSsMND0zIFQrPFXU5zIc7sraztysHRqJ0cr85vlBQq7jgw4cx sx8da4lzVPgRo8P6ThacTvOaqFYMCD8Sn0B82qPuMP5n3OBsFmRjTyq/TVdXgJzTfKVe r0IQu/yGwjtNAimjPE+uMPbOErvY8FdtVLx9WJm89JAtmkjaZpXnbICKjVb2RaGKiEYI ue9MX5b9WTKw/DzbVKmJw31llL3zykfTLdn6xyAvJEFxw+vGIsMwaBX2qpgGlDW0XQeD kcsg== 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=C8tAC0gLN223JcRUZxcLMJJFMyu8tkdoxKUnuFEAyfc=; b=Y/q5lz4uYk2vAqp6aZzsJlOBboPxKmQEFTw8q5zFu9SZNE4G8BSWY65dgCTSyMSFC6 7g++BrKHH+yyMcN7l86B/yRuq/QFNyFd5pJjpXMh6PkI7FFULIx9p6EyAaIe6w4gtljV gwH9tBOUpJknd2W+QuOuti0xuHzwiI/ggj89kzPGS3PFeKBHVO44VlRTaT82qV7ed4Uc 358vKDHgnM/FoMqIM/Yqkiz9POamwJaZSw4sHWG0+AeFRiJC8/Vv025wF2aySpQTzOUk pYTgYfhzPFl+qjCdGPHYxx25TRqp8kTZAQHpUo3TQ8Li2dI66eA5U4p81QFLg9VOZOaF J7AQ== X-Gm-Message-State: AO0yUKUqX2CT/m0sJriQ4W1DsnOjhaH6LeQS/Smn6feAZCvYcHprSxWr e+l2mbDyH4O1PKJ4cNNSb1ZxnewUfJyR9Uln X-Google-Smtp-Source: AK7set93SFPK4kOCsk46XkZwch3c+FTB0nitRi8NdsG57b2GVy4edX89rLbFS+RPadaRKsTkbjj6zA== X-Received: by 2002:a05:6214:5186:b0:56e:aa8b:9103 with SMTP id kl6-20020a056214518600b0056eaa8b9103mr7943090qvb.52.1676522223421; Wed, 15 Feb 2023 20:37:03 -0800 (PST) Received: from localhost.localdomain (dsl-155-109.b2b2c.ca. [66.158.155.109]) by smtp.gmail.com with ESMTPSA id t85-20020a374658000000b007186c9e167esm452992qka.52.2023.02.15.20.37.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Feb 2023 20:37:03 -0800 (PST) From: Maxim Cournoyer Date: Wed, 15 Feb 2023 23:36:42 -0500 Message-Id: <20230216043649.32119-4-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230216043649.32119-1-maxim.cournoyer@gmail.com> References: <20230216043649.32119-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/patches/icecat-reproducible-langpacks.patch: New file. * gnu/local.mk (dist_patch_DATA): Register. it. * gnu/packages/gnuzilla.scm (icecat-source): Apply it. --- (no changes since v1) gnu/local.mk | 1 + gnu/packages/gnuzilla.scm | 1 + .../icecat-reproducible-langpacks.patch | 45 +++++++++++++++++++ 3 files changed, 47 insertions(+) create mode 100644 gnu/packages/patches/icecat-reproducible-langpacks.patch diff --git a/gnu/local.mk b/gnu/local.mk index 07a7a0f527..d6f1f4482a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1327,6 +1327,7 @@ dist_patch_DATA = \ %D%/packages/patches/i7z-gcc-10.patch \ %D%/packages/patches/icecat-makeicecat.patch \ %D%/packages/patches/icecat-avoid-bundled-libraries.patch \ + %D%/packages/patches/icecat-reproducible-langpacks.patch \ %D%/packages/patches/icecat-use-system-graphite2+harfbuzz.patch \ %D%/packages/patches/icecat-use-system-media-libs.patch \ %D%/packages/patches/icedtea-7-hotspot-aarch64-use-c++98.patch\ diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 1bafa92377..17edb9fa7e 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -554,6 +554,7 @@ (define icecat-source (method computed-origin-method) (file-name (string-append "icecat-" %icecat-version ".tar.xz")) (sha256 #f) + (patches (search-patches "icecat-reproducible-langpacks.patch")) (uri (delay (with-imported-modules '((guix build utils)) diff --git a/gnu/packages/patches/icecat-reproducible-langpacks.patch b/gnu/packages/patches/icecat-reproducible-langpacks.patch new file mode 100644 index 0000000000..b36a770cc6 --- /dev/null +++ b/gnu/packages/patches/icecat-reproducible-langpacks.patch @@ -0,0 +1,45 @@ +Prevent the extension manifests from embedding the current date. + +This is inspired by the Debian +"Use-build-id-as-langpack-version-for-reproducibility.patch" maintained for +their Firefox package as well as reproducible-builds.org guidelines from +https://reproducible-builds.org/docs/source-date-epoch/. + +Upstream status: https://phabricator.services.mozilla.com/D169979 + +--- ./python/mozbuild/mozbuild/action/langpack_manifest.py.old 2023-02-13 11:01:21.051537347 -0500 ++++ ./python/mozbuild/mozbuild/action/langpack_manifest.py 2023-02-13 11:04:33.141817330 -0500 +@@ -36,6 +36,15 @@ + pushlog_api_url = "{0}/json-rev/{1}" + + ++import os ++import time ++import datetime ++ ++def get_build_date(): ++ """Honor SOURCE_DATE_EPOCH for reproducibility.""" ++ return datetime.datetime.utcfromtimestamp( ++ int(os.environ.get('SOURCE_DATE_EPOCH', time.time()))) ++ + ### + # Retrievers a UTC datetime of the push for the current commit + # from a mercurial clone directory. +@@ -54,7 +63,7 @@ + with mozversioncontrol.get_repository_object(path=path) as repo: + phase = repo._run("log", "-r", ".", "-T" "{phase}") + if phase.strip() != "public": +- return datetime.datetime.utcnow() ++ return get_build_date() + repo_url = repo._run("paths", "default") + repo_url = repo_url.strip().replace("ssh://", "https://") + repo_url = repo_url.replace("hg://", "https://") +@@ -105,7 +114,7 @@ + dt = get_dt_from_hg(path) + + if dt is None: +- dt = datetime.datetime.utcnow() ++ dt = get_build_date() + + dt = dt.replace(microsecond=0) + return dt.strftime("%Y%m%d%H%M%S") -- 2.39.1 From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH 09/10] gnu: icecat: Remove gtk+-2 input. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Thu, 16 Feb 2023 04:38: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, Jonathan Brielmaier , Maxim Cournoyer Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.167652223812911 (code B ref 32026); Thu, 16 Feb 2023 04:38:05 +0000 Received: (at 32026) by debbugs.gnu.org; 16 Feb 2023 04:37:18 +0000 Received: from localhost ([127.0.0.1]:34590 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSW1G-0003M4-1F for submit@debbugs.gnu.org; Wed, 15 Feb 2023 23:37:18 -0500 Received: from mail-qt1-f177.google.com ([209.85.160.177]:33426) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSW18-0003K9-Bp for 32026@debbugs.gnu.org; Wed, 15 Feb 2023 23:37:10 -0500 Received: by mail-qt1-f177.google.com with SMTP id h24so1081188qtr.0 for <32026@debbugs.gnu.org>; Wed, 15 Feb 2023 20:37:10 -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=XHw18uNx+NTTb2tnA3Y4JAbQOhw6KGekYKSygvbioGk=; b=DHFcBtM6WfH+HtzPDyFNCPRCeijlGztK0ZBn+PfmbOLnM4Uz9aMMX9PfLEh9x5d5RQ 5V5/cOzbzEiDBDdrfOGS43A9hy0/o8tys/NEvYy45tXkjvCs3W5/QVPn6GF9cN+OE5qx 00s6hBjo+PzOw54yGEvffPh6Nj9jVbbbcBV+CUnAJKZ4nEwM2utxB4nwt1eY8rGMO9ID 4DUkmZnb9qVl0rdw7C4Vf+Q61PCiuiBFCfZU7oNg/iuxggtjlKqFe/fwJQbCOK6HX/pN 0CQqBGaFLeHW2oe3BlILUTEPZKr3JyFzZXDEVLTUM9lPpqsqJB3Sblhq5fyl4FRYYI2B FYzg== 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=XHw18uNx+NTTb2tnA3Y4JAbQOhw6KGekYKSygvbioGk=; b=XjgO5tk0fxmPjkc6vYduixCgaOazFO5WJ3f2prI/Ms/Rm/VIKOdQA4lrSlCiLWaCfF sEnFgh3pm3zYRVkCLrFRNUnVKR2lACK8p61Q8v9XqUjOxhQ3d1W/STkogzJ2F7Xpd28R LPLT7JHfCq4U3QcqpzFqKtZBdo/o6mW1pijWvPzQp5KvFoNZV8B8TqaYxggLLvlEHZCj vvxQzXKxX721iEW+4kJqwwKZGuto7KnKZhnMx6iF8VzshS8CTgfIzMbypGkcFG0i4K8U mAd6s89f82loPe4xabLpILYdefl6w4TkOiEqJ9WCvg80GjioKl8/O1nEAklftOhjrfA0 fW6w== X-Gm-Message-State: AO0yUKXpUv56KpIyU/6zTThE8pKaq67Helw8OVpgJgUuXxD0c9DGDv5e jJ6KCJMY5dCrCRXRY44V8IzhEIa37wp6BB35 X-Google-Smtp-Source: AK7set/W2GI4qTzvF2k98TWsCrfTY+LKCE1APoxCrJgoGtVUbYuXhqpHfYTTl9bqqXE6wWnCU1TdBg== X-Received: by 2002:a05:622a:2c9:b0:3b8:6b57:499e with SMTP id a9-20020a05622a02c900b003b86b57499emr8428576qtx.36.1676522229950; Wed, 15 Feb 2023 20:37:09 -0800 (PST) Received: from localhost.localdomain (dsl-155-109.b2b2c.ca. [66.158.155.109]) by smtp.gmail.com with ESMTPSA id t85-20020a374658000000b007186c9e167esm452992qka.52.2023.02.15.20.37.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Feb 2023 20:37:09 -0800 (PST) From: Maxim Cournoyer Date: Wed, 15 Feb 2023 23:36:47 -0500 Message-Id: <20230216043649.32119-9-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230216043649.32119-1-maxim.cournoyer@gmail.com> References: <20230216043649.32119-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gnuzilla.scm (icecat-minimal) [inputs]: Remove gtk+-2. --- Changes in v2: - New commit gnu/packages/gnuzilla.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index fa868f6824..8e90327ea4 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -693,7 +693,6 @@ (define-public icecat-minimal gdk-pixbuf glib gtk+ - gtk+-2 ;; UNBUNDLE-ME! graphite2 cairo pango -- 2.39.1 From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH 05/10] gnu: Add icecat-l10n and icedove-l10n. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Thu, 16 Feb 2023 04:38:06 +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, Jonathan Brielmaier , Maxim Cournoyer Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.167652224012919 (code B ref 32026); Thu, 16 Feb 2023 04:38:06 +0000 Received: (at 32026) by debbugs.gnu.org; 16 Feb 2023 04:37:20 +0000 Received: from localhost ([127.0.0.1]:34592 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSW1G-0003MD-Fk for submit@debbugs.gnu.org; Wed, 15 Feb 2023 23:37:19 -0500 Received: from mail-qt1-f171.google.com ([209.85.160.171]:38749) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSW18-0003KE-Gx for 32026@debbugs.gnu.org; Wed, 15 Feb 2023 23:37:11 -0500 Received: by mail-qt1-f171.google.com with SMTP id c2so1027758qtw.5 for <32026@debbugs.gnu.org>; Wed, 15 Feb 2023 20:37:10 -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=5lsuQRt1wOPVx/WV2IDx0YOMGSRnaFf7LWvDSKsVmJQ=; b=AvGknYawLj/r7bMIvBnMpEsFWSVIvy6rLLCSE55/SU3BXc/lhjkxUfktczfEQXUlWv aLsMoxvRToT631Kp3Wi/4+FO4EwL271o5QmEKAEf1Shxp5p+kajko+WK4q/WN1vWO4kB 6r27SfVAZm8JQNBxwWdCGBz2nqpexqpmXExHhMjIqsF6zxZlUlEDsHcOck1T2vdciyio fDXqUVN6WEiM3VbnRWn8T8e8X7VDVN+zMxybrSNtjoEUcx1UvIU4AXPSOM96JlZ828q7 3eHQaBhvSSjT78F+ZFBgxNvwc5XdVyHVKBuoHreKVIFyO/tdyPQKeZ2eD5cirj2P+VaQ djTw== 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=5lsuQRt1wOPVx/WV2IDx0YOMGSRnaFf7LWvDSKsVmJQ=; b=erZjVhyZxqHZqu5ienMm2q21UyLmgRqaGRRN3eQWrlDS08M7cevI3pqVqfsuDEBryf RIBKch/r7bIYhPiCHP9owPyzehd7fxjIKPR/AeklCGE7tFWwJq+ZQ3zMKr2JsGucw89T zrGJ73J+Cu2uAMAQfQoiu5hV6/FCiYZCt2jvcMn3Ovh7M/C9gv77cqnubq4Z/f2b+K3k RNNW7bqYkkL8CnWzFSCXIhma//Cumj9zPdhXUVgKuqe1dyzAAMzj4dEGvOOQxKT85MfV 3vcLZKyjVXh/+frUYFs7/xqYfmXDZ66H6XeNu/9OyXy4a8WOa1XoelP4Lcjv+M0JY8xl DsaA== X-Gm-Message-State: AO0yUKUc8X2O7gg1k8fdBmp/tyxoe4FGk/TD9ThgcmCBfdG7EUv5TM1m HC2JtMGgVYImA6sbrx+7TGD9nRXIsOCJOfvy X-Google-Smtp-Source: AK7set/T7a1YMzyatggC9CKaseXVNFZpuc/744Ge82tC6cyMKtP8NkRxXCg15a5U2Wq1U37hMINF7w== X-Received: by 2002:a05:622a:1990:b0:3b8:691f:271 with SMTP id u16-20020a05622a199000b003b8691f0271mr7774782qtc.63.1676522224884; Wed, 15 Feb 2023 20:37:04 -0800 (PST) Received: from localhost.localdomain (dsl-155-109.b2b2c.ca. [66.158.155.109]) by smtp.gmail.com with ESMTPSA id t85-20020a374658000000b007186c9e167esm452992qka.52.2023.02.15.20.37.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Feb 2023 20:37:04 -0800 (PST) From: Maxim Cournoyer Date: Wed, 15 Feb 2023 23:36:43 -0500 Message-Id: <20230216043649.32119-5-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230216043649.32119-1-maxim.cournoyer@gmail.com> References: <20230216043649.32119-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gnuzilla.scm (%icecat-locales, %icedove-locales): New variable. (make-l10n-package): New procedure. (icecat-l10n, icedove-l10n): New variables. --- (no changes since v1) gnu/packages/gnuzilla.scm | 146 +++++++++++++++++++++++++++++++++++++- 1 file changed, 145 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 17edb9fa7e..63ea7440e6 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -17,7 +17,7 @@ ;;; Copyright © 2020, 2022 Marius Bakke ;;; Copyright © 2021 Brice Waegeneire ;;; Copyright © 2021 Maxime Devos -;;; Copyright © 2021, 2022 Maxim Cournoyer +;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer ;;; Copyright © 2021 Baptiste Strazzul ;;; ;;; This file is part of GNU Guix. @@ -1123,6 +1123,16 @@ (define (runpaths-of-input label) (cpe-name . "firefox_esr") (cpe-version . ,(first (string-split version #\-))))))) +(define %icecat-locales + '("ach" "af" "an" "ar" "ast" "az" "be" "bg" "bn" "br" "bs" "ca" "cak" + "ca-valencia" "cs" "cy" "da" "de" "dsb" "el" "en-CA" "en-GB" "eo" "es-AR" + "es-CL" "es-ES" "es-MX" "et" "eu" "fa" "ff" "fi" "fr" "fy-NL" "ga-IE" "gd" + "gl" "gn" "gu-IN" "he" "hi-IN" "hr" "hsb" "hu" "hy-AM" "ia" "id" "is" "it" + "ja" "ja-JP-mac" "ka" "kab" "kk" "km" "kn" "ko" "lij" "lt" "lv" "mk" "mr" "ms" + "my" "nb-NO" "ne-NP" "nl" "nn-NO" "oc" "pa-IN" "pl" "pt-BR" "pt-PT" "rm" "ro" + "ru" "sco" "si" "sk" "sl" "son" "sq" "sr" "sv-SE" "szl" "ta" "te" "th" "tl" + "tr" "trs" "uk" "ur" "uz" "vi" "xh" "zh-CN" "zh-TW")) + (define %icedove-build-id "20230207000000") ;must be of the form YYYYMMDDhhmmss (define %icedove-version "102.7.2") @@ -1147,6 +1157,15 @@ (define (comm-source->locales+changeset source) (((_ changeset locale) ...) (values locale (first changeset))))) +;;; Generated with comm-source->locales+changeset. +(define %icedove-locales + '("af" "ar" "ast" "be" "bg" "br" "ca" "cak" "cs" "cy" "da" "de" "dsb" "el" + "en-CA" "en-GB" "es-AR" "es-ES" "es-MX" "et" "eu" "fi" "fr" "fy-NL" "ga-IE" + "gd" "gl" "he" "hr" "hsb" "hu" "hy-AM" "id" "is" "it" "ja" "ja-JP-mac" "ka" + "kab" "kk" "ko" "lt" "lv" "ms" "nb-NO" "nl" "nn-NO" "pa-IN" "pl" "pt-BR" + "pt-PT" "rm" "ro" "ru" "sk" "sl" "sq" "sr" "sv-SE" "th" "tr" "uk" "uz" "vi" + "zh-CN" "zh-TW")) + ;;; To find out which changeset to use for the comm-l10n repo, use the ;;; 'comm-source->locales+changeset' procedure on the thunderbird-comm-source ;;; checkout directory. The complete localization data should be released as @@ -1555,6 +1574,131 @@ (define-public icedove/wayland (native-inputs '()) (inputs '()))) +(define (make-l10n-package project) + "Return a package for PROJECT, a symbol (either icecat or icedove). +It assumes the %PROJECT-VERSION, PROJECT-SOURCE and %PROJECT-LOCALES variables +already exist." + (unless (member project '(icecat icedove)) + (error "only icecat or icedove components are currently supported")) + + (let ((name (if (eq? 'icecat project) + "IceCat" + "Icedove"))) + + (package + (name (format #f "~a-l10n" project)) + (version (module-ref (current-module) + (symbol-append '% project '-version))) + (source (module-ref (current-module) + (symbol-append project '-source))) + (outputs (cons "out" (module-ref (current-module) + (symbol-append '% project '-locales)))) + (build-system gnu-build-system) + (arguments + (list + #:modules '((guix build gnu-build-system) + (guix build utils) + (ice-9 format) + (ice-9 ftw) + (srfi srfi-1) + (srfi srfi-26)) + #:tests? #f ;no tests, this is data + #:phases + #~(modify-phases %standard-phases + (delete 'bootstrap) + (delete 'install) + (replace 'configure + (lambda _ + ;; The following configuration is inspired by guidance at + ;; https://firefox-source-docs.mozilla.org/build/buildsystem/locales.html. + (call-with-output-file ".mozconfig" + (lambda (p) + (format p "~{~a~%~}" + (list (if (eq? 'icecat '#$project) + "ac_add_options --enable-project=browser" + "ac_add_options --enable-project=comm/mail") + "ac_add_options --disable-compile-environment" + (string-append + "ac_add_options --with-l10n-base=" + (getcwd) "/l10n") + ;; Hack, otherwise the build system throws: + ;; 'RuntimeError: File "brand.dtd" not found'. + "ac_add_options --enable-official-branding" + "mk_add_options MOZ_OBJDIR=obj")))) + (setenv "CONFIG_SHELL" (which "bash")) + (setenv "MOZBUILD_STATE_PATH" + (string-append (getcwd) "/mach_state")) + (setenv "MOZCONFIG" (string-append (getcwd) "/.mozconfig")) + (setenv "MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE" "system") + (setenv "BUILD_BACKENDS" "FasterMake,RecursiveMake"))) + (replace 'build ;build and install data files + (lambda* (#:key outputs #:allow-other-keys) + (define (find-file dir name) + (let ((files (find-files dir name))) + (when (null? files) + (error "could not find file in dir" name dir)) + (car files))) + + (for-each + (lambda (l) + (let* ((out (assoc-ref outputs l)) + ;; The older lib/$project/distribution/extensions + ;; directory is deprecated. Use the newer app-global + ;; directory, which is lib/$project/extensions. + (ext-dir-prefix + (format + #f "lib/~a/~:[~;browser/~]extensions" + '#$project (eq? 'icecat '#$project))) + (all-ext (string-append #$output "/" ext-dir-prefix)) + (ext-dir (string-append out "/" ext-dir-prefix)) + ;; XXX: Because Icedove doesn't have a makeicedove + ;; script that substitutes all the Thunderbird + ;; references to Icedove, the MOZ_LANGPACK_EID + ;; defined in comm/mail/locales/Makefile.in uses + ;; 'thunderbird' in its ID extension rather than + ;; 'icedove'. + (name (format #f "langpack-~a@~a.mozilla.org.xpi" + l (if (eq? 'icedove '#$project) + 'thunderbird + '#$project)))) + (format #t "processing locale `~a'...~%" l) + (if (eq? 'icecat '#$project) + ;; XXX: For some reasons, for IceCat, there are some + ;; parsing errors that cause the build system to + ;; return an unclean exit code; use system* to ignore + ;; errors. + (system* "./mach" "build" (string-append "langpack-" l)) + (invoke "./mach" "build" (string-append "langpack-" l))) + (mkdir-p ext-dir) + (let ((xpi (find-file "obj" (string-append + "\\." l "\\.langpack\\.xpi$")))) + (copy-file xpi (string-append ext-dir "/" name)) + ;; Symlink to the main output so that a user can + ;; install all of the language packs at once. + (mkdir-p all-ext) + (symlink (string-append ext-dir "/" name) + (string-append all-ext "/" name))))) + (if (eq? 'icedove '#$project) + '#$%icedove-locales + '#$%icecat-locales))))))) + (native-inputs + (list m4 + perl + python-wrapper + node + unzip)) + (home-page "https://www.mozilla.org/") + (synopsis (string-append "Language localization data for " name)) + (description (string-append "This package contains the various language +localization data files (language pack extensions) for " name ". The +individual localization packages can be installed by using the output +associated with their name.")) + (license license:mpl2.0)))) + +(define-public icecat-l10n (make-l10n-package 'icecat)) + +(define-public icedove-l10n (make-l10n-package 'icedove)) + (define-public firefox-decrypt (package (name "firefox-decrypt") -- 2.39.1 From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH 06/10] gnu: icedove: Automatically load system-provided extensions. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Thu, 16 Feb 2023 04:38:07 +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, Jonathan Brielmaier , Maxim Cournoyer Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.167652224012926 (code B ref 32026); Thu, 16 Feb 2023 04:38:07 +0000 Received: (at 32026) by debbugs.gnu.org; 16 Feb 2023 04:37:20 +0000 Received: from localhost ([127.0.0.1]:34594 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSW1H-0003MK-Rt for submit@debbugs.gnu.org; Wed, 15 Feb 2023 23:37:20 -0500 Received: from mail-qt1-f170.google.com ([209.85.160.170]:34446) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSW19-0003KI-OR for 32026@debbugs.gnu.org; Wed, 15 Feb 2023 23:37:12 -0500 Received: by mail-qt1-f170.google.com with SMTP id f10so1047121qtv.1 for <32026@debbugs.gnu.org>; Wed, 15 Feb 2023 20:37:11 -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=7B1Ls6Emk6juqZmppwlWOj3+7RUSwqn6r4P/ZSxDDVU=; b=f7dwKc5FQNFl91Nk1O93Jd7+EuFJ/NP8WqMbIluRoH5zEpYvHJud9uzI4JPLB2nCuJ py1NEECwiowSgNfxAAfAyDzJmNs42u8myXb7nQAk2SLl4gmkxSWepdkT5EXSYDJOhRS4 nWapyF992Qj7IaeQbBI1jFsDaxNFTUE7W0ORIqgXqGof/D0bgAr9LF6Y2OPSffAaKJal 6j2lMH8Qdfr4NJSkACKCR83WIkR6hgsqCHClY4dGf5uwqe76MJK4uX2AeKXZBfSJpJAA fEJVY8AKHAntKmNUbdQ3BsuLQ8H8IhFu8fTUafFXzf5XE5BQm/Lm2Y5LGtU09vy6pid4 cwOg== 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=7B1Ls6Emk6juqZmppwlWOj3+7RUSwqn6r4P/ZSxDDVU=; b=7u2/0lbKnDfg9UcOwT6tJw+E2NWEH6ZHWy/ygAVJ7WGJ6H+77ThfjMEHNYSgr5Ln1m ew987HMqFKE9bfpvXf6xnfKf47S3bkHfdr+bPCi/1PRNw/rT66qqos3gpvlf/7gwsTLb 7pPLLkEUpGISVf3W9f9FEgOcmyamAmxBiY1+qj/M8j5xjYta1/arTdl2WU6kNhmClTDb 4f6god1FrQg8DLFXns4XYYHbGNIlvwzbYU51+h2MavPA77zdezCuAqa3NrEEMb96jrhC Cjk7PapvTuOAIEko2vE/y6/b/iII8K1Wv+2Jycyr6z03/Vhb98w2kvkQQBW1/p/v/+rP JKSQ== X-Gm-Message-State: AO0yUKVdkFOJuJj/GccF8tlmlAz+y+Rn2KBt37SekZZtTurvlXVsDCBY gJeV8Vw7JJpnGou4aXtbd0BvwagWBHA9J/Pu X-Google-Smtp-Source: AK7set83rVPm/rXzZ36h4yEsDQY0eFPdq31BGVxiweqiatbNJxY84Cw7BVibPrgL7GFC6DoVELLkDg== X-Received: by 2002:a05:622a:3c9:b0:3af:b6bd:aba7 with SMTP id k9-20020a05622a03c900b003afb6bdaba7mr7768091qtx.43.1676522226184; Wed, 15 Feb 2023 20:37:06 -0800 (PST) Received: from localhost.localdomain (dsl-155-109.b2b2c.ca. [66.158.155.109]) by smtp.gmail.com with ESMTPSA id t85-20020a374658000000b007186c9e167esm452992qka.52.2023.02.15.20.37.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Feb 2023 20:37:05 -0800 (PST) From: Maxim Cournoyer Date: Wed, 15 Feb 2023 23:36:44 -0500 Message-Id: <20230216043649.32119-6-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230216043649.32119-1-maxim.cournoyer@gmail.com> References: <20230216043649.32119-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gnuzilla.scm (icedove-source): Set the extensions.autoDisableScopes preference value to 3. (icedove-minimal) [phases]: Add the --allow-addon-sideload and --with-unsigned-addon-scopes=app,system ac options to the configure phase. --- (no changes since v1) gnu/packages/gnuzilla.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 63ea7440e6..a578142967 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1281,7 +1281,15 @@ (define icedove-source (("(pref\\(\"extensions.systemAddon.update.enabled\").*" _ m) (string-append m ", false);")) (("(pref\\(\"lightweightThemes.update.enabled\").*" _ m) - (string-append m ", false);"))) + (string-append m ", false);")) + + ;; XXX: The autoDisableScopes is tweaked by the makeicecat + ;; script, but it doesn't know about Thunderbird. This is + ;; necessary to allow picking up the extensions found in the + ;; system global application directory, such as the language + ;; packs. + (("\"extensions.autoDisableScopes\", 15") + "\"extensions.autoDisableScopes\", 3")) ;; Step out of the directory and create the tarball. (chdir "..") @@ -1394,6 +1402,8 @@ (define-public icedove (lambda () (display (string-append + "ac_add_options --allow-addon-sideload\n" + "ac_add_options --with-unsigned-addon-scopes=app,system\n" "ac_add_options --disable-crashreporter\n" "ac_add_options --disable-debug\n" "ac_add_options --disable-debug-symbols\n" -- 2.39.1 From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH 07/10] gnu: Add language packs to icecat and icedove. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Thu, 16 Feb 2023 04:38:07 +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, Jonathan Brielmaier , Maxim Cournoyer Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.167652224112934 (code B ref 32026); Thu, 16 Feb 2023 04:38:07 +0000 Received: (at 32026) by debbugs.gnu.org; 16 Feb 2023 04:37:21 +0000 Received: from localhost ([127.0.0.1]:34596 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSW1I-0003MR-DB for submit@debbugs.gnu.org; Wed, 15 Feb 2023 23:37:21 -0500 Received: from mail-qt1-f174.google.com ([209.85.160.174]:33429) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSW1B-0003KQ-2U for 32026@debbugs.gnu.org; Wed, 15 Feb 2023 23:37:14 -0500 Received: by mail-qt1-f174.google.com with SMTP id h24so1081130qtr.0 for <32026@debbugs.gnu.org>; Wed, 15 Feb 2023 20:37:13 -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=E/nicBCK7b3L5DmKfveBEFHk4DpOzJMzMp6EB+2uTC0=; b=RUBQ1xRGdVMnNWCuzsmmh/7sjhZ3dOB+xUis1RYrPtfSFVw3oB1DwDO1TEPPQw0JGe we7XjEOmy02UCDR4uPNTtUkJ865WdyfsTPA13c+gVLRcF3l3lXxpsktRWiov+0+2L0HR VvRCv4SyVWNrTTfRRXunci3l0M2rCkJYLhPO6sCiHtHYI9xArrkMjzBV/vn/EKUtxo2t VnEWP9jSs8DpayqGVaVclfPt9QMNproaF1Fw/FBwc2dzBCoOVFk1D3kDHrY/a0kch/zI NTyMN9GNOm+bYc27tpvklo2PJBTFwHJG9KrOvkwPlJxpkT4pSge0E60Ils30whEcz1aB 3Ptw== 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=E/nicBCK7b3L5DmKfveBEFHk4DpOzJMzMp6EB+2uTC0=; b=ScuUtIKuB9KfdsnL+CaGI8AlGYO/e58zTQ3/kRJLVWCYclaSq5i/HZaawLV4RWZdLD y4odcrot2OVis0xf4t/UMVbWef6tVHB4mWAaDHhokJHNL5IqiH4D3ui7/hNJmeQ2M7sa qPUBp3hQuTLMe09vOOz+fJskiAcCFdK8rAG6BceXe2ZDkUFPjlEElmtA6mhiRd32bl9D CaQuhCgiPdRCSvVo0i/Y5wC473vrXzb6dp2RofDLk5V49abJ8twJpkAuLqdo52nWupsL ufoswSncNLXWC1nKeTwVPqaKssX+hm4TTE1h7H1saV7GWVlHpUQY5AOuAUA8WY6DXO6z Fiug== X-Gm-Message-State: AO0yUKUNVAdIj5vG++rsRJoXZ19U8QfPm/djrofgi5bhwPnn9qPtSmgz bpfzjMUOZFW0vDuxJWBGap0h//dvqgg5yN2H X-Google-Smtp-Source: AK7set8MZeVZMtAr93xmAB6mTc17NiyMGsLQT+O7FuOOfapMHT9sA2o8/J/U/UCE698ApIwLJ1MSEQ== X-Received: by 2002:a05:622a:4d0:b0:3bc:f954:323a with SMTP id q16-20020a05622a04d000b003bcf954323amr7845478qtx.62.1676522227425; Wed, 15 Feb 2023 20:37:07 -0800 (PST) Received: from localhost.localdomain (dsl-155-109.b2b2c.ca. [66.158.155.109]) by smtp.gmail.com with ESMTPSA id t85-20020a374658000000b007186c9e167esm452992qka.52.2023.02.15.20.37.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Feb 2023 20:37:07 -0800 (PST) From: Maxim Cournoyer Date: Wed, 15 Feb 2023 23:36:45 -0500 Message-Id: <20230216043649.32119-7-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230216043649.32119-1-maxim.cournoyer@gmail.com> References: <20230216043649.32119-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Fixes . * gnu/packages/gnuzilla.scm (icecat): Rename to... (icecat-minimal): ... this. (icedove: Rename to... (icedove-minimal): ... this. (make-mozilla-with-l10n): New procedure. (icecat, icedove): New variables. --- Changes in v2: - Do not clear native-inputs and inputs in make-mozilla-with-l10n, for 'guix shell -D icecat' gnu/packages/gnuzilla.scm | 133 ++++++++++++++++++++++++++++---------- 1 file changed, 98 insertions(+), 35 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index a578142967..9492d9a26a 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -679,9 +679,9 @@ (define icecat-source "--sort=name" icecat-dir))))))))) -(define-public icecat +(define-public icecat-minimal (package - (name "icecat") + (name "icecat-minimal") (version %icecat-version) (source icecat-source) (build-system gnu-build-system) @@ -1303,9 +1303,9 @@ (define icedove-source "--sort=name" #$name)))))))) -(define-public icedove +(define-public icedove-minimal (package - (name "icedove") + (name "icedove-minimal") (version %icedove-version) (source icedove-source) (properties @@ -1555,35 +1555,6 @@ (define-public icedove Thunderbird. It supports email, news feeds, chat, calendar and contacts.") (license license:mpl2.0))) -(define-public icedove/wayland - (package - (inherit icedove) - (name "icedove-wayland") - (build-system trivial-build-system) - (arguments - (list - #:modules '((guix build utils)) - #:builder - #~(begin - (use-modules (guix build utils)) - (let* ((exe (string-append #$output "/bin/icedove"))) - (mkdir-p (dirname exe)) - (call-with-output-file exe - (lambda (port) - (format port "#!~a - MOZ_ENABLE_WAYLAND=1 exec ~a $@" - #$(file-append bash-minimal "/bin/bash") - #$(file-append icedove "/bin/icedove")))) - (chmod exe #o555) - ;; Provide the manual and .desktop file. - (copy-recursively (string-append #$icedove "/share") - (string-append #$output "/share")) - (substitute* (string-append #$output - "/share/applications/icedove.desktop") - ((#$icedove) #$output)))))) - (native-inputs '()) - (inputs '()))) - (define (make-l10n-package project) "Return a package for PROJECT, a symbol (either icecat or icedove). It assumes the %PROJECT-VERSION, PROJECT-SOURCE and %PROJECT-LOCALES variables @@ -1705,9 +1676,101 @@ (define (find-file dir name) associated with their name.")) (license license:mpl2.0)))) -(define-public icecat-l10n (make-l10n-package 'icecat)) +(define icecat-l10n (make-l10n-package 'icecat)) + +(define icedove-l10n (make-l10n-package 'icedove)) + +;;; This hack exists because there's no way to configure extra extension +;;; search paths for IceCat or Icedove. The global extensions directory is +;;; constructed relatively to the executable file name. +(define (make-mozilla-with-l10n project) + (let ((base (module-ref (current-module) + (symbol-append project '-minimal))) + (l10n-package (module-ref (current-module) + (symbol-append project '-l10n))) + (name (symbol->string project)) + (icecat? (eq? 'icecat project))) + (package + (inherit base) + (name (symbol->string project)) + (build-system trivial-build-system) + (arguments + (list + #:modules '((guix build union) + (guix build utils)) + #:builder + #~(begin + (use-modules (guix build union) + (guix build utils)) + + (union-build #$output (list #$base #$l10n-package) + #:create-all-directories? #t) + + (define* (expose name #:optional (proc copy-file) + #:key (source #$base)) + (let ((dest (string-append #$output "/" name))) + (mkdir-p (dirname dest)) + (proc (string-append source "/" name) dest))) + + (let ((wrapper (string-append "lib/" #$name "/" #$name)) + (real-binary (string-append "lib/" #$name "/." #$name + "-real")) + (desktop-file (string-append "share/applications/" + #$name ".desktop"))) + ;; Copy wrapper file. + (delete-file (string-append #$output "/" wrapper)) + (expose wrapper) + + ;; Recreate bin symlink. + (delete-file (string-append #$output "/bin/" #$name)) + (symlink (string-append #$output "/" wrapper) + (string-append #$output "/bin/" #$name)) + + ;; Copy actual binary. + (delete-file (string-append #$output "/" real-binary)) + (expose real-binary) + + ;; Copy desktop file. + (delete-file (string-append #$output "/" desktop-file)) + (expose desktop-file) + + ;; Adjust the references in the desktop file and wrapper. + (substitute* (list (string-append #$output "/" desktop-file) + (string-append #$output "/" wrapper)) + ((#$base) #$output))))))))) + +(define-public icecat (make-mozilla-with-l10n 'icecat)) + +(define-public icedove (make-mozilla-with-l10n 'icedove)) -(define-public icedove-l10n (make-l10n-package 'icedove)) +(define-public icedove/wayland + (package + (inherit icedove) + (name "icedove-wayland") + (build-system trivial-build-system) + (arguments + (list + #:modules '((guix build utils)) + #:builder + #~(begin + (use-modules (guix build utils)) + (let* ((exe (string-append #$output "/bin/icedove"))) + (mkdir-p (dirname exe)) + (call-with-output-file exe + (lambda (port) + (format port "#!~a + MOZ_ENABLE_WAYLAND=1 exec ~a $@" + #$(file-append bash-minimal "/bin/bash") + #$(file-append icedove "/bin/icedove")))) + (chmod exe #o555) + ;; Provide the manual and .desktop file. + (copy-recursively (string-append #$icedove "/share") + (string-append #$output "/share")) + (substitute* (string-append #$output + "/share/applications/icedove.desktop") + ((#$icedove) #$output)))))) + (native-inputs '()) + (inputs '()))) (define-public firefox-decrypt (package -- 2.39.1 From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH 08/10] gnu: icedove: Use the locale of the system. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Thu, 16 Feb 2023 04:38:08 +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, Jonathan Brielmaier , Maxim Cournoyer Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.167652224212941 (code B ref 32026); Thu, 16 Feb 2023 04:38:08 +0000 Received: (at 32026) by debbugs.gnu.org; 16 Feb 2023 04:37:22 +0000 Received: from localhost ([127.0.0.1]:34598 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSW1J-0003MZ-EY for submit@debbugs.gnu.org; Wed, 15 Feb 2023 23:37:21 -0500 Received: from mail-qt1-f173.google.com ([209.85.160.173]:40458) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSW1C-0003Kd-9a for 32026@debbugs.gnu.org; Wed, 15 Feb 2023 23:37:14 -0500 Received: by mail-qt1-f173.google.com with SMTP id w3so1018251qts.7 for <32026@debbugs.gnu.org>; Wed, 15 Feb 2023 20:37:14 -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=lfQbNSP8EDjAjynE4aVCCdBLALbRLeypr4pqz8cwek0=; b=eBLVUJ3jVSdYhQOXrEHkRPXi9W8a2UJ+7J8IXI/Jp1pnbE2VaJ7EYGdA8TUiXVwDjv QvrHanDhtQs3j0QvjQgs/S6NAsaS5mFYp/707zmEMq/QiaihLyk2dap333q30c/tGSwr WCFJsnbDpBTT3D3iQ3ZWudd8pgZ9sHE25atAxVJV0tocbp4klAD73u61f3Q0VfJcR6CN mZTmZaWu0Qwonzxi2h1COv/oTLs/oll+rd4G3SfEbVuQVRByDMG/nMsMLLAn3LOTvUod bQCfqLwFEmtyTivcQokyC19E9XDU6h8kzR1xhcwkGZFf97MKq+6Jakv0qGpCl2HJkLiq URhA== 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=lfQbNSP8EDjAjynE4aVCCdBLALbRLeypr4pqz8cwek0=; b=B1fILqfY21tGwxKWTb0S8HEioNgYf9tuV9ClJcN3zYXJfU52UQFf3jNmOBxJVH7fBw 52VKfMNkhGJBzbypsPuYdb6qiAS4jE6uBFA3bBJbgE3A5I2cL1MGEybPziZ8x74N60Ge ss23ik0GlhfaVJ2/HujePWMl4AtOTovOJWBQyGHrzP0cUcdNzR6PWy4dQRQ5gfQyqQPS n1vgx8xdroiUD6PqjONL8n/bykEJY6dH+8vk/Tve0T2Hv3jbokqspvKexVC8JruW1lLF VlmKVSGGYnAfTDbZFBMCclR4E8gmAYIctgA1d0lPP61rOlILRoECqdr2FuugA6Q9s3Ru ymYA== X-Gm-Message-State: AO0yUKW5MPJWhlYq4gKUEVTcJ75WjLfm+sQUysCl6QuqIW5Y4t2WBoS5 Z3eKB+8OAYg6vtFBlsprQzGSq0YsmB32yyy2 X-Google-Smtp-Source: AK7set/HL12VNFQZ4w4Qv13YX+yPP9eP1r3jHzs2o/wQBILUgrePXwdmQR8hhFEeLO5l8mF+YWJ6Kw== X-Received: by 2002:a05:622a:180c:b0:3b8:5bc6:deab with SMTP id t12-20020a05622a180c00b003b85bc6deabmr7288959qtc.8.1676522228686; Wed, 15 Feb 2023 20:37:08 -0800 (PST) Received: from localhost.localdomain (dsl-155-109.b2b2c.ca. [66.158.155.109]) by smtp.gmail.com with ESMTPSA id t85-20020a374658000000b007186c9e167esm452992qka.52.2023.02.15.20.37.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Feb 2023 20:37:08 -0800 (PST) From: Maxim Cournoyer Date: Wed, 15 Feb 2023 23:36:46 -0500 Message-Id: <20230216043649.32119-8-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230216043649.32119-1-maxim.cournoyer@gmail.com> References: <20230216043649.32119-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gnuzilla.scm (icedove-source): Set the intl.locale.requested option to the empty string. --- (no changes since v1) gnu/packages/gnuzilla.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 9492d9a26a..fa868f6824 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1289,7 +1289,12 @@ (define icedove-source ;; system global application directory, such as the language ;; packs. (("\"extensions.autoDisableScopes\", 15") - "\"extensions.autoDisableScopes\", 3")) + "\"extensions.autoDisableScopes\", 3") + + ;; Set the default locale to that of the operating system. + ((".*extensions.autoDisableScopes.*" anchor) + (string-append anchor + "pref(\"intl.locale.requested\", \"\");\n"))) ;; Step out of the directory and create the tarball. (chdir "..") -- 2.39.1 From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH 10/10] gnu: icecat: Unbundle nss and nspr. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Thu, 16 Feb 2023 04:38:08 +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, Jonathan Brielmaier , Maxim Cournoyer Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.167652225912975 (code B ref 32026); Thu, 16 Feb 2023 04:38:08 +0000 Received: (at 32026) by debbugs.gnu.org; 16 Feb 2023 04:37:39 +0000 Received: from localhost ([127.0.0.1]:34601 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSW1a-0003NC-0n for submit@debbugs.gnu.org; Wed, 15 Feb 2023 23:37:38 -0500 Received: from mail-qv1-f53.google.com ([209.85.219.53]:39748) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSW1F-0003LI-18 for 32026@debbugs.gnu.org; Wed, 15 Feb 2023 23:37:17 -0500 Received: by mail-qv1-f53.google.com with SMTP id i5so580952qvp.6 for <32026@debbugs.gnu.org>; Wed, 15 Feb 2023 20:37:17 -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=Opqu4FKBLv2hB4HOdC3H4JIevFK9DoiT/uNzAQALBzw=; b=YY6czhZRif+bZZLRPz0ej2/W/ErVlGyNP9DUn/q9jrIV8BiDbZxO6wqa9vBoTdMuwr vGnZCwJT12s8+NMSrte14ZSHYcIGW/hOowGIDtuk/g7E1aE28T0vIs97Fr+SNk2lH79s Xl+Ji1LlsjpEfvve/tgaZBf9UGyzgntORvDAqdQgGT0fhkSKPaEmUt2BwHZL/WCo8TAx dsKyQ+NOG8cbASJ4b8LVCys8RK0U/EgEgymGYo1/HbZiT1H1xIGyxHe9q14Fi7IKpM+a vcL71Y3oUfzLl7gNxM4cLBaTiF+4xkxQwADaidSrGFUDot2I/h19heQX6F0FrwyOVRiz xHBg== 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=Opqu4FKBLv2hB4HOdC3H4JIevFK9DoiT/uNzAQALBzw=; b=gYiLDH78uSA2XxfYndmqWs3rsZNyAnRGrQI79Vju8kWmUTZbWzEoqzOUceAbXCw3Bn MRDMMMEpPQdH77riJYRFxTlAFkVJqRaDOEYy/pTiAqbHSWCarKEQPiAcDQdJAPJPXAKy TW8raewFE/LSGJRocqbXD8mEJ8jVL5CmbdJz5Rp+hbICDLi982lz/kQRhd25tjl1zcHd 2B0RX0j9xSve86OgrZJ3HKacSTF/I/sSscDHUAThJvYvoS3Hr4AaByEzUN8DcyDlt6BG qDZH1JRNDMQdI/FAgW2RGOUY1Dkrwwih9BbEEHryROYvXmrMwQ0Pmqz9jnoKYS3XPTYX ecsA== X-Gm-Message-State: AO0yUKW3XRZjYKbl6/DB2Qx0jZ240G34K+228UtLRV64Bo7TNNOjBoQc Qxr+KRdcRRoQdzvt35m7GidbSiHLPyUHmP5s X-Google-Smtp-Source: AK7set8Kur6nIKDr9xbfnjDpof25ftA0b1GGBXE0kjCq69f5VHu3yJLFTtZqOTVwdCD9HkvzW8Iwrg== X-Received: by 2002:a05:6214:27ce:b0:56e:bbd9:1c0e with SMTP id ge14-20020a05621427ce00b0056ebbd91c0emr8274300qvb.5.1676522231380; Wed, 15 Feb 2023 20:37:11 -0800 (PST) Received: from localhost.localdomain (dsl-155-109.b2b2c.ca. [66.158.155.109]) by smtp.gmail.com with ESMTPSA id t85-20020a374658000000b007186c9e167esm452992qka.52.2023.02.15.20.37.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Feb 2023 20:37:11 -0800 (PST) From: Maxim Cournoyer Date: Wed, 15 Feb 2023 23:36:48 -0500 Message-Id: <20230216043649.32119-10-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230216043649.32119-1-maxim.cournoyer@gmail.com> References: <20230216043649.32119-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gnuzilla.scm (icecat-minimal) [inputs]: Add nspr-next and nss-next. [configure-flags]: Re-instate the "--with-system-nspr" and "--with-system-nss" configure flags. [phases] {remove-bundled-libraries}: Update comment. --- Changes in v2: - New commit gnu/packages/gnuzilla.scm | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 8e90327ea4..ced3f75ecf 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -723,10 +723,8 @@ (define-public icecat-minimal mit-krb5 hunspell libnotify - ;; See - ;; and related comments in the 'remove-bundled-libraries' phase. - ;; UNBUNDLE-ME! nspr - ;; UNBUNDLE-ME! nss + nspr-next + nss-next shared-mime-info sqlite eudev @@ -821,12 +819,8 @@ (define-public icecat-minimal ;; UNBUNDLE-ME! "--with-system-theora" ; wants theora-1.2, not yet released ;; UNBUNDLE-ME! "--with-system-libvpx" "--with-system-icu" - - ;; See - ;; and related comments in the - ;; 'remove-bundled-libraries' phase below. - ;; UNBUNDLE-ME! "--with-system-nspr" - ;; UNBUNDLE-ME! "--with-system-nss" + "--with-system-nspr" + "--with-system-nss" ;; UNBUNDLE-ME! "--with-system-harfbuzz" ;; UNBUNDLE-ME! "--with-system-graphite2" @@ -875,12 +869,9 @@ (define-public icecat-minimal ;; FIXME: A script from the bundled nspr is used. ;;"nsprpub" ;; - ;; FIXME: With the update to IceCat 60, using system NSS - ;; broke certificate validation. See - ;; . For now, we use - ;; the bundled NSPR and NSS. TODO: Investigate, - ;; and try to unbundle these libraries again. - ;; UNBUNDLE-ME! "security/nss" + ;; FIXME: Some of the bundled NSS sources are used + ;; to build third_party/prio. + ;;"security/nss" ;; ;; TODO: Use more system media libraries. See: ;; -- 2.39.1 From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH 01/10] gnu: Add a 'update-mozilla-locales' helper for maintenance. Resent-From: Mark H Weaver Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Thu, 16 Feb 2023 22:07:01 +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: Maxim Cournoyer , 32026@debbugs.gnu.org Cc: ludo@gnu.org, Jonathan Brielmaier , Maxim Cournoyer Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.16765851755314 (code B ref 32026); Thu, 16 Feb 2023 22:07:01 +0000 Received: (at 32026) by debbugs.gnu.org; 16 Feb 2023 22:06:15 +0000 Received: from localhost ([127.0.0.1]:37841 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSmOM-0001Ne-OV for submit@debbugs.gnu.org; Thu, 16 Feb 2023 17:06:15 -0500 Received: from world.peace.net ([64.112.178.59]:37564) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSmOG-0001NM-F0 for 32026@debbugs.gnu.org; Thu, 16 Feb 2023 17:06:13 -0500 Received: from mhw by world.peace.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pSmO8-0001Od-O7; Thu, 16 Feb 2023 17:06:00 -0500 From: Mark H Weaver In-Reply-To: <20230216043649.32119-1-maxim.cournoyer@gmail.com> References: <20230216043649.32119-1-maxim.cournoyer@gmail.com> Date: Thu, 16 Feb 2023 17:05:06 -0500 Message-ID: <87mt5dfeqa.fsf@netris.org> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 3.6 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi Maxim, Maxim Cournoyer writes: > * gnu/packages/gnuzilla.scm (update-mozilla-locales): New procedure. > (all-mozilla-locales): Comment how to proceed to update it. Content analysis details: (3.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_SBL_CSS RBL: Received via a relay in Spamhaus SBL-CSS [64.112.178.59 listed in zen.spamhaus.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.6 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi Maxim, Maxim Cournoyer writes: > * gnu/packages/gnuzilla.scm (update-mozilla-locales): New procedure. > (all-mozilla-locales): Comment how to proceed to update it. Content analysis details: (2.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_SBL_CSS RBL: Received via a relay in Spamhaus SBL-CSS [64.112.178.59 listed in zen.spamhaus.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager Hi Maxim, Maxim Cournoyer writes: > * gnu/packages/gnuzilla.scm (update-mozilla-locales): New procedure. > (all-mozilla-locales): Comment how to proceed to update it. [...] > +(define (update-mozilla-locales changesets.json) > + "Output a new list of Mozilla locales, to update the ALL-MOZILLA-LOCALES > +variable defined bellow. It requires guile-json to be installed." > + ;; To extract the file used as argument, do: > + ;; tar -xf $(./pre-inst-env guix build \ > + ;; -e '(@@ (gnu packages gnuzilla) upstream-firefox-source)') \ > + ;; --strip-components=3 \ > + ;; --wildcards '*/browser/locales/l10n-changesets.json' > + (match (call-with-input-file changesets.json json->scm) > + (((lang ("revision" . revision) platforms pin) ...) > + (let ((data (reverse (map (lambda (rev lang) > + `(,(list->string (make-list 40 #\0)) > + ,(string-take rev 12) ,lang)) > + revision lang)))) > + (format #t "~{~s~%~}" data) > + data)))) Thanks very much for this! I didn't know about the browser/locales/l10n-changesets.json file, and neither does the code in the upstream 'makeicecat' script, which simply uses "hg clone" to fetch the latest revisions at the time the 'makeicecat' script is run. Now we can change that code to use the revisions listed in 'l10n-changesets.json' instead, and thus eliminate a source of nondeterminism for non-Guix users of IceCat. However, I'd like to propose a different way to make use of this code. Instead of adding this new toplevel procedure that must be run manually, which involves steering the user toward the 'upstream-firefox-source' variable (which therefore must be promoted to a toplevel binding), all of which makes me extremely uncomfortable, how about the following: I propose adding a check to the code that populates the l10n directory in 'icecat-source'. That code has access to the unpacked firefox source directory, and already makes use of '#+all-mozilla-locales'. It's in a perfect position to check whether '#+all-mozilla-locales' is up-to-date w.r.t. browser/locales/l10n-changesets.json. My suggestion would be this: if '#+all-mozilla-locales' is not up-to-date, print an error report with the relevant information and force the derivation to *fail*. What do you think? If the idea sounds good to you, would you like to work on it, or should I? Thanks again for your work on this! Regards, Mark From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH 10/10] gnu: icecat: Unbundle nss and nspr. Resent-From: Mark H Weaver Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Thu, 16 Feb 2023 22:16:01 +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: Maxim Cournoyer , 32026@debbugs.gnu.org Cc: ludo@gnu.org, Jonathan Brielmaier , Maxim Cournoyer Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.16765857326162 (code B ref 32026); Thu, 16 Feb 2023 22:16:01 +0000 Received: (at 32026) by debbugs.gnu.org; 16 Feb 2023 22:15:32 +0000 Received: from localhost ([127.0.0.1]:37847 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSmXM-0001bK-5a for submit@debbugs.gnu.org; Thu, 16 Feb 2023 17:15:32 -0500 Received: from world.peace.net ([64.112.178.59]:37732) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSmXK-0001b3-Tl for 32026@debbugs.gnu.org; Thu, 16 Feb 2023 17:15:31 -0500 Received: from mhw by world.peace.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pSmXE-0001VQ-35; Thu, 16 Feb 2023 17:15:24 -0500 From: Mark H Weaver In-Reply-To: <20230216043649.32119-10-maxim.cournoyer@gmail.com> References: <20230216043649.32119-1-maxim.cournoyer@gmail.com> <20230216043649.32119-10-maxim.cournoyer@gmail.com> Date: Thu, 16 Feb 2023 17:14:33 -0500 Message-ID: <87k00hfeaj.fsf@netris.org> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 3.6 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi Maxim, Maxim Cournoyer writes: > * gnu/packages/gnuzilla.scm (icecat-minimal) [inputs]: Add nspr-next and > nss-next. > [configure-flags]: Re-instate the "--with-system-nspr" and "--with-system-nss" > configure flags. > [phases] {r [...] Content analysis details: (3.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_SBL_CSS RBL: Received via a relay in Spamhaus SBL-CSS [64.112.178.59 listed in zen.spamhaus.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.6 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi Maxim, Maxim Cournoyer writes: > * gnu/packages/gnuzilla.scm (icecat-minimal) [inputs]: Add nspr-next and > nss-next. > [configure-flags]: Re-instate the "--with-system-nspr" and "--with-system-nss" > configure flags. > [phases] {r [...] Content analysis details: (2.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_SBL_CSS RBL: Received via a relay in Spamhaus SBL-CSS [64.112.178.59 listed in zen.spamhaus.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager Hi Maxim, Maxim Cournoyer writes: > * gnu/packages/gnuzilla.scm (icecat-minimal) [inputs]: Add nspr-next and > nss-next. > [configure-flags]: Re-instate the "--with-system-nspr" and "--with-system-nss" > configure flags. > [phases] {remove-bundled-libraries}: Update comment. This is really great, thank you! There's just one transient issue that makes me want to hold off on this: As I recently reported to guix-security, a Mozilla security advisory published on Tuesday mentions "CVE-2023-0767: Arbitrary memory write via PKCS 12 in NSS". I'd like someone to confirm that this issue has been fixed in 'nss-next' before applying this commit. I don't have time to check it myself right now. Thanks, Mark From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH 03/10] gnu: Define UPSTREAM-FIREFOX-SOURCE at the top level. Resent-From: Mark H Weaver Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Thu, 16 Feb 2023 22:28:02 +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: Maxim Cournoyer , 32026@debbugs.gnu.org Cc: ludo@gnu.org, Jonathan Brielmaier , Maxim Cournoyer Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.16765864747812 (code B ref 32026); Thu, 16 Feb 2023 22:28:02 +0000 Received: (at 32026) by debbugs.gnu.org; 16 Feb 2023 22:27:54 +0000 Received: from localhost ([127.0.0.1]:37871 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSmjK-00021v-4N for submit@debbugs.gnu.org; Thu, 16 Feb 2023 17:27:54 -0500 Received: from world.peace.net ([64.112.178.59]:37920) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSmjI-00021d-9Y for 32026@debbugs.gnu.org; Thu, 16 Feb 2023 17:27:52 -0500 Received: from mhw by world.peace.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pSmjA-0001dN-VI; Thu, 16 Feb 2023 17:27:45 -0500 From: Mark H Weaver In-Reply-To: <20230216043649.32119-3-maxim.cournoyer@gmail.com> References: <20230216043649.32119-1-maxim.cournoyer@gmail.com> <20230216043649.32119-3-maxim.cournoyer@gmail.com> Date: Thu, 16 Feb 2023 17:26:52 -0500 Message-ID: <87h6vlfdq0.fsf@netris.org> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 3.6 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi Maxim, Maxim Cournoyer writes: > * gnu/packages/gnuzilla.scm (%icecat-base-version): New variable. > (%upstream-firefox-version): Likewise. > (%icecat-version): Define in terms of %icecat-base-version. > (upstream-firefox-source): [...] Content analysis details: (3.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_SBL_CSS RBL: Received via a relay in Spamhaus SBL-CSS [64.112.178.59 listed in zen.spamhaus.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.6 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi Maxim, Maxim Cournoyer writes: > * gnu/packages/gnuzilla.scm (%icecat-base-version): New variable. > (%upstream-firefox-version): Likewise. > (%icecat-version): Define in terms of %icecat-base-version. > (upstream-firefox-source): [...] Content analysis details: (2.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_SBL_CSS RBL: Received via a relay in Spamhaus SBL-CSS [64.112.178.59 listed in zen.spamhaus.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager Hi Maxim, Maxim Cournoyer writes: > * gnu/packages/gnuzilla.scm (%icecat-base-version): New variable. > (%upstream-firefox-version): Likewise. > (%icecat-version): Define in terms of %icecat-base-version. > (upstream-firefox-source): New variable. > (icecat-source): Adjust to use the above newly introduced variables. I'm deeply uncomfortable binding toplevel variables, even unexported ones, that provide non-FSDG-complaint software. I guess that the primary motivation for this commit was to make it easier to use the 'update-mozilla-locales' helper. In an earlier message , I suggested an alternative way to use the code in your proposed 'update-mozilla-locales' helper which would eliminate the need to expose any *firefox* toplevel variables. I hope you'll find that alternative approach acceptable, so that we can avoid exposing non-FSDG-compliant software in our toplevel bindings. What do you think? Thanks, Mark From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH 05/10] gnu: Add icecat-l10n and icedove-l10n. Resent-From: Mark H Weaver Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Thu, 16 Feb 2023 22:47:01 +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: Maxim Cournoyer , 32026@debbugs.gnu.org Cc: ludo@gnu.org, Jonathan Brielmaier , Maxim Cournoyer Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.16765876119826 (code B ref 32026); Thu, 16 Feb 2023 22:47:01 +0000 Received: (at 32026) by debbugs.gnu.org; 16 Feb 2023 22:46:51 +0000 Received: from localhost ([127.0.0.1]:37895 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSn1f-0002YP-BC for submit@debbugs.gnu.org; Thu, 16 Feb 2023 17:46:51 -0500 Received: from world.peace.net ([64.112.178.59]:38008) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSn1d-0002Xv-P7 for 32026@debbugs.gnu.org; Thu, 16 Feb 2023 17:46:50 -0500 Received: from mhw by world.peace.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pSn1V-0001kU-S4; Thu, 16 Feb 2023 17:46:42 -0500 From: Mark H Weaver In-Reply-To: <20230216043649.32119-5-maxim.cournoyer@gmail.com> References: <20230216043649.32119-1-maxim.cournoyer@gmail.com> <20230216043649.32119-5-maxim.cournoyer@gmail.com> Date: Thu, 16 Feb 2023 17:45:49 -0500 Message-ID: <87cz69fcuf.fsf@netris.org> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 3.6 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi Maxim, Maxim Cournoyer writes: > * gnu/packages/gnuzilla.scm (%icecat-locales, %icedove-locales): New variable. > (make-l10n-package): New procedure. > (icecat-l10n, icedove-l10n) [...] Content analysis details: (3.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_SBL_CSS RBL: Received via a relay in Spamhaus SBL-CSS [64.112.178.59 listed in zen.spamhaus.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.6 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi Maxim, Maxim Cournoyer writes: > * gnu/packages/gnuzilla.scm (%icecat-locales, %icedove-locales): New variable. > (make-l10n-package): New procedure. > (icecat-l10n, icedove-l10n) [...] Content analysis details: (2.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_SBL_CSS RBL: Received via a relay in Spamhaus SBL-CSS [64.112.178.59 listed in zen.spamhaus.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager Hi Maxim, Maxim Cournoyer writes: > * gnu/packages/gnuzilla.scm (%icecat-locales, %icedove-locales): New variable. > (make-l10n-package): New procedure. > (icecat-l10n, icedove-l10n): New variables. Thanks very much for this important work. Our lack of support for language packs has been sore spot for several years, and I'm profoundly grateful to you for taking this on and getting it done! For now, I have just two general questions/comments: (1) Instead of generating the locales in separate "*-locales" packages and then merging them with the main package (which must then be renamed to "*-minimal"), how feasible would it be to incorporate the locale generation directly into the existing packages? (2) In terms of the API, I very much dislike the approach of having the 'make-l10n-package' accept just one argument: a symbol, which it uses to construct the variable names of toplevel variables that must be looked up using 'module-ref'. I'd greatly prefer to simply pass in all of the variables that are needed. What do you think? I'll hold off on a more detailed review until we can (hopefully) reach agreement on the overall approach. Thanks again! Mark From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH 09/10] gnu: icecat: Remove gtk+-2 input. Resent-From: Mark H Weaver Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Thu, 16 Feb 2023 22:52:02 +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: Maxim Cournoyer , 32026@debbugs.gnu.org Cc: ludo@gnu.org, Jonathan Brielmaier , Maxim Cournoyer Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.167658791110536 (code B ref 32026); Thu, 16 Feb 2023 22:52:02 +0000 Received: (at 32026) by debbugs.gnu.org; 16 Feb 2023 22:51:51 +0000 Received: from localhost ([127.0.0.1]:37904 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSn6V-0002js-7i for submit@debbugs.gnu.org; Thu, 16 Feb 2023 17:51:51 -0500 Received: from world.peace.net ([64.112.178.59]:38040) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSn6U-0002jf-1R for 32026@debbugs.gnu.org; Thu, 16 Feb 2023 17:51:50 -0500 Received: from mhw by world.peace.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pSn6N-0001mo-Mn; Thu, 16 Feb 2023 17:51:43 -0500 From: Mark H Weaver In-Reply-To: <20230216043649.32119-9-maxim.cournoyer@gmail.com> References: <20230216043649.32119-1-maxim.cournoyer@gmail.com> <20230216043649.32119-9-maxim.cournoyer@gmail.com> Date: Thu, 16 Feb 2023 17:50:52 -0500 Message-ID: <878rgxfcm0.fsf@netris.org> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 3.6 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi Maxim, Maxim Cournoyer writes: > * gnu/packages/gnuzilla.scm (icecat-minimal) [inputs]: Remove gtk+-2. Looks good to me, except that the commit log should say 'icecat' instead of 'icecat-minimal' if it's pushed now. Content analysis details: (3.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_SBL_CSS RBL: Received via a relay in Spamhaus SBL-CSS [64.112.178.59 listed in zen.spamhaus.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.6 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi Maxim, Maxim Cournoyer writes: > * gnu/packages/gnuzilla.scm (icecat-minimal) [inputs]: Remove gtk+-2. Looks good to me, except that the commit log should say 'icecat' instead of 'icecat-minimal' if it's pushed now. Content analysis details: (2.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_SBL_CSS RBL: Received via a relay in Spamhaus SBL-CSS [64.112.178.59 listed in zen.spamhaus.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager Hi Maxim, Maxim Cournoyer writes: > * gnu/packages/gnuzilla.scm (icecat-minimal) [inputs]: Remove gtk+-2. Looks good to me, except that the commit log should say 'icecat' instead of 'icecat-minimal' if it's pushed now. Thanks, Mark From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH 01/10] gnu: Add a 'update-mozilla-locales' helper for maintenance. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Fri, 17 Feb 2023 02:26:02 +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: Mark H Weaver Cc: 32026@debbugs.gnu.org, ludo@gnu.org, Jonathan Brielmaier Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.167660071832125 (code B ref 32026); Fri, 17 Feb 2023 02:26:02 +0000 Received: (at 32026) by debbugs.gnu.org; 17 Feb 2023 02:25:18 +0000 Received: from localhost ([127.0.0.1]:38107 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSqR4-0008M5-3d for submit@debbugs.gnu.org; Thu, 16 Feb 2023 21:25:18 -0500 Received: from mail-qt1-f180.google.com ([209.85.160.180]:36811) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSqR2-0008Lo-10 for 32026@debbugs.gnu.org; Thu, 16 Feb 2023 21:25:16 -0500 Received: by mail-qt1-f180.google.com with SMTP id t16so1693206qto.3 for <32026@debbugs.gnu.org>; Thu, 16 Feb 2023 18:25:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=crONdxzpHtQOGi8hP9orynMyNSu4I4rXrco5QHxpBGQ=; b=QnKfB+bljwmIgYYnJ2e+0NZobxxfWfXxeSz5j+Ji8xCLkrT2pl5WR5kQXlM5wCimDL XDb0kDfH5TWFGBRSG0cZZQ4kXjlW8AzW7ELctQLWdSSSHVXKmoRk8jsohC92DfN14zaA as5ipllLpxAGJWyzm6lF/492gAandEoTcuCcIaH8BIwRl4de8CmtRlfmNdQ3D4sotwsD NVaGdQY/CO1p1ceaqjj63OTmloy+6JWwCB1mpgLQ4+hE26NThfGN5o2JuC9b0gS/7YvT 2pHLyjotVwhCWmW00HtaeM7subrWAKCav0qFJSN8eUT0YgIxKIrjqykRvzUQ8Moq7FXb FKxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=crONdxzpHtQOGi8hP9orynMyNSu4I4rXrco5QHxpBGQ=; b=GXvfAP3+AeJPa1gexUY5W7EM+r0BGZWodmDgjYghvn9varoIUWmDe8AdV8EI0meH9H a9P8tf+5C4MdyalAplZ2lAkYq9z+6+bPJBFsuGp/7k8o/fMiCQ5LH1+TSFwiHr7j2mtg mKixVXO39/rHM/deLh3Yb+TVuDpOPrakBXoW7U6PEhAaC/XzCELlL0C5hwJCJF2WV8lA +r1PXPSVuoM32kIbd9qRnPIuWtCPPGFw7/dLCqivVRF8TpDnCoMhxBshJUbEm5lDUyu4 FTAmxHUzrFEsctaMXDokogDRAftfLt4EvzdC9WNo3HxOYsv+3adVhRZepQEqRMZUM4+4 lXjg== X-Gm-Message-State: AO0yUKXTIs+6CaiaGvRGZ9hq5jqfKmhlJusGRE25WuW6wUhXGO7fX8WO bpYjV9Wrq2l3j7S/4Ps94IY= X-Google-Smtp-Source: AK7set/M/IY8yAEUpxXxoM6Y6wpUVaMlnzEIAvm082dgWLGtu/XNxTTCxtWxM9B2gpOJ2ihZEyG6Ww== X-Received: by 2002:ac8:5c82:0:b0:3b8:5f26:e81f with SMTP id r2-20020ac85c82000000b003b85f26e81fmr7364429qta.26.1676600710452; Thu, 16 Feb 2023 18:25:10 -0800 (PST) Received: from hurd (dsl-152-188.b2b2c.ca. [66.158.152.188]) by smtp.gmail.com with ESMTPSA id g9-20020ac84b69000000b003b9bb59543fsm2346605qts.61.2023.02.16.18.25.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Feb 2023 18:25:10 -0800 (PST) From: Maxim Cournoyer References: <20230216043649.32119-1-maxim.cournoyer@gmail.com> <87mt5dfeqa.fsf@netris.org> Date: Fri, 17 Feb 2023 03:25:05 +0100 In-Reply-To: <87mt5dfeqa.fsf@netris.org> (Mark H. Weaver's message of "Thu, 16 Feb 2023 17:05:06 -0500") Message-ID: <87wn4ht4e6.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.2 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.8 (/) Hi Mark, Mark H Weaver writes: > Hi Maxim, > > Maxim Cournoyer writes: > >> * gnu/packages/gnuzilla.scm (update-mozilla-locales): New procedure. >> (all-mozilla-locales): Comment how to proceed to update it. > > [...] > >> +(define (update-mozilla-locales changesets.json) >> + "Output a new list of Mozilla locales, to update the ALL-MOZILLA-LOCALES >> +variable defined bellow. It requires guile-json to be installed." >> + ;; To extract the file used as argument, do: >> + ;; tar -xf $(./pre-inst-env guix build \ >> + ;; -e '(@@ (gnu packages gnuzilla) upstream-firefox-source)') \ >> + ;; --strip-components=3 \ >> + ;; --wildcards '*/browser/locales/l10n-changesets.json' >> + (match (call-with-input-file changesets.json json->scm) >> + (((lang ("revision" . revision) platforms pin) ...) >> + (let ((data (reverse (map (lambda (rev lang) >> + `(,(list->string (make-list 40 #\0)) >> + ,(string-take rev 12) ,lang)) >> + revision lang)))) >> + (format #t "~{~s~%~}" data) >> + data)))) > > Thanks very much for this! I didn't know about the > browser/locales/l10n-changesets.json file, and neither does the code in > the upstream 'makeicecat' script, which simply uses "hg clone" to fetch > the latest revisions at the time the 'makeicecat' script is run. Now we > can change that code to use the revisions listed in > 'l10n-changesets.json' instead, and thus eliminate a source of > nondeterminism for non-Guix users of IceCat. > > However, I'd like to propose a different way to make use of this code. > > Instead of adding this new toplevel procedure that must be run manually, > which involves steering the user toward the 'upstream-firefox-source' > variable (which therefore must be promoted to a toplevel binding), all > of which makes me extremely uncomfortable, how about the following: > > I propose adding a check to the code that populates the l10n directory > in 'icecat-source'. That code has access to the unpacked firefox source > directory, and already makes use of '#+all-mozilla-locales'. It's in a > perfect position to check whether '#+all-mozilla-locales' is up-to-date > w.r.t. browser/locales/l10n-changesets.json. > > My suggestion would be this: if '#+all-mozilla-locales' is not > up-to-date, print an error report with the relevant information and > force the derivation to *fail*. > > What do you think? If the idea sounds good to you, would you like to > work on it, or should I? It's a good idea, but I don't think it's worth implementing at this point, given that Mozilla will soon provide us with a strings_all.tar.zst tarball per release, which will include both Firefox and Thunderbird l10n data (it'll be available along the releases tarball) [0]. This will obsolete all this tedious work of keeping hashes up to date. [0] https://bugzilla.mozilla.org/show_bug.cgi?id=1817086 -- Thanks, Maxim From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH 03/10] gnu: Define UPSTREAM-FIREFOX-SOURCE at the top level. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Fri, 17 Feb 2023 02:56:01 +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: Mark H Weaver Cc: 32026@debbugs.gnu.org, ludo@gnu.org, Jonathan Brielmaier Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.16766025502802 (code B ref 32026); Fri, 17 Feb 2023 02:56:01 +0000 Received: (at 32026) by debbugs.gnu.org; 17 Feb 2023 02:55:50 +0000 Received: from localhost ([127.0.0.1]:38135 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSqub-0000j8-W2 for submit@debbugs.gnu.org; Thu, 16 Feb 2023 21:55:50 -0500 Received: from mail-qt1-f181.google.com ([209.85.160.181]:44667) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSqua-0000it-5W for 32026@debbugs.gnu.org; Thu, 16 Feb 2023 21:55:48 -0500 Received: by mail-qt1-f181.google.com with SMTP id s22so18854qtw.11 for <32026@debbugs.gnu.org>; Thu, 16 Feb 2023 18:55:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=2tkejtWpkUcPDVzs+BT+8GrYqScMw7jaYr3aEC9WmUs=; b=Dd2aS9Cm3ieZRD6w0eKYol5l+G+Q3B1YypEVUW0oZWcFL+3uS/zpvqMb4RgKa6zdb8 Wv90mD5ysRt0QVN13jQGFUYKLbwuAata5AqFqJH/4KXE18z2MkKwQsxKyRZjdt6UUuOQ 8NPhplXJ1xFth5y5WDI+aA+IkNCo/m2vTacTbdWwR6b6iJ0tqNi2E4CXTnXMrtNyD1Ak lyyGdA3MrfOtDLW0Sjb5t+ag0jcQf3Hw493k2kPSOAeF5Y2+eBV4idhLLc06di5AIByC OZc3T8NSb3cY59Mx+Nf/Qplwqcun/08heDYQeyFuwNs6MS/fvik/dzZZ86Q62mcOdA5b lpzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=2tkejtWpkUcPDVzs+BT+8GrYqScMw7jaYr3aEC9WmUs=; b=yokZXZ69p5cTIHyHkCo/+MuVUss/4l1ds4/S93wfbIHrRkNPQ77i+XiPFGtyeM8Aec Ln6NbUUIZqYlTTThn/OT/wSug7DxgjnbhcdNMYW0Hiudng4L+zvMt1WQxw/loQbVRZn4 d5N7dN+7Oq+B5n5pX1oF9uVSicdRDN6ozWPbR+cwG7exK67za2JJgDBwhNWF7P5q/Wme 5vvdMvj/8NglKH3u8LEzUz01HJ/jajB1iJOBKA7Ary3shZLpflAnszeAeL8IhmuWUEGy uP/ad9X7Y1DTgDTYy2QBfPkqSOCfeIFsaqZ5TFMRZTkUXMt3zjNewPfkUL58ah8E6eJV VR3A== X-Gm-Message-State: AO0yUKW9vx7x3WiuHZqcqs68UPWSAG2bEare5CIBb4mEqGAH/NfasArl SNYcLEVco2BsqWkhyRKOwUo= X-Google-Smtp-Source: AK7set+XxFOnDr6YQ8CIAhdmAyi72Z+v+iMqDW0rPpAdTVDG77y+7nHLRKxBRZ6BGSMYgsZzgj4r0Q== X-Received: by 2002:a05:622a:c4:b0:3b6:2f22:75bd with SMTP id p4-20020a05622a00c400b003b62f2275bdmr12581471qtw.28.1676602542565; Thu, 16 Feb 2023 18:55:42 -0800 (PST) Received: from hurd (dsl-152-188.b2b2c.ca. [66.158.152.188]) by smtp.gmail.com with ESMTPSA id p20-20020a05622a13d400b003b86b088755sm2485590qtk.15.2023.02.16.18.55.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Feb 2023 18:55:42 -0800 (PST) From: Maxim Cournoyer References: <20230216043649.32119-1-maxim.cournoyer@gmail.com> <20230216043649.32119-3-maxim.cournoyer@gmail.com> <87h6vlfdq0.fsf@netris.org> Date: Fri, 17 Feb 2023 03:55:40 +0100 In-Reply-To: <87h6vlfdq0.fsf@netris.org> (Mark H. Weaver's message of "Thu, 16 Feb 2023 17:26:52 -0500") Message-ID: <87pma9t2z7.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.2 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.8 (/) Hi Mark, Mark H Weaver writes: > Hi Maxim, > > Maxim Cournoyer writes: > >> * gnu/packages/gnuzilla.scm (%icecat-base-version): New variable. >> (%upstream-firefox-version): Likewise. >> (%icecat-version): Define in terms of %icecat-base-version. >> (upstream-firefox-source): New variable. >> (icecat-source): Adjust to use the above newly introduced variables. > > I'm deeply uncomfortable binding toplevel variables, even unexported > ones, that provide non-FSDG-complaint software. I guess that the > primary motivation for this commit was to make it easier to use the > 'update-mozilla-locales' helper. While I appreciate your concern, I think "hiding" the upstream source would be akin to putting our head in the sand. We do need that upstream source to produce GNU IceCat from source, so it may as well be convenient to handle while hacking on the GNU IceCat package. As you've noted, it isn't exported, so I think it'd be a stretch to say that this private binding "steers" users toward non-FSDG software. Note that we also have a %upstream-linux-source procedure in (gnu packages linux). > In an earlier message , I suggested an > alternative way to use the code in your proposed > 'update-mozilla-locales' helper which would eliminate the need to expose > any *firefox* toplevel variables. I hope you'll find that alternative > approach acceptable, so that we can avoid exposing non-FSDG-compliant > software in our toplevel bindings. > > What do you think? See my explanation there that the need to maintain the various l10n repositories commits/hashes is going away soon. -- Thanks, Maxim From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH 05/10] gnu: Add icecat-l10n and icedove-l10n. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Fri, 17 Feb 2023 03:38:01 +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: Mark H Weaver Cc: 32026@debbugs.gnu.org, ludo@gnu.org, Jonathan Brielmaier Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.16766050627196 (code B ref 32026); Fri, 17 Feb 2023 03:38:01 +0000 Received: (at 32026) by debbugs.gnu.org; 17 Feb 2023 03:37:42 +0000 Received: from localhost ([127.0.0.1]:38164 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSrZ8-0001rz-FI for submit@debbugs.gnu.org; Thu, 16 Feb 2023 22:37:42 -0500 Received: from mail-qt1-f179.google.com ([209.85.160.179]:36364) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSrZ6-0001rk-DF for 32026@debbugs.gnu.org; Thu, 16 Feb 2023 22:37:41 -0500 Received: by mail-qt1-f179.google.com with SMTP id t16so1785880qto.3 for <32026@debbugs.gnu.org>; Thu, 16 Feb 2023 19:37:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=IT/YXrsrrGl9aqJNTrOHZEKtfHiTTBXeyQZ/k6FLCL4=; b=iVs+ATFN9r19Gv7hh8Gy9VHwp8DjZyJ0/U13qSVHkANKm6DGFawsqeScfTqqkP2T/J t9Sve+vIYMjcq3N8ml4rIpmsGMLcEm3LjfEiJCpgLPMVMf5iKlobAdrFQhX9dIvUHt84 kbUqM8jrT8X2uWxaZTIfbzdE+/S7uJmvi8iTg52DASwPHcFAtj1AD8xKCaFORw+H0PXQ XEEmWDMp0oJwKNkyyqCSo5YDkhR6iaRMJEtnk02mkdAcUa8p/YfpeX25LdSfd2MhtQaw RUjDE/o906ISHXLHjJWAzKw5bvL82MeufnigmzyBYOQKsxogLrQ96GASsCTdlhVAkzZn 3MDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=IT/YXrsrrGl9aqJNTrOHZEKtfHiTTBXeyQZ/k6FLCL4=; b=g9YDY8YFhAe/yoP/takIFD373j0OPtxDStCq8FkLAAm8TXpWX30i5zc3lMnMgUyv+k d6r/7RRch6Nf7z+fMhVCQ1+rivtQyj5KRog6TkadL5gr07ApQoEoYxx/SopFCl+buoz6 D7Qn2A/Us28ce0MpSMUGAibKScD1P/SR5cRePkNBk/OvjXbnpHAknKzFDtY8nXAIJjs6 eK6f5MbEexA0cufnBxz2QRRCdVjjgOjxfkojzWpL9RJY+3Edti/OukoIf5WFvU772JuF mtUsOcuKwmAdT+n4XjwaD5ZDmv5MDBt9s4jAt7pTdNtO1zSu/YKSobJPzqOP3GTG2nZV f68Q== X-Gm-Message-State: AO0yUKVnLHMlzyxXTJ2sM3zg2PArq9/HzvHp9/yRQWvJ09El89DDJ1E7 Nj63FpH0u2J//U6EUj0fxAI= X-Google-Smtp-Source: AK7set9OCQ91fl25D3WYvQGWbo/07fwoX5PlH3++l1IrmiaH+nOn89dXnCzt5lU1/Z/lUcF2YXUuSA== X-Received: by 2002:ac8:5891:0:b0:3ba:1d8d:f6eb with SMTP id t17-20020ac85891000000b003ba1d8df6ebmr11703795qta.58.1676605054863; Thu, 16 Feb 2023 19:37:34 -0800 (PST) Received: from hurd (dsl-152-188.b2b2c.ca. [66.158.152.188]) by smtp.gmail.com with ESMTPSA id f5-20020a37d205000000b00729b7d71ac7sm2506534qkj.33.2023.02.16.19.37.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Feb 2023 19:37:34 -0800 (PST) From: Maxim Cournoyer References: <20230216043649.32119-1-maxim.cournoyer@gmail.com> <20230216043649.32119-5-maxim.cournoyer@gmail.com> <87cz69fcuf.fsf@netris.org> Date: Fri, 17 Feb 2023 04:37:20 +0100 In-Reply-To: <87cz69fcuf.fsf@netris.org> (Mark H. Weaver's message of "Thu, 16 Feb 2023 17:45:49 -0500") Message-ID: <87ilg1t11r.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.2 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.8 (/) Hi Mark! Mark H Weaver writes: > Hi Maxim, > > Maxim Cournoyer writes: >> * gnu/packages/gnuzilla.scm (%icecat-locales, %icedove-locales): New variable. >> (make-l10n-package): New procedure. >> (icecat-l10n, icedove-l10n): New variables. > > Thanks very much for this important work. Our lack of support for > language packs has been sore spot for several years, and I'm profoundly > grateful to you for taking this on and getting it done! > > For now, I have just two general questions/comments: Thanks! The motivator was a family member starting to use Guix System... ha! > (1) Instead of generating the locales in separate "*-locales" packages > and then merging them with the main package (which must then be > renamed to "*-minimal"), how feasible would it be to incorporate the > locale generation directly into the existing packages? It's entirely feasible, but I see a couple downsides that explain why I stuck with the current design: 1. The user no longer has an option to install IceCat without the 70 MiB or so of extra locales (via icecat-minimal). 2. The already lengthy IceCat package definition gets even more verbose and hard to follow. 3. The locales are slow to generate (it's sequential, and there are a lot of them). Currently they can be generate at the same time as icecat-minimal is built. 4. It makes debugging locale-generation problems more focused. > (2) In terms of the API, I very much dislike the approach of having the > 'make-l10n-package' accept just one argument: a symbol, which it > uses to construct the variable names of toplevel variables that must > be looked up using 'module-ref'. I'd greatly prefer to simply pass > in all of the variables that are needed. > > What do you think? I don't feel strongly about it. Since you do, I've adjusted it, in an upcoming v3. > I'll hold off on a more detailed review until we can (hopefully) reach > agreement on the overall approach. OK! Thanks for the comments. I hope I don't sound dismissive of them, although I find myself disagreeing with a few of them :-). -- Thanks, Maxim From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH v3 01/11] gnu: Add a 'update-mozilla-locales' helper for maintenance. References: <87po06puwt.fsf@gnu.org> In-Reply-To: <87po06puwt.fsf@gnu.org> Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Fri, 17 Feb 2023 12:56:02 +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, Jonathan Brielmaier , Maxim Cournoyer Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.16766385566996 (code B ref 32026); Fri, 17 Feb 2023 12:56:02 +0000 Received: (at 32026) by debbugs.gnu.org; 17 Feb 2023 12:55:56 +0000 Received: from localhost ([127.0.0.1]:38762 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pT0HM-0001om-1Y for submit@debbugs.gnu.org; Fri, 17 Feb 2023 07:55:56 -0500 Received: from mail-qt1-f176.google.com ([209.85.160.176]:39667) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pT0HK-0001oU-A7 for 32026@debbugs.gnu.org; Fri, 17 Feb 2023 07:55:54 -0500 Received: by mail-qt1-f176.google.com with SMTP id e26so759877qtq.6 for <32026@debbugs.gnu.org>; Fri, 17 Feb 2023 04:55:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=NigxFZDorP6MbY1JXdKfz0N12UW1oVSo4f2LrPMiQzA=; b=dP6utnY0ry95uY3ALehHclyYld856icBEMwgaWnzl/OBrCrDioXvfgXMKLwTtmiAug F/Vu3LBeqkUgkIBhxxYym14lGveKxVLAlwwjxq023HgUJu4BWIU/p+l5X6PnQBnlgiLK uCYqReUEuRsPr/yxAqNaWwiSzDUxqpAhMluLGY6SKIE+8mFlBIZa3RWUM5F9DUVM6ckG jLKU2HjtYNniqpYmPgbMzAxiqDZjp5L3xklq2XzBllnnZeErt0T23fTqT0Jyh11W/WIV 5PnSu+/ioWkcadNltdOSYvMC5TLqIkup7BwB4BjPSge0CCSs1zy1hAwRH4qamb11rVjB kzew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=NigxFZDorP6MbY1JXdKfz0N12UW1oVSo4f2LrPMiQzA=; b=KVywKIDUVx3fgpW25gWYkrQMBmn+QPPbNHbkrY7vsgO98XzjmM5CQhv+VIiG0zl4XD qBpzaMGztOwIecM2EzhYfdx4sUh5TAky4bWTI10Vlte/0noVE5I8srFhqJPfHDUdI/Uj GJ+c/QLisbRdEoh6GzMLEz9HbKk/rKg88Wi97iDIeYFHXGEmkYimpsBAA6ypikr0Fsl/ 4QB4sKcYBr/9/ecr/fApiMOx/Q9TVyKXLLqzYrvSJxD6bGek/hmY6E+H/2gWXkqmqjma s/dY/3KX6VNsptfb4pHxZG+PllhbpD7VsseRVhrL3w68O79Wy+KW+qqQA0qnZ3/rWyvF WozQ== X-Gm-Message-State: AO0yUKX67av8VL6z3pxIjrE7nBSS6zNYuUA0iDc30NA8+PyYqFG815hh ce0950C8nedWFef67IJxrSlhG88nfIkqpkTn X-Google-Smtp-Source: AK7set/RJBgwiHDWPbqvrLplMx3RcJbSgZA8jmKYd7vJCmFtNZmExueh+wD1JVZ7OTRyCUZt9moU8Q== X-Received: by 2002:ac8:5cd1:0:b0:3b8:6833:3ad2 with SMTP id s17-20020ac85cd1000000b003b868333ad2mr145098qta.65.1676638548492; Fri, 17 Feb 2023 04:55:48 -0800 (PST) Received: from localhost.localdomain (dsl-157-123.b2b2c.ca. [66.158.157.123]) by smtp.gmail.com with ESMTPSA id f17-20020ac80691000000b003b9b48cdbe8sm3176026qth.58.2023.02.17.04.55.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Feb 2023 04:55:48 -0800 (PST) From: Maxim Cournoyer Date: Fri, 17 Feb 2023 07:55:28 -0500 Message-Id: <20230217125539.24467-1-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gnuzilla.scm (update-mozilla-locales): New procedure. (all-mozilla-locales): Comment how to proceed to update it. --- (no changes since v1) gnu/packages/gnuzilla.scm | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index b2e0870fea..2011555d47 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -37,6 +37,7 @@ (define-module (gnu packages gnuzilla) #:use-module ((srfi srfi-1) #:hide (zip)) + #:use-module (ice-9 format) #:use-module (ice-9 match) #:use-module (gnu packages) #:use-module ((guix licenses) #:prefix license:) @@ -91,7 +92,8 @@ (define-module (gnu packages gnuzilla) #:use-module (gnu packages xiph) #:use-module (gnu packages xdisorg) #:use-module (gnu packages readline) - #:use-module (gnu packages sqlite)) + #:use-module (gnu packages sqlite) + #:autoload (json parser) (json->scm)) (define-public mozjs (package @@ -348,6 +350,10 @@ (define-public mozjs-78 (inputs (list icu4c readline zlib)))) + +;;; +;;; Localization helper procedures. +;;; (define mozilla-compare-locales (origin (method hg-fetch) @@ -371,6 +377,27 @@ (define-syntax-rule (mozilla-locales (hash-string changeset locale) ...) (list (mozilla-locale locale changeset hash-string) ...)) +(define (update-mozilla-locales changesets.json) + "Output a new list of Mozilla locales, to update the ALL-MOZILLA-LOCALES +variable defined bellow. It requires guile-json to be installed." + ;; To extract the file used as argument, do: + ;; tar -xf $(./pre-inst-env guix build \ + ;; -e '(@@ (gnu packages gnuzilla) upstream-firefox-source)') \ + ;; --strip-components=3 \ + ;; --wildcards '*/browser/locales/l10n-changesets.json' + (match (call-with-input-file changesets.json json->scm) + (((lang ("revision" . revision) platforms pin) ...) + (let ((data (reverse (map (lambda (rev lang) + `(,(list->string (make-list 40 #\0)) + ,(string-take rev 12) ,lang)) + revision lang)))) + (format #t "~{~s~%~}" data) + data)))) + +;;; This list must be maintained by hand by comparing with the entries in the +;;; browser/locales/l10n-changesets.json file in the Firefox source (see the +;;; 'update-mozilla-locales' procedure above which aims to make this a bit +;;; easier). (define all-mozilla-locales (mozilla-locales ;; sha256 changeset locale base-commit: 23d56ba150ddeaa58e96b3ecf9df251fbd05ed00 -- 2.39.1 From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH v3 02/11] gnu: icedove: Compute a self-contained source. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Fri, 17 Feb 2023 12:56:02 +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, Jonathan Brielmaier , Maxim Cournoyer Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.16766385617040 (code B ref 32026); Fri, 17 Feb 2023 12:56:02 +0000 Received: (at 32026) by debbugs.gnu.org; 17 Feb 2023 12:56:01 +0000 Received: from localhost ([127.0.0.1]:38767 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pT0HQ-0001pK-Eg for submit@debbugs.gnu.org; Fri, 17 Feb 2023 07:56:01 -0500 Received: from mail-qt1-f180.google.com ([209.85.160.180]:33676) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pT0HL-0001oW-Pp for 32026@debbugs.gnu.org; Fri, 17 Feb 2023 07:55:56 -0500 Received: by mail-qt1-f180.google.com with SMTP id bc7so574845qtb.0 for <32026@debbugs.gnu.org>; Fri, 17 Feb 2023 04:55:55 -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=6g/cR+RCp1qZ63oDvkDwMVTm9niVT+ahcKo+DlCLf+Y=; b=e5Z+SFtW/oTnDcegmWNlYtJd0rNWWstkO+4EmbKwtgItiJvEJs/IfdLkaHtT8oFsPt P0wj1iXm6EKheh5E2UWUwmMhh+7QZQXDoues3Z21zeXh1sbUOEgzPSheEbL5l3+Xv8T7 ex0bc222JdG3sdC19VQtKN0rwdK9bG6XekbTvJrvqv6wzaemjTAcZQeIFsTjvqPoltgh kqS7sfczBBYpyR3BdCtUW0vrv/uAIBd0+E5B/gm+IadUQl+EWD0ei4F98etGwSI+Otgz ZENolEDzZgLV/NuFniqeMI0xs3y5NhJOA+npVJjF0mwyEUDFkOPTT41HO1pSw8RGSjyu vKDA== 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=6g/cR+RCp1qZ63oDvkDwMVTm9niVT+ahcKo+DlCLf+Y=; b=3k54KK7RS5DlhWKiWef9ON96kVX4P9cgWnENDYht/EC2VayAmkusAcBVioYNCnKSkT gyQ5Ag345teMHqAeJIjAgefb1Uw/kMZl1PGR6ECveN9kjy72VGEGTghFm525O0ZwA4Xd zPjAIgbk12gtSsDzAjyIskxctqRx9FXkm13M9kaSPzJPBrigp0RyhnPcI/ux7jduv1Wi GP3WJNLMaqR9+isWms4lQaEAFphq2KxKI1kII4dP4ScCYrtYHkWWMWeQif3hpRtdQaCL Gv8BXU+m3uUrZnKcONORjrvycf0soyYN46x2yhI764ZwLjJI80EcMYhVyZOZDFMRx0h5 W/4Q== X-Gm-Message-State: AO0yUKWBlBH9MX8jO6ig1E/L2+pP/R/7SiFniGnzjOA9G0gaNcA0wU+g ErJeo3UQdXzIsVoNSyCNQarGMOnBc/lJn+3S X-Google-Smtp-Source: AK7set+ORXec/PdebXSknDPQ0YlBuNXxnWx/EM0OyRhZcn2ccaaDecCVUDpYZemd1sajREQuSmeA0Q== X-Received: by 2002:a05:622a:28b:b0:3b8:5ad9:3fe8 with SMTP id z11-20020a05622a028b00b003b85ad93fe8mr17092011qtw.48.1676638549965; Fri, 17 Feb 2023 04:55:49 -0800 (PST) Received: from localhost.localdomain (dsl-157-123.b2b2c.ca. [66.158.157.123]) by smtp.gmail.com with ESMTPSA id f17-20020ac80691000000b003b9b48cdbe8sm3176026qth.58.2023.02.17.04.55.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Feb 2023 04:55:49 -0800 (PST) From: Maxim Cournoyer Date: Fri, 17 Feb 2023 07:55:29 -0500 Message-Id: <20230217125539.24467-2-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230217125539.24467-1-maxim.cournoyer@gmail.com> References: <20230217125539.24467-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This refactoring work is to prepare for adding a icedove-l10n package, which will reuse that source. * gnu/packages/gnuzilla.scm (comm-source->locales+changset): New procedure. (thunderbird-source): Rename to... (thunderbird-comm-source): ... here. (icedove-source): New variable. (icedove) [source]: Use it. [phases]: Remove the prepare-thunderbird-sources and rename-to-icedove phases. --- (no changes since v2) Changes in v2: - Fix typo in comm-source->locales+changset - Reword comment gnu/packages/gnuzilla.scm | 210 +++++++++++++++++++++++++------------- 1 file changed, 140 insertions(+), 70 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 2011555d47..1ed52c68e9 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -47,6 +47,7 @@ (define-module (gnu packages gnuzilla) #:use-module (guix hg-download) #:use-module (guix gexp) #:use-module (guix store) + #:use-module (guix modules) #:use-module (guix monads) #:use-module (guix utils) #:use-module (guix build-system gnu) @@ -1128,7 +1129,7 @@ (define %icedove-version "102.7.2") ;; Provides the "comm" folder which is inserted into the icecat source. ;; Avoids the duplication of Icecat's source tarball. -(define thunderbird-source +(define thunderbird-comm-source (origin (method hg-fetch) (uri (hg-reference @@ -1139,11 +1140,148 @@ (define thunderbird-source (base32 "071q0pcfvfpzx741ly1sl8anlmzx02h17w4ylfnrkwrpaclq3p6p")))) +(define (comm-source->locales+changeset source) + "Given SOURCE, a checkout of the Thunderbird 'comm' component, return the +list of languages supported as well as the currently used changeset." + (match (update-mozilla-locales + (string-append source "/mail/locales/l10n-changesets.json")) + (((_ changeset locale) ...) + (values locale (first changeset))))) + +;;; To find out which changeset to use for the comm-l10n repo, use the +;;; 'comm-source->locales+changeset' procedure on the thunderbird-comm-source +;;; checkout directory. The complete localization data should be released as +;;; a tarball in the next release (see: +;;; https://bugzilla.mozilla.org/show_bug.cgi?id=1817086). When this tarball +;;; is available, it should replace the complete 'l10n' directory at the root +;;; of the IceCat source, instead of only the 'calendar', chat and mail +;;; directories that it provides. +(define thunderbird-comm-l10n + (let* ((changeset "5b6788295358") + (version (git-version %icedove-version "0" changeset))) + (origin + (method hg-fetch) + (uri (hg-reference + (url "https://hg.mozilla.org/projects/comm-l10n") + (changeset changeset))) + (file-name (git-file-name "comm-l10n" version)) + (sha256 + (base32 + "1jrsmkscjjllcfawi3788vwm53wn25inbhdis5nk4vfpr7wk5ill"))))) + +(define icedove-source + (let ((name (string-append "icedove-" %icedove-version))) + (origin + (method computed-origin-method) + (file-name (string-append name ".tar.xz")) + (sha256 #f) + (uri + (delay + (with-imported-modules (source-module-closure '((guix build utils))) + #~(begin + (use-modules (guix build utils) + (sxml simple)) + + (set-path-environment-variable + "PATH" '("bin") + (list #+(canonical-package tar) + #+(canonical-package xz))) + + ;; Extract the base Icecat tarball, renaming its top-level + ;; directory. + (invoke "tar" "--transform" (string-append "s,[^/]*," #$name ",") + "-xf" #$icecat-source) + (chdir #$name) + + ;; Merge the Thunderdbird localization data. + (copy-recursively #$thunderbird-comm-l10n "l10n") + + ;; Add the Thunderbird-specific "comm" directory.. + (mkdir "comm") + (copy-recursively #$thunderbird-comm-source "comm") + (delete-file "sourcestamp.txt") + + ;; Adjust the application name. + (substitute* "comm/mail/confvars.sh" + (("MOZ_APP_NAME=thunderbird") + "MOZ_APP_NAME=icedove") + (("MOZ_UPDATER=1") + "MOZ_UPDATER=0")) + + ;; Remove branding to comply with Mozilla's trademark policy + (with-directory-excursion "comm/mail/branding/nightly" + (delete-file "content/about-wordmark.svg") + (call-with-output-file "content/about-wordmark.svg" + (lambda (port) + (sxml->xml '(svg (@ (xmlns "http://www.w3.org/2000/svg") + (viewBox "0 0 789.1 90.78") + (width "333") + (height "48") + (fill "#fff")) + (text (@ (x "400") (y "70") + (text-anchor "middle") + (font-size "90")) + "Icedove Daily")) + port))) + (substitute* '("locales/en-US/brand.properties" + "locales/en-US/brand.ftl" + "locales/en-US/brand.dtd" + "configure.sh") + (("Thunderbird") "Icedove") + (("mozilla.org") "guix.gnu.org"))) + ;; Remove other mentions of Thunderbird in user-visible text. + (with-directory-excursion "comm/mail/base/content" + (substitute* '("overrides/app-license-name.html") + (("Thunderbird") "Icedove"))) + (with-directory-excursion "comm/mail/components/" + (substitute* '("MailGlue.jsm" + "extensions/schemas/addressBook.json" + "extensions/schemas/tabs.json" + "extensions/schemas/cloudFile.json" + "extensions/schemas/chrome_settings_overrides.json" + "extensions/schemas/windows.json" + "extensions/parent/ext-mail.js" + "im/messages/mail/Info.plist" + "enterprisepolicies/moz.build" + "enterprisepolicies/helpers/moz.build" + "enterprisepolicies/schemas/moz.build") + (("Thunderbird") "Icedove"))) + (substitute* '("comm/mailnews/base/prefs/content/accountUtils.js" + "comm/mail/base/content/customizeToolbar.js" + "comm/suite/components/customizeToolbar.js") + (("AppConstants.MOZ_APP_NAME (.)= \"thunderbird" _ e) + (format #f "AppConstants.MOZ_APP_NAME ~a= \"icedove" e))) + + ;; Override addon URLs and settings + (substitute* "comm/mail/app/profile/all-thunderbird.js" + (("(pref\\(\"extensions.webservice.discoverURL\").*" _ m) + (string-append m ", \"https://directory.fsf.org/wiki/Icedove\");")) + (("(pref\\(\"extensions.getAddons.search.url\").*" _ m) + (string-append m ", \"https://guix.gnu.org/packages\");")) + (("(pref\\(\"extensions.update.enabled\").*" _ m) + (string-append m ", false);")) + (("(pref\\(\"extensions.systemAddon.update.enabled\").*" _ m) + (string-append m ", false);")) + (("(pref\\(\"lightweightThemes.update.enabled\").*" _ m) + (string-append m ", false);"))) + + ;; Step out of the directory and create the tarball. + (chdir "..") + (format #t "Packing Icedove source tarball...~%") + (force-output) + (setenv "XZ_DEFAULTS" (string-join (%xz-parallel-args))) + (invoke "tar" "cfa" #$output + "--mtime=@315619200" ;1980-01-02 UTC + "--owner=root:0" + "--group=root:0" + "--sort=name" + #$name)))))))) + (define-public icedove (package (name "icedove") (version %icedove-version) - (source icecat-source) + (source icedove-source) (properties `((cpe-name . "thunderbird_esr"))) (build-system gnu-build-system) @@ -1157,11 +1295,6 @@ (define-public icedove ,@%gnu-build-system-modules) #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'prepare-thunderbird-sources - (lambda _ - (mkdir "comm") - (copy-recursively #$thunderbird-source "comm") - (delete-file "sourcestamp.txt"))) (add-after 'patch-source-shebangs 'patch-cargo-checksums (lambda _ (use-modules (guix build cargo-utils)) @@ -1191,69 +1324,6 @@ (define-public icedove (substitute* "comm/mail/moz.configure" (("MOZ_DEDICATED_PROFILES, True") "MOZ_DEDICATED_PROFILES, False")))) - (add-after 'prepare-thunderbird-sources 'rename-to-icedove - (lambda _ - (substitute* "comm/mail/confvars.sh" - (("MOZ_APP_NAME=thunderbird") - "MOZ_APP_NAME=icedove") - (("MOZ_UPDATER=1") - "MOZ_UPDATER=0")) - ;; Remove branding to comply with Mozilla's trademark policy - (with-directory-excursion "comm/mail/branding/nightly" - (delete-file "content/about-wordmark.svg") - (call-with-output-file "content/about-wordmark.svg" - (lambda (port) - (sxml->xml '(svg (@ (xmlns "http://www.w3.org/2000/svg") - (viewBox "0 0 789.1 90.78") - (width "333") - (height "48") - (fill "#fff")) - (text (@ (x "400") (y "70") - (text-anchor "middle") - (font-size "90")) - "Icedove Daily")) - port))) - (substitute* '("locales/en-US/brand.properties" - "locales/en-US/brand.ftl" - "locales/en-US/brand.dtd" - "configure.sh") - (("Thunderbird") "Icedove") - (("mozilla.org") "guix.gnu.org"))) - ;; Remove other mentions of Thunderbird in user-visible text. - (with-directory-excursion "comm/mail/base/content" - (substitute* '("overrides/app-license-name.html") - (("Thunderbird") "Icedove"))) - (with-directory-excursion "comm/mail/components/" - (substitute* '("MailGlue.jsm" - "extensions/schemas/addressBook.json" - "extensions/schemas/tabs.json" - "extensions/schemas/cloudFile.json" - "extensions/schemas/chrome_settings_overrides.json" - "extensions/schemas/windows.json" - "extensions/parent/ext-mail.js" - "im/messages/mail/Info.plist" - "enterprisepolicies/moz.build" - "enterprisepolicies/helpers/moz.build" - "enterprisepolicies/schemas/moz.build") - (("Thunderbird") "Icedove"))) - (substitute* '("comm/mailnews/base/prefs/content/accountUtils.js" - "comm/mail/base/content/customizeToolbar.js" - "comm/suite/components/customizeToolbar.js") - (("AppConstants.MOZ_APP_NAME (.)= \"thunderbird" _ e) - (format #f "AppConstants.MOZ_APP_NAME ~a= \"icedove" e))) - - ;; Override addon URLs and settings - (substitute* "comm/mail/app/profile/all-thunderbird.js" - (("(pref\\(\"extensions.webservice.discoverURL\").*" _ m) - (string-append m ", \"https://directory.fsf.org/wiki/Icedove\");")) - (("(pref\\(\"extensions.getAddons.search.url\").*" _ m) - (string-append m ", \"https://guix.gnu.org/packages\");")) - (("(pref\\(\"extensions.update.enabled\").*" _ m) - (string-append m ", false);")) - (("(pref\\(\"extensions.systemAddon.update.enabled\").*" _ m) - (string-append m ", false);")) - (("(pref\\(\"lightweightThemes.update.enabled\").*" _ m) - (string-append m ", false);"))))) (add-after 'build 'neutralize-store-references (lambda _ ;; Mangle the store references to compilers & other build tools in -- 2.39.1 From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH v3 03/11] gnu: Define UPSTREAM-FIREFOX-SOURCE at the top level. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Fri, 17 Feb 2023 12:56:03 +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, Jonathan Brielmaier , Maxim Cournoyer Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.16766385627054 (code B ref 32026); Fri, 17 Feb 2023 12:56:03 +0000 Received: (at 32026) by debbugs.gnu.org; 17 Feb 2023 12:56:02 +0000 Received: from localhost ([127.0.0.1]:38770 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pT0HR-0001pV-Ir for submit@debbugs.gnu.org; Fri, 17 Feb 2023 07:56:02 -0500 Received: from mail-qt1-f169.google.com ([209.85.160.169]:45029) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pT0HN-0001oY-6c for 32026@debbugs.gnu.org; Fri, 17 Feb 2023 07:55:57 -0500 Received: by mail-qt1-f169.google.com with SMTP id s22so759339qtw.11 for <32026@debbugs.gnu.org>; Fri, 17 Feb 2023 04:55:57 -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=csZZWbIIG6nivsnOnivxKMYKBMEZJ8NrVSmye9r+48g=; b=YK/mtGcf/1CRUev8x1cIN2NHx1LZLkRNbrObOPW+f2D4/pb3829d4uEqG1Abq3/hYZ KpzcvhA+DPelfL2FA0t1BXVyxy0eOFVBOZC6H4vEF9wzA/T4l8MT2YKGuSXyywsW9HX9 pkfEfO08tiJpU9GkL8mmNhCn1oCVzj9M51S8pVHS2YASPN8kv/cvmSGFdNyDfJnmz5Z7 I7A5CV7EMZUwtLTJ9uzuAXKa8j6ZxHR2IbDAfBcmWciiFTGwCV/SexChjx14UQpk7sCc nft5n96dl1efKDiohW3bhChsqw/dJdcrIzvKsm9Lee9G87sNl/C0cTlQkcWnvVGVsj3G QukA== 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=csZZWbIIG6nivsnOnivxKMYKBMEZJ8NrVSmye9r+48g=; b=XSwhjGRHgR1HN0tvpXFQXxGl73BqCB4idBN4Pp5hwFrMmQizfEirti5Jlp1B7FNhLC U9wCk3Ol0wO6zsKbV73QjL39XFZEo7fTpHreXM5XqVG/Iq/4FDrFx2AHU0+BP0kSk+jG psEfu2tyruFx5Kws5aHy1xcVZ3sN4jofogCzGQrSl3CTaV7AlSpU5JI2cdi0LfX4r8eD 7+FyhwDTtMmySOdgC0Ei80uFi25Q1CjmLIdaJ88bDVWMhp/y8XtTGd8VZGEQ1HzFPthu MGI3dGIiFjc6XVCZ+kSk6iJnXEBPHfhEP2MsOjzfeY+yXJr6dQEHPACIykIUVxxAgb77 t2Og== X-Gm-Message-State: AO0yUKXsRHSZfWtoojhv6ajPYR6F6dzcXQZQCzCwykitCrFw315F5PX7 fyFLznVP4gTGAgplxQ6Sq9Rt4RqqsMT2rkY3 X-Google-Smtp-Source: AK7set8Cm8g8tjL+QGnUiNwcGr0ZPOuQfx1CYt4c/p4EFplgMfDNRVeDCp0g+jiOgAHXRxxnNk77Xg== X-Received: by 2002:ac8:5811:0:b0:3b8:6b57:499e with SMTP id g17-20020ac85811000000b003b86b57499emr1566698qtg.36.1676638551267; Fri, 17 Feb 2023 04:55:51 -0800 (PST) Received: from localhost.localdomain (dsl-157-123.b2b2c.ca. [66.158.157.123]) by smtp.gmail.com with ESMTPSA id f17-20020ac80691000000b003b9b48cdbe8sm3176026qth.58.2023.02.17.04.55.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Feb 2023 04:55:50 -0800 (PST) From: Maxim Cournoyer Date: Fri, 17 Feb 2023 07:55:30 -0500 Message-Id: <20230217125539.24467-3-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230217125539.24467-1-maxim.cournoyer@gmail.com> References: <20230217125539.24467-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gnuzilla.scm (%icecat-base-version): New variable. (%upstream-firefox-version): Likewise. (%icecat-version): Define in terms of %icecat-base-version. (upstream-firefox-source): New variable. (icecat-source): Adjust to use the above newly introduced variables. --- (no changes since v1) gnu/packages/gnuzilla.scm | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 1ed52c68e9..1bafa92377 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -505,31 +505,29 @@ (define all-mozilla-locales ;; XXXX: Workaround 'snippet' limitations. (define computed-origin-method (@@ (guix packages) computed-origin-method)) -(define %icecat-version "102.8.0-guix0-preview1") +(define %icecat-base-version "102.8.0") +(define %upstream-firefox-version (string-append %icecat-base-version "esr")) +(define %icecat-version (string-append %icecat-base-version "-guix0-preview1")) (define %icecat-build-id "20230214000000") ;must be of the form YYYYMMDDhhmmss +(define upstream-firefox-source + (origin + (method url-fetch) + (uri (string-append + "https://ftp.mozilla.org/pub/firefox/releases/" + %upstream-firefox-version "/source/" + "firefox-" %upstream-firefox-version ".source.tar.xz")) + (sha256 + (base32 + "0j6afrgfsmd0adbbmffw4p1f2hznpck9d36z3bsjx36f7cjgdy27")))) + ;; 'icecat-source' is a "computed" origin that generates an IceCat tarball ;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat' ;; script from the upstream IceCat project. (define icecat-source - (let* ((base-version (first (string-split %icecat-version #\-))) - - (major-version (first (string-split base-version #\.))) - (minor-version (second (string-split base-version #\.))) - (sub-version (third (string-split base-version #\.))) - - (upstream-firefox-version (string-append base-version "esr")) - (upstream-firefox-source - (origin - (method url-fetch) - (uri (string-append - "https://ftp.mozilla.org/pub/firefox/releases/" - upstream-firefox-version "/source/" - "firefox-" upstream-firefox-version ".source.tar.xz")) - (sha256 - (base32 - "0j6afrgfsmd0adbbmffw4p1f2hznpck9d36z3bsjx36f7cjgdy27")))) - + (let* ((major-version (first (string-split %icecat-base-version #\.))) + (minor-version (second (string-split %icecat-base-version #\.))) + (sub-version (third (string-split %icecat-base-version #\.))) (upstream-icecat-base-version "102.8.0") ; maybe older than base-version ;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version)) (gnuzilla-commit "03d9e3db5affe21db077c410ec08c313d6aa280e") @@ -562,7 +560,7 @@ (define icecat-source #~(begin (use-modules (guix build utils)) (let ((firefox-dir - (string-append "firefox-" #$base-version)) + (string-append "firefox-" #$%icecat-base-version)) (icecat-dir (string-append "icecat-" #$%icecat-version))) -- 2.39.1 From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH v3 04/11] gnu: icecat: Make language packs reproducible. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Fri, 17 Feb 2023 12:56:03 +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, Jonathan Brielmaier , Maxim Cournoyer Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.16766385637071 (code B ref 32026); Fri, 17 Feb 2023 12:56:03 +0000 Received: (at 32026) by debbugs.gnu.org; 17 Feb 2023 12:56:03 +0000 Received: from localhost ([127.0.0.1]:38772 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pT0HS-0001pj-6c for submit@debbugs.gnu.org; Fri, 17 Feb 2023 07:56:02 -0500 Received: from mail-qt1-f170.google.com ([209.85.160.170]:37626) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pT0HO-0001oa-5e for 32026@debbugs.gnu.org; Fri, 17 Feb 2023 07:55:58 -0500 Received: by mail-qt1-f170.google.com with SMTP id a27so711908qto.4 for <32026@debbugs.gnu.org>; Fri, 17 Feb 2023 04:55:58 -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=rv6V7stAe7RIxPDWzth94H0AanpP1lBv2wbdAs9LaZ4=; b=ckEjWZYC9hDiKASXlr5zJ7fcfQ70IIHwIWhZORsU1W8As436SIjwpRO76fSNjBVlyz tN/5EVW8JGUBTQxIVV5diOVXIpGrUll/qRFRWRL2ENPeUWWXvxGjO7Q5Gdi5srLXfkeC kMCpDf6KqRprUTDkRB93oRKOPJXUGuGCTCancqAgwegEeiy+krlFKT6F4zXGlqeQ1pPz WMtiqYzfqRaE5mENAvGRqnFqG0qkD29jMfz4rvbT7kJ8xTeySBwweWOOoPMTcDCZNlPL PfahbXL8gPjSJS5kwHS5BrOHZrZ/c6g31vAC+OlG+kyq/rsFe3yI9zPfdWductoBNjK1 dA2A== 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=rv6V7stAe7RIxPDWzth94H0AanpP1lBv2wbdAs9LaZ4=; b=OoDz9qpVu/htHA3QU3LY5dOkSCLSjDA+uSmHZ4FVmL3SFyktC3Lg/SOpkuVf8WG5Bh t6nkRgo1VwD+wUL/PDbIfmgEMk/w8UBlCSfaJrsTymfaB9Z7St2moVKunbgxXjQwZ3bk ttzkcA8U/kUFNJ3NcrGXFE4Oj8DVRKCPGgaE4VvI+xV3yS8bPkNgPIJgeFO/zv60uMmJ KxonrdbwHiML2xoIIJx4KgYEdHb+bJuOQ0XQFHGhT7Y2TwJfBefR8RQA3G/hqSDiFH5A AR02dSArpyDGQzVk0XY85erT6mXn0UlwZRizcFKG9+PPi0qazP4VbnQVbNV78RpYrTRc cE0g== X-Gm-Message-State: AO0yUKXj2rRz3g2+cqhF6nUyAyEvXLkbQC46rUN1b2KKiT8BWqFEOBui 40hEH0gzGetk+E+IvWlN/7XlNoLa8jC28Mw/ X-Google-Smtp-Source: AK7set+du/5xW6iVIwBf9OawRLfllpn/uhuzqPyL5s+Ar9zYL+oV31q/ACBACzAGZtwtu4hndHOQ0Q== X-Received: by 2002:a05:622a:190a:b0:3bd:155c:3ac8 with SMTP id w10-20020a05622a190a00b003bd155c3ac8mr6297243qtc.67.1676638552571; Fri, 17 Feb 2023 04:55:52 -0800 (PST) Received: from localhost.localdomain (dsl-157-123.b2b2c.ca. [66.158.157.123]) by smtp.gmail.com with ESMTPSA id f17-20020ac80691000000b003b9b48cdbe8sm3176026qth.58.2023.02.17.04.55.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Feb 2023 04:55:52 -0800 (PST) From: Maxim Cournoyer Date: Fri, 17 Feb 2023 07:55:31 -0500 Message-Id: <20230217125539.24467-4-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230217125539.24467-1-maxim.cournoyer@gmail.com> References: <20230217125539.24467-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/patches/icecat-reproducible-langpacks.patch: New file. * gnu/local.mk (dist_patch_DATA): Register. it. * gnu/packages/gnuzilla.scm (icecat-source): Apply it. --- (no changes since v1) gnu/local.mk | 1 + gnu/packages/gnuzilla.scm | 1 + .../icecat-reproducible-langpacks.patch | 45 +++++++++++++++++++ 3 files changed, 47 insertions(+) create mode 100644 gnu/packages/patches/icecat-reproducible-langpacks.patch diff --git a/gnu/local.mk b/gnu/local.mk index 5fcbdd4586..ddc5796ca8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1327,6 +1327,7 @@ dist_patch_DATA = \ %D%/packages/patches/i7z-gcc-10.patch \ %D%/packages/patches/icecat-makeicecat.patch \ %D%/packages/patches/icecat-avoid-bundled-libraries.patch \ + %D%/packages/patches/icecat-reproducible-langpacks.patch \ %D%/packages/patches/icecat-use-system-graphite2+harfbuzz.patch \ %D%/packages/patches/icecat-use-system-media-libs.patch \ %D%/packages/patches/icedtea-7-hotspot-aarch64-use-c++98.patch\ diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 1bafa92377..17edb9fa7e 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -554,6 +554,7 @@ (define icecat-source (method computed-origin-method) (file-name (string-append "icecat-" %icecat-version ".tar.xz")) (sha256 #f) + (patches (search-patches "icecat-reproducible-langpacks.patch")) (uri (delay (with-imported-modules '((guix build utils)) diff --git a/gnu/packages/patches/icecat-reproducible-langpacks.patch b/gnu/packages/patches/icecat-reproducible-langpacks.patch new file mode 100644 index 0000000000..b36a770cc6 --- /dev/null +++ b/gnu/packages/patches/icecat-reproducible-langpacks.patch @@ -0,0 +1,45 @@ +Prevent the extension manifests from embedding the current date. + +This is inspired by the Debian +"Use-build-id-as-langpack-version-for-reproducibility.patch" maintained for +their Firefox package as well as reproducible-builds.org guidelines from +https://reproducible-builds.org/docs/source-date-epoch/. + +Upstream status: https://phabricator.services.mozilla.com/D169979 + +--- ./python/mozbuild/mozbuild/action/langpack_manifest.py.old 2023-02-13 11:01:21.051537347 -0500 ++++ ./python/mozbuild/mozbuild/action/langpack_manifest.py 2023-02-13 11:04:33.141817330 -0500 +@@ -36,6 +36,15 @@ + pushlog_api_url = "{0}/json-rev/{1}" + + ++import os ++import time ++import datetime ++ ++def get_build_date(): ++ """Honor SOURCE_DATE_EPOCH for reproducibility.""" ++ return datetime.datetime.utcfromtimestamp( ++ int(os.environ.get('SOURCE_DATE_EPOCH', time.time()))) ++ + ### + # Retrievers a UTC datetime of the push for the current commit + # from a mercurial clone directory. +@@ -54,7 +63,7 @@ + with mozversioncontrol.get_repository_object(path=path) as repo: + phase = repo._run("log", "-r", ".", "-T" "{phase}") + if phase.strip() != "public": +- return datetime.datetime.utcnow() ++ return get_build_date() + repo_url = repo._run("paths", "default") + repo_url = repo_url.strip().replace("ssh://", "https://") + repo_url = repo_url.replace("hg://", "https://") +@@ -105,7 +114,7 @@ + dt = get_dt_from_hg(path) + + if dt is None: +- dt = datetime.datetime.utcnow() ++ dt = get_build_date() + + dt = dt.replace(microsecond=0) + return dt.strftime("%Y%m%d%H%M%S") -- 2.39.1 From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH v3 05/11] gnu: Add icecat-l10n and icedove-l10n. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Fri, 17 Feb 2023 12:57:02 +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, Jonathan Brielmaier , Maxim Cournoyer Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.16766385697142 (code B ref 32026); Fri, 17 Feb 2023 12:57:02 +0000 Received: (at 32026) by debbugs.gnu.org; 17 Feb 2023 12:56:09 +0000 Received: from localhost ([127.0.0.1]:38783 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pT0HZ-0001r6-15 for submit@debbugs.gnu.org; Fri, 17 Feb 2023 07:56:09 -0500 Received: from mail-qt1-f171.google.com ([209.85.160.171]:45033) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pT0HP-0001oc-Fz for 32026@debbugs.gnu.org; Fri, 17 Feb 2023 07:56:00 -0500 Received: by mail-qt1-f171.google.com with SMTP id s22so759391qtw.11 for <32026@debbugs.gnu.org>; Fri, 17 Feb 2023 04:55:59 -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=arI39eiYNrlPMEpibenm4NtpvPhjtgu5CD6SX1MRep8=; b=aY2sT7YWsGN0RYRNtOiH+JkuI2omgke07yQGpymQFd5psY2qR60o4ZS3VlNSafeR00 XofF7KDQakKdXPueYmrBUk6DVLyyT8RRtUqZU9gvYyDtdmadtvMH28/cO/8xVJxpmFz1 byhQptepJlCefiDxRnPi3U1+3j2zFD8x2PwzvQvbGWPNs2mSehPIkCPO9WPGjIUtuUJt AI6F/7SncFP5OPhUIecefCDJsW1cLKb7z+n/jPu7Sms9y1Q8EIr4lIux5JFibXmTh6e+ sjHaXOqkHCthlM+LJF8o0BCwqL6uIfRHyMR62YKouazYo+LlBhTv4xj/EYgCVRAdNr+O lRMg== 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=arI39eiYNrlPMEpibenm4NtpvPhjtgu5CD6SX1MRep8=; b=O58Aio5XYBm4SZK7Ty/y6ACOiogdyyHnp0H0KryDMXuZbn8Sw1fviV5ZPNGMNom1jH dMFyZl3PzVZVU88qAzBFwH1QmH30RnQlqAofqJVDQSds7hFe6a9PV0j9s6FcVJWuP6EG fUliW7b7piRZQDLFPiF7ziljpLAkWuNxNXQPbIgx1cZwaiVfLVqoSj+c51ehtQdvm/w5 Q1tx3/Xtm5Ue0V/G5bvcJIGvuYDXvFf9bZ0pnK+QiZ0zSb54B5/THW1jOaS7c34UqQGJ mZAE06BNUNZZjZjA1751b4G+54JT6z8doh1zFW4+s3eryDQyaoLAlVGwS+ZMxJXu+q2/ nIQw== X-Gm-Message-State: AO0yUKWJG0p3yy/bJvWE9LCBVY1KV2EUopM94F/UxQckSwZwlN0pS+5e nkwaQJjZuCRGQ7SVIETq1geP7DtAAR6okXUR X-Google-Smtp-Source: AK7set/QwHmujag0+yI/8RNwTTWz7A/PuXKlShmBdev7F0Ueyhy4VMnJVY3PQM8KyLHbqi0AbPry1Q== X-Received: by 2002:a05:622a:1c9:b0:3b9:b1ea:2d1b with SMTP id t9-20020a05622a01c900b003b9b1ea2d1bmr15991749qtw.58.1676638553804; Fri, 17 Feb 2023 04:55:53 -0800 (PST) Received: from localhost.localdomain (dsl-157-123.b2b2c.ca. [66.158.157.123]) by smtp.gmail.com with ESMTPSA id f17-20020ac80691000000b003b9b48cdbe8sm3176026qth.58.2023.02.17.04.55.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Feb 2023 04:55:53 -0800 (PST) From: Maxim Cournoyer Date: Fri, 17 Feb 2023 07:55:32 -0500 Message-Id: <20230217125539.24467-5-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230217125539.24467-1-maxim.cournoyer@gmail.com> References: <20230217125539.24467-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gnuzilla.scm (%icecat-locales, %icedove-locales): New variable. (make-l10n-package): New procedure. (icecat-l10n, icedove-l10n): New variables. --- (no changes since v1) gnu/packages/gnuzilla.scm | 143 +++++++++++++++++++++++++++++++++++++- 1 file changed, 142 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 17edb9fa7e..7bc7ad6cec 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -17,7 +17,7 @@ ;;; Copyright © 2020, 2022 Marius Bakke ;;; Copyright © 2021 Brice Waegeneire ;;; Copyright © 2021 Maxime Devos -;;; Copyright © 2021, 2022 Maxim Cournoyer +;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer ;;; Copyright © 2021 Baptiste Strazzul ;;; ;;; This file is part of GNU Guix. @@ -1123,6 +1123,16 @@ (define (runpaths-of-input label) (cpe-name . "firefox_esr") (cpe-version . ,(first (string-split version #\-))))))) +(define %icecat-locales + '("ach" "af" "an" "ar" "ast" "az" "be" "bg" "bn" "br" "bs" "ca" "cak" + "ca-valencia" "cs" "cy" "da" "de" "dsb" "el" "en-CA" "en-GB" "eo" "es-AR" + "es-CL" "es-ES" "es-MX" "et" "eu" "fa" "ff" "fi" "fr" "fy-NL" "ga-IE" "gd" + "gl" "gn" "gu-IN" "he" "hi-IN" "hr" "hsb" "hu" "hy-AM" "ia" "id" "is" "it" + "ja" "ja-JP-mac" "ka" "kab" "kk" "km" "kn" "ko" "lij" "lt" "lv" "mk" "mr" "ms" + "my" "nb-NO" "ne-NP" "nl" "nn-NO" "oc" "pa-IN" "pl" "pt-BR" "pt-PT" "rm" "ro" + "ru" "sco" "si" "sk" "sl" "son" "sq" "sr" "sv-SE" "szl" "ta" "te" "th" "tl" + "tr" "trs" "uk" "ur" "uz" "vi" "xh" "zh-CN" "zh-TW")) + (define %icedove-build-id "20230207000000") ;must be of the form YYYYMMDDhhmmss (define %icedove-version "102.7.2") @@ -1147,6 +1157,15 @@ (define (comm-source->locales+changeset source) (((_ changeset locale) ...) (values locale (first changeset))))) +;;; Generated with comm-source->locales+changeset. +(define %icedove-locales + '("af" "ar" "ast" "be" "bg" "br" "ca" "cak" "cs" "cy" "da" "de" "dsb" "el" + "en-CA" "en-GB" "es-AR" "es-ES" "es-MX" "et" "eu" "fi" "fr" "fy-NL" "ga-IE" + "gd" "gl" "he" "hr" "hsb" "hu" "hy-AM" "id" "is" "it" "ja" "ja-JP-mac" "ka" + "kab" "kk" "ko" "lt" "lv" "ms" "nb-NO" "nl" "nn-NO" "pa-IN" "pl" "pt-BR" + "pt-PT" "rm" "ro" "ru" "sk" "sl" "sq" "sr" "sv-SE" "th" "tr" "uk" "uz" "vi" + "zh-CN" "zh-TW")) + ;;; To find out which changeset to use for the comm-l10n repo, use the ;;; 'comm-source->locales+changeset' procedure on the thunderbird-comm-source ;;; checkout directory. The complete localization data should be released as @@ -1555,6 +1574,128 @@ (define-public icedove/wayland (native-inputs '()) (inputs '()))) +(define (make-l10n-package project version source locales) + "Return a package for PROJECT, a symbol (either icecat or icedove), with +their corresponding VERSION, SOURCE and LOCALES variables." + (unless (member project '(icecat icedove)) + (error "only icecat or icedove components are currently supported")) + + (let ((name (if (eq? 'icecat project) + "IceCat" + "Icedove"))) + (package + (name (format #f "~a-l10n" project)) + (version version) + (source source) + (outputs (cons "out" locales)) + (build-system gnu-build-system) + (arguments + (list + #:modules '((guix build gnu-build-system) + (guix build utils) + (ice-9 format) + (ice-9 ftw) + (srfi srfi-1) + (srfi srfi-26)) + #:tests? #f ;no tests, this is data + #:phases + #~(modify-phases %standard-phases + (delete 'bootstrap) + (delete 'install) + (replace 'configure + (lambda _ + ;; The following configuration is inspired by guidance at + ;; https://firefox-source-docs.mozilla.org/build/buildsystem/locales.html. + (call-with-output-file ".mozconfig" + (lambda (p) + (format p "~{~a~%~}" + (list (if (eq? 'icecat '#$project) + "ac_add_options --enable-project=browser" + "ac_add_options --enable-project=comm/mail") + "ac_add_options --disable-compile-environment" + (string-append + "ac_add_options --with-l10n-base=" + (getcwd) "/l10n") + ;; Hack, otherwise the build system throws: + ;; 'RuntimeError: File "brand.dtd" not found'. + "ac_add_options --enable-official-branding" + "mk_add_options MOZ_OBJDIR=obj")))) + (setenv "CONFIG_SHELL" (which "bash")) + (setenv "MOZBUILD_STATE_PATH" + (string-append (getcwd) "/mach_state")) + (setenv "MOZCONFIG" (string-append (getcwd) "/.mozconfig")) + (setenv "MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE" "system") + (setenv "BUILD_BACKENDS" "FasterMake,RecursiveMake"))) + (replace 'build ;build and install data files + (lambda* (#:key outputs #:allow-other-keys) + (define (find-file dir name) + (let ((files (find-files dir name))) + (when (null? files) + (error "could not find file in dir" name dir)) + (car files))) + + (for-each + (lambda (l) + (let* ((out (assoc-ref outputs l)) + ;; The older lib/$project/distribution/extensions + ;; directory is deprecated. Use the newer app-global + ;; directory, which is lib/$project/extensions. + (ext-dir-prefix + (format + #f "lib/~a/~:[~;browser/~]extensions" + '#$project (eq? 'icecat '#$project))) + (all-ext (string-append #$output "/" ext-dir-prefix)) + (ext-dir (string-append out "/" ext-dir-prefix)) + ;; XXX: Because Icedove doesn't have a makeicedove + ;; script that substitutes all the Thunderbird + ;; references to Icedove, the MOZ_LANGPACK_EID + ;; defined in comm/mail/locales/Makefile.in uses + ;; 'thunderbird' in its ID extension rather than + ;; 'icedove'. + (name (format #f "langpack-~a@~a.mozilla.org.xpi" + l (if (eq? 'icedove '#$project) + 'thunderbird + '#$project)))) + (format #t "processing locale `~a'...~%" l) + (if (eq? 'icecat '#$project) + ;; XXX: For some reasons, for IceCat, there are some + ;; parsing errors that cause the build system to + ;; return an unclean exit code; use system* to ignore + ;; errors. + (system* "./mach" "build" (string-append "langpack-" l)) + (invoke "./mach" "build" (string-append "langpack-" l))) + (mkdir-p ext-dir) + (let ((xpi (find-file "obj" (string-append + "\\." l "\\.langpack\\.xpi$")))) + (copy-file xpi (string-append ext-dir "/" name)) + ;; Symlink to the main output so that a user can + ;; install all of the language packs at once. + (mkdir-p all-ext) + (symlink (string-append ext-dir "/" name) + (string-append all-ext "/" name))))) + (if (eq? 'icedove '#$project) + '#$%icedove-locales + '#$%icecat-locales))))))) + (native-inputs + (list m4 + perl + python-wrapper + node + unzip)) + (home-page "https://www.mozilla.org/") + (synopsis (string-append "Language localization data for " name)) + (description (string-append "This package contains the various language +localization data files (language pack extensions) for " name ". The +individual localization packages can be installed by using the output +associated with their name.")) + (license license:mpl2.0)))) + +(define-public icecat-l10n + (make-l10n-package 'icecat %icecat-version icecat-source %icecat-locales)) + +(define-public icedove-l10n + (make-l10n-package 'icedove %icedove-version icedove-source %icedove-locales)) + (define-public firefox-decrypt (package (name "firefox-decrypt") -- 2.39.1 From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH v3 06/11] gnu: icedove: Automatically load system-provided extensions. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Fri, 17 Feb 2023 12:57:02 +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, Jonathan Brielmaier , Maxim Cournoyer Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.16766385707149 (code B ref 32026); Fri, 17 Feb 2023 12:57:02 +0000 Received: (at 32026) by debbugs.gnu.org; 17 Feb 2023 12:56:10 +0000 Received: from localhost ([127.0.0.1]:38785 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pT0HZ-0001r9-Nx for submit@debbugs.gnu.org; Fri, 17 Feb 2023 07:56:10 -0500 Received: from mail-qt1-f180.google.com ([209.85.160.180]:46892) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pT0HQ-0001oj-Mx for 32026@debbugs.gnu.org; Fri, 17 Feb 2023 07:56:01 -0500 Received: by mail-qt1-f180.google.com with SMTP id u22so532674qtq.13 for <32026@debbugs.gnu.org>; Fri, 17 Feb 2023 04:56:00 -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=aBAKvX7Vz7rd8QPbdNaNIdihFvujrWC4S2FYoCT3bIk=; b=hKzeZuFf82VJI8Wrb/wrTPwPCJsNAsyP9ZzUjiLCgZfB8OsRxVSEb3cD2nJQnvmiCe b9lsaCexn14xFrBXHBdO9YjB4sW8Ev2BNB6lLQljL4y6zw7H5y9x4ATKz5Kk7itBqdQf hWl6ktZY5K0AjxRbn+zvU0ZPqTLrMoMAjPh2zJwbYF79IrPc5Oo2Ki5THEnIzG7Hawq4 bEFrA92XvmAi9nD5mSipx529sk7zkhHhJLao4ZccYu7fu2rTFUNhU1/ofZelAqSn8N2m XyiGlMdcegDSf5nNxoy2AYwP7Su1UCIvbI80KPsfotAACwiCqsChZfzfuqqN57i71jIu 7qLg== 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=aBAKvX7Vz7rd8QPbdNaNIdihFvujrWC4S2FYoCT3bIk=; b=jqINhVmLGO5yFqzxSqr1WZK74XoNP8w3tuBf6Vw9OjkBtAN1q5n3znr1ABue2DcQPS zREoRt4hkqZzhOIWAcjKTjAujQ0b0xk3cvO/WLr8YmG99HpkV/K2aaGMZtZQA5/79GgT V2CEv/A0XhgOKojcMzd2pKu8e3jhbv/knMPbl9UkhWBre3Eg6KlLuBXMXiXLK4R9CN3p C3P7eRQ5HMpHwJQFYHZymSJGBs2Fh0n6jIMCPOpyOtqux2QcRQe40HMSK0iMlv32VEQW 3iBf5sD84ewZW4XondShVZn8onmjOAF/khabwBZYI4dyjizw+qkEUB5SrWGumxIbVWwt PxcA== X-Gm-Message-State: AO0yUKUOMZb2oSjBOP1pIsrFmqWAu3tChW/3sz8D/TRQY8TcGu1SZ+0H Ls+Ed8pBjjt8Ctkm64HpbLtQNGmKR8TWPPtD X-Google-Smtp-Source: AK7set/Vzk2DWLpKUaOH2x03JSYQ8IT3cV7UtW7/LOFcV6bGnF2AyZ5EHLgQFfhWbhoEPWNDm37WkQ== X-Received: by 2002:ac8:604e:0:b0:3b6:45f1:4933 with SMTP id k14-20020ac8604e000000b003b645f14933mr638148qtm.66.1676638555203; Fri, 17 Feb 2023 04:55:55 -0800 (PST) Received: from localhost.localdomain (dsl-157-123.b2b2c.ca. [66.158.157.123]) by smtp.gmail.com with ESMTPSA id f17-20020ac80691000000b003b9b48cdbe8sm3176026qth.58.2023.02.17.04.55.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Feb 2023 04:55:54 -0800 (PST) From: Maxim Cournoyer Date: Fri, 17 Feb 2023 07:55:33 -0500 Message-Id: <20230217125539.24467-6-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230217125539.24467-1-maxim.cournoyer@gmail.com> References: <20230217125539.24467-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gnuzilla.scm (icedove-source): Set the extensions.autoDisableScopes preference value to 3. (icedove-minimal) [phases]: Add the --allow-addon-sideload and --with-unsigned-addon-scopes=app,system ac options to the configure phase. --- (no changes since v1) gnu/packages/gnuzilla.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 7bc7ad6cec..3ece3f057c 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1281,7 +1281,15 @@ (define icedove-source (("(pref\\(\"extensions.systemAddon.update.enabled\").*" _ m) (string-append m ", false);")) (("(pref\\(\"lightweightThemes.update.enabled\").*" _ m) - (string-append m ", false);"))) + (string-append m ", false);")) + + ;; XXX: The autoDisableScopes is tweaked by the makeicecat + ;; script, but it doesn't know about Thunderbird. This is + ;; necessary to allow picking up the extensions found in the + ;; system global application directory, such as the language + ;; packs. + (("\"extensions.autoDisableScopes\", 15") + "\"extensions.autoDisableScopes\", 3")) ;; Step out of the directory and create the tarball. (chdir "..") @@ -1394,6 +1402,8 @@ (define-public icedove (lambda () (display (string-append + "ac_add_options --allow-addon-sideload\n" + "ac_add_options --with-unsigned-addon-scopes=app,system\n" "ac_add_options --disable-crashreporter\n" "ac_add_options --disable-debug\n" "ac_add_options --disable-debug-symbols\n" -- 2.39.1 From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH v3 07/11] gnu: Add language packs to icecat and icedove. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Fri, 17 Feb 2023 12:57:03 +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, Jonathan Brielmaier , Maxim Cournoyer Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.16766385707157 (code B ref 32026); Fri, 17 Feb 2023 12:57:03 +0000 Received: (at 32026) by debbugs.gnu.org; 17 Feb 2023 12:56:10 +0000 Received: from localhost ([127.0.0.1]:38787 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pT0Ha-0001rG-2S for submit@debbugs.gnu.org; Fri, 17 Feb 2023 07:56:10 -0500 Received: from mail-qt1-f170.google.com ([209.85.160.170]:45949) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pT0HS-0001oz-6b for 32026@debbugs.gnu.org; Fri, 17 Feb 2023 07:56:03 -0500 Received: by mail-qt1-f170.google.com with SMTP id d10so712045qtr.12 for <32026@debbugs.gnu.org>; Fri, 17 Feb 2023 04:56:02 -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=g/RDFL6cRtkLmLkEsNSGBBCYqC4aAyywO1hAG5HFASs=; b=Mxzkc3hmHlDXl+K/1Pyq5Z24RsSiXE/eBHp2n+ONQdSQc6A4ZCNWW4zOYxoIY6PZ50 C0+e6rovGf3v3hiJjTejGrSvuMUVWINPUbY9sjCX2aKik9Cm9hO4Hor8wQzx+JYQIe4J Ot4l7ilmz5e8Knsss6nBb9lwVRauMFqLD2vp1fp52vLU1ltMvm0dYQbq+nIzaGB/0UU7 lVIf49JdPO9LTmupsCUV+W8H56KSXYkbwu44g++VZaKEqgy1fIo5Ay4TD3S0K540YX1h 25LFAtlv/LFQ706p0TLIZ89Jj1uu+fGwCy14xYTnDyDDt9Ry/sStFJWGCkGO595H0MzX N4Aw== 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=g/RDFL6cRtkLmLkEsNSGBBCYqC4aAyywO1hAG5HFASs=; b=3S2lt6JvRMjflgnxBm98x/mAdEvggZ7M0nOTldxyGGMdkD/FuGWiwOl2pJIFfnLXVV NgnMFZDXxbzEY2FA/A3m4ZxUGiJJ01VBcF04kI0livi2EQE71g0F53pIHxrmksWnYArP aPIs2+nelcgRj5onFvrQtUYYlCMFJUzbk4H9nkqwCBLf9/+hOTMN5lSfI3CGXM+2vhhX UgxIeiLFtSd1ZEds996IWkw3bypmE2vD9UrZSJd1JWdoYynnfF2A7HjR+gucVlqY/0O/ X65G53WhA9MIh5ZgFmlhXJ+/v0c54xC9bMEeujwsL/GOc4RO6GNvcj3FGbApCnPJqN21 NK/Q== X-Gm-Message-State: AO0yUKWN4nlNXWLQHq9VhxkFYaPAAEJFnwoUWJQ6vF4ONOZvy9fs1xGE 0//SS+fQ5JwvfVt7B2jbNK3cZRxp3U6CfFtK X-Google-Smtp-Source: AK7set+M46QET3ljdyAgDN13JK1vrx7VBWkHbuY0+v7IIVeN5yO52bQvfA9SpsjfE1Stv2FNykSDZg== X-Received: by 2002:a05:622a:198c:b0:3b9:a441:37f4 with SMTP id u12-20020a05622a198c00b003b9a44137f4mr1506609qtc.52.1676638556632; Fri, 17 Feb 2023 04:55:56 -0800 (PST) Received: from localhost.localdomain (dsl-157-123.b2b2c.ca. [66.158.157.123]) by smtp.gmail.com with ESMTPSA id f17-20020ac80691000000b003b9b48cdbe8sm3176026qth.58.2023.02.17.04.55.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Feb 2023 04:55:56 -0800 (PST) From: Maxim Cournoyer Date: Fri, 17 Feb 2023 07:55:34 -0500 Message-Id: <20230217125539.24467-7-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230217125539.24467-1-maxim.cournoyer@gmail.com> References: <20230217125539.24467-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Fixes . * gnu/packages/gnuzilla.scm (icecat): Rename to... (icecat-minimal): ... this. (icedove: Rename to... (icedove-minimal): ... this. (make-mozilla-with-l10n): New procedure. (icecat, icedove): New variables. --- Changes in v3: - Make make-l10n-package more functional, taking inputs as arguments - Validate the PROJECT argument in make-l10n-package Changes in v2: - Do not clear native-inputs and inputs in make-mozilla-with-l10n, for 'guix shell -D icecat' gnu/packages/gnuzilla.scm | 133 ++++++++++++++++++++++++++++---------- 1 file changed, 100 insertions(+), 33 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 3ece3f057c..02493b9aff 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -679,9 +679,9 @@ (define icecat-source "--sort=name" icecat-dir))))))))) -(define-public icecat +(define-public icecat-minimal (package - (name "icecat") + (name "icecat-minimal") (version %icecat-version) (source icecat-source) (build-system gnu-build-system) @@ -1303,9 +1303,9 @@ (define icedove-source "--sort=name" #$name)))))))) -(define-public icedove +(define-public icedove-minimal (package - (name "icedove") + (name "icedove-minimal") (version %icedove-version) (source icedove-source) (properties @@ -1555,35 +1555,6 @@ (define-public icedove Thunderbird. It supports email, news feeds, chat, calendar and contacts.") (license license:mpl2.0))) -(define-public icedove/wayland - (package - (inherit icedove) - (name "icedove-wayland") - (build-system trivial-build-system) - (arguments - (list - #:modules '((guix build utils)) - #:builder - #~(begin - (use-modules (guix build utils)) - (let* ((exe (string-append #$output "/bin/icedove"))) - (mkdir-p (dirname exe)) - (call-with-output-file exe - (lambda (port) - (format port "#!~a - MOZ_ENABLE_WAYLAND=1 exec ~a $@" - #$(file-append bash-minimal "/bin/bash") - #$(file-append icedove "/bin/icedove")))) - (chmod exe #o555) - ;; Provide the manual and .desktop file. - (copy-recursively (string-append #$icedove "/share") - (string-append #$output "/share")) - (substitute* (string-append #$output - "/share/applications/icedove.desktop") - ((#$icedove) #$output)))))) - (native-inputs '()) - (inputs '()))) - (define (make-l10n-package project version source locales) "Return a package for PROJECT, a symbol (either icecat or icedove), with their corresponding VERSION, SOURCE and LOCALES variables." @@ -1706,6 +1677,102 @@ (define-public icecat-l10n (define-public icedove-l10n (make-l10n-package 'icedove %icedove-version icedove-source %icedove-locales)) +;;; This hack exists because there's no way to configure extra extension +;;; search paths for IceCat or Icedove. The global extensions directory is +;;; constructed relatively to the executable file name. +(define (make-mozilla-with-l10n project base l10n-package) + "Return a package definition for PROJECT (a symbol such as 'icecat or +'icedove) that combines the BASE package with L10N-PACKAGE." + + (unless (member project '(icecat icedove)) + (error "only icecat or icedove components are currently supported")) + + (let ((name (symbol->string project)) + (icecat? (eq? 'icecat project))) + (package + (inherit base) + (name (symbol->string project)) + (build-system trivial-build-system) + (arguments + (list + #:modules '((guix build union) + (guix build utils)) + #:builder + #~(begin + (use-modules (guix build union) + (guix build utils)) + + (union-build #$output (list #$base #$l10n-package) + #:create-all-directories? #t) + + (define* (expose name #:optional (proc copy-file) + #:key (source #$base)) + (let ((dest (string-append #$output "/" name))) + (mkdir-p (dirname dest)) + (proc (string-append source "/" name) dest))) + + (let ((wrapper (string-append "lib/" #$name "/" #$name)) + (real-binary (string-append "lib/" #$name "/." #$name + "-real")) + (desktop-file (string-append "share/applications/" + #$name ".desktop"))) + ;; Copy wrapper file. + (delete-file (string-append #$output "/" wrapper)) + (expose wrapper) + + ;; Recreate bin symlink. + (delete-file (string-append #$output "/bin/" #$name)) + (symlink (string-append #$output "/" wrapper) + (string-append #$output "/bin/" #$name)) + + ;; Copy actual binary. + (delete-file (string-append #$output "/" real-binary)) + (expose real-binary) + + ;; Copy desktop file. + (delete-file (string-append #$output "/" desktop-file)) + (expose desktop-file) + + ;; Adjust the references in the desktop file and wrapper. + (substitute* (list (string-append #$output "/" desktop-file) + (string-append #$output "/" wrapper)) + ((#$base) #$output))))))))) + +(define-public icecat + (make-mozilla-with-l10n 'icecat icecat-minimal icecat-l10n)) + +(define-public icedove + (make-mozilla-with-l10n 'icedove icedove-minimal icedove-l10n)) + +(define-public icedove/wayland + (package + (inherit icedove) + (name "icedove-wayland") + (build-system trivial-build-system) + (arguments + (list + #:modules '((guix build utils)) + #:builder + #~(begin + (use-modules (guix build utils)) + (let* ((exe (string-append #$output "/bin/icedove"))) + (mkdir-p (dirname exe)) + (call-with-output-file exe + (lambda (port) + (format port "#!~a + MOZ_ENABLE_WAYLAND=1 exec ~a $@" + #$(file-append bash-minimal "/bin/bash") + #$(file-append icedove "/bin/icedove")))) + (chmod exe #o555) + ;; Provide the manual and .desktop file. + (copy-recursively (string-append #$icedove "/share") + (string-append #$output "/share")) + (substitute* (string-append #$output + "/share/applications/icedove.desktop") + ((#$icedove) #$output)))))) + (native-inputs '()) + (inputs '()))) + (define-public firefox-decrypt (package (name "firefox-decrypt") -- 2.39.1 From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH v3 08/11] gnu: icedove: Use the locale of the system. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Fri, 17 Feb 2023 12:57:03 +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, Jonathan Brielmaier , Maxim Cournoyer Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.16766385717164 (code B ref 32026); Fri, 17 Feb 2023 12:57:03 +0000 Received: (at 32026) by debbugs.gnu.org; 17 Feb 2023 12:56:11 +0000 Received: from localhost ([127.0.0.1]:38789 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pT0Ha-0001rO-L3 for submit@debbugs.gnu.org; Fri, 17 Feb 2023 07:56:10 -0500 Received: from mail-qt1-f172.google.com ([209.85.160.172]:45953) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pT0HT-0001p6-Kh for 32026@debbugs.gnu.org; Fri, 17 Feb 2023 07:56:04 -0500 Received: by mail-qt1-f172.google.com with SMTP id d10so712096qtr.12 for <32026@debbugs.gnu.org>; Fri, 17 Feb 2023 04:56:03 -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=qRKpc+uJUzX1vxk4egUdNaEvoEOkBKlS7WgsQL3ktuc=; b=NKR4lf4zXTazjdcAfY5P5UHK/mY70hb57fxmVba4xmHbWREInmpswNamXon1h9v7K1 uTw+NrujNdmZyw8dopDCp86WGnzIcG7dzSyck5j3sDI2NN1HJdpvzR37e/E5jGyfVouV sVDLZSc/nwNtz1q27pox2+p6CiUkAK60Cab1mdpzDVDcumA+p0JIXbckl7nk0JRWYgoE q+tKqPD/2S96rqBw+PlDAy6DezD8uA3678L3zGhRDJZdlcSKN10EeeSCCAFJISdBv9GT alAPMh2gZfMeZZreOQx6fjZ9qqIfGKBV2+fWdYrk7bqli0lS5tGnCfU1PDrkpruM5VU6 L8pw== 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=qRKpc+uJUzX1vxk4egUdNaEvoEOkBKlS7WgsQL3ktuc=; b=pEoWfQ9EpVK5BtsHx0GlzvzYz+SOJgaEdtOTyAhDBbqHWrw/MOsxiLPHv6M28BmPmj mT0AOFnJWTZ0Ji20VQtIENNmrnoYKs5ACGGjp13Bgq0CGOknn6PauU4oXLZohDoR0xz/ nu0OOsTNxh3Zsb27k9l8V8ehgAmVchx4jMLw+aP6N2mXhoprAgqNrZ8uit0ZrXqS03fq ZJuSfnZ9ZO5sPMYEGhvPgU03f9P1EoFnQFF050wvoCJk6lDMtkplnDefKdTuHQFBXIQE DJeuoTAki7hR2kkJGqFuvVljp5jm04urFW1x1vRWssbu1CoNWzvEa0+phe+D6RdPckl5 PMFw== X-Gm-Message-State: AO0yUKWRZq64hqPiy3zut2PvdMGjjesnGb4BcmXFgSNsaHcxTL53Xzzm bOWt8sMId8n1QFs7xWwugBZkOQXYs2AwCp+n X-Google-Smtp-Source: AK7set/ajmy00xWf0vzt0PbK4beat67vJdcNx36+u1OB+/4TuHyAL23bhwGEGALW6CYRwrpnhKOEhA== X-Received: by 2002:a05:622a:170a:b0:3b8:5aa8:7d7a with SMTP id h10-20020a05622a170a00b003b85aa87d7amr1422555qtk.68.1676638558037; Fri, 17 Feb 2023 04:55:58 -0800 (PST) Received: from localhost.localdomain (dsl-157-123.b2b2c.ca. [66.158.157.123]) by smtp.gmail.com with ESMTPSA id f17-20020ac80691000000b003b9b48cdbe8sm3176026qth.58.2023.02.17.04.55.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Feb 2023 04:55:57 -0800 (PST) From: Maxim Cournoyer Date: Fri, 17 Feb 2023 07:55:35 -0500 Message-Id: <20230217125539.24467-8-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230217125539.24467-1-maxim.cournoyer@gmail.com> References: <20230217125539.24467-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gnuzilla.scm (icedove-source): Set the intl.locale.requested option to the empty string. --- (no changes since v1) gnu/packages/gnuzilla.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 02493b9aff..d331e89f75 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1289,7 +1289,12 @@ (define icedove-source ;; system global application directory, such as the language ;; packs. (("\"extensions.autoDisableScopes\", 15") - "\"extensions.autoDisableScopes\", 3")) + "\"extensions.autoDisableScopes\", 3") + + ;; Set the default locale to that of the operating system. + ((".*extensions.autoDisableScopes.*" anchor) + (string-append anchor + "pref(\"intl.locale.requested\", \"\");\n"))) ;; Step out of the directory and create the tarball. (chdir "..") -- 2.39.1 From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH v3 09/11] gnu: icecat: Remove gtk+-2 input. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Fri, 17 Feb 2023 12:57:03 +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, Jonathan Brielmaier , Maxim Cournoyer Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.16766385717171 (code B ref 32026); Fri, 17 Feb 2023 12:57:03 +0000 Received: (at 32026) by debbugs.gnu.org; 17 Feb 2023 12:56:11 +0000 Received: from localhost ([127.0.0.1]:38791 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pT0Ha-0001rV-Vo for submit@debbugs.gnu.org; Fri, 17 Feb 2023 07:56:11 -0500 Received: from mail-qt1-f178.google.com ([209.85.160.178]:42648) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pT0HU-0001pD-Sz for 32026@debbugs.gnu.org; Fri, 17 Feb 2023 07:56:05 -0500 Received: by mail-qt1-f178.google.com with SMTP id t8so527093qtp.9 for <32026@debbugs.gnu.org>; Fri, 17 Feb 2023 04:56:04 -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=LkKlZUeWPY5w6LXPDFmgrskyXV2Dmx3yDpzFsu+LDVM=; b=dzRThN07FAJhX5JVTf7GGbLtj+x5ViserRnZxHLvLHc6wzYVCTPs7lKXbQZRFjCYKH KCXVPd4W/dPMyGtNaSSbliM/SbD4r7b0PGYCSBkznBxaNlFlri8xYNN2ZqZJ1xpZiNDN KzHz1Frw9Pg6q74yIa/oBN5axEEsD2nQOryWRcte6EwJBIgLr9uldsvslzqnNLIFZuHH 8O/dhE7bbz8HIPdRVWZMhXgFGFLKMeUVJ41PVkedhaYU+q2u+j36NyIQOrDX0T+8XBUi MWfRLu8iquOWxxuZ5CwK6bO2GnPHBCK0DWUB+cqvdhI//82dPupT57mODjwfWviNQ26/ gN2w== 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=LkKlZUeWPY5w6LXPDFmgrskyXV2Dmx3yDpzFsu+LDVM=; b=mmy4Hxpwctl2NlYcD/079vtaDoRWBEH6ox8t9w7aPb8lQo9Z4iHhCC+9aGpP0BMecK HMovW4nsVqBQF5qQpO1kQvHADjRa5kww4v43W9nCS9qcJXbweaYr8BdtCm6cK2BDpr5H vF/upfqsNoZk4OCojBKTALwZdbA1p2QEIIvGtOL3sqwpFaGz+9fMpRyoMT+9tAbhJcu6 dguqPlbe1praq3KEobQ85RJSQoSdf4z4OPuEtD1pTfmUsZcPQhwbgGqm7DAZSdSQXciY fkACVrkdBLIH/KfnDNQSI+ljf8wC52eN+X3+QXSXAsX0jmG90aVOHTY+Q8JzNdkwCc7f jC4w== X-Gm-Message-State: AO0yUKXGKLqML7cKFfHQLzPJxv3NP+XywADbybAqlyj5tgw7D6BNQiKv /k8SDono6oJTcOsUfM+ZDG8gc63jcUYO7SVz X-Google-Smtp-Source: AK7set/81cHHubuqFimoB34aYyO84OMk5Y5T+q6ykJA+fb9MUqHXM4L0pd7YCmWAlGosruz/1Hnz6Q== X-Received: by 2002:a05:622a:1a0e:b0:3bd:1728:8886 with SMTP id f14-20020a05622a1a0e00b003bd17288886mr4063163qtb.9.1676638559338; Fri, 17 Feb 2023 04:55:59 -0800 (PST) Received: from localhost.localdomain (dsl-157-123.b2b2c.ca. [66.158.157.123]) by smtp.gmail.com with ESMTPSA id f17-20020ac80691000000b003b9b48cdbe8sm3176026qth.58.2023.02.17.04.55.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Feb 2023 04:55:59 -0800 (PST) From: Maxim Cournoyer Date: Fri, 17 Feb 2023 07:55:36 -0500 Message-Id: <20230217125539.24467-9-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230217125539.24467-1-maxim.cournoyer@gmail.com> References: <20230217125539.24467-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gnuzilla.scm (icecat-minimal) [inputs]: Remove gtk+-2. --- (no changes since v2) Changes in v2: - New commit gnu/packages/gnuzilla.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index d331e89f75..bf8f8378dd 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -693,7 +693,6 @@ (define-public icecat-minimal gdk-pixbuf glib gtk+ - gtk+-2 ;; UNBUNDLE-ME! graphite2 cairo pango -- 2.39.1 From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH v3 10/11] gnu: nss-next: Update to 3.88.1 [fixes CVE-2023-0767]. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Fri, 17 Feb 2023 12:57:04 +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.16766385717179 (code B ref 32026); Fri, 17 Feb 2023 12:57:04 +0000 Received: (at 32026) by debbugs.gnu.org; 17 Feb 2023 12:56:11 +0000 Received: from localhost ([127.0.0.1]:38793 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pT0Hb-0001rc-9m for submit@debbugs.gnu.org; Fri, 17 Feb 2023 07:56:11 -0500 Received: from mail-qt1-f178.google.com ([209.85.160.178]:35780) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pT0HW-0001pN-4a for 32026@debbugs.gnu.org; Fri, 17 Feb 2023 07:56:06 -0500 Received: by mail-qt1-f178.google.com with SMTP id v3so663697qta.2 for <32026@debbugs.gnu.org>; Fri, 17 Feb 2023 04:56:06 -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=e7Vh12BQVoKiWtaXCcA5lJrWg9zj8NQTHPjpJSIcbIc=; b=Hb4IFGYamFcwQlfVCdpcCG6IYDonr9S8cRRPqVTlUdzYmGozDUyuYMr7a/7QH55wSh MdnGmPHPOuHnSFKtv6+C4R1CqAYnmQ3hPrBMixr/+8AT+bbeNxUvV0JeA6ghj/YXzvUD 1GI0V2z3OjQmrYzNhkUlTtH8L8+mZahmCoQ1T278D17/IU5eoPuUuFT3K3eEhjwWgeDc pCo0dUiHwRXW3rZ95iROFi9AufI72Imk7lRYtj/ynEg9pX46ZrdApTmNp8m33bvnbWCq g5aJhRjmKPAnGDsJHVSwpn6DOti4mOK50cGLHfjMXZLWpYPbG3hIG73C4TSkf/fQtQVo isDg== 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=e7Vh12BQVoKiWtaXCcA5lJrWg9zj8NQTHPjpJSIcbIc=; b=NoxNgpi/9NgLJTdlS8HwUmOmlL+K7cq8QM8v3jqb95nprur/5xr+Vi+cw+mcYHP05l p6B/z9maX4tggPHhwGDXjUPQBIPfvGS+j0u2/ua0WTCh7rtGmr78Vs61j6NxWvjKxk7P aM7BxwlZsORG3MK3AfNMjEb4IQYyLGNKkI6cwl2BhoQpxf7uLriCW1iDQlDlGR2g8JTS 2gGadFu7vgN8VFUvYtjKYm64Gg/ES/YZi/NgPHZKEPETMgLquLVt/dZJIN55zWtqXMQW 3rUfRpElgfe1fFEryCTWozkg6cqhe2KwNLgGTSV55LrP5qdP2GPPDZCLYr6N3QDQURIj Nr1g== X-Gm-Message-State: AO0yUKVRG/bBAelh24a+rcgPXS5dZ2ehfHkN0a67sMxJyYuFPbuP0kbB 2gGo6XbXumRcfhhMDcSMN5pnXjSO9F4m2Elf X-Google-Smtp-Source: AK7set8jMMjXw5UpYfLfGzbnVyoN1EWDnTiA3ain511f/PNPtXgqGKwK7ea92Wnzy31MBzoiRS1AIw== X-Received: by 2002:ac8:5a53:0:b0:3ba:13dd:f253 with SMTP id o19-20020ac85a53000000b003ba13ddf253mr338274qta.7.1676638560680; Fri, 17 Feb 2023 04:56:00 -0800 (PST) Received: from localhost.localdomain (dsl-157-123.b2b2c.ca. [66.158.157.123]) by smtp.gmail.com with ESMTPSA id f17-20020ac80691000000b003b9b48cdbe8sm3176026qth.58.2023.02.17.04.56.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Feb 2023 04:56:00 -0800 (PST) From: Maxim Cournoyer Date: Fri, 17 Feb 2023 07:55:37 -0500 Message-Id: <20230217125539.24467-10-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230217125539.24467-1-maxim.cournoyer@gmail.com> References: <20230217125539.24467-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/nss.scm (nss-next): Update to 3.88.1 --- Changes in v3: - New commit. gnu/packages/nss.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index c1d9966fd7..c06807c808 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -246,7 +246,7 @@ (define-public nss (define-public nss-next (package (inherit nss) - (version "3.83") + (version "3.88.1") (source (origin (inherit (package-source nss)) (uri (let ((version-with-underscores @@ -257,5 +257,5 @@ (define-public nss-next "nss-" version ".tar.gz"))) (sha256 (base32 - "0a01xwfrr334mibj1agbykjkc72ph906f2n8ff5hn2b4z5kyl8xb")))) + "15il9fsmixa1r4446zq1wl627sg0hz9h67w6kjxz273xz3nl7li7")))) (propagated-inputs (list nspr-next)))) ;required by nss.pc -- 2.39.1 From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH v3 11/11] gnu: icecat: Unbundle nss and nspr. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Fri, 17 Feb 2023 12:57:04 +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, Jonathan Brielmaier , Maxim Cournoyer Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.16766385727185 (code B ref 32026); Fri, 17 Feb 2023 12:57:04 +0000 Received: (at 32026) by debbugs.gnu.org; 17 Feb 2023 12:56:12 +0000 Received: from localhost ([127.0.0.1]:38795 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pT0Hb-0001rk-J6 for submit@debbugs.gnu.org; Fri, 17 Feb 2023 07:56:11 -0500 Received: from mail-qt1-f179.google.com ([209.85.160.179]:38665) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pT0HX-0001pr-II for 32026@debbugs.gnu.org; Fri, 17 Feb 2023 07:56:07 -0500 Received: by mail-qt1-f179.google.com with SMTP id a8so618033qtj.5 for <32026@debbugs.gnu.org>; Fri, 17 Feb 2023 04:56:07 -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=BAU6pwpKFOXyu8rihpiE2CMEBUPbs+PVz8VpfEQeVd0=; b=ndakleTAJi1EzmjFYl+snAsjLL9PImkldKThgDDKN1JKMysc5euYKWXeDChlKW4xXk AXnQNkOLZkhEWAZxZ/X6oRoNrgWE9okkmOtwxtGG+qroFUN2zrFld2htPVCvgjhHFVQl a4iUn539ZSlEfbPLVVX0mI66Gl4K+h3T9SFTS2+7B8pRB3NsZdWDpRunQluml0kxgETJ 10tgBUSCJXacEQpnQlJWFEOrg0pn4TYtGozV1oyMmdfSpxOnpa012LlJg59i6ozwLklp ME/aClxwhom89m/AZEKCldAXWm0O9V+iWbVNoAPAahvGnCrjwkPUe0COZn3vsEBWFGpn unZg== 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=BAU6pwpKFOXyu8rihpiE2CMEBUPbs+PVz8VpfEQeVd0=; b=q1EnmLMczzQr+IjMrwkPECEfTqbphbXPbaDhvpG6bOrcodemoAW8YAfCWLEXBmuULZ PwKTp4pkUBWVVrQNzgux5GNWDEYTVEw9K0GhkaXDn7y+eJ/bXpBo98we2NoUXxXTvU7l XR2qWlDxkGV1OLPCNL9utqvj2w1SVeswJF5xdBx55InZWPhu34/He8zSgvJ3pd6kFgXg QkJVxooeLMGH4RGMP4qROIX/G1aoTO4WBu4mJaX8i8ZAQOBJl0TdFDjTT+tz9c+rvn2V AxzuU/97R+Rl55eqa5O09wC2CngKZNRBO7KCyRvp1TQRtC2hQP2IGWaQgEEAg1F2p0PJ rA/g== X-Gm-Message-State: AO0yUKWG3TRhX6xkEGEnSoxFlX1HCCv4IAvoKWQfr0CUMtkANQjb4Evp 4mADCrG1ZdL//MOB7y5VcMjsGMNdxb48pm6S X-Google-Smtp-Source: AK7set9Z+HPpSB8H619q/nqcAlftaOjlRQ3UHuTYFw5xrPVuW/dNFlmmT47nDSdMweCdb2qYqYAVvA== X-Received: by 2002:a05:622a:394:b0:3b8:5810:561e with SMTP id j20-20020a05622a039400b003b85810561emr333711qtx.6.1676638561941; Fri, 17 Feb 2023 04:56:01 -0800 (PST) Received: from localhost.localdomain (dsl-157-123.b2b2c.ca. [66.158.157.123]) by smtp.gmail.com with ESMTPSA id f17-20020ac80691000000b003b9b48cdbe8sm3176026qth.58.2023.02.17.04.56.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Feb 2023 04:56:01 -0800 (PST) From: Maxim Cournoyer Date: Fri, 17 Feb 2023 07:55:38 -0500 Message-Id: <20230217125539.24467-11-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230217125539.24467-1-maxim.cournoyer@gmail.com> References: <20230217125539.24467-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gnuzilla.scm (icecat-minimal) [inputs]: Add nspr-next and nss-next. [configure-flags]: Re-instate the "--with-system-nspr" and "--with-system-nss" configure flags. [phases] {remove-bundled-libraries}: Update comment. --- (no changes since v2) Changes in v2: - New commit gnu/packages/gnuzilla.scm | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index bf8f8378dd..fd15076cc6 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -723,10 +723,8 @@ (define-public icecat-minimal mit-krb5 hunspell libnotify - ;; See - ;; and related comments in the 'remove-bundled-libraries' phase. - ;; UNBUNDLE-ME! nspr - ;; UNBUNDLE-ME! nss + nspr-next + nss-next shared-mime-info sqlite eudev @@ -821,12 +819,8 @@ (define-public icecat-minimal ;; UNBUNDLE-ME! "--with-system-theora" ; wants theora-1.2, not yet released ;; UNBUNDLE-ME! "--with-system-libvpx" "--with-system-icu" - - ;; See - ;; and related comments in the - ;; 'remove-bundled-libraries' phase below. - ;; UNBUNDLE-ME! "--with-system-nspr" - ;; UNBUNDLE-ME! "--with-system-nss" + "--with-system-nspr" + "--with-system-nss" ;; UNBUNDLE-ME! "--with-system-harfbuzz" ;; UNBUNDLE-ME! "--with-system-graphite2" @@ -875,12 +869,9 @@ (define-public icecat-minimal ;; FIXME: A script from the bundled nspr is used. ;;"nsprpub" ;; - ;; FIXME: With the update to IceCat 60, using system NSS - ;; broke certificate validation. See - ;; . For now, we use - ;; the bundled NSPR and NSS. TODO: Investigate, - ;; and try to unbundle these libraries again. - ;; UNBUNDLE-ME! "security/nss" + ;; FIXME: Some of the bundled NSS sources are used + ;; to build third_party/prio. + ;;"security/nss" ;; ;; TODO: Use more system media libraries. See: ;; -- 2.39.1 From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH 10/10] gnu: icecat: Unbundle nss and nspr. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Fri, 17 Feb 2023 19:45:02 +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: Mark H Weaver Cc: 32026@debbugs.gnu.org, ludo@gnu.org, Jonathan Brielmaier Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.167666310023883 (code B ref 32026); Fri, 17 Feb 2023 19:45:02 +0000 Received: (at 32026) by debbugs.gnu.org; 17 Feb 2023 19:45:00 +0000 Received: from localhost ([127.0.0.1]:41611 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pT6fD-0006D9-QH for submit@debbugs.gnu.org; Fri, 17 Feb 2023 14:45:00 -0500 Received: from mail-qt1-f169.google.com ([209.85.160.169]:41686) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pT6fC-0006Cu-21 for 32026@debbugs.gnu.org; Fri, 17 Feb 2023 14:44:58 -0500 Received: by mail-qt1-f169.google.com with SMTP id f22so1643151qtb.8 for <32026@debbugs.gnu.org>; Fri, 17 Feb 2023 11:44:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=7+ZXqkRDsJra1tXGGT/1Tk/g5pU5qvFd/5uRhwEc4rQ=; b=ewG/LMYsZD9g+oT5SFPOpz0W9bIJy/WstVpG+bzuAclLzyhdie/8+smIaiDA5EM2db bBJdbbtzQlhk2+gC1U1PnX9kHho2KTmBSoIvxta0Ma4DP2aiSHQqrVY9Yir3r4be9ept pWt7jp/FnEFrYHFrcrgeYInxt5aRja7Jj8U01bRvi09vHHacKXyyTP3/FurL+fMxVioS MyerFZSt6XCNsAQPbj/1BIFJGrf2eFpTgS0G5HITRaysiZhoxacDJlu04PHESiDZmHS6 nUcIyVXCWYTR9WhyfGFlRChuzvEe3OFowLhwVuPk5gduX7JKwhOJ0MR4nheM9aYUQVIl XCvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=7+ZXqkRDsJra1tXGGT/1Tk/g5pU5qvFd/5uRhwEc4rQ=; b=sVXdmy/569fCGSsjU6+/AYZZof+LqoGLnsBu7gLLNmOnrcoXU7npIm2NyOg9j83v74 v7b6gxbdGcqoOaZ/Kn5ZiaSu2kenKGNn5DCUD4mNjV8d73EDv+WWXDrNAFGBtqeAx71v X3DpyDjtSic6l6LenRAG4lWas8lZzzBdvCR0zIF0/mFMnNKP1f9JI6G3u/ZKwOqhr3xJ e/kCWLp79HCRhceRKkWuA4yp1mm7oPYlx7F7Zx0GBphjPp8B+HnWUBRMLp8ad/KFNu52 qUFsnf/0q0uxQOcI4HZDB6fosDL3eRqn4nQFyLvhLimnWZuWrl5C47THHeWIkwA4IBo1 LJOQ== X-Gm-Message-State: AO0yUKWt5kCJFRf8k5wIxQZXz9PcAvYfUfIMGnI3qK4x8Ay7/KFi8HCD ir2TvPEIDNa4YxAS/S9VlY8l/TtFCQwzW6KO X-Google-Smtp-Source: AK7set85ivjE+nbTptCRuq0gBHz9WsdgDOniP1cez7C4JC7f3fC4AUTaLWXhiJ4lTRDP0nMc1ZH9Tw== X-Received: by 2002:ac8:5f46:0:b0:3a5:24ac:a175 with SMTP id y6-20020ac85f46000000b003a524aca175mr785384qta.56.1676663092474; Fri, 17 Feb 2023 11:44:52 -0800 (PST) Received: from hurd (dsl-157-123.b2b2c.ca. [66.158.157.123]) by smtp.gmail.com with ESMTPSA id hf22-20020a05622a609600b003b85ed59fa2sm3690817qtb.50.2023.02.17.11.44.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Feb 2023 11:44:52 -0800 (PST) From: Maxim Cournoyer References: <20230216043649.32119-1-maxim.cournoyer@gmail.com> <20230216043649.32119-10-maxim.cournoyer@gmail.com> <87k00hfeaj.fsf@netris.org> Date: Fri, 17 Feb 2023 14:44:50 -0500 In-Reply-To: <87k00hfeaj.fsf@netris.org> (Mark H. Weaver's message of "Thu, 16 Feb 2023 17:14:33 -0500") Message-ID: <87zg9cqdot.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.2 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.8 (/) Hi Mark, Mark H Weaver writes: > Hi Maxim, > > Maxim Cournoyer writes: > >> * gnu/packages/gnuzilla.scm (icecat-minimal) [inputs]: Add nspr-next and >> nss-next. >> [configure-flags]: Re-instate the "--with-system-nspr" and "--with-system-nss" >> configure flags. >> [phases] {remove-bundled-libraries}: Update comment. > > This is really great, thank you! > > There's just one transient issue that makes me want to hold off on this: > As I recently reported to guix-security, a Mozilla security advisory > > published on Tuesday mentions "CVE-2023-0767: Arbitrary memory write via > PKCS 12 in NSS". I'd like someone to confirm that this issue has been > fixed in 'nss-next' before applying this commit. I don't have time to > check it myself right now. I've updated nss-next to 3.88.1 on master, which is supposed to fix this CVE, and pushed the whole revised series as v3. -- Thanks, Maxim From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH v3 10/11] gnu: nss-next: Update to 3.88.1 [fixes CVE-2023-0767]. Resent-From: Mark H Weaver Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Fri, 17 Feb 2023 21:40:02 +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: Maxim Cournoyer , 32026@debbugs.gnu.org Cc: ludo@gnu.org, Maxim Cournoyer Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.16766699722686 (code B ref 32026); Fri, 17 Feb 2023 21:40:02 +0000 Received: (at 32026) by debbugs.gnu.org; 17 Feb 2023 21:39:32 +0000 Received: from localhost ([127.0.0.1]:41767 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pT8S4-0000hF-9R for submit@debbugs.gnu.org; Fri, 17 Feb 2023 16:39:32 -0500 Received: from world.peace.net ([64.112.178.59]:49898) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pT8S3-0000h3-1e for 32026@debbugs.gnu.org; Fri, 17 Feb 2023 16:39:31 -0500 Received: from mhw by world.peace.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pT8Rv-0003ls-DG; Fri, 17 Feb 2023 16:39:23 -0500 From: Mark H Weaver In-Reply-To: <20230217125539.24467-10-maxim.cournoyer@gmail.com> References: <20230217125539.24467-1-maxim.cournoyer@gmail.com> <20230217125539.24467-10-maxim.cournoyer@gmail.com> Date: Fri, 17 Feb 2023 16:38:31 -0500 Message-ID: <873574dlal.fsf@netris.org> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 3.6 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi Maxim, Maxim Cournoyer writes: > * gnu/packages/nss.scm (nss-next): Update to 3.88.1 This commit should be pushed immediately as an important security update. Content analysis details: (3.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_SBL_CSS RBL: Received via a relay in Spamhaus SBL-CSS [64.112.178.59 listed in zen.spamhaus.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.6 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi Maxim, Maxim Cournoyer writes: > * gnu/packages/nss.scm (nss-next): Update to 3.88.1 This commit should be pushed immediately as an important security update. Content analysis details: (2.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_SBL_CSS RBL: Received via a relay in Spamhaus SBL-CSS [64.112.178.59 listed in zen.spamhaus.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager Hi Maxim, Maxim Cournoyer writes: > * gnu/packages/nss.scm (nss-next): Update to 3.88.1 This commit should be pushed immediately as an important security update. Thanks, Mark From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH 10/10] gnu: icecat: Unbundle nss and nspr. Resent-From: Mark H Weaver Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sat, 18 Feb 2023 01:04:01 +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: Maxim Cournoyer Cc: 32026@debbugs.gnu.org, ludo@gnu.org, Jonathan Brielmaier Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.1676682230460 (code B ref 32026); Sat, 18 Feb 2023 01:04:01 +0000 Received: (at 32026) by debbugs.gnu.org; 18 Feb 2023 01:03:50 +0000 Received: from localhost ([127.0.0.1]:41952 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTBdm-00007M-Ae for submit@debbugs.gnu.org; Fri, 17 Feb 2023 20:03:50 -0500 Received: from world.peace.net ([64.112.178.59]:50276) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTBdk-000077-L6 for 32026@debbugs.gnu.org; Fri, 17 Feb 2023 20:03:49 -0500 Received: from mhw by world.peace.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pTBdc-0004wL-Qz; Fri, 17 Feb 2023 20:03:40 -0500 From: Mark H Weaver In-Reply-To: <87zg9cqdot.fsf@gmail.com> References: <20230216043649.32119-1-maxim.cournoyer@gmail.com> <20230216043649.32119-10-maxim.cournoyer@gmail.com> <87k00hfeaj.fsf@netris.org> <87zg9cqdot.fsf@gmail.com> Date: Fri, 17 Feb 2023 20:02:47 -0500 Message-ID: <874jrjbx9p.fsf@netris.org> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Maxim, Maxim Cournoyer writes: > I've updated nss-next to 3.88.1 on master, which is supposed to fix this > CVE, [...] Great, thanks! Could you please make sure that 'nspr-next' is up-to-date as well? It would be good to avoid inadvertently downgrading the NSPR used by IceCat. I don't know off-hand what fixes might be undone as a result. Mark From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH 10/10] gnu: icecat: Unbundle nss and nspr. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sat, 18 Feb 2023 14:10:02 +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: Mark H Weaver Cc: 32026@debbugs.gnu.org, ludo@gnu.org, Jonathan Brielmaier Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.167672936929316 (code B ref 32026); Sat, 18 Feb 2023 14:10:02 +0000 Received: (at 32026) by debbugs.gnu.org; 18 Feb 2023 14:09:29 +0000 Received: from localhost ([127.0.0.1]:42787 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTNu5-0007cm-4z for submit@debbugs.gnu.org; Sat, 18 Feb 2023 09:09:29 -0500 Received: from mail-qt1-f175.google.com ([209.85.160.175]:37621) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTNu3-0007cY-N6 for 32026@debbugs.gnu.org; Sat, 18 Feb 2023 09:09:28 -0500 Received: by mail-qt1-f175.google.com with SMTP id f20so530372qto.4 for <32026@debbugs.gnu.org>; Sat, 18 Feb 2023 06:09:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=Xc0xpxt4+3A9iY/YDYpLTlbdW/fSYW2ruyOG5ydeZkU=; b=Ujuk6DURwgrfCW4e2Gka2/bzknIzVPLlruxZp2pru2ghBgPoBglIt7P9nzMOttJsu0 tU69ax3AwEX7VpOQOT8iF2TY3kOniK74WAqJeIvFP/Vf5cU4KFjmZLeZlJDTqPf3WtOW 7ErwH8B/zFyhuAkyfSkWshwyTTg7czWiD8Z6S17HaP3kjs8wZC3rVfwmc1mKadJVoEXo prZRsmUaGIh8xSYNC6858OwMyBxA7m6qC7JpeOHFwtxDxbmv/mVlqZpW/o/60V0hk3v3 4ogDAnvmTYcYsqgeO4g+fMzlAMGBGu5pcIqxthwEfxhW13fOUVhWx7Yh+3zeAUCg2I7x F9eg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=Xc0xpxt4+3A9iY/YDYpLTlbdW/fSYW2ruyOG5ydeZkU=; b=4eVDvfvAQ/a7Tf8M63d1f+/YSVlGh1Pi3GfyaoZg4uS8eSr9iN6/LdYJx8owC9JTlM DeC77/c0p0qLu7ENAPgih8bZB6xLAAqaPPocP2mAj5EXzNgJM8qGR1SJ8hnqEfXtuJaR cSds3UCO+5S5MxtP5d4K8Ctq78TX3C+jD998+WHjZkMk1g/Xggg4QipXLgMUqh87jbgU d3CB8Wtibtt2fD/DODOsuWenIe16Nd/86Z8aHKsZbGpB56M6zxmytx/KjsCdaHFLiaRk FS8ZuJ14w4qhusFBQHSqkSxASvkP+zscxSsBlUKhji9QK0SShFN87F+bfs7mvlw+kJUJ +onQ== X-Gm-Message-State: AO0yUKV+Ve48uOwNW+EJcTDCLfHcrVl2V908Huoxk+VAYVqoFjyujE24 D3sPwMP4X1T3rwtoWAnEvfrT5OPAWggyrBrL X-Google-Smtp-Source: AK7set8rRvimftUIftBPVITAMjyDX4pbwIkm3vJx/k8Lyh5Up9hFqL2f4xgy3uyLv1hWtCGQd+IXdQ== X-Received: by 2002:ac8:5a04:0:b0:3b8:41d2:1b43 with SMTP id n4-20020ac85a04000000b003b841d21b43mr5513092qta.61.1676729361526; Sat, 18 Feb 2023 06:09:21 -0800 (PST) Received: from hurd (dsl-157-123.b2b2c.ca. [66.158.157.123]) by smtp.gmail.com with ESMTPSA id y190-20020a3764c7000000b0071ddbe8fe23sm5324241qkb.24.2023.02.18.06.09.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Feb 2023 06:09:21 -0800 (PST) From: Maxim Cournoyer References: <20230216043649.32119-1-maxim.cournoyer@gmail.com> <20230216043649.32119-10-maxim.cournoyer@gmail.com> <87k00hfeaj.fsf@netris.org> <87zg9cqdot.fsf@gmail.com> <874jrjbx9p.fsf@netris.org> Date: Sat, 18 Feb 2023 09:09:19 -0500 In-Reply-To: <874jrjbx9p.fsf@netris.org> (Mark H. Weaver's message of "Fri, 17 Feb 2023 20:02:47 -0500") Message-ID: <87v8jzoyk0.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Mark, Mark H Weaver writes: > Hi Maxim, > > Maxim Cournoyer writes: >> I've updated nss-next to 3.88.1 on master, which is supposed to fix this >> CVE, [...] > > Great, thanks! > > Could you please make sure that 'nspr-next' is up-to-date as well? > It would be good to avoid inadvertently downgrading the NSPR used by > IceCat. I don't know off-hand what fixes might be undone as a result. I had already verified, and if I'm correct, it's already at the latest version available (4.35) [0]. [0] https://ftp.mozilla.org/pub/nspr/releases/ -- Thanks, Maxim From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH v3 10/11] gnu: nss-next: Update to 3.88.1 [fixes CVE-2023-0767]. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sat, 18 Feb 2023 17:28:01 +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: Mark H Weaver Cc: 32026@debbugs.gnu.org, ludo@gnu.org Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.167674126117959 (code B ref 32026); Sat, 18 Feb 2023 17:28:01 +0000 Received: (at 32026) by debbugs.gnu.org; 18 Feb 2023 17:27:41 +0000 Received: from localhost ([127.0.0.1]:44869 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTQzt-0004fa-8d for submit@debbugs.gnu.org; Sat, 18 Feb 2023 12:27:41 -0500 Received: from mail-qt1-f170.google.com ([209.85.160.170]:44623) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTQzq-0004fP-T3 for 32026@debbugs.gnu.org; Sat, 18 Feb 2023 12:27:39 -0500 Received: by mail-qt1-f170.google.com with SMTP id h22so807943qtb.11 for <32026@debbugs.gnu.org>; Sat, 18 Feb 2023 09:27:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=SQTzV0J8OOyoFhtxul7nr+cHGroD3jZQgJjdLzTREJk=; b=NcdzEtoOghRjrEoDS8xMEigoL/Zl3fIMAEMdYzumF0p1yCvcY2PcUqmp501vSNGHwa zU4Z2uPvV77ldZIop0CfSJLRj5/+J2NyV6bHbimRx1//D1J59fTz9DIioNuL+ZO50SgR 8oE1iUwL8qvmh0L6sUFyYvOPBiqXzjJ1TMUjdMW6DxsuCpZD55cScLoFe4yEneDh2FYG awXlGauu9XD4jVgw2aHbKoqkvUwKV3s7gOXX+2rSqh0RbwTeAIQ6pUd5Wl4rTUNHNen6 D4TxNmwvmYS0V8s0LsFcl8M5YZBndBDIHVanK8XXyEoFKpuOSs/qXreiHux97ynhA+3A E7eg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=SQTzV0J8OOyoFhtxul7nr+cHGroD3jZQgJjdLzTREJk=; b=jrygh0I68OXS1XIQkblrH5LXggFEd4n+JOX3DgL0h4CiZCwwODjC90ow311Vspdpri qOaQig811oq6Dsotdd+Nxuo390DXYh8JmXVtG2J/k6uDTnP+2sAN4ZeIqSy95Xr1Md7c oHzPBKP6Iz/a19NRz1av+N3eoCy0WjwbNK79mtNNe0CzM8Z+TEJmUlQY3o7wkJtO0GbG avJ584Nl/2LJuk05VnSxIFxPxsE/myl9QJEbpAEUFLax0LUl4ZqHwjX1GmZ5wkWEZ6VR mU65RTPvmM+k7RIy2BDos1NDajKRIWgB0fiBUoO4dM6H72HICYCAZI0//mOOE2CNDMLd zLcA== X-Gm-Message-State: AO0yUKU065mWhAv8599V/Tngv9sNK9JPDmFZvbEk0xZpwMJpv4482hDF Oa984pmp4+4uSWsRQ24v8BDtduHxcgugyI61 X-Google-Smtp-Source: AK7set/jRwlgwpaKurbBxwD34gKFhRzXeO/f9g8H55YQdhQgyI+B4jUGXLQf0D7FbqZ67Rg0N4YmfQ== X-Received: by 2002:ac8:5942:0:b0:3bd:140:4f4e with SMTP id 2-20020ac85942000000b003bd01404f4emr9784072qtz.2.1676741253380; Sat, 18 Feb 2023 09:27:33 -0800 (PST) Received: from hurd (dsl-157-123.b2b2c.ca. [66.158.157.123]) by smtp.gmail.com with ESMTPSA id d9-20020ac800c9000000b003b0b903720esm5501815qtg.13.2023.02.18.09.27.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Feb 2023 09:27:32 -0800 (PST) From: Maxim Cournoyer References: <20230217125539.24467-1-maxim.cournoyer@gmail.com> <20230217125539.24467-10-maxim.cournoyer@gmail.com> <873574dlal.fsf@netris.org> Date: Sat, 18 Feb 2023 12:27:31 -0500 In-Reply-To: <873574dlal.fsf@netris.org> (Mark H. Weaver's message of "Fri, 17 Feb 2023 16:38:31 -0500") Message-ID: <87r0umq3y4.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Mark! Mark H Weaver writes: > Hi Maxim, > > Maxim Cournoyer writes: >> * gnu/packages/nss.scm (nss-next): Update to 3.88.1 > > This commit should be pushed immediately as an important security > update. It's already been pushed for nss-next, and Tobias has taken care of grafting our main 'nss' package, which has many dependents. See commits 246a3d90eac82966b691bdca4660ab9c5d802631 and b04ee227a47419291391a2b6e857e41ed1c32155, respectively. -- Thanks, Maxim From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH v3 10/11] gnu: nss-next: Update to 3.88.1 [fixes CVE-2023-0767]. Resent-From: Tobias Geerinckx-Rice Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sat, 18 Feb 2023 19:56:02 +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: Maxim Cournoyer Cc: mhw@netris.org, 32026@debbugs.gnu.org, ludo@gnu.org X-Debbugs-Original-Cc: Mark H Weaver , 32026@debbugs.gnu.org, bug-guix@gnu.org, ludo@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16767501061658 (code B ref -1); Sat, 18 Feb 2023 19:56:02 +0000 Received: (at submit) by debbugs.gnu.org; 18 Feb 2023 19:55:06 +0000 Received: from localhost ([127.0.0.1]:45004 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTTIX-0000Qg-VR for submit@debbugs.gnu.org; Sat, 18 Feb 2023 14:55:06 -0500 Received: from lists.gnu.org ([209.51.188.17]:52466) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTTIW-0000QY-Ne for submit@debbugs.gnu.org; Sat, 18 Feb 2023 14:55:05 -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 1pTTIW-0000HS-4j for bug-guix@gnu.org; Sat, 18 Feb 2023 14:55:04 -0500 Received: from tobias.gr ([80.241.217.52]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pTTIU-0000AA-6I; Sat, 18 Feb 2023 14:55:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=2018; bh=tDxTw9hizoSiq aXvCcg7RERkkVN29NncMJYCYggPkv4=; h=in-reply-to:date:subject:cc:to: from:references; d=tobias.gr; b=XDMsWOeGh397TZaQ1xb0D8E+AppcIWIhfDnTZp 4NIwMHcJuvSxbHygL8KAk6xHZmugMJk0P150pQLIzP0L3jg72m/uzxOcLz+pCYbCi55ErZ efpa4BDmd3EjYGFjDHPYQLYi+xYKd6i9oo3SmAIySl4fETisUMQ8raUtcMqwKzRmHeIVDt VAN3NpN3sn//wmJXFEanCwj2Lu0MgPIk6YIaAUxPAaA8kd5rNcG+q2YEZlaBIVKAmwnLtj S/Tuo5RtxVz7AYDC+q6RUFp0e4CKWPyH0lFWNJd4YWVtEQOWakxzewhG+d3VwtfHh5ACwq nY4GvnLGbitgbv1dDfWHfPcg== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id a6ba87b5 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sat, 18 Feb 2023 19:54:55 +0000 (UTC) References: <20230217125539.24467-1-maxim.cournoyer@gmail.com> <20230217125539.24467-10-maxim.cournoyer@gmail.com> <873574dlal.fsf@netris.org> <87r0umq3y4.fsf@gmail.com> From: Tobias Geerinckx-Rice Date: Sat, 18 Feb 2023 20:49:36 +0100 In-reply-to: <87r0umq3y4.fsf@gmail.com> BIMI-Selector: v=BIMI1; s=default; Message-ID: <87cz66wxut.fsf@nckx> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Received-SPF: pass client-ip=80.241.217.52; envelope-from=me@tobias.gr; helo=tobias.gr 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-Spam-Score: -1.6 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.6 (--) --=-=-= Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Maxim Cournoyer =E5=86=99=E9=81=93=EF=BC=9A > It's already been pushed for nss-next, and Tobias has taken care=20 > of > grafting our main 'nss' package, which has many dependents. See=20 > commits > 246a3d90eac82966b691bdca4660ab9c5d802631 and > b04ee227a47419291391a2b6e857e41ed1c32155, respectively. Grafting such a big version jump made me nervous. I did so anyway, partially on Mozilla's assurance (FWIW) that it's=20 ABI-compatible, but mainly because I dare not vouch for a single=20 cherry-pick to 3.81 actually keeping users safe. I'd much rather deal with ABI bug reports than the alternative :-) Kind regards, T G-R --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIMEARYKACsWIQT12iAyS4c9C3o4dnINsP+IT1VteQUCY/Etmg0cbWVAdG9iaWFz LmdyAAoJEA2w/4hPVW15TdUBAMKj3g3wLJVhA/m4xw8hoLGfo66LUzFMh7oWq5kN TGybAPsETxDzGWnae8NXHEePVrybWseuvIPLkiQj4D4+wXfpBw== =r6u0 -----END PGP SIGNATURE----- --=-=-=-- From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH 05/10] gnu: Add icecat-l10n and icedove-l10n. Resent-From: Mark H Weaver Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sat, 18 Feb 2023 20:24:01 +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: Maxim Cournoyer Cc: 32026@debbugs.gnu.org, ludo@gnu.org, Jonathan Brielmaier Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.16767518114453 (code B ref 32026); Sat, 18 Feb 2023 20:24:01 +0000 Received: (at 32026) by debbugs.gnu.org; 18 Feb 2023 20:23:31 +0000 Received: from localhost ([127.0.0.1]:45032 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTTk2-00019l-Vu for submit@debbugs.gnu.org; Sat, 18 Feb 2023 15:23:31 -0500 Received: from world.peace.net ([64.112.178.59]:58142) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTTk1-00019X-Kd for 32026@debbugs.gnu.org; Sat, 18 Feb 2023 15:23:29 -0500 Received: from mhw by world.peace.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pTTjs-0003YJ-3z; Sat, 18 Feb 2023 15:23:20 -0500 From: Mark H Weaver In-Reply-To: <87ilg1t11r.fsf@gmail.com> References: <20230216043649.32119-1-maxim.cournoyer@gmail.com> <20230216043649.32119-5-maxim.cournoyer@gmail.com> <87cz69fcuf.fsf@netris.org> <87ilg1t11r.fsf@gmail.com> Date: Sat, 18 Feb 2023 15:22:28 -0500 Message-ID: <878rgu2068.fsf@netris.org> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Maxim, Maxim Cournoyer writes: > Mark H Weaver writes: [...] >> (1) Instead of generating the locales in separate "*-locales" packages >> and then merging them with the main package (which must then be >> renamed to "*-minimal"), how feasible would it be to incorporate the >> locale generation directly into the existing packages? > > It's entirely feasible, but I see a couple downsides that explain why I > stuck with the current design: > > 1. The user no longer has an option to install IceCat without the 70 MiB > or so of extra locales (via icecat-minimal). > > 2. The already lengthy IceCat package definition gets even more verbose > and hard to follow. > > 3. The locales are slow to generate (it's sequential, and there are a > lot of them). Currently they can be generate at the same time as > icecat-minimal is built. > > 4. It makes debugging locale-generation problems more focused. Okay, that makes sense. Thanks for explaining it. I didn't realize until now that there's no way, in the current patch set, to install a subset of language packs. I see that the icecat-l10n package installs each language pack into a separate output, which led me to initially guess that users could install a subset of those outputs. At present, I guess that those separate outputs are not yet usable. At some point, it would be good to facilitate the creation of custom 'icecat' packages with only a subset of language packs added, but we can work on that later. There's no need to hold back on this important first step. >> (2) In terms of the API, I very much dislike the approach of having the >> 'make-l10n-package' accept just one argument: a symbol, which it >> uses to construct the variable names of toplevel variables that must >> be looked up using 'module-ref'. I'd greatly prefer to simply pass >> in all of the variables that are needed. >> >> What do you think? > > I don't feel strongly about it. Since you do, I've adjusted it, in an > upcoming v3. Thank you! Regards, Mark From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH 05/10] gnu: Add icecat-l10n and icedove-l10n. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sat, 18 Feb 2023 20:43:01 +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: Mark H Weaver Cc: 32026@debbugs.gnu.org, ludo@gnu.org, Jonathan Brielmaier Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.16767529686224 (code B ref 32026); Sat, 18 Feb 2023 20:43:01 +0000 Received: (at 32026) by debbugs.gnu.org; 18 Feb 2023 20:42:48 +0000 Received: from localhost ([127.0.0.1]:45037 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTU2h-0001cK-SB for submit@debbugs.gnu.org; Sat, 18 Feb 2023 15:42:48 -0500 Received: from mail-qt1-f177.google.com ([209.85.160.177]:43974) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTU2f-0001c7-Rs for 32026@debbugs.gnu.org; Sat, 18 Feb 2023 15:42:46 -0500 Received: by mail-qt1-f177.google.com with SMTP id fu23so940780qtb.10 for <32026@debbugs.gnu.org>; Sat, 18 Feb 2023 12:42:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=puP72RaM2L1STo+xz+mnftRUAc6Pw0oGdRVk3AkTQTM=; b=hCzGUTCrY6ujTdCxZaDYx1b6k7ZDHEYyPrYkDEDSlRiPOTmiYY7iDNDQY/3n0vNUO+ d+k/icH8i7XALrDWb5behBejlnQTHRBjfDq0cdEB263r6MIZ9tgtj5Cu1omIZlcAnrIz 6wmanl04dVXLi77O3yrsTO5XwLRQhxTyNf2IQ/zRwa1rhR+n6dioX0I0CCc2jpGcKgfB /QK4JH1FeppqNBODBXyuAjvpe+m6xjGRgWjL8qhd8vR/uTiebDsQ6Hwl7T0eJjBfEwQl r3338g2tTUwxKZK0zY/dsVM+muGgCIBQuDGQGWKupazi19xhXt52XhtgIMO2LcOmSDC/ Um5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=puP72RaM2L1STo+xz+mnftRUAc6Pw0oGdRVk3AkTQTM=; b=u0DUQa6vr2w/UoCjJEyj6cpJZDe4WU6Sd/wg7+iysGwvY8/yisc+BZAlowsmlEjPz+ okVzR2nuo0UOLwFKsDHjRT7Ws8a63z7AnnWlvuVBrsEAxbg39C0i1+swgHun+/OpZ4gz WlBCVPjidcSifMrRvbLYKKmUa1bex0UqV8LoMF+1rSZd1Rs6PPzgdMVbudFasyJ+qnQs K4dn5wB7NavbFxE9QtOSXmj0OoUZr/bde24I57reEV4/2pIzPMfQLE+zFiKKDqDyqAWA iakcWM9YSNaxfp8SIWial6ZpUZh7Ee+Cil1s2Bw5lXjDRdQSljR1l2v7VZQaidWFE6O8 D2dw== X-Gm-Message-State: AO0yUKXy5vYhRfrXkol66h2/02tT/NFBo44jq1iUOEcoqORf3WiO+xET dQNMzub1B99X2SBqOnWr+ms= X-Google-Smtp-Source: AK7set/Ew7DRepGUciiEMwqRyGKKE/6az19QkTYxfgLmsI18DszxLoCVVfXZ2T0fpQHYK4UZY7OMCQ== X-Received: by 2002:a05:622a:1a1f:b0:3ba:1398:c68d with SMTP id f31-20020a05622a1a1f00b003ba1398c68dmr10047302qtb.16.1676752960183; Sat, 18 Feb 2023 12:42:40 -0800 (PST) Received: from hurd (dsl-157-123.b2b2c.ca. [66.158.157.123]) by smtp.gmail.com with ESMTPSA id fp42-20020a05622a50aa00b003ba11bfe4fcsm5746009qtb.28.2023.02.18.12.42.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Feb 2023 12:42:39 -0800 (PST) From: Maxim Cournoyer References: <20230216043649.32119-1-maxim.cournoyer@gmail.com> <20230216043649.32119-5-maxim.cournoyer@gmail.com> <87cz69fcuf.fsf@netris.org> <87ilg1t11r.fsf@gmail.com> <878rgu2068.fsf@netris.org> Date: Sat, 18 Feb 2023 15:42:38 -0500 In-Reply-To: <878rgu2068.fsf@netris.org> (Mark H. Weaver's message of "Sat, 18 Feb 2023 15:22:28 -0500") Message-ID: <87v8jyogch.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Mark, Mark H Weaver writes: > Hi Maxim, > > Maxim Cournoyer writes: > >> Mark H Weaver writes: > [...] >>> (1) Instead of generating the locales in separate "*-locales" packages >>> and then merging them with the main package (which must then be >>> renamed to "*-minimal"), how feasible would it be to incorporate the >>> locale generation directly into the existing packages? >> >> It's entirely feasible, but I see a couple downsides that explain why I >> stuck with the current design: >> >> 1. The user no longer has an option to install IceCat without the 70 MiB >> or so of extra locales (via icecat-minimal). >> >> 2. The already lengthy IceCat package definition gets even more verbose >> and hard to follow. >> >> 3. The locales are slow to generate (it's sequential, and there are a >> lot of them). Currently they can be generate at the same time as >> icecat-minimal is built. >> >> 4. It makes debugging locale-generation problems more focused. > > Okay, that makes sense. Thanks for explaining it. > > I didn't realize until now that there's no way, in the current patch > set, to install a subset of language packs. I see that the icecat-l10n > package installs each language pack into a separate output, which led me > to initially guess that users could install a subset of those outputs. > At present, I guess that those separate outputs are not yet usable. > > At some point, it would be good to facilitate the creation of custom > 'icecat' packages with only a subset of language packs added, but we can > work on that later. There's no need to hold back on this important > first step. It would be nice indeed, and that's what I initially aimed at, until I realize there was no such ready to use facility in Mozilla products (there's no easy way to extend the static search path). I've left the packages public, because the .xpi files can still be installed manually, perhaps useful for users of other distributions of of an icecat-minimal user that wants to install a single trusted .xpi. -- Thanks, Maxim From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH v3 10/11] gnu: nss-next: Update to 3.88.1 [fixes CVE-2023-0767]. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sat, 18 Feb 2023 20:47:01 +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: Tobias Geerinckx-Rice Cc: mhw@netris.org, 32026@debbugs.gnu.org, ludo@gnu.org X-Debbugs-Original-Cc: Mark H Weaver , 32026@debbugs.gnu.org, bug-guix@gnu.org, ludo@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16767531676644 (code B ref -1); Sat, 18 Feb 2023 20:47:01 +0000 Received: (at submit) by debbugs.gnu.org; 18 Feb 2023 20:46:07 +0000 Received: from localhost ([127.0.0.1]:45053 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTU5v-0001j6-Hm for submit@debbugs.gnu.org; Sat, 18 Feb 2023 15:46:07 -0500 Received: from lists.gnu.org ([209.51.188.17]:33424) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTU5s-0001iy-Qa for submit@debbugs.gnu.org; Sat, 18 Feb 2023 15:46:06 -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 1pTU5o-00049h-P2 for bug-guix@gnu.org; Sat, 18 Feb 2023 15:46:01 -0500 Received: from mail-qt1-x835.google.com ([2607:f8b0:4864:20::835]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pTU5m-00019m-OP; Sat, 18 Feb 2023 15:46:00 -0500 Received: by mail-qt1-x835.google.com with SMTP id i14so847193qtr.9; Sat, 18 Feb 2023 12:45:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=fTqI9G8RooMhmQipJQ+bntwoxcdOwWKKsJDZ6lQiFDY=; b=YBz91RdV8cyGWGYKHypQqoakHJ8KnuguvqU/HHGdBfnlaAtPWPNV3p2p6AE6+avAt2 Wc0+fIk19YORQLNolGI+6ZRtQluqiXIq4NR0B2H9dige9Tj599cw1mnP1I2h+WHaflWc U+timIwtmhLhdUEN5A/nqjA4NM1inKnjUWrecgh0G6Eb2xNRkQg/lkLsO8ZBrVNvnZz1 QedCWfXyxFpKLRFo4vqEvv6ewxUCWVAdanVZ9uLzKSC0axrqBnSlNFKlPm4f6VnCPfhL Kyj0X4nFDxeb/kjqUiDNPRPkA9fkNWBjOHXYHbRwy3UhJjLuVfxgX6tfLsy27Wge/Sva ZkCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=fTqI9G8RooMhmQipJQ+bntwoxcdOwWKKsJDZ6lQiFDY=; b=3W7OEYgN4+NCz8zKU5ZQndObS4jBGKa7N/Pzi5IAlWdVfTSV1ZdLOS1rwZV42qafdA jb31NAjBdlrxJwWUU6Sj8+rIuQxY88gGouuC4yxASm3Hhrjb/sBj8UlHe6Lm5BnPvLez ggdDsL+ve8mCmruVfCqXAOPsGb5zyHWQrruxARdsSm+qRRJXk8FLdS7SSdKg/Nk3ceIW EeZpWQEduVFZcS/iUsTcTiJDyVYSPakbtadC/5vIB4lN9VHVZ3TKN1JivPAgWA2i3Eky gHGLos57p82b5W7wu0qWnfMpJnswZ4ZJaE3R2KHuAoDONjPOBJLUXUlyJCNHX89PXHKe u3Jg== X-Gm-Message-State: AO0yUKX+NB70DWqHu2DL4PXaCteHltIBQPqHek2Oz4zhN0JkRhRLIi8y NtrLe9QgDVe7xtXBnX3NcOr1qNBSTb5Y3A== X-Google-Smtp-Source: AK7set/4Ysq3gNmdCLBZop1LnLFpxa7hzXvPvJ0orcjFqYX1Yd7K4GQf2wxgpm/YExVNwa+KPjdOeA== X-Received: by 2002:a05:622a:607:b0:3bd:a75:1b9 with SMTP id z7-20020a05622a060700b003bd0a7501b9mr15563402qta.41.1676753157245; Sat, 18 Feb 2023 12:45:57 -0800 (PST) Received: from hurd (dsl-157-123.b2b2c.ca. [66.158.157.123]) by smtp.gmail.com with ESMTPSA id b11-20020ac84f0b000000b003b86d3ee49asm5734417qte.74.2023.02.18.12.45.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Feb 2023 12:45:56 -0800 (PST) From: Maxim Cournoyer References: <20230217125539.24467-1-maxim.cournoyer@gmail.com> <20230217125539.24467-10-maxim.cournoyer@gmail.com> <873574dlal.fsf@netris.org> <87r0umq3y4.fsf@gmail.com> <87cz66wxut.fsf@nckx> Date: Sat, 18 Feb 2023 15:45:55 -0500 In-Reply-To: <87cz66wxut.fsf@nckx> (Tobias Geerinckx-Rice's message of "Sat, 18 Feb 2023 20:49:36 +0100") Message-ID: <87mt5aog70.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=2607:f8b0:4864:20::835; envelope-from=maxim.cournoyer@gmail.com; helo=mail-qt1-x835.google.com 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Hi, Tobias Geerinckx-Rice writes: > Maxim Cournoyer =E5=86=99=E9=81=93=EF=BC=9A >> It's already been pushed for nss-next, and Tobias has taken care of >> grafting our main 'nss' package, which has many dependents. See >> commits >> 246a3d90eac82966b691bdca4660ab9c5d802631 and >> b04ee227a47419291391a2b6e857e41ed1c32155, respectively. > > Grafting such a big version jump made me nervous. > > I did so anyway, partially on Mozilla's assurance (FWIW) that it's > ABI-compatible, but mainly because I dare not vouch for a single > cherry-pick to 3.81 actually keeping users safe. > > I'd much rather deal with ABI bug reports than the alternative :-) Sounds a reasonable gamble, thank you! --=20 Thanks, Maxim From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH 03/10] gnu: Define UPSTREAM-FIREFOX-SOURCE at the top level. Resent-From: Mark H Weaver Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sat, 18 Feb 2023 20:48:02 +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: Maxim Cournoyer Cc: 32026@debbugs.gnu.org, ludo@gnu.org, Jonathan Brielmaier Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.16767532456777 (code B ref 32026); Sat, 18 Feb 2023 20:48:02 +0000 Received: (at 32026) by debbugs.gnu.org; 18 Feb 2023 20:47:25 +0000 Received: from localhost ([127.0.0.1]:45058 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTU7B-0001lF-0w for submit@debbugs.gnu.org; Sat, 18 Feb 2023 15:47:25 -0500 Received: from world.peace.net ([64.112.178.59]:58540) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTU79-0001l0-VH for 32026@debbugs.gnu.org; Sat, 18 Feb 2023 15:47:24 -0500 Received: from mhw by world.peace.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pTU71-0003jc-C1; Sat, 18 Feb 2023 15:47:15 -0500 From: Mark H Weaver In-Reply-To: <87pma9t2z7.fsf@gmail.com> References: <20230216043649.32119-1-maxim.cournoyer@gmail.com> <20230216043649.32119-3-maxim.cournoyer@gmail.com> <87h6vlfdq0.fsf@netris.org> <87pma9t2z7.fsf@gmail.com> Date: Sat, 18 Feb 2023 15:46:23 -0500 Message-ID: <875yby1z2d.fsf@netris.org> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Maxim, Maxim Cournoyer writes: > Mark H Weaver writes: > >> Maxim Cournoyer writes: >> >>> * gnu/packages/gnuzilla.scm (%icecat-base-version): New variable. >>> (%upstream-firefox-version): Likewise. >>> (%icecat-version): Define in terms of %icecat-base-version. >>> (upstream-firefox-source): New variable. >>> (icecat-source): Adjust to use the above newly introduced variables. >> >> I'm deeply uncomfortable binding toplevel variables, even unexported >> ones, that provide non-FSDG-complaint software. I guess that the >> primary motivation for this commit was to make it easier to use the >> 'update-mozilla-locales' helper. > > While I appreciate your concern, I think "hiding" the upstream source > would be akin to putting our head in the sand. We do need that upstream > source to produce GNU IceCat from source, so it may as well be > convenient to handle while hacking on the GNU IceCat package. As you've > noted, it isn't exported, so I think it'd be a stretch to say that this > private binding "steers" users toward non-FSDG software. Note that we > also have a %upstream-linux-source procedure in (gnu packages linux). The '%upstream-linux-source' procedure was not easily avoidable, and it's not at all convenient to use because it requires passing in the nix-formatted hash. In contrast, the argument for adding 'unstream-firefox-source' as a toplevel binding is a very slender thread, and it would immediately enable users to type commands like: guix build -e '(@@ (gnu packages gnuzilla) upstream-firefox-source)' At which point Guix would dutifully provide non-FSDG-compliant software to the user. Moreover, in another of your proposed commits ("gnu: Add a 'update-mozilla-locales' helper for maintenance"), in a comment, you literally steer the user to download the Firefox source and provide the precise command to do it. This is a slippery slope. It is not the role of core Guix to facilitate downloading Firefox source code for purposes of IceCat development. That is the domain of the IceCat project itself. I feel very strongly about this. Thanks, Mark From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH v3 04/11] gnu: icecat: Make language packs reproducible. Resent-From: Mark H Weaver Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sat, 18 Feb 2023 21:04:01 +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: Maxim Cournoyer , 32026@debbugs.gnu.org Cc: ludo@gnu.org, Jonathan Brielmaier , Maxim Cournoyer Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.16767541988562 (code B ref 32026); Sat, 18 Feb 2023 21:04:01 +0000 Received: (at 32026) by debbugs.gnu.org; 18 Feb 2023 21:03:18 +0000 Received: from localhost ([127.0.0.1]:45074 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTUMY-0002E2-E0 for submit@debbugs.gnu.org; Sat, 18 Feb 2023 16:03:18 -0500 Received: from world.peace.net ([64.112.178.59]:58876) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTUMX-0002Dm-HZ for 32026@debbugs.gnu.org; Sat, 18 Feb 2023 16:03:17 -0500 Received: from mhw by world.peace.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pTUMO-0003qz-NY; Sat, 18 Feb 2023 16:03:08 -0500 From: Mark H Weaver In-Reply-To: <20230217125539.24467-4-maxim.cournoyer@gmail.com> References: <20230217125539.24467-1-maxim.cournoyer@gmail.com> <20230217125539.24467-4-maxim.cournoyer@gmail.com> Date: Sat, 18 Feb 2023 16:02:17 -0500 Message-ID: <8735721ybv.fsf@netris.org> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Maxim, Maxim Cournoyer writes: > * gnu/packages/patches/icecat-reproducible-langpacks.patch: New file. > * gnu/local.mk (dist_patch_DATA): Register. it. > * gnu/packages/gnuzilla.scm (icecat-source): Apply it. Instead of adding this patch in Guix, let's make the change in upstream IceCat. Among other things, adding a 'patches' field to 'icecat-source' has the unfortunate consequence of forcing an additional 'patch-and-repack' phase during the build, which unpacks the entire multigigabyte source code, applies the patch, and repacks it all again. Would you like to submit a commit to the gnuzilla repo that simply adds the 'icecat-reproducible-langpacks.patch' file to the data/patches/ directory? I guess the file names in the patch also need a component added to the front (e.g. "a/" and "b/"). If you don't want to do it, I'll do it. In any case, it should be removed from this series of commits for Guix. Does that make sense? Regards, Mark From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH v3 04/11] gnu: icecat: Make language packs reproducible. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sun, 19 Feb 2023 17:36:02 +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: Mark H Weaver Cc: 32026@debbugs.gnu.org, ludo@gnu.org, Jonathan Brielmaier Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.167682813623899 (code B ref 32026); Sun, 19 Feb 2023 17:36:02 +0000 Received: (at 32026) by debbugs.gnu.org; 19 Feb 2023 17:35:36 +0000 Received: from localhost ([127.0.0.1]:49610 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTnb5-0006DN-Pn for submit@debbugs.gnu.org; Sun, 19 Feb 2023 12:35:36 -0500 Received: from mail-qv1-f51.google.com ([209.85.219.51]:45721) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTnb3-0006D4-AG for 32026@debbugs.gnu.org; Sun, 19 Feb 2023 12:35:34 -0500 Received: by mail-qv1-f51.google.com with SMTP id e17so560374qvr.12 for <32026@debbugs.gnu.org>; Sun, 19 Feb 2023 09:35:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=ZHKs/x4Pt3x5lAEfTgv/lJeZ1rFkng5piLGAhW5uB/c=; b=HBluAL2fV6UGlvcoSY9Axx/wD/qlAgbFXM6OzAcvTo9PR3PPVxKTBlhfKWypmpQ/+O 9nD7tT74Un05IbqwfwbSpNI6lIpJTeHRS5JUCGP0RvEKjOD8EKx2Xy9oRpVzAitnHZ6C 9YAIzShwGLienaQeXt8DZNzCjCmbRTA1vls4JiKidvBw3rD/nu3oRP13WQjf5m908esu 4Llblya5YTvb8w7RZod7u/Ed33QO6XzWawTU0EsCWte05O9AkfihMrMgX4hf3qXpTyOU 8bKb53XvI4jNREntiWWnkRFOs9kfDyKPj3JAFl2AAIcivjt1OaM5tMr/Za9hTCmxCl54 IwjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=ZHKs/x4Pt3x5lAEfTgv/lJeZ1rFkng5piLGAhW5uB/c=; b=PmTTf5gfqd/XkrQz59WZcsTb2iCuepGZk2X/Q49d4ju4wS+cKEI0nZTc9RfNfpEdT5 Ce9dLHCOgZZBIWDI/fcR/+XH32AxNTASSL5LwnOQ8XiTMpK5q+mJJx0fyu0qC19iKNFl heEq5VYVP444fKRcJEFwnvyBmBfCommlgpjdOvKQ+YZPpoITDN8fUodOCsl7VHaWLWVL kpBzUJcRlghBb0Lw5T+b9xw6dKqn+B0CxfZ9+thrqO23drALSohNBN8CtoiZzIUZKobX W+Vu5CHQHRSf4202h7P3AwzgRS3s/q9QIgFpGD/iq+6x4UCeng7dcodCrf3kkon2SmMx Arbw== X-Gm-Message-State: AO0yUKUdRcqKImJqvJePMerNzid0z6ay6gsKBqmuXENjNeeLRE6CqYG5 5oi6dAsyxBSnT7eVlNnnNTQLY//kY/bN3A== X-Google-Smtp-Source: AK7set8E20g7MbdOoCN0hCiQK1dDTT36ppyzZXg9WgDKvmyqGoMpY9D65F0mfS+gseqJmiSJn3cjGQ== X-Received: by 2002:ad4:5fcd:0:b0:56e:b273:fb46 with SMTP id jq13-20020ad45fcd000000b0056eb273fb46mr3950672qvb.51.1676828127591; Sun, 19 Feb 2023 09:35:27 -0800 (PST) Received: from hurd (dsl-158-213.b2b2c.ca. [66.158.158.213]) by smtp.gmail.com with ESMTPSA id j64-20020a378743000000b00739e7e10b71sm7547208qkd.114.2023.02.19.09.35.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Feb 2023 09:35:27 -0800 (PST) From: Maxim Cournoyer References: <20230217125539.24467-1-maxim.cournoyer@gmail.com> <20230217125539.24467-4-maxim.cournoyer@gmail.com> <8735721ybv.fsf@netris.org> Date: Sun, 19 Feb 2023 12:35:26 -0500 In-Reply-To: <8735721ybv.fsf@netris.org> (Mark H. Weaver's message of "Sat, 18 Feb 2023 16:02:17 -0500") Message-ID: <87fsb1o8wx.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Mark, Mark H Weaver writes: > Hi Maxim, > > Maxim Cournoyer writes: >> * gnu/packages/patches/icecat-reproducible-langpacks.patch: New file. >> * gnu/local.mk (dist_patch_DATA): Register. it. >> * gnu/packages/gnuzilla.scm (icecat-source): Apply it. > > Instead of adding this patch in Guix, let's make the change in upstream > IceCat. > > Among other things, adding a 'patches' field to 'icecat-source' has the > unfortunate consequence of forcing an additional 'patch-and-repack' > phase during the build, which unpacks the entire multigigabyte source > code, applies the patch, and repacks it all again. > > Would you like to submit a commit to the gnuzilla repo that simply adds > the 'icecat-reproducible-langpacks.patch' file to the data/patches/ > directory? I guess the file names in the patch also need a component > added to the front (e.g. "a/" and "b/"). > > If you don't want to do it, I'll do it. In any case, it should be > removed from this series of commits for Guix. Done! The issue number of the patch sent is: #61633 I tested it with this: --8<---------------cut here---------------start------------->8--- modified gnu/packages/gnuzilla.scm @@ -43,6 +43,7 @@ (define-module (gnu packages gnuzilla) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git) #:use-module (guix git-download) #:use-module (guix hg-download) #:use-module (guix gexp) @@ -523,19 +524,22 @@ (define icecat-source ;; The upstream-icecat-base-version may be older than the ;; %icecat-base-version. (upstream-icecat-base-version "102.8.0") - (gnuzilla-commit "03d9e3db5affe21db077c410ec08c313d6aa280e") + (gnuzilla-commit "fffdd8891c641a9f84a298c0a5ea42f75caec203") (gnuzilla-source - (origin - (method git-fetch) - (uri (git-reference - (url "git://git.savannah.gnu.org/gnuzilla.git") - (commit gnuzilla-commit))) - (file-name (git-file-name "gnuzilla" - ;;upstream-icecat-base-version - (string-take gnuzilla-commit 8))) - (sha256 - (base32 - "12id87nsdwm6kra0gm3d3ww8kr0xxb4yllw9wcqmnrlnmspdc1n8")))) + (git-checkout + (url "file:///home/maxim/src/gnuzilla") + (commit gnuzilla-commit)) + ;; (method git-fetch) + ;; (uri (git-reference + ;; (url "file:///home/maxim/src/gnuzilla") + ;; (commit gnuzilla-commit))) + ;; (file-name (git-file-name "gnuzilla" + ;; ;;upstream-icecat-base-version + ;; (string-take gnuzilla-commit 8))) + ;; (sha256 + ;; (base32 + ;; "12id87nsdwm6kra0gm3d3ww8kr0xxb4yllw9wcqmnrlnmspdc1n8")) + ) --8<---------------cut here---------------end--------------->8--- -- Thanks, Maxim From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH 03/10] gnu: Define UPSTREAM-FIREFOX-SOURCE at the top level. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sun, 19 Feb 2023 17:44:02 +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: Mark H Weaver Cc: 32026@debbugs.gnu.org, ludo@gnu.org, Jonathan Brielmaier Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.167682862824877 (code B ref 32026); Sun, 19 Feb 2023 17:44:02 +0000 Received: (at 32026) by debbugs.gnu.org; 19 Feb 2023 17:43:48 +0000 Received: from localhost ([127.0.0.1]:49614 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTnj1-0006TB-UE for submit@debbugs.gnu.org; Sun, 19 Feb 2023 12:43:48 -0500 Received: from mail-qt1-f181.google.com ([209.85.160.181]:41954) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTniz-0006Sv-PJ for 32026@debbugs.gnu.org; Sun, 19 Feb 2023 12:43:46 -0500 Received: by mail-qt1-f181.google.com with SMTP id he27so473464qtb.8 for <32026@debbugs.gnu.org>; Sun, 19 Feb 2023 09:43:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=zyaJU48qr6Q5VDnpWqHvveDdIZlmI+iZgMl4gz5dqcs=; b=PzZaXghtmw3tenX7ow48MrL5e8ggqtzfQ5vUIHhS+rfMuv6YZ5QJTfocb+L7TbCGnJ IyIR0WghsLH7yGQHB9PtIuxKsN6og33fLv/SVZtIWQDTfXCh0ZRNAHi63c4UsO8uaGgw PNeEYGYYK0Uk8C/+4M3lI1D53tCOdxsA9oqToGsS/IOMvOnWh5hKxObMkcfAg2dIwa+3 aZNP1bLx5aHqX0Gn/431gxkWJ/XWg+RHkWXI5tRIBQCHVKoAympx2q53lxq2V3WKrxZj uuX00wRrECQpPgKUSkxGQ15ie003sMXvX0eLqWRnsyLz0zvBbh/16/pn9x8WvWDTEdUN 4hFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=zyaJU48qr6Q5VDnpWqHvveDdIZlmI+iZgMl4gz5dqcs=; b=c07zcsddg/WgmSdgD2XqzqEEaw5WcbvO63Cp1sPhhCXToD76jK4qeg/W76DwxVrKyV iEtcGxJyUY+wh0yiu+jbuk+/e9mo8QnAt0WSnM9Y58AM1AUXM0/BbqohUexOdU9Qge9n fz7lHV5cczYdAh3RrCzrXFOS+KZLZCP58cuvzyFT5q0oR8xjl2kGCGMbry7qvkWQ2V/f d3uEZ/0Hj6qajfCyHtHlmXSHMw/anOMndP6vOoxPVXtGWa1YgIzznlsksX6hpwdOI0E+ JMWLURk4N1c8LSFERDRf8+abe2kQO10XnbfECTMLb8LJDL8iXYGEPB2YA6FphJYhR44W VzNA== X-Gm-Message-State: AO0yUKXri8qXuzh5R/azFBkZ/u7W2385cqGIcFCUdADu4Ckl1qN9wWcp pq7HpSLZyXtJdKcg8MpJ7GQ= X-Google-Smtp-Source: AK7set8ebAJk6DGQtC9QE1ZcczBxgu7+ceeYLx1iEb4BD/McYPE25/sXr7LonBc64XiASNF4ZZH5zA== X-Received: by 2002:a05:622a:e:b0:3b8:68ef:d538 with SMTP id x14-20020a05622a000e00b003b868efd538mr15119313qtw.52.1676828620217; Sun, 19 Feb 2023 09:43:40 -0800 (PST) Received: from hurd (dsl-158-213.b2b2c.ca. [66.158.158.213]) by smtp.gmail.com with ESMTPSA id q188-20020a378ec5000000b0073d82a8113bsm2421257qkd.126.2023.02.19.09.43.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Feb 2023 09:43:39 -0800 (PST) From: Maxim Cournoyer References: <20230216043649.32119-1-maxim.cournoyer@gmail.com> <20230216043649.32119-3-maxim.cournoyer@gmail.com> <87h6vlfdq0.fsf@netris.org> <87pma9t2z7.fsf@gmail.com> <875yby1z2d.fsf@netris.org> Date: Sun, 19 Feb 2023 12:43:38 -0500 In-Reply-To: <875yby1z2d.fsf@netris.org> (Mark H. Weaver's message of "Sat, 18 Feb 2023 15:46:23 -0500") Message-ID: <87bklpo8j9.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello, Mark H Weaver writes: > Hi Maxim, > > Maxim Cournoyer writes: > >> Mark H Weaver writes: >> >>> Maxim Cournoyer writes: >>> >>>> * gnu/packages/gnuzilla.scm (%icecat-base-version): New variable. >>>> (%upstream-firefox-version): Likewise. >>>> (%icecat-version): Define in terms of %icecat-base-version. >>>> (upstream-firefox-source): New variable. >>>> (icecat-source): Adjust to use the above newly introduced variables. >>> >>> I'm deeply uncomfortable binding toplevel variables, even unexported >>> ones, that provide non-FSDG-complaint software. I guess that the >>> primary motivation for this commit was to make it easier to use the >>> 'update-mozilla-locales' helper. >> >> While I appreciate your concern, I think "hiding" the upstream source >> would be akin to putting our head in the sand. We do need that upstream >> source to produce GNU IceCat from source, so it may as well be >> convenient to handle while hacking on the GNU IceCat package. As you've >> noted, it isn't exported, so I think it'd be a stretch to say that this >> private binding "steers" users toward non-FSDG software. Note that we >> also have a %upstream-linux-source procedure in (gnu packages linux). > > The '%upstream-linux-source' procedure was not easily avoidable, and > it's not at all convenient to use because it requires passing in the > nix-formatted hash. > > In contrast, the argument for adding 'unstream-firefox-source' as a > toplevel binding is a very slender thread, and it would immediately > enable users to type commands like: > > guix build -e '(@@ (gnu packages gnuzilla) upstream-firefox-source)' > At which point Guix would dutifully provide non-FSDG-compliant software > to the user. > > Moreover, in another of your proposed commits ("gnu: Add a > 'update-mozilla-locales' helper for maintenance"), in a comment, you > literally steer the user to download the Firefox source and provide the > precise command to do it. > > This is a slippery slope. It is not the role of core Guix to facilitate > downloading Firefox source code for purposes of IceCat development. > That is the domain of the IceCat project itself. We're already on a slippery slope for fetching the non-free source ourselves to process them, but I'd argue that this doesn't steer users toward non-free software, but rather empowers them to free the original source of the software they use. In an ideal GNU FSDG world put forward by some proponents, we'd not even let users' machine fetch the non-free source and instead host it somewhere else, ready to be used. > I feel very strongly about this. I don't really see how "obsfuscating" the non-free source we process makes it much different, or how having an easier access to that non-free source from the CLI would steer users toward "using" non-free software. A source is not a usable (executable) form. But anyway, with that opinion of mine expressed, I've reverted the offending bits so that we can move on, knowing that once we get the strings_all.tar.zst locales data planned in future releases, it won't matter much anyway. See the result in v4. -- Thanks, Maxim From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH v4 1/9] gnu: Add a 'update-mozilla-locales' helper for maintenance. References: <87po06puwt.fsf@gnu.org> In-Reply-To: <87po06puwt.fsf@gnu.org> Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sun, 19 Feb 2023 19:25:02 +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, Jonathan Brielmaier , Maxim Cournoyer Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.16768346873003 (code B ref 32026); Sun, 19 Feb 2023 19:25:02 +0000 Received: (at 32026) by debbugs.gnu.org; 19 Feb 2023 19:24:47 +0000 Received: from localhost ([127.0.0.1]:49683 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTpIl-0000mN-Hr for submit@debbugs.gnu.org; Sun, 19 Feb 2023 14:24:47 -0500 Received: from mail-qt1-f179.google.com ([209.85.160.179]:39711) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTpIk-0000m8-PN for 32026@debbugs.gnu.org; Sun, 19 Feb 2023 14:24:47 -0500 Received: by mail-qt1-f179.google.com with SMTP id i5so720201qtw.6 for <32026@debbugs.gnu.org>; Sun, 19 Feb 2023 11:24:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=PceRKjQWenz8l6anbU4mQSn+he9XYRU7hxj9gzK3gos=; b=J1GKSwxpBIgjisEO7oYpqXmElnG1TfcBEmW174HZzKCaCY+CA3Mj2okPioOyKtdCn2 rjI1+Q+pzMM5qHOeqZkjnm/3Z+TYmrJuX0fKVMcxV82Y4c3cEyB1Z8fH5PykPHZfaXYx FqZucpqNJZthq4alEaFnHk8PYnOiw2B8TGm1MlcffmtbYDdk7TbNkiK/KsCFXWF2qphk GLi9ZI28PHsFzDcG7mnJTuaQCEAFEwM/CtrufE/epOxWMZshXJsp77aGgFhEo7qvQc/F p8uAR23XPdNm3Y4x6CysgNHlcFCWzwCd2/wmzS/UOjaY8M/8QkMe68s1e2EWvtmrIPJ8 i4Sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=PceRKjQWenz8l6anbU4mQSn+he9XYRU7hxj9gzK3gos=; b=4MAw0nGX7S88ZSD2X867Dhn9dyQ6IUqphtdbRMozvCcdHk+pMxLPBPRLSQHpU/IX3W fC/aTBA/JvVrDdWoRhYYNUyg5mVFtbF9FBJoMidHNB/K/lMUYZK6/gm87S45I9R5UukE CN1xaaGd+vYvuPjS2rdMoUdWvlPPHMzY9QkO5vhKfGiGPCzqXCJ3dhsdsLxtKEEVsc1B SbNimwOHpi5WpQBznfjN6Lm5G7IoB1AbS13kRBtN1nurho5MomcNSBfabqRkrreicGrc EiTS/Vby1rjOVbhZX4Bk2TTx7k7RR50zNsh7cZVTA3FQBFVU+QRFWh6I8s4W5gQoGPyb 0S2A== X-Gm-Message-State: AO0yUKUUagBN7BRA8R1NZCK9jB9cJ1uUQpwuPl5ILsfGVN3bw0I5JxN7 NXNpxLp59rpnb9XteT9U3nRvv8G6xhIzEA== X-Google-Smtp-Source: AK7set8uv5xkPf7DYjAvZPF6inRCaOcoJro4qeimaHzIyYTc+Nnx5V/F1PKKn+wCxKLNwbotrgLHRw== X-Received: by 2002:ac8:7fcf:0:b0:3bd:1835:b001 with SMTP id b15-20020ac87fcf000000b003bd1835b001mr16799926qtk.20.1676834681084; Sun, 19 Feb 2023 11:24:41 -0800 (PST) Received: from localhost.localdomain (dsl-158-213.b2b2c.ca. [66.158.158.213]) by smtp.gmail.com with ESMTPSA id bz18-20020a05622a1e9200b003be56bdd3b1sm3288914qtb.92.2023.02.19.11.24.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Feb 2023 11:24:40 -0800 (PST) From: Maxim Cournoyer Date: Sun, 19 Feb 2023 14:23:57 -0500 Message-Id: <20230219192405.26549-1-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gnuzilla.scm (update-mozilla-locales): New procedure. (all-mozilla-locales): Comment how to proceed to update it. --- Changes in v4: - Strip useful comments, in the name of non-free source obfuscation gnu/packages/gnuzilla.scm | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index b2e0870fea..16e2208426 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -37,6 +37,7 @@ (define-module (gnu packages gnuzilla) #:use-module ((srfi srfi-1) #:hide (zip)) + #:use-module (ice-9 format) #:use-module (ice-9 match) #:use-module (gnu packages) #:use-module ((guix licenses) #:prefix license:) @@ -91,7 +92,8 @@ (define-module (gnu packages gnuzilla) #:use-module (gnu packages xiph) #:use-module (gnu packages xdisorg) #:use-module (gnu packages readline) - #:use-module (gnu packages sqlite)) + #:use-module (gnu packages sqlite) + #:autoload (json parser) (json->scm)) (define-public mozjs (package @@ -348,6 +350,10 @@ (define-public mozjs-78 (inputs (list icu4c readline zlib)))) + +;;; +;;; Localization helper procedures. +;;; (define mozilla-compare-locales (origin (method hg-fetch) @@ -371,6 +377,18 @@ (define-syntax-rule (mozilla-locales (hash-string changeset locale) ...) (list (mozilla-locale locale changeset hash-string) ...)) +(define (update-mozilla-locales changesets.json) + "Output a new list of Mozilla locales, to update the ALL-MOZILLA-LOCALES +variable defined bellow. It requires guile-json to be installed." + (match (call-with-input-file changesets.json json->scm) + (((lang ("revision" . revision) platforms pin) ...) + (let ((data (reverse (map (lambda (rev lang) + `(,(list->string (make-list 40 #\0)) + ,(string-take rev 12) ,lang)) + revision lang)))) + (format #t "~{~s~%~}" data) + data)))) + (define all-mozilla-locales (mozilla-locales ;; sha256 changeset locale base-commit: 636b771536b95d15a2fd68b468deeebac97d6bee -- 2.39.1 From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH v4 2/9] gnu: icedove: Compute a self-contained source. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sun, 19 Feb 2023 19:26:01 +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, Jonathan Brielmaier , Maxim Cournoyer Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.16768347103079 (code B ref 32026); Sun, 19 Feb 2023 19:26:01 +0000 Received: (at 32026) by debbugs.gnu.org; 19 Feb 2023 19:25:10 +0000 Received: from localhost ([127.0.0.1]:49687 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTpJ7-0000na-Ti for submit@debbugs.gnu.org; Sun, 19 Feb 2023 14:25:10 -0500 Received: from mail-qt1-f171.google.com ([209.85.160.171]:38738) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTpJ6-0000nK-4X for 32026@debbugs.gnu.org; Sun, 19 Feb 2023 14:25:08 -0500 Received: by mail-qt1-f171.google.com with SMTP id f1so637511qtb.5 for <32026@debbugs.gnu.org>; Sun, 19 Feb 2023 11:25:08 -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=gAERYfHw10sPYX0GMXYoSVJ9W45vsWrwebio7nV/gCY=; b=V/jQyIsnR7QglF/Rj1rc0irCChAgibZInErv1Jv9z0cdphu4/iEtDWYpnxjfhKeudH xKw4JP/ICJDe6Q+TOdjmVjvp5KCztRpXi+8wRQ7a5tF/RHW89DF2wEHUzWmGxjnGwOhr aqJ5gtpMaGULOFc1RM+Tk/BH9XnQ34Yr/NK6AW3QOmp32K5+/2eyXFdX3wEISI/cUOJv N9p+NYPqhOjckqYFGMf8nqrHmZWwMwb+cdtI1ckRsdWMKDKZkzCpuLjrmmRMunVZhZMr 0W3tOnYilr44LQYcMg772xknYVJa8W8oIPNqIWqEJ63N7Q28eSeOmXgpk9P8N3Uatfxq gb/w== 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=gAERYfHw10sPYX0GMXYoSVJ9W45vsWrwebio7nV/gCY=; b=MTcdxXLr1JhQCf+Dsm/xY6dk9KwVGE8m1KiloK2Fm/Ah/VnhlXWjQ19n51BQvQGx4d 1wyvID+TYZQHLY6O76RDvYlMyr/v1eoUj40Pprc4ayREncGp2Q2gnbXuh3YqITGKGWAO HCR7S1Kw4DIfIJv5jIhcYAGg19g2t15fmXqHQEyLOlfkKdp4jzkcezjP5yuVtf+V84dE RsajruRZSJ8Bjau8xalOTqC9O7oS7R1p53GL6bt3+48G2uq93n+M2FnEKCUg2TYooeV4 2WZbKvSLWYsayVmDVT6lpqLGQVT4Aka6pMvA2ttC+Pa0TZHzUNMK44x4P6Yq3isRVG5g 3fYg== X-Gm-Message-State: AO0yUKWfDFRzCywhZCzjl0bU/yxp4hJ37THDDe7ib5DLhpxBa8pczHD9 cg7Ab9pFGn5YO7ssr3DhWmNfrKQfxco3Ug== X-Google-Smtp-Source: AK7set93vYwLGTX0eZjRlPbPfvCe7vIkSfXHpfotgC2SJRTzX7ZEV216tunipzibc/f9HzOUxy2UHw== X-Received: by 2002:a05:622a:1906:b0:3ba:3ac7:ccf1 with SMTP id w6-20020a05622a190600b003ba3ac7ccf1mr13643995qtc.58.1676834702445; Sun, 19 Feb 2023 11:25:02 -0800 (PST) Received: from localhost.localdomain (dsl-158-213.b2b2c.ca. [66.158.158.213]) by smtp.gmail.com with ESMTPSA id bz18-20020a05622a1e9200b003be56bdd3b1sm3288914qtb.92.2023.02.19.11.25.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Feb 2023 11:25:02 -0800 (PST) From: Maxim Cournoyer Date: Sun, 19 Feb 2023 14:23:58 -0500 Message-Id: <20230219192405.26549-2-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230219192405.26549-1-maxim.cournoyer@gmail.com> References: <20230219192405.26549-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This refactoring work is to prepare for adding a icedove-l10n package, which will reuse that source. * gnu/packages/gnuzilla.scm (comm-source->locales+changset): New procedure. (thunderbird-source): Rename to... (thunderbird-comm-source): ... here. (icedove-source): New variable. (icedove) [source]: Use it. [phases]: Remove the prepare-thunderbird-sources and rename-to-icedove phases. --- (no changes since v2) Changes in v2: - Fix typo in comm-source->locales+changset - Reword comment gnu/packages/gnuzilla.scm | 210 +++++++++++++++++++++++++------------- 1 file changed, 140 insertions(+), 70 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 16e2208426..3a742d06c6 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -47,6 +47,7 @@ (define-module (gnu packages gnuzilla) #:use-module (guix hg-download) #:use-module (guix gexp) #:use-module (guix store) + #:use-module (guix modules) #:use-module (guix monads) #:use-module (guix utils) #:use-module (guix build-system gnu) @@ -1119,7 +1120,7 @@ (define %icedove-version "102.7.2") ;; Provides the "comm" folder which is inserted into the icecat source. ;; Avoids the duplication of Icecat's source tarball. -(define thunderbird-source +(define thunderbird-comm-source (origin (method hg-fetch) (uri (hg-reference @@ -1130,11 +1131,148 @@ (define thunderbird-source (base32 "071q0pcfvfpzx741ly1sl8anlmzx02h17w4ylfnrkwrpaclq3p6p")))) +(define (comm-source->locales+changeset source) + "Given SOURCE, a checkout of the Thunderbird 'comm' component, return the +list of languages supported as well as the currently used changeset." + (match (update-mozilla-locales + (string-append source "/mail/locales/l10n-changesets.json")) + (((_ changeset locale) ...) + (values locale (first changeset))))) + +;;; To find out which changeset to use for the comm-l10n repo, use the +;;; 'comm-source->locales+changeset' procedure on the thunderbird-comm-source +;;; checkout directory. The complete localization data should be released as +;;; a tarball in the next release (see: +;;; https://bugzilla.mozilla.org/show_bug.cgi?id=1817086). When this tarball +;;; is available, it should replace the complete 'l10n' directory at the root +;;; of the IceCat source, instead of only the 'calendar', chat and mail +;;; directories that it provides. +(define thunderbird-comm-l10n + (let* ((changeset "5b6788295358") + (version (git-version %icedove-version "0" changeset))) + (origin + (method hg-fetch) + (uri (hg-reference + (url "https://hg.mozilla.org/projects/comm-l10n") + (changeset changeset))) + (file-name (git-file-name "comm-l10n" version)) + (sha256 + (base32 + "1jrsmkscjjllcfawi3788vwm53wn25inbhdis5nk4vfpr7wk5ill"))))) + +(define icedove-source + (let ((name (string-append "icedove-" %icedove-version))) + (origin + (method computed-origin-method) + (file-name (string-append name ".tar.xz")) + (sha256 #f) + (uri + (delay + (with-imported-modules (source-module-closure '((guix build utils))) + #~(begin + (use-modules (guix build utils) + (sxml simple)) + + (set-path-environment-variable + "PATH" '("bin") + (list #+(canonical-package tar) + #+(canonical-package xz))) + + ;; Extract the base Icecat tarball, renaming its top-level + ;; directory. + (invoke "tar" "--transform" (string-append "s,[^/]*," #$name ",") + "-xf" #$icecat-source) + (chdir #$name) + + ;; Merge the Thunderdbird localization data. + (copy-recursively #$thunderbird-comm-l10n "l10n") + + ;; Add the Thunderbird-specific "comm" directory.. + (mkdir "comm") + (copy-recursively #$thunderbird-comm-source "comm") + (delete-file "sourcestamp.txt") + + ;; Adjust the application name. + (substitute* "comm/mail/confvars.sh" + (("MOZ_APP_NAME=thunderbird") + "MOZ_APP_NAME=icedove") + (("MOZ_UPDATER=1") + "MOZ_UPDATER=0")) + + ;; Remove branding to comply with Mozilla's trademark policy + (with-directory-excursion "comm/mail/branding/nightly" + (delete-file "content/about-wordmark.svg") + (call-with-output-file "content/about-wordmark.svg" + (lambda (port) + (sxml->xml '(svg (@ (xmlns "http://www.w3.org/2000/svg") + (viewBox "0 0 789.1 90.78") + (width "333") + (height "48") + (fill "#fff")) + (text (@ (x "400") (y "70") + (text-anchor "middle") + (font-size "90")) + "Icedove Daily")) + port))) + (substitute* '("locales/en-US/brand.properties" + "locales/en-US/brand.ftl" + "locales/en-US/brand.dtd" + "configure.sh") + (("Thunderbird") "Icedove") + (("mozilla.org") "guix.gnu.org"))) + ;; Remove other mentions of Thunderbird in user-visible text. + (with-directory-excursion "comm/mail/base/content" + (substitute* '("overrides/app-license-name.html") + (("Thunderbird") "Icedove"))) + (with-directory-excursion "comm/mail/components/" + (substitute* '("MailGlue.jsm" + "extensions/schemas/addressBook.json" + "extensions/schemas/tabs.json" + "extensions/schemas/cloudFile.json" + "extensions/schemas/chrome_settings_overrides.json" + "extensions/schemas/windows.json" + "extensions/parent/ext-mail.js" + "im/messages/mail/Info.plist" + "enterprisepolicies/moz.build" + "enterprisepolicies/helpers/moz.build" + "enterprisepolicies/schemas/moz.build") + (("Thunderbird") "Icedove"))) + (substitute* '("comm/mailnews/base/prefs/content/accountUtils.js" + "comm/mail/base/content/customizeToolbar.js" + "comm/suite/components/customizeToolbar.js") + (("AppConstants.MOZ_APP_NAME (.)= \"thunderbird" _ e) + (format #f "AppConstants.MOZ_APP_NAME ~a= \"icedove" e))) + + ;; Override addon URLs and settings + (substitute* "comm/mail/app/profile/all-thunderbird.js" + (("(pref\\(\"extensions.webservice.discoverURL\").*" _ m) + (string-append m ", \"https://directory.fsf.org/wiki/Icedove\");")) + (("(pref\\(\"extensions.getAddons.search.url\").*" _ m) + (string-append m ", \"https://guix.gnu.org/packages\");")) + (("(pref\\(\"extensions.update.enabled\").*" _ m) + (string-append m ", false);")) + (("(pref\\(\"extensions.systemAddon.update.enabled\").*" _ m) + (string-append m ", false);")) + (("(pref\\(\"lightweightThemes.update.enabled\").*" _ m) + (string-append m ", false);"))) + + ;; Step out of the directory and create the tarball. + (chdir "..") + (format #t "Packing Icedove source tarball...~%") + (force-output) + (setenv "XZ_DEFAULTS" (string-join (%xz-parallel-args))) + (invoke "tar" "cfa" #$output + "--mtime=@315619200" ;1980-01-02 UTC + "--owner=root:0" + "--group=root:0" + "--sort=name" + #$name)))))))) + (define-public icedove (package (name "icedove") (version %icedove-version) - (source icecat-source) + (source icedove-source) (properties `((cpe-name . "thunderbird_esr"))) (build-system gnu-build-system) @@ -1148,11 +1286,6 @@ (define-public icedove ,@%gnu-build-system-modules) #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'prepare-thunderbird-sources - (lambda _ - (mkdir "comm") - (copy-recursively #$thunderbird-source "comm") - (delete-file "sourcestamp.txt"))) (add-after 'patch-source-shebangs 'patch-cargo-checksums (lambda _ (use-modules (guix build cargo-utils)) @@ -1182,69 +1315,6 @@ (define-public icedove (substitute* "comm/mail/moz.configure" (("MOZ_DEDICATED_PROFILES, True") "MOZ_DEDICATED_PROFILES, False")))) - (add-after 'prepare-thunderbird-sources 'rename-to-icedove - (lambda _ - (substitute* "comm/mail/confvars.sh" - (("MOZ_APP_NAME=thunderbird") - "MOZ_APP_NAME=icedove") - (("MOZ_UPDATER=1") - "MOZ_UPDATER=0")) - ;; Remove branding to comply with Mozilla's trademark policy - (with-directory-excursion "comm/mail/branding/nightly" - (delete-file "content/about-wordmark.svg") - (call-with-output-file "content/about-wordmark.svg" - (lambda (port) - (sxml->xml '(svg (@ (xmlns "http://www.w3.org/2000/svg") - (viewBox "0 0 789.1 90.78") - (width "333") - (height "48") - (fill "#fff")) - (text (@ (x "400") (y "70") - (text-anchor "middle") - (font-size "90")) - "Icedove Daily")) - port))) - (substitute* '("locales/en-US/brand.properties" - "locales/en-US/brand.ftl" - "locales/en-US/brand.dtd" - "configure.sh") - (("Thunderbird") "Icedove") - (("mozilla.org") "guix.gnu.org"))) - ;; Remove other mentions of Thunderbird in user-visible text. - (with-directory-excursion "comm/mail/base/content" - (substitute* '("overrides/app-license-name.html") - (("Thunderbird") "Icedove"))) - (with-directory-excursion "comm/mail/components/" - (substitute* '("MailGlue.jsm" - "extensions/schemas/addressBook.json" - "extensions/schemas/tabs.json" - "extensions/schemas/cloudFile.json" - "extensions/schemas/chrome_settings_overrides.json" - "extensions/schemas/windows.json" - "extensions/parent/ext-mail.js" - "im/messages/mail/Info.plist" - "enterprisepolicies/moz.build" - "enterprisepolicies/helpers/moz.build" - "enterprisepolicies/schemas/moz.build") - (("Thunderbird") "Icedove"))) - (substitute* '("comm/mailnews/base/prefs/content/accountUtils.js" - "comm/mail/base/content/customizeToolbar.js" - "comm/suite/components/customizeToolbar.js") - (("AppConstants.MOZ_APP_NAME (.)= \"thunderbird" _ e) - (format #f "AppConstants.MOZ_APP_NAME ~a= \"icedove" e))) - - ;; Override addon URLs and settings - (substitute* "comm/mail/app/profile/all-thunderbird.js" - (("(pref\\(\"extensions.webservice.discoverURL\").*" _ m) - (string-append m ", \"https://directory.fsf.org/wiki/Icedove\");")) - (("(pref\\(\"extensions.getAddons.search.url\").*" _ m) - (string-append m ", \"https://guix.gnu.org/packages\");")) - (("(pref\\(\"extensions.update.enabled\").*" _ m) - (string-append m ", false);")) - (("(pref\\(\"extensions.systemAddon.update.enabled\").*" _ m) - (string-append m ", false);")) - (("(pref\\(\"lightweightThemes.update.enabled\").*" _ m) - (string-append m ", false);"))))) (add-after 'build 'neutralize-store-references (lambda _ ;; Mangle the store references to compilers & other build tools in -- 2.39.1 From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH v4 3/9] gnu: Define %icecat-base-version at the top level. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sun, 19 Feb 2023 19:26:02 +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, Jonathan Brielmaier , Maxim Cournoyer Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.16768347143097 (code B ref 32026); Sun, 19 Feb 2023 19:26:02 +0000 Received: (at 32026) by debbugs.gnu.org; 19 Feb 2023 19:25:14 +0000 Received: from localhost ([127.0.0.1]:49690 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTpJB-0000nt-ND for submit@debbugs.gnu.org; Sun, 19 Feb 2023 14:25:14 -0500 Received: from mail-qt1-f182.google.com ([209.85.160.182]:45689) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTpJ9-0000nR-LS for 32026@debbugs.gnu.org; Sun, 19 Feb 2023 14:25:12 -0500 Received: by mail-qt1-f182.google.com with SMTP id t10so692264qto.12 for <32026@debbugs.gnu.org>; Sun, 19 Feb 2023 11:25:11 -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=3QATiJyFuYViGubtWES8psclHffej/qOhXpCNQE0DMY=; b=ZQyXvulHvP+5sut4cTl8HrzZG+5y+5kkEVy3ohgTeldXBmvDRdcA1i88AokgN3Wh6c kXnujhfs9AUQem2S9x+EfHNK5V2vcDaOryFID+J0+55uF0UIvm6GOArS3CDWOL4lAkW5 b9pkodJ5Mx9TaXXiy9Ngwl4dYzOfz1BBsPeSVCL5pCJ4abSuSUsmUGufZ6VoY/EFaYFs j1AuOUntkPVU2We2DNYaC3rV2gZAF8nU+y21ryq7afaCS6xBIlsE5NmI8f8FziaQ71MO tMjHDzLzVA/Jggug0PpGJLTi7mStE/YLCPoSMOYY3EBW2d1ET0YrWkXjip667/zd2Qvn LH9w== 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=3QATiJyFuYViGubtWES8psclHffej/qOhXpCNQE0DMY=; b=54xKDYBqQ1S1BurcpKBiqZRvY1nuM2gXbQ9gQgPSIRD0nDwPXnFXQTzesesI6pSq3O tNStXctzfdlYCeDBbAz6mqT8mSGeBzmE6lraQ8lso2dYSALYw9MTweMozdVxE06HJxXn ZKxpM66dMhzO1I2ctxYscLtokieRW+x7Hj1LtohBVqiyBG4Nq+2Eg1wUmMZFjq3Og78M GtcrOOmcLWrZ1mbQUt1ol/WHZM1HdUeb1hgesACP4CKTRrLn0js4KJzvaD9S4m3beGNe WDkNsuLmslRz1H9iYwExSKxEHbbgXaUlOT5qTdZO2nUNz0E/HmzgV+/u0BVBTZ40dtsn 0lhA== X-Gm-Message-State: AO0yUKVeIs2ErMvwBOBBZOBbfHxmLTNgkYlimFf5f71Zd1TZR+QAK1zv HuJllqmr1EjtOmoUmlDriTAmPhu6RTCBUQ== X-Google-Smtp-Source: AK7set+j3JteSQgPj5zPhf9N5nP4eL8PjKU/m+pHJjCTPq/06xxmF/Vlc+EtD3ss4KAPX7A+eONK2A== X-Received: by 2002:a05:622a:1805:b0:3b9:bb27:e116 with SMTP id t5-20020a05622a180500b003b9bb27e116mr13098700qtc.1.1676834706084; Sun, 19 Feb 2023 11:25:06 -0800 (PST) Received: from localhost.localdomain (dsl-158-213.b2b2c.ca. [66.158.158.213]) by smtp.gmail.com with ESMTPSA id bz18-20020a05622a1e9200b003be56bdd3b1sm3288914qtb.92.2023.02.19.11.25.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Feb 2023 11:25:05 -0800 (PST) From: Maxim Cournoyer Date: Sun, 19 Feb 2023 14:23:59 -0500 Message-Id: <20230219192405.26549-3-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230219192405.26549-1-maxim.cournoyer@gmail.com> References: <20230219192405.26549-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gnuzilla.scm (%icecat-base-version): New variable. (%icecat-version): Define in terms of %icecat-base-version. (icecat-source): Adjust to use the above newly introduced variables. --- Changes in v4: - Re-obfuscate upstream-firefox-source gnu/packages/gnuzilla.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 3a742d06c6..bb379a7fb1 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -496,20 +496,19 @@ (define all-mozilla-locales ;; XXXX: Workaround 'snippet' limitations. (define computed-origin-method (@@ (guix packages) computed-origin-method)) -(define %icecat-version "102.8.0-guix0-preview1") +(define %icecat-base-version "102.8.0") +(define %icecat-version (string-append %icecat-base-version "-guix0-preview1")) (define %icecat-build-id "20230214000000") ;must be of the form YYYYMMDDhhmmss ;; 'icecat-source' is a "computed" origin that generates an IceCat tarball ;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat' ;; script from the upstream IceCat project. (define icecat-source - (let* ((base-version (first (string-split %icecat-version #\-))) + (let* ((major-version (first (string-split %icecat-base-version #\.))) + (minor-version (second (string-split %icecat-base-version #\.))) + (sub-version (third (string-split %icecat-base-version #\.))) - (major-version (first (string-split base-version #\.))) - (minor-version (second (string-split base-version #\.))) - (sub-version (third (string-split base-version #\.))) - - (upstream-firefox-version (string-append base-version "esr")) + (upstream-firefox-version (string-append %icecat-base-version "esr")) (upstream-firefox-source (origin (method url-fetch) @@ -521,8 +520,9 @@ (define icecat-source (base32 "0j6afrgfsmd0adbbmffw4p1f2hznpck9d36z3bsjx36f7cjgdy27")))) - (upstream-icecat-base-version "102.8.0") ; maybe older than base-version - ;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version)) + ;; The upstream-icecat-base-version may be older than the + ;; %icecat-base-version. + (upstream-icecat-base-version "102.8.0") (gnuzilla-commit "03d9e3db5affe21db077c410ec08c313d6aa280e") (gnuzilla-source (origin @@ -553,7 +553,7 @@ (define icecat-source #~(begin (use-modules (guix build utils)) (let ((firefox-dir - (string-append "firefox-" #$base-version)) + (string-append "firefox-" #$%icecat-base-version)) (icecat-dir (string-append "icecat-" #$%icecat-version))) -- 2.39.1 From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH v4 8/9] gnu: icecat: Remove gtk+-2 input. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sun, 19 Feb 2023 19:26:02 +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, Jonathan Brielmaier , Maxim Cournoyer Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.16768347203139 (code B ref 32026); Sun, 19 Feb 2023 19:26:02 +0000 Received: (at 32026) by debbugs.gnu.org; 19 Feb 2023 19:25:20 +0000 Received: from localhost ([127.0.0.1]:49696 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTpJI-0000oY-39 for submit@debbugs.gnu.org; Sun, 19 Feb 2023 14:25:20 -0500 Received: from mail-qt1-f182.google.com ([209.85.160.182]:45689) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTpJG-0000nR-63 for 32026@debbugs.gnu.org; Sun, 19 Feb 2023 14:25:18 -0500 Received: by mail-qt1-f182.google.com with SMTP id t10so692455qto.12 for <32026@debbugs.gnu.org>; Sun, 19 Feb 2023 11:25:18 -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=pcQ1cGP89A7lzn0RBjCW54MSE0Ph5lZoW+G8gcBiQ+Y=; b=fyDrDxGkOan+I0PMOcbOsXbkeD7HN2K7BuY4dxyuZH+lSOmeeJe0mArgUHZ/FCPF1C XoqfwBVVQy073b0Cm9KP4wryvUlF3E5FCoE6Bv/9gClWassSL7WEiWdnbSqJGkf7Tjtq X+zU9jhUFYLMKiB+i86BwY9N/lJ2I+xzZmbElGrdfwTKn8LKmjtuOl+k0+BN4xDLKBUV sNGPoykGb8JNq9f06RL4LZobUOUI3gQWrAfMOcGis31V46oaRafk4J/T2idWNAsViDuA i9ngMZNrefRlgZQ4Qz/0l67IATcFLuh65FVShwhOT4wlkiaelmuHo+LdW2h+dp0FO3sd pFkw== 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=pcQ1cGP89A7lzn0RBjCW54MSE0Ph5lZoW+G8gcBiQ+Y=; b=sg4W4AXN0/ddPnsUiULQKviM5g/N2hWA//fauba2o4A+WZMTFfilKoRJSMkIzfNI10 fLCKn6VMwo0OtA663jpOwehozisDFfc2XdX5x8HXNwzyTOQ+Vpvd1zwHhubVYZCNmViw aqt+MdiGwrcg26dh0srN9d3MHgypDSwXtDYQBY9zKdhpyaWSn9lC6JBBArlrAVQsWpRn wA2w7T+48ONpBr2Udpf4XNBXRoyhrjsPzL17xlvOE0w510DPQClL8U73rcXWcCiMSCmm pacDQ7VJcebR9OWEOOwH78VaQEFAxVPR+mds9Am6CNeuhluoMgF/ZwvqDiIGwp7uZFDf S4DA== X-Gm-Message-State: AO0yUKWj0h3zvi8vWL3RcKzbIsiyLe39I41ZSDNWAcrU8ixbRzteTUK4 USfazhT0VdpiYwtwysKEe/tgWuAa6j0M3Q== X-Google-Smtp-Source: AK7set9nzy/KET/pqhvzt2l2VmRyHdMya3xR0S9UWUGcdTSpy+U1C3rt1bgZxXbjgc/DJ9Ts0aRWNg== X-Received: by 2002:a05:622a:1703:b0:3b8:6075:5d12 with SMTP id h3-20020a05622a170300b003b860755d12mr10248365qtk.54.1676834717730; Sun, 19 Feb 2023 11:25:17 -0800 (PST) Received: from localhost.localdomain (dsl-158-213.b2b2c.ca. [66.158.158.213]) by smtp.gmail.com with ESMTPSA id bz18-20020a05622a1e9200b003be56bdd3b1sm3288914qtb.92.2023.02.19.11.25.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Feb 2023 11:25:17 -0800 (PST) From: Maxim Cournoyer Date: Sun, 19 Feb 2023 14:24:04 -0500 Message-Id: <20230219192405.26549-8-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230219192405.26549-1-maxim.cournoyer@gmail.com> References: <20230219192405.26549-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gnuzilla.scm (icecat-minimal) [inputs]: Remove gtk+-2. --- (no changes since v2) Changes in v2: - New commit gnu/packages/gnuzilla.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index f12b1fd64d..daffc97771 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -685,7 +685,6 @@ (define-public icecat-minimal gdk-pixbuf glib gtk+ - gtk+-2 ;; UNBUNDLE-ME! graphite2 cairo pango -- 2.39.1 From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH v4 4/9] gnu: Add icecat-l10n and icedove-l10n. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sun, 19 Feb 2023 19:26:02 +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, Jonathan Brielmaier , Maxim Cournoyer Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.16768347213148 (code B ref 32026); Sun, 19 Feb 2023 19:26:02 +0000 Received: (at 32026) by debbugs.gnu.org; 19 Feb 2023 19:25:21 +0000 Received: from localhost ([127.0.0.1]:49698 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTpJI-0000oa-AU for submit@debbugs.gnu.org; Sun, 19 Feb 2023 14:25:21 -0500 Received: from mail-qt1-f178.google.com ([209.85.160.178]:37861) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTpJF-0000nl-V1 for 32026@debbugs.gnu.org; Sun, 19 Feb 2023 14:25:18 -0500 Received: by mail-qt1-f178.google.com with SMTP id cf6so686112qtb.4 for <32026@debbugs.gnu.org>; Sun, 19 Feb 2023 11:25:17 -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=T3R8TXONCNWPZgw7BlZC0vZX6M1rNXGSTbNienjaYMM=; b=QBlf5VtfgM4Fb0p6BNmJ3fdXp5SE//9CGTvXrLWHIFm/2QY5+dRVZ9zSwFiwZPOQyZ rIrz8vhg5sj4EH7OgA8WbpO4c9LD5Lh/rjhvqCm3P8wrSNMCvaD453u9ghAur5rf1NIK qxzkHotUaH6QY7HRb7BqNca0FECNjN+HE5c7l9bEaU0wHqtteAK/ZDKpXPNVsmsjkkGe aQEFkK89rZngcoqO+83pIX9Uyq7WvaQUwA2GKXEwmEOzjRkoUdGojcX92v1j2NeZSpxp ocXsmyMKPDqkBsL6Wz8eTHmaaG6b7CXzXtyUw8i0v6w7IdF8JoLImLdy01NNfc7D8ipp xA6Q== 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=T3R8TXONCNWPZgw7BlZC0vZX6M1rNXGSTbNienjaYMM=; b=VbmEboQAjQgDrvfG6fIOsxnqz+/XFrk/UsBjcPNk+rFsX3oGM9Wo2EU2i5sFYaunDN LfMq+JZUZ5TG4X+jw1Xc55FNIJDaluzZGf8CYErr8iV1Vpl2tOr/0E/w60oawPu9WMnl wAOhgcwJ43zZ8IMYTtSl5tcttquAU6Ia5uYck5/oHqhMGmbfltOYx8ji5RGrXHBsgCQQ g50qG53dXoeoPWsfy4WWv3KQIVbePvrv/66FFExUsoL4ciYo5hW0WQ+r8KClfHMJ/FmR V3fNzmv4giFdyX3es/mZhlaBgKXDkeKkrxEsGBBXLBefUg/ajNGm1reZsxCJW5ZHJfgl xeGQ== X-Gm-Message-State: AO0yUKVnmgw34YOD6pG+a++D+56LThaXpriM2yoySNsGKQtOKmkV5noi 4EdjE3HjnoUq15SYm4JrMGt0ThWv0dQMTA== X-Google-Smtp-Source: AK7set/jthayKsiuhqWKzbf2Ld4w1ifA9KrbefyyhVdc1PupaTR7RwYbZzl2Y1e2jGALDL6KWTwQ7g== X-Received: by 2002:ac8:5784:0:b0:3b9:b422:4d69 with SMTP id v4-20020ac85784000000b003b9b4224d69mr10987195qta.39.1676834712276; Sun, 19 Feb 2023 11:25:12 -0800 (PST) Received: from localhost.localdomain (dsl-158-213.b2b2c.ca. [66.158.158.213]) by smtp.gmail.com with ESMTPSA id bz18-20020a05622a1e9200b003be56bdd3b1sm3288914qtb.92.2023.02.19.11.25.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Feb 2023 11:25:12 -0800 (PST) From: Maxim Cournoyer Date: Sun, 19 Feb 2023 14:24:00 -0500 Message-Id: <20230219192405.26549-4-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230219192405.26549-1-maxim.cournoyer@gmail.com> References: <20230219192405.26549-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gnuzilla.scm (%icecat-locales, %icedove-locales): New variable. (make-l10n-package): New procedure. (icecat-l10n, icedove-l10n): New variables. --- (no changes since v1) gnu/packages/gnuzilla.scm | 143 +++++++++++++++++++++++++++++++++++++- 1 file changed, 142 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index bb379a7fb1..01fc974805 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -17,7 +17,7 @@ ;;; Copyright © 2020, 2022 Marius Bakke ;;; Copyright © 2021 Brice Waegeneire ;;; Copyright © 2021 Maxime Devos -;;; Copyright © 2021, 2022 Maxim Cournoyer +;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer ;;; Copyright © 2021 Baptiste Strazzul ;;; ;;; This file is part of GNU Guix. @@ -1115,6 +1115,16 @@ (define (runpaths-of-input label) (cpe-name . "firefox_esr") (cpe-version . ,(first (string-split version #\-))))))) +(define %icecat-locales + '("ach" "af" "an" "ar" "ast" "az" "be" "bg" "bn" "br" "bs" "ca" "cak" + "ca-valencia" "cs" "cy" "da" "de" "dsb" "el" "en-CA" "en-GB" "eo" "es-AR" + "es-CL" "es-ES" "es-MX" "et" "eu" "fa" "ff" "fi" "fr" "fy-NL" "ga-IE" "gd" + "gl" "gn" "gu-IN" "he" "hi-IN" "hr" "hsb" "hu" "hy-AM" "ia" "id" "is" "it" + "ja" "ja-JP-mac" "ka" "kab" "kk" "km" "kn" "ko" "lij" "lt" "lv" "mk" "mr" "ms" + "my" "nb-NO" "ne-NP" "nl" "nn-NO" "oc" "pa-IN" "pl" "pt-BR" "pt-PT" "rm" "ro" + "ru" "sco" "si" "sk" "sl" "son" "sq" "sr" "sv-SE" "szl" "ta" "te" "th" "tl" + "tr" "trs" "uk" "ur" "uz" "vi" "xh" "zh-CN" "zh-TW")) + (define %icedove-build-id "20230207000000") ;must be of the form YYYYMMDDhhmmss (define %icedove-version "102.7.2") @@ -1139,6 +1149,15 @@ (define (comm-source->locales+changeset source) (((_ changeset locale) ...) (values locale (first changeset))))) +;;; Generated with comm-source->locales+changeset. +(define %icedove-locales + '("af" "ar" "ast" "be" "bg" "br" "ca" "cak" "cs" "cy" "da" "de" "dsb" "el" + "en-CA" "en-GB" "es-AR" "es-ES" "es-MX" "et" "eu" "fi" "fr" "fy-NL" "ga-IE" + "gd" "gl" "he" "hr" "hsb" "hu" "hy-AM" "id" "is" "it" "ja" "ja-JP-mac" "ka" + "kab" "kk" "ko" "lt" "lv" "ms" "nb-NO" "nl" "nn-NO" "pa-IN" "pl" "pt-BR" + "pt-PT" "rm" "ro" "ru" "sk" "sl" "sq" "sr" "sv-SE" "th" "tr" "uk" "uz" "vi" + "zh-CN" "zh-TW")) + ;;; To find out which changeset to use for the comm-l10n repo, use the ;;; 'comm-source->locales+changeset' procedure on the thunderbird-comm-source ;;; checkout directory. The complete localization data should be released as @@ -1547,6 +1566,128 @@ (define-public icedove/wayland (native-inputs '()) (inputs '()))) +(define (make-l10n-package project version source locales) + "Return a package for PROJECT, a symbol (either icecat or icedove), with +their corresponding VERSION, SOURCE and LOCALES variables." + (unless (member project '(icecat icedove)) + (error "only icecat or icedove components are currently supported")) + + (let ((name (if (eq? 'icecat project) + "IceCat" + "Icedove"))) + (package + (name (format #f "~a-l10n" project)) + (version version) + (source source) + (outputs (cons "out" locales)) + (build-system gnu-build-system) + (arguments + (list + #:modules '((guix build gnu-build-system) + (guix build utils) + (ice-9 format) + (ice-9 ftw) + (srfi srfi-1) + (srfi srfi-26)) + #:tests? #f ;no tests, this is data + #:phases + #~(modify-phases %standard-phases + (delete 'bootstrap) + (delete 'install) + (replace 'configure + (lambda _ + ;; The following configuration is inspired by guidance at + ;; https://firefox-source-docs.mozilla.org/build/buildsystem/locales.html. + (call-with-output-file ".mozconfig" + (lambda (p) + (format p "~{~a~%~}" + (list (if (eq? 'icecat '#$project) + "ac_add_options --enable-project=browser" + "ac_add_options --enable-project=comm/mail") + "ac_add_options --disable-compile-environment" + (string-append + "ac_add_options --with-l10n-base=" + (getcwd) "/l10n") + ;; Hack, otherwise the build system throws: + ;; 'RuntimeError: File "brand.dtd" not found'. + "ac_add_options --enable-official-branding" + "mk_add_options MOZ_OBJDIR=obj")))) + (setenv "CONFIG_SHELL" (which "bash")) + (setenv "MOZBUILD_STATE_PATH" + (string-append (getcwd) "/mach_state")) + (setenv "MOZCONFIG" (string-append (getcwd) "/.mozconfig")) + (setenv "MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE" "system") + (setenv "BUILD_BACKENDS" "FasterMake,RecursiveMake"))) + (replace 'build ;build and install data files + (lambda* (#:key outputs #:allow-other-keys) + (define (find-file dir name) + (let ((files (find-files dir name))) + (when (null? files) + (error "could not find file in dir" name dir)) + (car files))) + + (for-each + (lambda (l) + (let* ((out (assoc-ref outputs l)) + ;; The older lib/$project/distribution/extensions + ;; directory is deprecated. Use the newer app-global + ;; directory, which is lib/$project/extensions. + (ext-dir-prefix + (format + #f "lib/~a/~:[~;browser/~]extensions" + '#$project (eq? 'icecat '#$project))) + (all-ext (string-append #$output "/" ext-dir-prefix)) + (ext-dir (string-append out "/" ext-dir-prefix)) + ;; XXX: Because Icedove doesn't have a makeicedove + ;; script that substitutes all the Thunderbird + ;; references to Icedove, the MOZ_LANGPACK_EID + ;; defined in comm/mail/locales/Makefile.in uses + ;; 'thunderbird' in its ID extension rather than + ;; 'icedove'. + (name (format #f "langpack-~a@~a.mozilla.org.xpi" + l (if (eq? 'icedove '#$project) + 'thunderbird + '#$project)))) + (format #t "processing locale `~a'...~%" l) + (if (eq? 'icecat '#$project) + ;; XXX: For some reasons, for IceCat, there are some + ;; parsing errors that cause the build system to + ;; return an unclean exit code; use system* to ignore + ;; errors. + (system* "./mach" "build" (string-append "langpack-" l)) + (invoke "./mach" "build" (string-append "langpack-" l))) + (mkdir-p ext-dir) + (let ((xpi (find-file "obj" (string-append + "\\." l "\\.langpack\\.xpi$")))) + (copy-file xpi (string-append ext-dir "/" name)) + ;; Symlink to the main output so that a user can + ;; install all of the language packs at once. + (mkdir-p all-ext) + (symlink (string-append ext-dir "/" name) + (string-append all-ext "/" name))))) + (if (eq? 'icedove '#$project) + '#$%icedove-locales + '#$%icecat-locales))))))) + (native-inputs + (list m4 + perl + python-wrapper + node + unzip)) + (home-page "https://www.mozilla.org/") + (synopsis (string-append "Language localization data for " name)) + (description (string-append "This package contains the various language +localization data files (language pack extensions) for " name ". The +individual localization packages can be installed by using the output +associated with their name.")) + (license license:mpl2.0)))) + +(define-public icecat-l10n + (make-l10n-package 'icecat %icecat-version icecat-source %icecat-locales)) + +(define-public icedove-l10n + (make-l10n-package 'icedove %icedove-version icedove-source %icedove-locales)) + (define-public firefox-decrypt (package (name "firefox-decrypt") -- 2.39.1 From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH v4 5/9] gnu: icedove: Automatically load system-provided extensions. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sun, 19 Feb 2023 19:26:03 +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, Jonathan Brielmaier , Maxim Cournoyer Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.16768347223161 (code B ref 32026); Sun, 19 Feb 2023 19:26:03 +0000 Received: (at 32026) by debbugs.gnu.org; 19 Feb 2023 19:25:22 +0000 Received: from localhost ([127.0.0.1]:49701 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTpJJ-0000op-HO for submit@debbugs.gnu.org; Sun, 19 Feb 2023 14:25:21 -0500 Received: from mail-qt1-f175.google.com ([209.85.160.175]:34520) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTpJH-0000nz-8W for 32026@debbugs.gnu.org; Sun, 19 Feb 2023 14:25:19 -0500 Received: by mail-qt1-f175.google.com with SMTP id ay26so635405qtb.1 for <32026@debbugs.gnu.org>; Sun, 19 Feb 2023 11:25:19 -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=bd9pBMvJDSXMVTlq7mh7s8LZUoC5KfJvyAGpgAWS5Eo=; b=ATBH8vL87iX1092eNXiX63wxTlRhrdEWnusb9tY9mzZzlh1UwfFe1HyXE1xVMHlpo/ yCk36RFsYYLYIJ19e+NkVWAglIiQsFUw7xRsz3V5T5ixBPerZdwYv+a9wCAArBD8cf2c Tx+H1jYWXoES1FJmqy5oCfrHDl8iI7TIo8rTbTUNnrlhpaMLsyYqMPpOdMhh+jXuqDn8 2V3udtiVJ4/+Hpj6EDAs2ytv8YUgcxgUiCnDdZWkfUIXOffIibaWOJv3zSKrAyXHlaIC szb2u+9OZMjmmGSa2a1+DRu/zQ63jhV2gYAze6hp7Pn2LlxaGQVjIxhWl4I/tTC9LL9Q opGg== 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=bd9pBMvJDSXMVTlq7mh7s8LZUoC5KfJvyAGpgAWS5Eo=; b=DbxowStzpfkjv0iMbNEePWj2B/ZwXUdXOVL22sjsfEBAyQlR/0DG5PiRey+uWz5xpQ AGR2d3lOWgdPt6w7JuXU0S8nbjuZEHXXu/BtDjtsH3BHTKGSQ95bibghdWUXh26f1hPV HCvEFpReMetHAwkDf1djygvVMQSAOxB42x6GA/iZ+VW+wqCnvTi6ZAyX591bTlzp6rlv 49CFf+olMCoT1iL8zIFfb7Jfv0OWqMF8Ue2PkSxZI8qMrK8+rEIb0nFZaiYWGHGwHwjO PRXMQRUt4FgsJd5yPD25O4dm5ZAxyVpYj3B1HzTCvSMy9UNVbfHrZuB7UTE5WMzdCskW W4kA== X-Gm-Message-State: AO0yUKU6Nj1G9W7HI/FXaYWhDSFd5IMLfe9tl63Z3Px6HcRfgSuHZ5Jy OAafBguySvs9hzA5/4wmLcXt+pxxXtHoKA== X-Google-Smtp-Source: AK7set+IL+R5sFI8+cM0/noPBZoFUk6JSL642OHYfuDzv5dKCkEWH7MPYSBLSURyDakNKGGWYXjL1g== X-Received: by 2002:ac8:7f44:0:b0:3bd:14c:c39b with SMTP id g4-20020ac87f44000000b003bd014cc39bmr14862674qtk.25.1676834713650; Sun, 19 Feb 2023 11:25:13 -0800 (PST) Received: from localhost.localdomain (dsl-158-213.b2b2c.ca. [66.158.158.213]) by smtp.gmail.com with ESMTPSA id bz18-20020a05622a1e9200b003be56bdd3b1sm3288914qtb.92.2023.02.19.11.25.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Feb 2023 11:25:13 -0800 (PST) From: Maxim Cournoyer Date: Sun, 19 Feb 2023 14:24:01 -0500 Message-Id: <20230219192405.26549-5-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230219192405.26549-1-maxim.cournoyer@gmail.com> References: <20230219192405.26549-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gnuzilla.scm (icedove-source): Set the extensions.autoDisableScopes preference value to 3. (icedove-minimal) [phases]: Add the --allow-addon-sideload and --with-unsigned-addon-scopes=app,system ac options to the configure phase. --- (no changes since v1) gnu/packages/gnuzilla.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 01fc974805..38c34251ab 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1273,7 +1273,15 @@ (define icedove-source (("(pref\\(\"extensions.systemAddon.update.enabled\").*" _ m) (string-append m ", false);")) (("(pref\\(\"lightweightThemes.update.enabled\").*" _ m) - (string-append m ", false);"))) + (string-append m ", false);")) + + ;; XXX: The autoDisableScopes is tweaked by the makeicecat + ;; script, but it doesn't know about Thunderbird. This is + ;; necessary to allow picking up the extensions found in the + ;; system global application directory, such as the language + ;; packs. + (("\"extensions.autoDisableScopes\", 15") + "\"extensions.autoDisableScopes\", 3")) ;; Step out of the directory and create the tarball. (chdir "..") @@ -1386,6 +1394,8 @@ (define-public icedove (lambda () (display (string-append + "ac_add_options --allow-addon-sideload\n" + "ac_add_options --with-unsigned-addon-scopes=app,system\n" "ac_add_options --disable-crashreporter\n" "ac_add_options --disable-debug\n" "ac_add_options --disable-debug-symbols\n" -- 2.39.1 From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH v4 9/9] gnu: icecat: Unbundle nss and nspr. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sun, 19 Feb 2023 19:26:03 +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, Jonathan Brielmaier , Maxim Cournoyer Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.16768347293181 (code B ref 32026); Sun, 19 Feb 2023 19:26:03 +0000 Received: (at 32026) by debbugs.gnu.org; 19 Feb 2023 19:25:29 +0000 Received: from localhost ([127.0.0.1]:49704 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTpJR-0000pE-0u for submit@debbugs.gnu.org; Sun, 19 Feb 2023 14:25:29 -0500 Received: from mail-qt1-f171.google.com ([209.85.160.171]:38738) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTpJH-0000nK-Gt for 32026@debbugs.gnu.org; Sun, 19 Feb 2023 14:25:19 -0500 Received: by mail-qt1-f171.google.com with SMTP id f1so637781qtb.5 for <32026@debbugs.gnu.org>; Sun, 19 Feb 2023 11:25:19 -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=mZHT/REm506lNw4WpeO0z+vAiTH0t0ZFuNCAzXSKgnY=; b=CmeqBKHuzLiC6EKaMJdNyONuN5AQP30H65kRWrva0zepgCMkpawrU9h8EQ/c7UpOAe 8XOviOY0l0YqMOBvFegdR/7t1xHIwQKU/0jlaib7SGx+pT+9jwDiUFQlwvnMh2RnQseY Abi7Kof9+f1d8GQAB2l4ov/0iZrYlPJ0JCGx5X3lwYar1sSH+MwHMAf3evsrzev1RSDh 71YCcP3Yv7PkMOJzpjNQ78ofZXJD83DTAWP1hKALyQozG39/SjcqPRyeiYVaLPMzIdJn 7FuiXk2I16H6/tNReTTVkdxdGW0RfdC/lgShQdVIbW52No7Bv30LwyVm5oxwCk6ARUcC xdew== 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=mZHT/REm506lNw4WpeO0z+vAiTH0t0ZFuNCAzXSKgnY=; b=zMtH4SYlVNZfN4ncYiFxa0JKqRHFQjTpmDQChywjVGVKKUcs0ptTZqmizoZ+DH1y/F 6JZmsbbdJzyT419po2N9e24vZYYAG5F6Qe0gO1+xZHYJ52iCUocSUDBs4K+Zcz3VazNQ 12GNL9On5Ms+Jrww8P8ElQtYmfS2hIS4k1S3zg921Jrc2b7WUwpm+gtcGhRo66jN3F4O NhV2xDpj6vq7l+UnakNQ4WflqbLI7QVUOi8U4ObbN86yn0W07wUlioptS0F/TlckpfXU QuflQwPQhsbVVHsCxvgTvD7yjKtHcxD7Fa267qR2Yu6fTj4Tnc7Nc4pX2+dALHDIaFF6 F9PQ== X-Gm-Message-State: AO0yUKWBaZCCXaAha1JDAtz56It8lCO9cKz9EDlixPDJooProgj638la 4c46HxYkb0osc7JqteyMudeqpyty1mZ/9g== X-Google-Smtp-Source: AK7set++gDhxagPTXxcK0Ez6LF5VsSWbEM7/D16OOVC+DeygaxieAdlJTzINjgBuTX67Gn/4z0zo5g== X-Received: by 2002:ac8:58d2:0:b0:3b6:88c2:2ac6 with SMTP id u18-20020ac858d2000000b003b688c22ac6mr11836976qta.27.1676834719128; Sun, 19 Feb 2023 11:25:19 -0800 (PST) Received: from localhost.localdomain (dsl-158-213.b2b2c.ca. [66.158.158.213]) by smtp.gmail.com with ESMTPSA id bz18-20020a05622a1e9200b003be56bdd3b1sm3288914qtb.92.2023.02.19.11.25.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Feb 2023 11:25:18 -0800 (PST) From: Maxim Cournoyer Date: Sun, 19 Feb 2023 14:24:05 -0500 Message-Id: <20230219192405.26549-9-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230219192405.26549-1-maxim.cournoyer@gmail.com> References: <20230219192405.26549-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gnuzilla.scm (icecat-minimal) [inputs]: Add nspr-next and nss-next. [configure-flags]: Re-instate the "--with-system-nspr" and "--with-system-nss" configure flags. [phases] {remove-bundled-libraries}: Update comment. --- (no changes since v2) Changes in v2: - New commit gnu/packages/gnuzilla.scm | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index daffc97771..f4723d683c 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -715,10 +715,8 @@ (define-public icecat-minimal mit-krb5 hunspell libnotify - ;; See - ;; and related comments in the 'remove-bundled-libraries' phase. - ;; UNBUNDLE-ME! nspr - ;; UNBUNDLE-ME! nss + nspr-next + nss-next shared-mime-info sqlite eudev @@ -813,12 +811,8 @@ (define-public icecat-minimal ;; UNBUNDLE-ME! "--with-system-theora" ; wants theora-1.2, not yet released ;; UNBUNDLE-ME! "--with-system-libvpx" "--with-system-icu" - - ;; See - ;; and related comments in the - ;; 'remove-bundled-libraries' phase below. - ;; UNBUNDLE-ME! "--with-system-nspr" - ;; UNBUNDLE-ME! "--with-system-nss" + "--with-system-nspr" + "--with-system-nss" ;; UNBUNDLE-ME! "--with-system-harfbuzz" ;; UNBUNDLE-ME! "--with-system-graphite2" @@ -867,12 +861,9 @@ (define-public icecat-minimal ;; FIXME: A script from the bundled nspr is used. ;;"nsprpub" ;; - ;; FIXME: With the update to IceCat 60, using system NSS - ;; broke certificate validation. See - ;; . For now, we use - ;; the bundled NSPR and NSS. TODO: Investigate, - ;; and try to unbundle these libraries again. - ;; UNBUNDLE-ME! "security/nss" + ;; FIXME: Some of the bundled NSS sources are used + ;; to build third_party/prio. + ;;"security/nss" ;; ;; TODO: Use more system media libraries. See: ;; -- 2.39.1 From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH v4 6/9] gnu: Add language packs to icecat and icedove. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sun, 19 Feb 2023 19:26:04 +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, Jonathan Brielmaier , Maxim Cournoyer Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.16768347303189 (code B ref 32026); Sun, 19 Feb 2023 19:26:04 +0000 Received: (at 32026) by debbugs.gnu.org; 19 Feb 2023 19:25:30 +0000 Received: from localhost ([127.0.0.1]:49706 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTpJR-0000pG-Kg for submit@debbugs.gnu.org; Sun, 19 Feb 2023 14:25:30 -0500 Received: from mail-qt1-f172.google.com ([209.85.160.172]:37857) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTpJI-0000o5-Iu for 32026@debbugs.gnu.org; Sun, 19 Feb 2023 14:25:21 -0500 Received: by mail-qt1-f172.google.com with SMTP id cf6so686161qtb.4 for <32026@debbugs.gnu.org>; Sun, 19 Feb 2023 11:25:20 -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=WBdhaMUT+4MW4oeY357fyXMU+nxUeN+t8od7yqkLiZM=; b=Rj9YSGc38vtLcoOFPh1zXXq3BmZd58fRiSR4HyoFgxmhSDYPkgSkIhjPdeO3q4SrK9 pHhiHW6LZM++J22WBmxKQlpBWGDaoka8g0u6CEMZDrng5azHcp5/x3cZe3miAlY5mjRu ly9b/a9je5e39r7gU2gkL4Xd2WVurcJn4CkSHiTRuj3F0SiLxJyjVnIVVxZ+qT3kkhCE DZlx92YQW8YJwikJAz4sAUYubmWZPGgO2jBUh+LFHzbX18mjAO6ZZ9C0Dj/Ez0u/WMmA 85EF6WMEwtK1YDlsX6uOAmsq1abcqc3l5f3Cq7LT74vr16pbLCfnjYBB8cYbR4EWlmKh eBXQ== 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=WBdhaMUT+4MW4oeY357fyXMU+nxUeN+t8od7yqkLiZM=; b=mvA+QRwaaDQBwAR3CT3zxzjCex1cYBDm1W87kuzJ1uREsg9e34six9P6esqdsuYJUV hvTIFvAVY4DX61bAXV/AptxKRe9E7ruZ7rNyex8xenY/nAPVFPDHf6X88r55NiZZyMrn nCUsIewPT0yXWbTYbEGxF0bKIK6cnTtQuFjEaQZoxAn4d87/c4phL93labQofylU7Rq+ 6taIMmao5bB9Kr1wmWG1i0rl3kbhY79fS2uJxbj7mbFXewsnq4GY29wimnprssJPBX9h dnMD0kHCcy2KH/v4c3Ki85sKwiOU0j7Mxwn/GUX9rfKEFhTLV8ZDAWTlavriYXll5ki9 n1eg== X-Gm-Message-State: AO0yUKUDdweImQwhLSOxy891ThURkh20jngnauUaM/2ZsYeODPk0If34 BnpSrclMODCL88CILa2lzJMXcOoUkJW3gQ== X-Google-Smtp-Source: AK7set93acDAvsnEcqC1pXXoUlgzjhwpTF30JrMoMuzHG1ML9spekLfEDUNE3/Uj9nrV1AKChBOCwg== X-Received: by 2002:a05:622a:178d:b0:3b8:26a7:d608 with SMTP id s13-20020a05622a178d00b003b826a7d608mr8250431qtk.19.1676834714957; Sun, 19 Feb 2023 11:25:14 -0800 (PST) Received: from localhost.localdomain (dsl-158-213.b2b2c.ca. [66.158.158.213]) by smtp.gmail.com with ESMTPSA id bz18-20020a05622a1e9200b003be56bdd3b1sm3288914qtb.92.2023.02.19.11.25.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Feb 2023 11:25:14 -0800 (PST) From: Maxim Cournoyer Date: Sun, 19 Feb 2023 14:24:02 -0500 Message-Id: <20230219192405.26549-6-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230219192405.26549-1-maxim.cournoyer@gmail.com> References: <20230219192405.26549-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Fixes . * gnu/packages/gnuzilla.scm (icecat): Rename to... (icecat-minimal): ... this. (icedove: Rename to... (icedove-minimal): ... this. (make-mozilla-with-l10n): New procedure. (icecat, icedove): New variables. --- (no changes since v3) Changes in v3: - Make make-l10n-package more functional, taking inputs as arguments - Validate the PROJECT argument in make-l10n-package Changes in v2: - Do not clear native-inputs and inputs in make-mozilla-with-l10n, for 'guix shell -D icecat' gnu/packages/gnuzilla.scm | 133 ++++++++++++++++++++++++++++---------- 1 file changed, 100 insertions(+), 33 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 38c34251ab..ab2065054a 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -671,9 +671,9 @@ (define icecat-source "--sort=name" icecat-dir))))))))) -(define-public icecat +(define-public icecat-minimal (package - (name "icecat") + (name "icecat-minimal") (version %icecat-version) (source icecat-source) (build-system gnu-build-system) @@ -1295,9 +1295,9 @@ (define icedove-source "--sort=name" #$name)))))))) -(define-public icedove +(define-public icedove-minimal (package - (name "icedove") + (name "icedove-minimal") (version %icedove-version) (source icedove-source) (properties @@ -1547,35 +1547,6 @@ (define-public icedove Thunderbird. It supports email, news feeds, chat, calendar and contacts.") (license license:mpl2.0))) -(define-public icedove/wayland - (package - (inherit icedove) - (name "icedove-wayland") - (build-system trivial-build-system) - (arguments - (list - #:modules '((guix build utils)) - #:builder - #~(begin - (use-modules (guix build utils)) - (let* ((exe (string-append #$output "/bin/icedove"))) - (mkdir-p (dirname exe)) - (call-with-output-file exe - (lambda (port) - (format port "#!~a - MOZ_ENABLE_WAYLAND=1 exec ~a $@" - #$(file-append bash-minimal "/bin/bash") - #$(file-append icedove "/bin/icedove")))) - (chmod exe #o555) - ;; Provide the manual and .desktop file. - (copy-recursively (string-append #$icedove "/share") - (string-append #$output "/share")) - (substitute* (string-append #$output - "/share/applications/icedove.desktop") - ((#$icedove) #$output)))))) - (native-inputs '()) - (inputs '()))) - (define (make-l10n-package project version source locales) "Return a package for PROJECT, a symbol (either icecat or icedove), with their corresponding VERSION, SOURCE and LOCALES variables." @@ -1698,6 +1669,102 @@ (define-public icecat-l10n (define-public icedove-l10n (make-l10n-package 'icedove %icedove-version icedove-source %icedove-locales)) +;;; This hack exists because there's no way to configure extra extension +;;; search paths for IceCat or Icedove. The global extensions directory is +;;; constructed relatively to the executable file name. +(define (make-mozilla-with-l10n project base l10n-package) + "Return a package definition for PROJECT (a symbol such as 'icecat or +'icedove) that combines the BASE package with L10N-PACKAGE." + + (unless (member project '(icecat icedove)) + (error "only icecat or icedove components are currently supported")) + + (let ((name (symbol->string project)) + (icecat? (eq? 'icecat project))) + (package + (inherit base) + (name (symbol->string project)) + (build-system trivial-build-system) + (arguments + (list + #:modules '((guix build union) + (guix build utils)) + #:builder + #~(begin + (use-modules (guix build union) + (guix build utils)) + + (union-build #$output (list #$base #$l10n-package) + #:create-all-directories? #t) + + (define* (expose name #:optional (proc copy-file) + #:key (source #$base)) + (let ((dest (string-append #$output "/" name))) + (mkdir-p (dirname dest)) + (proc (string-append source "/" name) dest))) + + (let ((wrapper (string-append "lib/" #$name "/" #$name)) + (real-binary (string-append "lib/" #$name "/." #$name + "-real")) + (desktop-file (string-append "share/applications/" + #$name ".desktop"))) + ;; Copy wrapper file. + (delete-file (string-append #$output "/" wrapper)) + (expose wrapper) + + ;; Recreate bin symlink. + (delete-file (string-append #$output "/bin/" #$name)) + (symlink (string-append #$output "/" wrapper) + (string-append #$output "/bin/" #$name)) + + ;; Copy actual binary. + (delete-file (string-append #$output "/" real-binary)) + (expose real-binary) + + ;; Copy desktop file. + (delete-file (string-append #$output "/" desktop-file)) + (expose desktop-file) + + ;; Adjust the references in the desktop file and wrapper. + (substitute* (list (string-append #$output "/" desktop-file) + (string-append #$output "/" wrapper)) + ((#$base) #$output))))))))) + +(define-public icecat + (make-mozilla-with-l10n 'icecat icecat-minimal icecat-l10n)) + +(define-public icedove + (make-mozilla-with-l10n 'icedove icedove-minimal icedove-l10n)) + +(define-public icedove/wayland + (package + (inherit icedove) + (name "icedove-wayland") + (build-system trivial-build-system) + (arguments + (list + #:modules '((guix build utils)) + #:builder + #~(begin + (use-modules (guix build utils)) + (let* ((exe (string-append #$output "/bin/icedove"))) + (mkdir-p (dirname exe)) + (call-with-output-file exe + (lambda (port) + (format port "#!~a + MOZ_ENABLE_WAYLAND=1 exec ~a $@" + #$(file-append bash-minimal "/bin/bash") + #$(file-append icedove "/bin/icedove")))) + (chmod exe #o555) + ;; Provide the manual and .desktop file. + (copy-recursively (string-append #$icedove "/share") + (string-append #$output "/share")) + (substitute* (string-append #$output + "/share/applications/icedove.desktop") + ((#$icedove) #$output)))))) + (native-inputs '()) + (inputs '()))) + (define-public firefox-decrypt (package (name "firefox-decrypt") -- 2.39.1 From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH v4 7/9] gnu: icedove: Use the locale of the system. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sun, 19 Feb 2023 19:26:04 +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, Jonathan Brielmaier , Maxim Cournoyer Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.16768347313196 (code B ref 32026); Sun, 19 Feb 2023 19:26:04 +0000 Received: (at 32026) by debbugs.gnu.org; 19 Feb 2023 19:25:31 +0000 Received: from localhost ([127.0.0.1]:49708 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTpJS-0000pO-KF for submit@debbugs.gnu.org; Sun, 19 Feb 2023 14:25:30 -0500 Received: from mail-qt1-f181.google.com ([209.85.160.181]:34527) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTpJK-0000oA-0d for 32026@debbugs.gnu.org; Sun, 19 Feb 2023 14:25:22 -0500 Received: by mail-qt1-f181.google.com with SMTP id ay26so635458qtb.1 for <32026@debbugs.gnu.org>; Sun, 19 Feb 2023 11:25:22 -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=We/KnHelTq4id524hcfx+3Uy8UTKpCqVgv2ZC1ihBWk=; b=O1mDm0p/phISimQPD+eG9Y7FJ4jHdHTgO+M2zMytob82T+H4ALy5UR2tKqMi4wYt9v +XOX433yMmpRQ6tAfNGs0V9eme//4RBZds+hjEsiMp3QT8CEDhg/NAUDrRlFyPx+eYOs Bh13Ej+CwUuxMLt2ZkmLPsuSpIAks09NsrWHqB/AThQB9xkbh6D5vg21iwJWKzeUCQla NrZGRp8QZlv68OkwE5N/3gnwJyiGaqx9KYAvBy6NOgXQDUoJJ90dsRyUtQPQZSDiGNml WKuNKDfnAE6TFsa780aAoVSnVOAn5hY1LhoahFxrjUpoVoBX8vcmcsGKHvhkB6TCxVwY y8VQ== 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=We/KnHelTq4id524hcfx+3Uy8UTKpCqVgv2ZC1ihBWk=; b=BS/kcRfClP/cydsYvS3Q0ZOhJ+PVG6M+COwuqRadbo1H2adYnoqaaVWN+igHziyVbN OLz4UOz556RQ3RtAtWi3r475ojtj3cOY9qbwfs4d8H0qp82M0ca1bjVU6qwhiUh/D7gt S97k0uCDcPa/6ROraBL/DQ+XMYf44EFjItnsaPnYAOSJw8u73IfMIKqAcJSlNkqAxZi+ uZOXu2rBA4W1J5PtqG76Z28SReBsj6Kq15Qx+Y6b079zo38QqdTUMnsOaijtTAmt9cM+ VfQ5HYUAgCZVaWtjOiZA2wI5MMvIhxKYwAuY5KSczcGkjP8ax7Rb+gC8821MXqpr4zyV QUig== X-Gm-Message-State: AO0yUKV2zDBGR25JPJt6NZ4jIqyeuyaE20HTX1N8kk5fFjPtrfq5spDW EtqVzNaZDQ7GLElcOivXZ02I8owsRJK7rg== X-Google-Smtp-Source: AK7set/kfJ/sdnTP9TFXr9x77nJSW1tFLtBFyGlWrm+Vngn1nqJ26CHRRSvkOnY2idVRCqk8bo3nIw== X-Received: by 2002:a05:622a:315:b0:3b6:36e1:ed42 with SMTP id q21-20020a05622a031500b003b636e1ed42mr10024272qtw.9.1676834716486; Sun, 19 Feb 2023 11:25:16 -0800 (PST) Received: from localhost.localdomain (dsl-158-213.b2b2c.ca. [66.158.158.213]) by smtp.gmail.com with ESMTPSA id bz18-20020a05622a1e9200b003be56bdd3b1sm3288914qtb.92.2023.02.19.11.25.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Feb 2023 11:25:16 -0800 (PST) From: Maxim Cournoyer Date: Sun, 19 Feb 2023 14:24:03 -0500 Message-Id: <20230219192405.26549-7-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230219192405.26549-1-maxim.cournoyer@gmail.com> References: <20230219192405.26549-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gnuzilla.scm (icedove-source): Set the intl.locale.requested option to the empty string. --- (no changes since v1) gnu/packages/gnuzilla.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index ab2065054a..f12b1fd64d 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1281,7 +1281,12 @@ (define icedove-source ;; system global application directory, such as the language ;; packs. (("\"extensions.autoDisableScopes\", 15") - "\"extensions.autoDisableScopes\", 3")) + "\"extensions.autoDisableScopes\", 3") + + ;; Set the default locale to that of the operating system. + ((".*extensions.autoDisableScopes.*" anchor) + (string-append anchor + "pref(\"intl.locale.requested\", \"\");\n"))) ;; Step out of the directory and create the tarball. (chdir "..") -- 2.39.1 From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH v4 3/9] gnu: Define %icecat-base-version at the top level. Resent-From: Mark H Weaver Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sun, 19 Feb 2023 20:15:02 +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: Maxim Cournoyer , 32026@debbugs.gnu.org Cc: ludo@gnu.org, Jonathan Brielmaier , Maxim Cournoyer Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.16768376988247 (code B ref 32026); Sun, 19 Feb 2023 20:15:02 +0000 Received: (at 32026) by debbugs.gnu.org; 19 Feb 2023 20:14:58 +0000 Received: from localhost ([127.0.0.1]:49746 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTq5K-00028w-9X for submit@debbugs.gnu.org; Sun, 19 Feb 2023 15:14:58 -0500 Received: from world.peace.net ([64.112.178.59]:36048) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTq5I-00028i-HJ for 32026@debbugs.gnu.org; Sun, 19 Feb 2023 15:14:56 -0500 Received: from mhw by world.peace.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pTq5B-0003k7-4T; Sun, 19 Feb 2023 15:14:49 -0500 From: Mark H Weaver In-Reply-To: <20230219192405.26549-3-maxim.cournoyer@gmail.com> References: <20230219192405.26549-1-maxim.cournoyer@gmail.com> <20230219192405.26549-3-maxim.cournoyer@gmail.com> Date: Sun, 19 Feb 2023 15:13:55 -0500 Message-ID: <87lektct0h.fsf@netris.org> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Maxim, Maxim Cournoyer writes: > * gnu/packages/gnuzilla.scm (%icecat-base-version): New variable. > (%icecat-version): Define in terms of %icecat-base-version. > (icecat-source): Adjust to use the above newly introduced variables. What's the rationale for this? I couldn't find any uses of '%icecat-base-version' in your patch set outside of 'icecat-source'. I don't have a strong objection, but it seems unjustified. Thanks, Mark From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH v4 1/9] gnu: Add a 'update-mozilla-locales' helper for maintenance. Resent-From: Mark H Weaver Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sun, 19 Feb 2023 20:19:01 +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: Maxim Cournoyer , 32026@debbugs.gnu.org Cc: ludo@gnu.org, Jonathan Brielmaier , Maxim Cournoyer Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.16768379098666 (code B ref 32026); Sun, 19 Feb 2023 20:19:01 +0000 Received: (at 32026) by debbugs.gnu.org; 19 Feb 2023 20:18:29 +0000 Received: from localhost ([127.0.0.1]:49757 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTq8j-0002Fi-2Z for submit@debbugs.gnu.org; Sun, 19 Feb 2023 15:18:29 -0500 Received: from world.peace.net ([64.112.178.59]:36068) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTq8g-0002FT-Ob for 32026@debbugs.gnu.org; Sun, 19 Feb 2023 15:18:26 -0500 Received: from mhw by world.peace.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pTq8Z-0003ly-F7; Sun, 19 Feb 2023 15:18:19 -0500 From: Mark H Weaver In-Reply-To: <20230219192405.26549-1-maxim.cournoyer@gmail.com> References: <20230219192405.26549-1-maxim.cournoyer@gmail.com> Date: Sun, 19 Feb 2023 15:17:27 -0500 Message-ID: <87ilfxcsul.fsf@netris.org> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Maxim, Maxim Cournoyer writes: > * gnu/packages/gnuzilla.scm (update-mozilla-locales): New procedure. > (all-mozilla-locales): Comment how to proceed to update it. The second line above should be removed to reflect the updated patch. > +(define (update-mozilla-locales changesets.json) > + "Output a new list of Mozilla locales, to update the ALL-MOZILLA-LOCALES > +variable defined bellow. It requires guile-json to be installed." s/bellow/below/ Otherwise, it looks good to me. Thanks! Mark From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH v4 3/9] gnu: Define %icecat-base-version at the top level. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sun, 19 Feb 2023 22:15:02 +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: Mark H Weaver Cc: 32026@debbugs.gnu.org, ludo@gnu.org, Jonathan Brielmaier Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.16768448786850 (code B ref 32026); Sun, 19 Feb 2023 22:15:02 +0000 Received: (at 32026) by debbugs.gnu.org; 19 Feb 2023 22:14:38 +0000 Received: from localhost ([127.0.0.1]:49852 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTrx7-0001mQ-QD for submit@debbugs.gnu.org; Sun, 19 Feb 2023 17:14:38 -0500 Received: from mail-qt1-f176.google.com ([209.85.160.176]:38437) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTrx6-0001mB-9M for 32026@debbugs.gnu.org; Sun, 19 Feb 2023 17:14:36 -0500 Received: by mail-qt1-f176.google.com with SMTP id f1so800750qtb.5 for <32026@debbugs.gnu.org>; Sun, 19 Feb 2023 14:14:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=cuVa+mb8P08SUlMMBLcjaQHRnpvLvAbDffk0GI4mcAE=; b=m6Uq29ejC8CrxSWq9WTdzavGXGWzgrc8Np/pIE7+ga3bO31HOnwVl0fn0uITmuq+Zg rmeD132SZrVCtcG8nch+SajX6BEU+Pkl/lGUPfNQYWTa2mRQ3jomkYmWWHLakjJOgACx 8QaT2Kv/H6F8JZn3UcbRUwGSKcZpDFYe+YR6i8Gkmy5gEP+LMgf35qfjJ+WmoUrWduSj ecWyHN+KQbHEKqKMLhIqo5Vf7uM1rVcNsGStvCIAIFMBMZC+UmhJh9OFFmEg0FAPG/ic odV64lbu/LxdaoYX91QGiIKfkKVB0LPi36QMh1lkf20mr9Ym9Rtl76hriH9dOWzyTxue +URQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=cuVa+mb8P08SUlMMBLcjaQHRnpvLvAbDffk0GI4mcAE=; b=WRfXy7y25w2gVj+ofH2CBRT6RTOC/UO16mwWMKWi29S2JIjAkgWHyZwcxt3Yee84Ph a+HH2woZVMK+W9+cQxgE9FVsgoAsU0tVwAWOfETEt1cXf3q85mN7kkRM9A1lr9Hf0h+r 7VnG3qKAOS73Xtpq4EOmZ2plmCYqaA38uRlIVuMEJD8bGq7ZA62oItzPVqXwW4EpNukH 0YOsVlaYNfKVhaUk5fJwxuMANnUk3u2Pd2ZgTvIr6LKjFJICLLElsm9/+KaxbuVlyNbv aIRz4EWXGF3a/I9ej6ojx5MFv/U61nCZkBFj9Wta80fLyGvK0FSNbw66DL0bvN+yR+Pt AlBA== X-Gm-Message-State: AO0yUKXaT9TmA88mle4Yniu8rdPqfYIoIuxRGRKr/D+xsMMu/B66L7OV /pBy17ojvGPni40wGKuUW5RUsCPugxFq9A== X-Google-Smtp-Source: AK7set/o9L1ynrNDFzNSk3yoyCz/qsi7/q7KE+MeKRy9HMa7hsYvd4wjk0awidwzOflS/1I+dOFN4g== X-Received: by 2002:a05:622a:1ce:b0:3b9:b4b5:4b7a with SMTP id t14-20020a05622a01ce00b003b9b4b54b7amr16511048qtw.11.1676844870626; Sun, 19 Feb 2023 14:14:30 -0800 (PST) Received: from hurd (dsl-158-213.b2b2c.ca. [66.158.158.213]) by smtp.gmail.com with ESMTPSA id p71-20020a37424a000000b0073b275607f0sm7918714qka.65.2023.02.19.14.14.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Feb 2023 14:14:30 -0800 (PST) From: Maxim Cournoyer References: <20230219192405.26549-1-maxim.cournoyer@gmail.com> <20230219192405.26549-3-maxim.cournoyer@gmail.com> <87lektct0h.fsf@netris.org> Date: Sun, 19 Feb 2023 17:14:29 -0500 In-Reply-To: <87lektct0h.fsf@netris.org> (Mark H. Weaver's message of "Sun, 19 Feb 2023 15:13:55 -0500") Message-ID: <877cwdnvzu.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Mark, Mark H Weaver writes: > Hi Maxim, > > Maxim Cournoyer writes: >> * gnu/packages/gnuzilla.scm (%icecat-base-version): New variable. >> (%icecat-version): Define in terms of %icecat-base-version. >> (icecat-source): Adjust to use the above newly introduced variables. > > What's the rationale for this? I couldn't find any uses of > '%icecat-base-version' in your patch set outside of 'icecat-source'. > I don't have a strong objection, but it seems unjustified. > > Thanks, > Mark Not much anymore, but I just thought it was cleaner than having to do (base-version (first (string-split %icecat-version #\-))) later on to retrieve this information. -- Thanks, Maxim From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH v4 1/9] gnu: Add a 'update-mozilla-locales' helper for maintenance. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sun, 19 Feb 2023 23:18:02 +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: Mark H Weaver Cc: 32026@debbugs.gnu.org, ludo@gnu.org, Jonathan Brielmaier Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.16768486738770 (code B ref 32026); Sun, 19 Feb 2023 23:18:02 +0000 Received: (at 32026) by debbugs.gnu.org; 19 Feb 2023 23:17:53 +0000 Received: from localhost ([127.0.0.1]:49934 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTswL-0002HO-9L for submit@debbugs.gnu.org; Sun, 19 Feb 2023 18:17:53 -0500 Received: from mail-qt1-f181.google.com ([209.85.160.181]:39743) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTswK-0002H8-HC for 32026@debbugs.gnu.org; Sun, 19 Feb 2023 18:17:52 -0500 Received: by mail-qt1-f181.google.com with SMTP id i5so952709qtw.6 for <32026@debbugs.gnu.org>; Sun, 19 Feb 2023 15:17:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=hWbH0/kEQHH5Ub+xYq9NQSqrDyZ+anDwVwhffIXcEFU=; b=FA1V+YWl/AsfHX2MoptUpwzRKL4Egvjrgwybj6nLGCs32SWfJU6TV2+HLu3+moJueM /BZEg6aM0nmCQpxKr+iywh21g8go2aeAHNDuMkByUV2rOtsF4aoBZGDaZ4rg5NOt2C1m ylClo5heXtKTw3MEkjrA/YseY3Qj2NxLnGjYQ2pfLM0Vr4GWkoqwskSwjMuSo1sdb2lr F/OG4aP/Rmz8zmzdxRschLwkj2vcp4dMHlrNYMZwvWcV/5iwZP1rFeBge1PH8DQsHUCw HUEn0FJQRCohnIukcCLqFaqCDukjWBhKxA5VMYQD4bt5Rfcnz03Acg/8ZYg4vudKHE5W WiCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=hWbH0/kEQHH5Ub+xYq9NQSqrDyZ+anDwVwhffIXcEFU=; b=Dgcg68E5WLqtAGwmdc3PIFocyn/gdZpXEppYcws/sNcDwppbIv672TYgn4sLWnaD7r czWKmcI4czEZc1ZqBd832S3fdcOXvohNokXZKdajTRLBW5JdqJwSsdBjwaeMLBzoOYWo iJxLbAgOeFVl0ygipsKMZ2oJkQpJXkeSMqGoTSreaOnIk08el8a8jVXESwgJGoFMzCGE NnThetk8tHneRNgtFrAsNskVGpTHIs/RUQ5+LT4zrJ4/TipVWECv8oN905PXrz0apKGV cnRV+VzkZQBuxYXwQIYIqWn7CJXmEFeXzMCJHLb6al9EIK8s4bIGSYpj5i0HvtgozLAt MexA== X-Gm-Message-State: AO0yUKUy1IidUiHQluoM1sOZJVer3WGRANT16TElbcUwHtA4xkONrFzX oqUddPZnAKnYYyg+v9SJTRQs0fm+D6v4fQ== X-Google-Smtp-Source: AK7set8L5Vo/Ibn8AWYHVzMESwuud951qp/wc4re+VXwcbqT/M5hMDCponFd6xVqSQ5btpPqjZEcLA== X-Received: by 2002:a05:622a:1310:b0:3b9:c153:f169 with SMTP id v16-20020a05622a131000b003b9c153f169mr9423608qtk.0.1676848666934; Sun, 19 Feb 2023 15:17:46 -0800 (PST) Received: from hurd (dsl-158-213.b2b2c.ca. [66.158.158.213]) by smtp.gmail.com with ESMTPSA id i188-20020a3786c5000000b0071d0f1d01easm8001887qkd.57.2023.02.19.15.17.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Feb 2023 15:17:46 -0800 (PST) From: Maxim Cournoyer References: <20230219192405.26549-1-maxim.cournoyer@gmail.com> <87ilfxcsul.fsf@netris.org> Date: Sun, 19 Feb 2023 18:17:45 -0500 In-Reply-To: <87ilfxcsul.fsf@netris.org> (Mark H. Weaver's message of "Sun, 19 Feb 2023 15:17:27 -0500") Message-ID: <873571nt2e.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi! Mark H Weaver writes: > Hi Maxim, > > Maxim Cournoyer writes: >> * gnu/packages/gnuzilla.scm (update-mozilla-locales): New procedure. >> (all-mozilla-locales): Comment how to proceed to update it. > > The second line above should be removed to reflect the updated patch. > >> +(define (update-mozilla-locales changesets.json) >> + "Output a new list of Mozilla locales, to update the ALL-MOZILLA-LOCALES >> +variable defined bellow. It requires guile-json to be installed." > > s/bellow/below/ > > Otherwise, it looks good to me. Adjusted locally, thanks! -- Thanks, Maxim From unknown Tue Sep 09 00:44:18 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) Subject: bug#32026: closed (Re: [PATCH 03/10] gnu: Define UPSTREAM-FIREFOX-SOURCE at the top level.) Message-ID: References: <87wn4dm9g8.fsf@gmail.com> <87po06puwt.fsf@gnu.org> X-Gnu-PR-Message: they-closed 32026 X-Gnu-PR-Package: guix Reply-To: 32026@debbugs.gnu.org Date: Mon, 20 Feb 2023 01:07:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1676855222-19723-1" This is a multi-part message in MIME format... ------------=_1676855222-19723-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #32026: IceCat locales are missing? which was filed against the guix package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 32026@debbugs.gnu.org. --=20 32026: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D32026 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1676855222-19723-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 32026-done) by debbugs.gnu.org; 20 Feb 2023 01:06:56 +0000 Received: from localhost ([127.0.0.1]:50003 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTuds-00057o-9T for submit@debbugs.gnu.org; Sun, 19 Feb 2023 20:06:56 -0500 Received: from mail-qt1-f170.google.com ([209.85.160.170]:36364) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTudq-00057b-NX for 32026-done@debbugs.gnu.org; Sun, 19 Feb 2023 20:06:55 -0500 Received: by mail-qt1-f170.google.com with SMTP id x1so547757qtw.3 for <32026-done@debbugs.gnu.org>; Sun, 19 Feb 2023 17:06:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=Vpw6U5DXT+92B59ac6ERpSjyi4bhZWX2SJlpQEGVDGA=; b=qCW308K4mFBCDfgJADBFQcRCDygSdOMHZ4pKS4tuclGx3J2Cq1lDRA0QWLGinOR8W/ NOPx3bLpyq4Gk22vN8LLjWG8BpojvZqTTGgiGFXy1Sj+lDJd6uxnonIDrbLg9IoHG0+w yy9RA/MZfBcXhacdSw842uHJQKarlG4hzKWDCqCk+XoNHOPNaME5XYQ+CiN+dlB6/5Ju 51wxNhrsgH3hMQqC1OJI40JiYL7RDEfWwzb82iQ+RAsTFi5yjbC1ZdOAFRCCTm/hHqLy xXE6zX10J3bIlYNgUigSxE0/Y51OQVp5GJ/KgplNZqdJ+vEn7Wl2Kc1UF2lcqByUAIVV TiHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=Vpw6U5DXT+92B59ac6ERpSjyi4bhZWX2SJlpQEGVDGA=; b=WWWMgBK3EkG4N6b0TC1xYm0oPAduZ+ANgG05gf54ijG47odhcEJnfyMAxIOUvBQEXg sUtKQfZfGXMwQTdiYiAHSE0r5kbKwXzkAxyt2avtBMYL2Bz5+g7+xpdCUVmqCruL9P6z GfMuq4jAi5lHq++6k5iMNd4dTvqxQs38nhBCTD1JQY1sS364GpN41diTQRWqcAvDE2el TepPdIt8/nzEarMFFx6zbKRhbIOHH6yJylVMXOhBddK1ewjz49cA7Wi8xfdSoRwz6sFv obTs3kjvvdL03ZfasqvL8p90QYJBDR4Ft5ppIenkiAWNHFzWTWUv1g1mw1ZYda7LO7kE 3bSA== X-Gm-Message-State: AO0yUKWlXUB86MFqx/5fN0fhTD2prUeWt3z2WXTrTqkBnUV3UEK11u0w K5C720J+JvnthG/AbKPC14s= X-Google-Smtp-Source: AK7set/ACa5cyWj4jwGKW/x0HwnUuwLQUAIze0A3L+vb5Ju9/rDWF1qGjZNj+efuIVKVqKgeyvJqIw== X-Received: by 2002:ac8:7d12:0:b0:3b8:58d0:b4d8 with SMTP id g18-20020ac87d12000000b003b858d0b4d8mr14530800qtb.48.1676855209281; Sun, 19 Feb 2023 17:06:49 -0800 (PST) Received: from hurd (dsl-158-213.b2b2c.ca. [66.158.158.213]) by smtp.gmail.com with ESMTPSA id b14-20020ac801ce000000b003b880ef08acsm7856120qtg.35.2023.02.19.17.06.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Feb 2023 17:06:48 -0800 (PST) From: Maxim Cournoyer To: Mark H Weaver Subject: Re: [PATCH 03/10] gnu: Define UPSTREAM-FIREFOX-SOURCE at the top level. References: <20230216043649.32119-1-maxim.cournoyer@gmail.com> <20230216043649.32119-3-maxim.cournoyer@gmail.com> <87h6vlfdq0.fsf@netris.org> <87pma9t2z7.fsf@gmail.com> <875yby1z2d.fsf@netris.org> Date: Sun, 19 Feb 2023 20:06:47 -0500 In-Reply-To: <875yby1z2d.fsf@netris.org> (Mark H. Weaver's message of "Sat, 18 Feb 2023 15:46:23 -0500") Message-ID: <87wn4dm9g8.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 32026-done Cc: 32026-done@debbugs.gnu.org, ludo@gnu.org, Jonathan Brielmaier X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Mark, I believe I've addressed all your comments; I've now pushed the series to master (taking care to update the gnuzilla commit to f23f8b6 for the language pack reproducibility fix). Thank you for the review, and let me know if I missed anything! Closing. -- Thanks, Maxim ------------=_1676855222-19723-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 1 Jul 2018 20:23:43 +0000 Received: from localhost ([127.0.0.1]:42403 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fZisp-00068l-AX for submit@debbugs.gnu.org; Sun, 01 Jul 2018 16:23:43 -0400 Received: from eggs.gnu.org ([208.118.235.92]:56603) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fZisl-00068R-UT for submit@debbugs.gnu.org; Sun, 01 Jul 2018 16:23:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZisg-0006Ur-3Q for submit@debbugs.gnu.org; Sun, 01 Jul 2018 16:23:34 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:35591) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fZisg-0006Uj-0v for submit@debbugs.gnu.org; Sun, 01 Jul 2018 16:23:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47574) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZisf-0007FG-7J for bug-guix@gnu.org; Sun, 01 Jul 2018 16:23:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZise-0006TU-Al for bug-guix@gnu.org; Sun, 01 Jul 2018 16:23:33 -0400 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:45534) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZise-0006TO-7K for bug-guix@gnu.org; Sun, 01 Jul 2018 16:23:32 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=50538 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1fZisd-0007J1-Rr for bug-guix@gnu.org; Sun, 01 Jul 2018 16:23:32 -0400 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: bug-guix@gnu.org Subject: IceCat locales are missing? X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 13 Messidor an 226 de la =?utf-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Sun, 01 Jul 2018 22:23:30 +0200 Message-ID: <87po06puwt.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -6.0 (------) Hello Guix, As of e96ba83faed499b7d6fc4ed984d40a6f74d549cc, IceCat appears to lack localized message catalogs altogether. ISTR Mozilla distributes them separately. Perhaps we should package them somehow? Ludo=E2=80=99. ------------=_1676855222-19723-1-- From unknown Tue Sep 09 00:44:18 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: ng0 Subject: bug#25504: closed (Re: [PATCH 03/10] gnu: Define UPSTREAM-FIREFOX-SOURCE at the top level.) Message-ID: References: <87wn4dm9g8.fsf@gmail.com> <8737gcbde9.fsf@wasp.i-did-not-set--mail-host-address--so-tickle-me> X-Gnu-PR-Message: they-closed 25504 X-Gnu-PR-Package: guix Reply-To: 25504@debbugs.gnu.org Date: Mon, 20 Feb 2023 01:07:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1676855222-19723-3" This is a multi-part message in MIME format... ------------=_1676855222-19723-3 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #32026: icecat language packs which was filed against the guix package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 25504@debbugs.gnu.org. --=20 32026: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D32026 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1676855222-19723-3 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 32026-done) by debbugs.gnu.org; 20 Feb 2023 01:06:56 +0000 Received: from localhost ([127.0.0.1]:50003 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTuds-00057o-9T for submit@debbugs.gnu.org; Sun, 19 Feb 2023 20:06:56 -0500 Received: from mail-qt1-f170.google.com ([209.85.160.170]:36364) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTudq-00057b-NX for 32026-done@debbugs.gnu.org; Sun, 19 Feb 2023 20:06:55 -0500 Received: by mail-qt1-f170.google.com with SMTP id x1so547757qtw.3 for <32026-done@debbugs.gnu.org>; Sun, 19 Feb 2023 17:06:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=Vpw6U5DXT+92B59ac6ERpSjyi4bhZWX2SJlpQEGVDGA=; b=qCW308K4mFBCDfgJADBFQcRCDygSdOMHZ4pKS4tuclGx3J2Cq1lDRA0QWLGinOR8W/ NOPx3bLpyq4Gk22vN8LLjWG8BpojvZqTTGgiGFXy1Sj+lDJd6uxnonIDrbLg9IoHG0+w yy9RA/MZfBcXhacdSw842uHJQKarlG4hzKWDCqCk+XoNHOPNaME5XYQ+CiN+dlB6/5Ju 51wxNhrsgH3hMQqC1OJI40JiYL7RDEfWwzb82iQ+RAsTFi5yjbC1ZdOAFRCCTm/hHqLy xXE6zX10J3bIlYNgUigSxE0/Y51OQVp5GJ/KgplNZqdJ+vEn7Wl2Kc1UF2lcqByUAIVV TiHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=Vpw6U5DXT+92B59ac6ERpSjyi4bhZWX2SJlpQEGVDGA=; b=WWWMgBK3EkG4N6b0TC1xYm0oPAduZ+ANgG05gf54ijG47odhcEJnfyMAxIOUvBQEXg sUtKQfZfGXMwQTdiYiAHSE0r5kbKwXzkAxyt2avtBMYL2Bz5+g7+xpdCUVmqCruL9P6z GfMuq4jAi5lHq++6k5iMNd4dTvqxQs38nhBCTD1JQY1sS364GpN41diTQRWqcAvDE2el TepPdIt8/nzEarMFFx6zbKRhbIOHH6yJylVMXOhBddK1ewjz49cA7Wi8xfdSoRwz6sFv obTs3kjvvdL03ZfasqvL8p90QYJBDR4Ft5ppIenkiAWNHFzWTWUv1g1mw1ZYda7LO7kE 3bSA== X-Gm-Message-State: AO0yUKWlXUB86MFqx/5fN0fhTD2prUeWt3z2WXTrTqkBnUV3UEK11u0w K5C720J+JvnthG/AbKPC14s= X-Google-Smtp-Source: AK7set/ACa5cyWj4jwGKW/x0HwnUuwLQUAIze0A3L+vb5Ju9/rDWF1qGjZNj+efuIVKVqKgeyvJqIw== X-Received: by 2002:ac8:7d12:0:b0:3b8:58d0:b4d8 with SMTP id g18-20020ac87d12000000b003b858d0b4d8mr14530800qtb.48.1676855209281; Sun, 19 Feb 2023 17:06:49 -0800 (PST) Received: from hurd (dsl-158-213.b2b2c.ca. [66.158.158.213]) by smtp.gmail.com with ESMTPSA id b14-20020ac801ce000000b003b880ef08acsm7856120qtg.35.2023.02.19.17.06.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Feb 2023 17:06:48 -0800 (PST) From: Maxim Cournoyer To: Mark H Weaver Subject: Re: [PATCH 03/10] gnu: Define UPSTREAM-FIREFOX-SOURCE at the top level. References: <20230216043649.32119-1-maxim.cournoyer@gmail.com> <20230216043649.32119-3-maxim.cournoyer@gmail.com> <87h6vlfdq0.fsf@netris.org> <87pma9t2z7.fsf@gmail.com> <875yby1z2d.fsf@netris.org> Date: Sun, 19 Feb 2023 20:06:47 -0500 In-Reply-To: <875yby1z2d.fsf@netris.org> (Mark H. Weaver's message of "Sat, 18 Feb 2023 15:46:23 -0500") Message-ID: <87wn4dm9g8.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 32026-done Cc: 32026-done@debbugs.gnu.org, ludo@gnu.org, Jonathan Brielmaier X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Mark, I believe I've addressed all your comments; I've now pushed the series to master (taking care to update the gnuzilla commit to f23f8b6 for the language pack reproducibility fix). Thank you for the review, and let me know if I missed anything! Closing. -- Thanks, Maxim ------------=_1676855222-19723-3 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 21 Jan 2017 17:31:40 +0000 Received: from localhost ([127.0.0.1]:37702 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cUzVs-0005gR-45 for submit@debbugs.gnu.org; Sat, 21 Jan 2017 12:31:40 -0500 Received: from eggs.gnu.org ([208.118.235.92]:52853) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cUyGM-0003p6-C9 for submit@debbugs.gnu.org; Sat, 21 Jan 2017 11:11:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cUyGG-0005Om-52 for submit@debbugs.gnu.org; Sat, 21 Jan 2017 11:11:29 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:60898) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cUyGG-0005OZ-1M for submit@debbugs.gnu.org; Sat, 21 Jan 2017 11:11:28 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43818) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cUyGE-0007NB-JZ for bug-guix@gnu.org; Sat, 21 Jan 2017 11:11:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cUyGB-0005LF-DV for bug-guix@gnu.org; Sat, 21 Jan 2017 11:11:26 -0500 Received: from perdizione.investici.org ([2001:41d0:2:33d0::19]:30989) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cUyGB-0005K0-3e for bug-guix@gnu.org; Sat, 21 Jan 2017 11:11:23 -0500 Received: from [94.23.50.208] (perdizione [94.23.50.208]) (Authenticated sender: niasterisk@grrlz.net) by localhost (Postfix) with ESMTPSA id 24B101200E3 for ; Sat, 21 Jan 2017 16:11:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cryptolab.net; s=stigmate; t=1485015081; bh=uW0ld3zR/ZQm6nj0oouYMrosv32LozYcwpJl9vtOyUA=; h=From:To:Subject:Date; b=QWcKsg7Bkv+zOPqdrDPrJ/6WwUqJkm6bpxQcKkbneH7JkPrRSbcZuTfSrtM6dNZql NnGAy96dFXDJlGa0xvSZjv1H8GqNudlbXHF3xkL+KwcIzBeQRhddXgV2f4gP6mvyZY /UYxBUVp3mxIgVrBA+EZfc1Q2lS8DvaamnnbXDao= From: ng0 To: bug-guix@gnu.org Subject: icecat language packs Date: Sat, 21 Jan 2017 16:12:30 +0000 Message-ID: <8737gcbde9.fsf@wasp.i-did-not-set--mail-host-address--so-tickle-me> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.1 (----) X-Debbugs-Envelope-To: submit X-Mailman-Approved-At: Sat, 21 Jan 2017 12:31:38 -0500 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.1 (----) We should include the language packages icecat provides. I haven't looked into this too much, and I'm not familar with application localization in Guix, if there are any mechanisms in place for this already. --=20 =E2=99=A5=E2=92=B6 ng0 -- https://www.inventati.org/patternsinthechaos/ ------------=_1676855222-19723-3-- From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH v4 1/9] gnu: Add a 'update-mozilla-locales' helper for maintenance. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Mon, 20 Feb 2023 11:07:01 +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: Maxim Cournoyer Cc: mhw@netris.org, 32026@debbugs.gnu.org, Jonathan Brielmaier Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.167689121617852 (code B ref 32026); Mon, 20 Feb 2023 11:07:01 +0000 Received: (at 32026) by debbugs.gnu.org; 20 Feb 2023 11:06:56 +0000 Received: from localhost ([127.0.0.1]:50649 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pU40V-0004ds-Qe for submit@debbugs.gnu.org; Mon, 20 Feb 2023 06:06:56 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33710) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pU40T-0004de-Kc for 32026@debbugs.gnu.org; Mon, 20 Feb 2023 06:06:54 -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 1pU40N-0005FG-RB; Mon, 20 Feb 2023 06:06:47 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=eDYKWz+2rQ9IxueXH+YL3hSZO/eY+7J/VqpJpGVeExQ=; b=TE/VLACE2tIQ2yNOiBuT LgNu3CMCKXWrxogVBWl+IYWdxrvpnU87rTGxf+bVHfSqHOBonskL60PJHP7vk3mbJTfG8QG9kq1Fq Ki/iePbCiOj+ik2TGoXaI8xzU8hjfFm9G/Lqi3IrzjN9RGfVVOyXrRq9RQN9TjN8crab0YBwG7lyh IOkyzSzrYbZExNj/y5FBtMdf9+m3a9ZdYkqF90iD4k12Hrg9hGd7u0doziQosusXMf38zP12xZ1zC NnNB43X9NmOj+aIe3k+vwPVz8nl/lkBLiyXx8O9POKxjk5EXcbxzny7Lg4gIj9NqGH0EVOqVdVDZQ qPmfIsU1dm4QrQ==; Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pU40M-0006XZ-Q5; Mon, 20 Feb 2023 06:06:47 -0500 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <20230219192405.26549-1-maxim.cournoyer@gmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: Duodi 2 =?UTF-8?Q?Vent=C3=B4se?= an 231 de la =?UTF-8?Q?R=C3=A9volution,?= jour du Cornouiller X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Mon, 20 Feb 2023 12:06:44 +0100 In-Reply-To: <20230219192405.26549-1-maxim.cournoyer@gmail.com> (Maxim Cournoyer's message of "Sun, 19 Feb 2023 14:23:57 -0500") Message-ID: <87edqkiojf.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hey Maxim, Thanks a lot for working on this! Having locales available makes a big difference to many users. (A couple of years ago I started working on that for the LibreOffice package. I got quite far but didn=E2=80=99t complete it. I can dig that f= rom my stashes if there=E2=80=99s interest in giving a hand.) Ludo=E2=80=99. From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH v4 1/9] gnu: Add a 'update-mozilla-locales' helper for maintenance. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Mon, 20 Feb 2023 15:36:02 +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: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: mhw@netris.org, 32026@debbugs.gnu.org, Jonathan Brielmaier Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.16769073362376 (code B ref 32026); Mon, 20 Feb 2023 15:36:02 +0000 Received: (at 32026) by debbugs.gnu.org; 20 Feb 2023 15:35:36 +0000 Received: from localhost ([127.0.0.1]:53280 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pU8CV-0000cG-Rt for submit@debbugs.gnu.org; Mon, 20 Feb 2023 10:35:36 -0500 Received: from mail-qt1-f169.google.com ([209.85.160.169]:39457) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pU8CQ-0000bw-Ql for 32026@debbugs.gnu.org; Mon, 20 Feb 2023 10:35:34 -0500 Received: by mail-qt1-f169.google.com with SMTP id w23so1100410qtn.6 for <32026@debbugs.gnu.org>; Mon, 20 Feb 2023 07:35:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=Wg7CIaFXj8DRjYacZ/VseBJhHSWtp7hdlRJjwg3OJaU=; b=lXXV4N3GAUcDJVifywLGjCu0TjTHwFVsd4nkWD2hMHJbaQfpSAhKvUXzDzYnFJTqaj kAx/WE05fuiFEqyFBygYbovOu6/Xr5TWMu9v2N9l3+2dw0lU1v9tgu/b9f+2H25Tl8lJ qcVO9wDMSDyHZeEnUTLjAnDQZWXG78+7oN5F0/m3xvI/0H2Bp88Bl1twudOiZyQk74yi 1bqwh6FEAs2kpLxT80qHvRDFbK/BD1ynez410HWthXUqBqsjIniWYtSrT7J62lakrR4g Mn6Geu7hDCfzMR1KqY2TaGk7sCQWiRWhdab6fvuggIsAblYkQiaqjTSQgANl3d0IsOKZ r+vQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=Wg7CIaFXj8DRjYacZ/VseBJhHSWtp7hdlRJjwg3OJaU=; b=3sod3CTzgc5uF98WWaV8jJpRZ3XOj7yZa4R6n8Mw8oBcADjO171eSXyU2EWV1q0lht pjTgbtpVfr7wTpJxC8LSEmHq+qydRd40+AVJmh2jj5jLoBDu5LMDK3I168P/utSh6TQF EkfuTQ7MluCGCc+sElWS7gNag3PYn8YJqQJVh8Tm6Ec3m3ene4XkEBJI4mxUjX8zb5SR bcTTAmy74dNjbEk8QjlH/ALRK2EILnBYhqBycFusD+M1LDImig720mAZZvYdVwsbMiuH rRtOJJI8fTuZ2v90lPYcOTRsZJlPXEjaVB5ISiad/xzLhWUXiOOD3f0S89HRat1XZSyW G/Fg== X-Gm-Message-State: AO0yUKVZUXYFS9TUsHZytE1CjFg4EiP3yuP2cPProSzGCfRzm9trS3BR XyIJGNcIzgEug1mQgRaLlTc= X-Google-Smtp-Source: AK7set/mYKZMpoQKiU4fnZQysx5RFnFVB2brv7ugVh4w9kAEfTHvMR/93pise/3bLYhPbUeqJBlt/g== X-Received: by 2002:a05:622a:409:b0:3a9:818f:db3d with SMTP id n9-20020a05622a040900b003a9818fdb3dmr18924212qtx.53.1676907325148; Mon, 20 Feb 2023 07:35:25 -0800 (PST) Received: from hurd ([2607:fad8:4:3::1001]) by smtp.gmail.com with ESMTPSA id ey17-20020a05622a4c1100b003b86b088755sm502896qtb.15.2023.02.20.07.35.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Feb 2023 07:35:24 -0800 (PST) From: Maxim Cournoyer References: <20230219192405.26549-1-maxim.cournoyer@gmail.com> <87edqkiojf.fsf@gnu.org> Date: Mon, 20 Feb 2023 10:35:23 -0500 In-Reply-To: <87edqkiojf.fsf@gnu.org> ("Ludovic =?UTF-8?Q?Court=C3=A8s?="'s message of "Mon, 20 Feb 2023 12:06:44 +0100") Message-ID: <87y1osl58k.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Ludovic, Ludovic Court=C3=A8s writes: > Hey Maxim, > > Thanks a lot for working on this! Having locales available makes a big > difference to many users. > > (A couple of years ago I started working on that for the LibreOffice > package. I got quite far but didn=E2=80=99t complete it. I can dig that= from > my stashes if there=E2=80=99s interest in giving a hand.) I'd be interested to pick it up, yes! Perhaps not in the coming 2 weeks, which will be very busy for me, but afterward. --=20 Thanks, Maxim From unknown Tue Sep 09 00:44:18 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32026: LibreOffice locales Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Wed, 22 Feb 2023 09:20:02 +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: Maxim Cournoyer Cc: mhw@netris.org, 32026@debbugs.gnu.org, Jonathan Brielmaier Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.167705757430056 (code B ref 32026); Wed, 22 Feb 2023 09:20:02 +0000 Received: (at 32026) by debbugs.gnu.org; 22 Feb 2023 09:19:34 +0000 Received: from localhost ([127.0.0.1]:57963 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pUlHi-0007oh-1X for submit@debbugs.gnu.org; Wed, 22 Feb 2023 04:19:34 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38102) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pUlHd-0007oS-Q4 for 32026@debbugs.gnu.org; Wed, 22 Feb 2023 04:19:32 -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 1pUlHX-0005LO-Qs; Wed, 22 Feb 2023 04:19:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=DstiBUmV+bm+OtDLMqR6WFnOU5lcOUxxNUHfl/OuS1w=; b=AoEkg6j4Kf7tMfLET1+f HUX/WqBGXdZ7USODCUDwCW6kKl1ktihXXnc+OQMPg5V0I16RTdQJGftTHSuoMZJc1zUU+Z29nHfeE yT9VO0DxILIh7sdHganbQmCRIiAWAeFFHyRcr8+QJ1IsbI7qp2FEyP707yMogJYCfg8TJUZKsYnX8 nzkrVaCEzSOE9nYmVpVfVMavfkloMMhh9Mj4j74tY854IZ97ab4dyrZoUBGkQUEmrFcZkYQUc2CAS PmUKBbQkxPbOTH8r49VyLIp2/K9q8Qw8vujmaPyOQoZUaWPizAh4piXMcqP1P1ysc9Y1c+qKM6VNg 8esyJ/poM+/e4A==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pUlHX-0006xO-Df; Wed, 22 Feb 2023 04:19:23 -0500 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <20230219192405.26549-1-maxim.cournoyer@gmail.com> <87edqkiojf.fsf@gnu.org> <87y1osl58k.fsf@gmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: Quartidi 4 =?UTF-8?Q?Vent=C3=B4se?= an 231 de la =?UTF-8?Q?R=C3=A9volution,?= jour du =?UTF-8?Q?Tro=C3=A8ne?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Wed, 22 Feb 2023 10:19:21 +0100 In-Reply-To: <87y1osl58k.fsf@gmail.com> (Maxim Cournoyer's message of "Mon, 20 Feb 2023 10:35:23 -0500") Message-ID: <87mt569hwm.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi! Maxim Cournoyer skribis: > Ludovic Court=C3=A8s writes: [...] >> (A couple of years ago I started working on that for the LibreOffice >> package. I got quite far but didn=E2=80=99t complete it. I can dig tha= t from >> my stashes if there=E2=80=99s interest in giving a hand.) > > I'd be interested to pick it up, yes! Perhaps not in the coming 2 > weeks, which will be very busy for me, but afterward. Here=E2=80=99s the WIP patch and associated LibreOffice patch (which didn= =E2=80=99t quite work for some reason: LO wouldn=E2=80=99t look for locales where I wa= nted it to.) Ludo=E2=80=99. --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Unstaged modified gnu/packages/libreoffice.scm @@ -6,7 +6,7 @@ ;;; Copyright =C2=A9 2017 Thomas Danckaert ;;; Copyright =C2=A9 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright =C2=A9 2017 Andy Wingo -;;; Copyright =C2=A9 2017, 2018 Ludovic Court=C3=A8s +;;; Copyright =C2=A9 2017, 2018, 2019 Ludovic Court=C3=A8s ;;; Copyright =C2=A9 2017, 2018, 2019 Marius Bakke ;;; Copyright =C2=A9 2017 Rutger Helling ;;; Copyright =C2=A9 2018, 2019 Ricardo Wurmus @@ -53,6 +53,7 @@ (define-module (gnu packages libreoffice) #:use-module (gnu packages documentation) #:use-module (gnu packages flex) #:use-module (gnu packages fontutils) + #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gl) #:use-module (gnu packages glib) @@ -969,7 +970,8 @@ (define-public libreoffice "0apbmammmp4pk473xiv5vk50r4c5gjvqzf9jkficksvz58q= 6114f")))) (search-patches "libreoffice-boost.patch" "libreoffice-icu.patch" - "libreoffice-glm.patch"))) + "libreoffice-glm.patch" + "libreoffice-locale-directory.patch"))) (modules '((guix build utils))) (snippet '(begin @@ -1164,6 +1166,16 @@ (define (install-appdata app) "--disable-pdfium" "--disable-gtk" ; disable use of GTK+ 2 "--without-doxygen"))) + + (native-search-paths + ;; This Guix-specific environment variable tells LibreOffice where to + ;; find locale data as provided by the 'libreoffice-translation-*' + ;; packages. + (list (search-path-specification + (variable "LO_LOCALE_DIRECTORY") + (separator #f) + (files '("share/libreoffice/locale"))))) + (home-page "https://www.libreoffice.org/") (synopsis "Office suite") (description "LibreOffice is a comprehensive office suite. It contains @@ -1172,3 +1184,84 @@ (define (install-appdata app) flowcharting application; Base, a database and database frontend; Math for editing mathematics.") (license mpl2.0))) + +(define (libreoffice-translation language) + (package + (inherit libreoffice) + (name (string-append "libreoffice-translation-" language)) + (version (package-version libreoffice)) + (build-system gnu-build-system) + (arguments + (substitute-keyword-arguments (package-arguments libreoffice) + ((#:phases phases '%standard-phases) + `(modify-phases ,phases + (add-after 'unpack 'unpack-translations + (lambda* (#:key inputs #:allow-other-keys) + (let ((translations (assoc-ref inputs "translations"))) + (mkdir "src") + (symlink translations + (string-append "src/libreoffice-translations-" + ,version ".tar.xz")) + #t))) + (replace 'build + (lambda _ + (invoke "make" "build-l10n-only" + "-j" (number->string (parallel-job-count))))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (locale (string-append out + ,(string-append + "/share/libreoffice/locale/" + language + "/LC_MESSAGES"))) + (registry (string-append out + "/lib/libreoffice/share/reg= istry"))) + (for-each (lambda (mo) + (install-file mo locale)) + (find-files "." "\\.mo$")) + (for-each (lambda (xcd) + (install-file xcd registry)) + (find-files "." "^Langpack-.*\\.xcd$")) + (for-each (lambda (xcd) + (install-file xcd + (string-append registry "/res")= )) + (find-files "." + ,(string-append language "\\.xcd$")= )) + #t))) + (delete 'bin-and-desktop-install))) + ((#:configure-flags flags '()) + `(cons ,(string-append "--with-lang=3D" language) ,flags)) + ((#:tests? _ #f) + #f))) + (native-inputs + `(("gettext" ,gnu-gettext) + ("translations" ,(origin + (method url-fetch) + (uri (string-append + "https://download.documentfoundation.org/l= ibreoffice/src/" + (version-prefix version 3) "/libreoffice-t= ranslations-" + version ".tar.xz")) + (sha256 + (base32 + "15fdni68b3kyl6115v0d24cl0dp1hdjhkx571w086lrpz= 0fk9mfi")))) + ,@(package-native-inputs libreoffice))) + (synopsis "Translation of the LibreOffice user interface"))) + +(define %libreoffice-translations + ;; List of available translations. Obtained by calling 'scandir' on the + ;; contents of 'translations/source' from the "libreoffice-translations" + ;; tarball. + '("ab" "af" "am" "an" "ar" "as" "ast" "az" "be" "bg" "bn" "bn-IN" "bo" "= br" + "brx" "bs" "ca" "ca-valencia" "cs" "cy" "da" "de" "dgo" "dz" "el" "en-= GB" + "en-ZA" "eo" "es" "et" "eu" "fa" "fi" "fr" "fy" "ga" "gd" "gl" "gu" "g= ug" + "he" "hi" "hr" "hsb" "hu" "id" "is" "it" "ja" "jv" "ka" "kab" "kk" "kl" + "km" "kmr-Latn" "kn" "ko" "kok" "ks" "ky" "lb" "lo" "lt" "lv" "mai" "m= k" + "ml" "mn" "mni" "mr" "my" "nb" "ne" "nl" "nn" "nr" "nso" "oc" "om" "or" + "pa-IN" "pl" "pt" "pt-BR" "ro" "ru" "rw" "sah" "sa-IN" "sat" "sd" "si" + "sid" "sk" "sl" "sq" "sr" "sr-Latn" "ss" "st" "sv" "sw-TZ" "szl" "ta" = "te" + "tg" "th" "ti" "tn" "tr" "ts" "tt" "ug" "uk" "ur" "uz" "ve" "vec" "vi" + "xh" "zh-CN" "zh-TW" "zu")) + +(define-public libreoffice-l10n-fr + (libreoffice-translation "fr")) --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=libreoffice-locale-directory.patch Content-Transfer-Encoding: quoted-printable Content-Description: the LO patch Define a new environment variable to determine the directory where message catalogs ('.mo' files) are to be be looked up. LibreOffice already has environment variables such as 'BRAND_BASE_DIR' and 'BRAND_SHARE_RESOURCE_SUBDIR' but these are not helpful in this case. Patch by Ludovic Court=C3=A8s . --- libreoffice-6.1.5.2/unotools/source/i18n/resmgr.cxx 2019-03-10 16:22:21= .352963608 +0100 +++ libreoffice-6.1.5.2/unotools/source/i18n/resmgr.cxx 2019-03-10 16:30:20= .090848346 +0100 @@ -144,6 +144,11 @@ namespace Translate rtl::Bootstrap::expandMacros(uri); OUString path; osl::File::getSystemPathFromFileURL(uri, path); + + const char *cLocaleDir =3D ::getenv("LO_LOCALE_DIRECTORY"); + if (cLocaleDir !=3D NULL) + path =3D OUString::createFromAscii(cLocaleDir); + OString sPath(OUStringToOString(path, osl_getThreadTextEncoding())= ); gen.add_messages_path(sPath.getStr()); #if defined UNX && !defined MACOSX && !defined IOS && !defined ANDROID --=-=-=--