This is an automated email from the git hooks/post-receive script.
guix_mirror_bot pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new c51a40b0c8 gnu: icecat: Update to 128.12.0-gnu1 [security fixes].
c51a40b0c8 is described below
commit c51a40b0c86db85d2f945427bf6f2d4b3a350cb0
Author: Mark H Weaver <m...@netris.org>
AuthorDate: Thu Jun 19 17:31:59 2025 -0400
gnu: icecat: Update to 128.12.0-gnu1 [security fixes].
Includes fixes for CVE-2025-6424, CVE-2025-6425, CVE-2025-6426,
CVE-2025-6429, and CVE-2025-6430.
* gnu/packages/gnuzilla.scm (mozilla-115-compare-locales)
(mozilla-115-locale, mozilla-115-locales, update-mozilla-115-locales)
(all-mozilla-115-locales, %icecat-115-base-version)
(%icecat-115-version %icecat-115-build-id, icecat-115-source): New
bindings, retaining the previous meanings (before this commit) of
mozilla-compare-locales, mozilla-locale, mozilla-locales,
update-mozilla-locales, all-mozilla-locales, %icecat-base-version,
%icecat-version, %icecat-build-id, and icecat-source, respectively.
(mozilla-locale, mozilla-locales, update-mozilla-locales)
(all-mozilla-locales): Remove bindings.
(mozilla-compare-locales): Switch to new Github URL.
(mozilla-l10n): New variable.
(%icecat-locales): Move definition above "%icecat-base-version".
Add new locales "sat" and "skr".
(%icecat-base-version, %icecat-version, %icecat-build-id): Update.
(icecat-source): Update 'gnuzilla-commit' and hashes.
Remove 'upstream-icecat-base-version' local variable
and associated comments. Modify the code
within (with-directory-excursion "l10n" ...) to adapt to new
upstream handling of locales.
(icecat-minimal) [inputs]: Switch from 'ffmpeg-5' to 'ffmpeg'.
Update the comment on why we are still using the bundled NSS.
[native-inputs]: Switch from 'rust-cbindgen-0.24' to 'rust-cbindgen'.
[arguments]: Add "--enable-rust-simd" to configure-flags.
Adapt 'remove-cargo-frozen-flag' phase to work on IceCat 128.
(comm-source->locales+changeset): Use 'update-mozilla-115-locales'.
(icedove-source): Use 'icecat-115-source'.
* gnu/packages/patches/icecat-use-system-wide-dir.patch,
gnu/packages/patches/icecat-compare-paths.patch: Adapt to IceCat 128.
* gnu/packages/patches/icecat-102-makeicecat.patch: Delete file
* gnu/local.mk (dist_patch_DATA): Remove it.
---
gnu/local.mk | 1 -
gnu/packages/gnuzilla.scm | 273 +++++++++++++++++----
gnu/packages/patches/icecat-102-makeicecat.patch | 51 ----
gnu/packages/patches/icecat-compare-paths.patch | 8 +-
.../patches/icecat-use-system-wide-dir.patch | 2 +-
5 files changed, 231 insertions(+), 104 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 6cfda474e1..4af4c88350 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1608,7 +1608,6 @@ dist_patch_DATA =
\
%D%/packages/patches/hwloc-1-test-btrfs.patch \
%D%/packages/patches/i7z-gcc-10.patch \
%D%/packages/patches/icecat-makeicecat.patch \
- %D%/packages/patches/icecat-102-makeicecat.patch \
%D%/packages/patches/icecat-avoid-bundled-libraries.patch \
%D%/packages/patches/icecat-compare-paths.patch \
%D%/packages/patches/icecat-use-system-graphite2+harfbuzz.patch \
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index c260dbc169..943d26334c 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -402,7 +402,7 @@ from collections.abc import MutableSequence"))))
;;;
;;; Localization helper procedures.
;;;
-(define mozilla-compare-locales
+(define mozilla-115-compare-locales
(origin
(method hg-fetch)
(uri (hg-reference
@@ -411,7 +411,7 @@ from collections.abc import MutableSequence"))))
(file-name "mozilla-compare-locales")
(sha256 (base32 "00bpkaqf2ng1nn9ajyb5mli0jq58q5fm2n3yy90jy0hp4q2gbs50"))))
-(define (mozilla-locale locale changeset hash-string)
+(define (mozilla-115-locale locale changeset hash-string)
(origin
(method hg-fetch)
(uri (hg-reference
@@ -421,12 +421,12 @@ from collections.abc import MutableSequence"))))
(file-name (string-append "mozilla-locale-" locale))
(sha256 (base32 hash-string))))
-(define-syntax-rule (mozilla-locales (hash-string changeset locale) ...)
- (list (mozilla-locale locale changeset hash-string)
+(define-syntax-rule (mozilla-115-locales (hash-string changeset locale) ...)
+ (list (mozilla-115-locale locale changeset hash-string)
...))
-(define (update-mozilla-locales changesets.json)
- "Output a new list of Mozilla locales, to update the ALL-MOZILLA-LOCALES
+(define (update-mozilla-115-locales changesets.json)
+ "Output a new list of Mozilla locales, to update the ALL-MOZILLA-115-LOCALES
variable defined below. It requires guile-json to be installed."
(match (call-with-input-file changesets.json json->scm)
(((lang ("revision" . revision) platforms pin) ...)
@@ -437,8 +437,8 @@ variable defined below. It requires guile-json to be
installed."
(format #t "~{~s~%~}" data)
data))))
-(define-public all-mozilla-locales
- (mozilla-locales
+(define-public all-mozilla-115-locales
+ (mozilla-115-locales
;; sha256 changeset
locale
;;---------------------------------------------------------------------------
("152dc3nxbsjhawq8wm040hbnhq96l039j3k8ll4q93qm93msj507" "de9eb6a1e3e0"
"ach")
@@ -545,22 +545,18 @@ variable defined below. It requires guile-json to be
installed."
("1c1sfaincridbdp66bzgwgxgp5gqpvzkf10m9yafm9bgkif18vwy" "f614d8a31562"
"zh-CN")
("0s9chi76476gznrxjcn6slhgsznjnaps0h29kck6ijb0x3yx98xi" "ab22459ceb2f"
"zh-TW")))
-;; XXXX: Workaround 'snippet' limitations.
(define computed-origin-method (@@ (guix packages) computed-origin-method))
-(define %icecat-base-version "115.24.0")
-(define %icecat-version (string-append %icecat-base-version "-guix1"))
-(define %icecat-build-id "20250527000000") ;must be of the form YYYYMMDDhhmmss
+(define %icecat-115-base-version "115.24.0")
+(define %icecat-115-version (string-append %icecat-115-base-version "-guix1"))
+(define %icecat-115-build-id "20250527000000") ;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* ((major-version (first (string-split %icecat-base-version #\.)))
- (minor-version (second (string-split %icecat-base-version #\.)))
- (sub-version (third (string-split %icecat-base-version #\.)))
+(define icecat-115-source
+ (let* ((major-version (first (string-split %icecat-115-base-version #\.)))
+ (minor-version (second (string-split %icecat-115-base-version #\.)))
+ (sub-version (third (string-split %icecat-115-base-version #\.)))
- (upstream-firefox-version (string-append %icecat-base-version "esr"))
+ (upstream-firefox-version (string-append %icecat-115-base-version
"esr"))
(upstream-firefox-source
(origin
(method url-fetch)
@@ -597,7 +593,7 @@ variable defined below. It requires guile-json to be
installed."
(origin
(method computed-origin-method)
- (file-name (string-append "icecat-" %icecat-version ".tar.xz"))
+ (file-name (string-append "icecat-" %icecat-115-version ".tar.xz"))
(sha256 #f)
(uri
(delay
@@ -605,9 +601,9 @@ variable defined below. It requires guile-json to be
installed."
#~(begin
(use-modules (guix build utils))
(let ((firefox-dir
- (string-append "firefox-" #$%icecat-base-version))
+ (string-append "firefox-" #$%icecat-115-base-version))
(icecat-dir
- (string-append "icecat-" #$%icecat-version)))
+ (string-append "icecat-" #$%icecat-115-version)))
(set-path-environment-variable
"PATH" '("bin")
@@ -693,7 +689,202 @@ variable defined below. It requires guile-json to be
installed."
(call-with-output-file
"browser/chrome/browser/preferences/advanced-scripts.dtd"
(lambda (port) #f)))))
- '#+all-mozilla-locales)
+ '#+all-mozilla-115-locales)
+ (copy-recursively #+mozilla-115-compare-locales
+ "compare-locales"
+ #:log (%make-void-port "w"))
+ (delete-file "compare-locales/.gitignore")
+ (delete-file "compare-locales/.hgignore")
+ (delete-file "compare-locales/.hgtags")))
+
+ (format #t "Running makeicecat script...~%")
+ (force-output)
+ (invoke "bash" "/tmp/gnuzilla/makeicecat")
+
+ (format #t "Packing IceCat source tarball...~%")
+ (force-output)
+ (setenv "XZ_DEFAULTS" (string-join (%xz-parallel-args)))
+ (invoke "tar" "cfa" #$output
+ ;; Avoid non-determinism in the archive. We set the
+ ;; mtime of files in the archive to early 1980 because
+ ;; the build process fails if the mtime of source
+ ;; files is pre-1980, due to the creation of zip
+ ;; archives.
+ "--mtime=@315619200" ; 1980-01-02 UTC
+ "--owner=root:0"
+ "--group=root:0"
+ "--sort=name"
+ icecat-dir)))))))))
+
+(define mozilla-compare-locales
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/mozilla/compare-locales";)
+ (commit "RELEASE_9_0_4")))
+ (file-name "mozilla-compare-locales")
+ (sha256 (base32 "13qn983j0pgs2550fgd5gvnl4lq6ywqjvgbyx850jwg79w8b0ifz"))))
+
+(define mozilla-l10n
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/mozilla-l10n/firefox-l10n";)
+ (commit "fcd0300e8478d1ec4d1c097a073ddb8e1e0351e3")))
+ (file-name "mozilla-l10n")
+ (sha256 (base32 "1pzw65852ix6a6qb3wwhg5vrkz8337cs6lznk2vj0md5cvf2rrc4"))))
+
+(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" "fur"
+ "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" "sat" "sc"
+ "sco" "si" "sk" "skr" "sl" "son" "sq" "sr" "sv-SE" "szl" "ta" "te"
+ "tg" "th" "tl" "tr" "trs" "uk" "ur" "uz" "vi" "xh" "zh-CN" "zh-TW"))
+
+(define %icecat-base-version "128.12.0")
+(define %icecat-version (string-append %icecat-base-version "-gnu1"))
+(define %icecat-build-id "20250624000000") ;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* ((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-firefox-version (string-append %icecat-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
+ "0gwpkpl053jv8j7bl8cjdqngxfj5wbj2mm48rqzws5nbqs3fpv9b"))))
+
+ (gnuzilla-commit "7286181cbff5c4b98ed9246366a85ae1fbc8f54d")
+ (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"
+ (string-take gnuzilla-commit 8)))
+ (sha256
+ (base32
+ "087zc12axp7sphswbyvbfkgiabx62czlrajpzqi4ck0rc0jv6p4x"))))
+
+ ;; 'search-patch' returns either a valid file name or #f, so wrap it
+ ;; in 'assume-valid-file-name' to avoid 'local-file' warnings.
+ (makeicecat-patch
+ (local-file (assume-valid-file-name
+ (search-patch "icecat-makeicecat.patch")))))
+
+ (origin
+ (method computed-origin-method)
+ (file-name (string-append "icecat-" %icecat-version ".tar.xz"))
+ (sha256 #f)
+ (uri
+ (delay
+ (with-imported-modules '((guix build utils))
+ #~(begin
+ (use-modules (guix build utils))
+ (let ((firefox-dir
+ (string-append "firefox-" #$%icecat-base-version))
+ (icecat-dir
+ (string-append "icecat-" #$%icecat-version)))
+
+ (set-path-environment-variable
+ "PATH" '("bin")
+ (list #+python
+ #+(canonical-package bash)
+ #+(canonical-package coreutils)
+ #+(canonical-package findutils)
+ #+(canonical-package patch)
+ #+(canonical-package xz)
+ #+(canonical-package sed)
+ #+(canonical-package grep)
+ #+(canonical-package bzip2)
+ #+(canonical-package gzip)
+ #+(canonical-package tar)))
+
+ (set-path-environment-variable
+ "PYTHONPATH"
+ (list #+(format #f "lib/python~a/site-packages"
+ (version-major+minor
+ (package-version python))))
+ '#+(cons python-jsonschema
+ (map second
+ (package-transitive-propagated-inputs
+ python-jsonschema))))
+
+ ;; We copy the gnuzilla source directory because it is
+ ;; read-only in 'gnuzilla-source', and the makeicecat script
+ ;; uses "cp -a" to copy parts of it and assumes that the
+ ;; copies will be writable.
+ (copy-recursively #+gnuzilla-source "/tmp/gnuzilla"
+ #:log (%make-void-port "w"))
+
+ (with-directory-excursion "/tmp/gnuzilla"
+ (make-file-writable "makeicecat")
+ (invoke "patch" "--force" "--no-backup-if-mismatch"
+ "-p1" "--input" #+makeicecat-patch)
+ (patch-shebang "makeicecat")
+ (substitute* "makeicecat"
+ (("^readonly FFMAJOR=(.*)" all ffmajor)
+ (unless (string=? #$major-version
+ (string-trim-both ffmajor))
+ ;; The makeicecat script cannot be expected to work
+ ;; properly on a different version of Firefox, even if
+ ;; no errors occur during execution.
+ (error "makeicecat major version mismatch"))
+ (string-append "readonly FFMAJOR=" #$major-version "\n"))
+ (("^readonly FFMINOR=.*")
+ (string-append "readonly FFMINOR=" #$minor-version "\n"))
+ (("^readonly FFSUB=.*")
+ (string-append "readonly FFSUB=" #$sub-version "\n"))
+ (("^readonly DATADIR=.*")
+ "readonly DATADIR=/tmp/gnuzilla/data\n")
+ (("^readonly SOURCEDIR=.*")
+ (string-append "readonly SOURCEDIR=" icecat-dir "\n"))
+ (("/bin/sed")
+ #+(file-append (canonical-package sed) "/bin/sed"))))
+
+ (format #t "Unpacking upstream firefox tarball...~%")
+ (force-output)
+ (invoke "tar" "xf" #+upstream-firefox-source)
+ (rename-file firefox-dir icecat-dir)
+
+ (with-directory-excursion icecat-dir
+ (format #t "Populating l10n directory...~%")
+ (force-output)
+ (mkdir "l10n")
+ (with-directory-excursion "l10n"
+ (for-each
+ (lambda (locale)
+ (let ((locale-dir
+ (string-append #+mozilla-l10n "/" locale)))
+ (format #t " ~a~%" locale)
+ (force-output)
+ (copy-recursively locale-dir locale
+ #:log (%make-void-port "w"))
+ (for-each make-file-writable (find-files locale))
+ (with-directory-excursion locale
+ (when (file-exists? ".hgtags")
+ (delete-file ".hgtags"))
+ (mkdir-p "browser/chrome/browser/preferences")
+ (call-with-output-file
+
"browser/chrome/browser/preferences/advanced-scripts.dtd"
+ (lambda (port) #f)))))
+ '#+%icecat-locales)
(copy-recursively #+mozilla-compare-locales
"compare-locales"
#:log (%make-void-port "w"))
@@ -755,9 +946,7 @@ variable defined below. It requires guile-json to be
installed."
libxcomposite
libxt
libffi
- ;; Support for FFmpeg 6 was only added in version 112 (see:
- ;; https://bugzilla.mozilla.org/show_bug.cgi?id=1819374).
- ffmpeg-5
+ ffmpeg
libvpx
icu4c
pixman
@@ -768,7 +957,8 @@ variable defined below. It requires guile-json to be
installed."
hunspell
libnotify
nspr
- ;; UNBUNDLE-ME! nss (pending upgrade of 'nss' to 3.90 or later)
+ ;; UNBUNDLE-ME! nss
+ ;; (pending resolution of
<https://codeberg.org/guix/guix/issues/661>)
shared-mime-info
sqlite
eudev
@@ -781,7 +971,7 @@ variable defined below. It requires guile-json to be
installed."
;; a tarball suitable for compilation on any system that IceCat supports.
;; (Bug fixes and security fixes, however, should go in 'source').
(list
- ;; XXX TODO: Adapt these patches to IceCat 102.
+ ;; XXX TODO: Adapt these patches to current IceCat.
;; ("icecat-avoid-bundled-libraries.patch"
;; ,(search-patch "icecat-avoid-bundled-libraries.patch"))
;; ("icecat-use-system-graphite2+harfbuzz.patch"
@@ -790,7 +980,7 @@ variable defined below. It requires guile-json to be
installed."
;; ,(search-patch "icecat-use-system-media-libs.patch"))
rust
`(,rust "cargo")
- rust-cbindgen-0.24
+ rust-cbindgen
llvm-17
clang-17
perl
@@ -830,8 +1020,7 @@ variable defined below. It requires guile-json to be
installed."
"--disable-debug"
"--disable-debug-symbols"
- ;; TODO: Re-enable after updating to the 128 ESR.
- ;"--enable-rust-simd"
+ "--enable-rust-simd"
"--enable-release"
"--enable-optimize"
"--enable-strip"
@@ -848,7 +1037,6 @@ variable defined below. It requires guile-json to be
installed."
(dirname (search-input-file %build-inputs
"lib/libclang.so")))
- ;; Hack to work around missing "unofficial" branding in icecat.
"--enable-official-branding"
;; TODO: Add support for wasm sandboxed libraries.
@@ -866,7 +1054,8 @@ variable defined below. It requires guile-json to be
installed."
;; UNBUNDLE-ME! "--with-system-libvpx"
"--with-system-icu"
"--with-system-nspr"
- ;; UNBUNDLE-ME! "--with-system-nss" ; pending upgrade of 'nss' to 3.90
+ ;; UNBUNDLE-ME! "--with-system-nss"
+ ;; (pending resolution of
<https://codeberg.org/guix/guix/issues/661>)
;; UNBUNDLE-ME! "--with-system-harfbuzz"
;; UNBUNDLE-ME! "--with-system-graphite2"
@@ -1013,7 +1202,7 @@ variable defined below. It requires guile-json to be
installed."
;; complain that it's not able to change Cargo.lock.
;; https://bugzilla.mozilla.org/show_bug.cgi?id=1726373
(substitute* "build/RunCbindgen.py"
- (("\"--frozen\",") ""))))
+ (("args.append\\(\"--frozen\"\\)") "pass"))))
(delete 'bootstrap)
(replace 'configure
;; configure does not work followed by both "SHELL=..." and
@@ -1167,16 +1356,6 @@ testing.")
(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" "fur" "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" "sc" "sco" "si" "sk" "sl" "son" "sq" "sr" "sv-SE" "szl" "ta" "te" "tg"
- "th" "tl" "tr" "trs" "uk" "ur" "uz" "vi" "xh" "zh-CN" "zh-TW"))
-
(define %icedove-build-id "20241119000000") ;must be of the form YYYYMMDDhhmmss
(define %icedove-version "115.16.3")
@@ -1196,7 +1375,7 @@ testing.")
(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
+ (match (update-mozilla-115-locales
(string-append source "/mail/locales/l10n-changesets.json"))
(((_ changeset locale) ...)
(values locale (first changeset)))))
@@ -1245,7 +1424,7 @@ list of languages supported as well as the currently used
changeset."
;; Extract the base Icecat tarball, renaming its top-level
;; directory.
(invoke "tar" "--transform" (string-append "s,[^/]*," #$name
",")
- "-xf" #$icecat-source)
+ "-xf" #$icecat-115-source)
(chdir #$name)
;; Merge the Thunderdbird localization data.
diff --git a/gnu/packages/patches/icecat-102-makeicecat.patch
b/gnu/packages/patches/icecat-102-makeicecat.patch
deleted file mode 100644
index 940ca36b6c..0000000000
--- a/gnu/packages/patches/icecat-102-makeicecat.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-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*'.
-
-diff --git a/makeicecat b/makeicecat
-index bf2b7a6..bc3b19b 100755
---- a/makeicecat
-+++ b/makeicecat
-@@ -56,7 +56,7 @@ readonly SOURCEDIR=icecat-${FFVERSION}
- # debug/shell options
- readonly DEVEL=0
- set -euo pipefail
--(( DEVEL )) && set -x
-+set -x
-
-
-
###############################################################################
-@@ -455,7 +455,7 @@ configure_search()
-
-
- # Process various JSON pre-configuration dumps.
-- python3 ../../tools/process-json-files.py .
browser/components/extensions/schemas/
-+ python3 "${DATADIR}"/../tools/process-json-files.py .
browser/components/extensions/schemas/
- }
-
- configure_mobile()
-@@ -837,12 +837,12 @@ finalize_sourceball()
- # entry point
-
###############################################################################
-
--validate_env || exit 1
--prepare_env
--fetch_source
--verify_sources
--extract_sources
--fetch_l10n
-+# validate_env || exit 1
-+# prepare_env
-+# fetch_source
-+# verify_sources
-+# extract_sources
-+# fetch_l10n
- apply_patches
- configure
- configure_search
-@@ -854,4 +854,4 @@ prepare_macos_packaging
- configure_extensions
- configure_onboarding
- apply_bugfixes
--finalize_sourceball
-+# finalize_sourceball
diff --git a/gnu/packages/patches/icecat-compare-paths.patch
b/gnu/packages/patches/icecat-compare-paths.patch
index 69c03e05ee..87a49d58fa 100644
--- a/gnu/packages/patches/icecat-compare-paths.patch
+++ b/gnu/packages/patches/icecat-compare-paths.patch
@@ -1,8 +1,8 @@
See comment in gnu/build/icecat-extension.scm.
---- a/toolkit/mozapps/extensions/internal/XPIDatabase.jsm
-+++ b/toolkit/mozapps/extensions/internal/XPIDatabase.jsm
-@@ -3452,6 +3452,7 @@ const XPIDatabaseReconcile = {
+--- a/toolkit/mozapps/extensions/internal/XPIDatabase.sys.mjs
++++ b/toolkit/mozapps/extensions/internal/XPIDatabase.sys.mjs
+@@ -3613,6 +3613,7 @@ const XPIDatabaseReconcile = {
if (
newAddon ||
oldAddon.updateDate != xpiState.mtime ||
@@ -10,7 +10,7 @@ See comment in gnu/build/icecat-extension.scm.
(aUpdateCompatibility && this.isAppBundledLocation(installLocation))
) {
newAddon = this.updateMetadata(
-@@ -3460,8 +3461,6 @@ const XPIDatabaseReconcile = {
+@@ -3621,8 +3622,6 @@ const XPIDatabaseReconcile = {
xpiState,
newAddon
);
diff --git a/gnu/packages/patches/icecat-use-system-wide-dir.patch
b/gnu/packages/patches/icecat-use-system-wide-dir.patch
index a635a4d18e..223467a9c1 100644
--- a/gnu/packages/patches/icecat-use-system-wide-dir.patch
+++ b/gnu/packages/patches/icecat-use-system-wide-dir.patch
@@ -3,7 +3,7 @@ native manifests) with "$ICECAT_SYSTEM_DIR".
--- a/toolkit/xre/nsXREDirProvider.cpp
+++ b/toolkit/xre/nsXREDirProvider.cpp
-@@ -293,24 +293,12 @@ nsresult
nsXREDirProvider::GetBackgroundTasksProfilesRootDir(
+@@ -296,24 +296,12 @@ nsresult
nsXREDirProvider::GetBackgroundTasksProfilesRootDir(
static nsresult GetSystemParentDirectory(nsIFile** aFile) {
nsresult rv;
nsCOMPtr<nsIFile> localDir;
