mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-26 14:28:15 -05:00
gnu: icedove: Update to 102.3.0.
* gnu/packages/gnuzilla.scm (icedove): Update to 102.3.0. [source]: Use icecat-source again. [arguments]: Remove `--frozen` flag from cargo invokation. Remove `--with-user-appdir` flag (no longer honoured since TB91). Disable WASM sandbox for now (needs more dependencies). [inputs]: Add alsa-lib. Use icu4c-71. [native-inputs]: Update hg-reference link. Use rust@1.59 and rust-cbindgen@0.23.
This commit is contained in:
parent
0e36779986
commit
16447da515
1 changed files with 20 additions and 12 deletions
|
@ -1520,12 +1520,12 @@ (define icecat-91-source
|
||||||
icecat-dir)))))))))
|
icecat-dir)))))))))
|
||||||
|
|
||||||
;; Update this together with icecat!
|
;; Update this together with icecat!
|
||||||
(define %icedove-build-id "20220919000000") ;must be of the form YYYYMMDDhhmmss
|
(define %icedove-build-id "20220920000000") ;must be of the form YYYYMMDDhhmmss
|
||||||
(define-public icedove
|
(define-public icedove
|
||||||
(package
|
(package
|
||||||
(name "icedove")
|
(name "icedove")
|
||||||
(version "91.13.1")
|
(version "102.3.0")
|
||||||
(source icecat-91-source)
|
(source icecat-source)
|
||||||
(properties
|
(properties
|
||||||
`((cpe-name . "thunderbird_esr")))
|
`((cpe-name . "thunderbird_esr")))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
|
@ -1557,6 +1557,13 @@ (define-public icedove
|
||||||
(for-each generate-all-checksums
|
(for-each generate-all-checksums
|
||||||
'("third_party/rust"
|
'("third_party/rust"
|
||||||
"toolkit/library/rust")))))
|
"toolkit/library/rust")))))
|
||||||
|
(add-after 'patch-cargo-checksums 'remove-cargo-frozen-flag
|
||||||
|
(lambda _
|
||||||
|
;; Remove --frozen flag from cargo invokation, otherwise it'll
|
||||||
|
;; complain that it's not able to change Cargo.lock.
|
||||||
|
;; https://bugzilla.mozilla.org/show_bug.cgi?id=1726373
|
||||||
|
(substitute* "build/RunCbindgen.py"
|
||||||
|
(("\"--frozen\",") ""))))
|
||||||
;; Fixes issue where each installation directory generates its own profile.
|
;; Fixes issue where each installation directory generates its own profile.
|
||||||
;; See e.g. https://trac.torproject.org/projects/tor/ticket/31457
|
;; See e.g. https://trac.torproject.org/projects/tor/ticket/31457
|
||||||
(add-after 'patch-source-shebangs 'fix-profile-setting
|
(add-after 'patch-source-shebangs 'fix-profile-setting
|
||||||
|
@ -1709,7 +1716,7 @@ (define-public icedove
|
||||||
"ac_add_options --with-system-nspr\n"
|
"ac_add_options --with-system-nspr\n"
|
||||||
;"ac_add_options --with-system-nss\n"
|
;"ac_add_options --with-system-nss\n"
|
||||||
"ac_add_options --with-system-zlib\n"
|
"ac_add_options --with-system-zlib\n"
|
||||||
"ac_add_options --with-user-appdir=\\.icedove\n"
|
"ac_add_options --without-wasm-sandboxed-libraries\n"
|
||||||
"mk_add_options MOZ_MAKE_FLAGS=-j"
|
"mk_add_options MOZ_MAKE_FLAGS=-j"
|
||||||
(number->string (parallel-job-count)) "\n"))))
|
(number->string (parallel-job-count)) "\n"))))
|
||||||
(display (getcwd))
|
(display (getcwd))
|
||||||
|
@ -1759,7 +1766,8 @@ (define-public icedove
|
||||||
`("XDG_DATA_DIRS" prefix (,gtk-share))
|
`("XDG_DATA_DIRS" prefix (,gtk-share))
|
||||||
`("LD_LIBRARY_PATH" prefix (,pulseaudio-lib ,eudev-lib)))))))))
|
`("LD_LIBRARY_PATH" prefix (,pulseaudio-lib ,eudev-lib)))))))))
|
||||||
(inputs
|
(inputs
|
||||||
(list bzip2
|
(list alsa-lib
|
||||||
|
bzip2
|
||||||
cairo
|
cairo
|
||||||
cups
|
cups
|
||||||
dbus-glib
|
dbus-glib
|
||||||
|
@ -1770,7 +1778,7 @@ (define-public icedove
|
||||||
gtk+
|
gtk+
|
||||||
gtk+-2
|
gtk+-2
|
||||||
hunspell
|
hunspell
|
||||||
icu4c
|
icu4c-71
|
||||||
libcanberra
|
libcanberra
|
||||||
libevent
|
libevent
|
||||||
libffi
|
libffi
|
||||||
|
@ -1803,17 +1811,17 @@ (define-public icedove
|
||||||
;; in the Thunderbird release tarball. We don't use the release
|
;; in the Thunderbird release tarball. We don't use the release
|
||||||
;; tarball because it duplicates the Icecat sources and only adds the
|
;; tarball because it duplicates the Icecat sources and only adds the
|
||||||
;; "comm" directory, which is provided by this repository.
|
;; "comm" directory, which is provided by this repository.
|
||||||
,(let ((changeset "2f9b465346ceb38b4ab79ccc1bfe8d8ad0bc8743"))
|
,(let ((changeset "04f60827c1b53ab86121c7d122d3a8216219ff9f"))
|
||||||
(origin
|
(origin
|
||||||
(method hg-fetch)
|
(method hg-fetch)
|
||||||
(uri (hg-reference
|
(uri (hg-reference
|
||||||
(url "https://hg.mozilla.org/releases/comm-esr91")
|
(url "https://hg.mozilla.org/releases/comm-esr102")
|
||||||
(changeset changeset)))
|
(changeset changeset)))
|
||||||
(file-name (string-append "thunderbird-" version "-checkout"))
|
(file-name (string-append "thunderbird-" version "-checkout"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"10vsbwlh5imq7iljwzq3r4y80wzsmj6s2gsi1n64l0wmfq2m6ilb")))))
|
"078jrxpzqj45l84i39a9fq023j71ngca5gs2ngpjsbily51bzx09")))))
|
||||||
("cargo" ,rust "cargo")
|
("cargo" ,(force rust-1.59-promise) "cargo")
|
||||||
("clang" ,clang)
|
("clang" ,clang)
|
||||||
("llvm" ,llvm)
|
("llvm" ,llvm)
|
||||||
("m4" ,m4)
|
("m4" ,m4)
|
||||||
|
@ -1822,8 +1830,8 @@ (define-public icedove
|
||||||
("perl" ,perl)
|
("perl" ,perl)
|
||||||
("pkg-config" ,pkg-config)
|
("pkg-config" ,pkg-config)
|
||||||
("python" ,python-wrapper)
|
("python" ,python-wrapper)
|
||||||
("rust" ,rust)
|
("rust" ,(force rust-1.59-promise))
|
||||||
("rust-cbindgen" ,rust-cbindgen-0.19)
|
("rust-cbindgen" ,(force rust-cbindgen-0.23-promise))
|
||||||
("which" ,which)
|
("which" ,which)
|
||||||
("yasm" ,yasm)))
|
("yasm" ,yasm)))
|
||||||
(home-page "https://www.thunderbird.net")
|
(home-page "https://www.thunderbird.net")
|
||||||
|
|
Loading…
Reference in a new issue