[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#32026: [PATCH v3 04/11] gnu: icecat: Make language packs reproducibl
From: |
Maxim Cournoyer |
Subject: |
bug#32026: [PATCH v3 04/11] gnu: icecat: Make language packs reproducible. |
Date: |
Sun, 19 Feb 2023 12:35:26 -0500 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) |
Hi Mark,
Mark H Weaver <mhw@netris.org> writes:
> Hi Maxim,
>
> Maxim Cournoyer <maxim.cournoyer@gmail.com> 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
- bug#32026: [PATCH v3 01/11] gnu: Add a 'update-mozilla-locales' helper for maintenance., Maxim Cournoyer, 2023/02/17
- bug#32026: [PATCH v3 02/11] gnu: icedove: Compute a self-contained source., Maxim Cournoyer, 2023/02/17
- bug#32026: [PATCH v3 04/11] gnu: icecat: Make language packs reproducible., Maxim Cournoyer, 2023/02/17
- bug#32026: [PATCH v3 03/11] gnu: Define UPSTREAM-FIREFOX-SOURCE at the top level., Maxim Cournoyer, 2023/02/17
- bug#32026: [PATCH v3 05/11] gnu: Add icecat-l10n and icedove-l10n., Maxim Cournoyer, 2023/02/17
- bug#32026: [PATCH v3 06/11] gnu: icedove: Automatically load system-provided extensions., Maxim Cournoyer, 2023/02/17
- bug#32026: [PATCH v3 08/11] gnu: icedove: Use the locale of the system., Maxim Cournoyer, 2023/02/17
- bug#32026: [PATCH v3 10/11] gnu: nss-next: Update to 3.88.1 [fixes CVE-2023-0767]., Maxim Cournoyer, 2023/02/17
bug#32026: [PATCH v3 11/11] gnu: icecat: Unbundle nss and nspr., Maxim Cournoyer, 2023/02/17