diff options
Diffstat (limited to 'gnu/packages/gnuzilla.scm')
| -rw-r--r-- | gnu/packages/gnuzilla.scm | 35 |
1 files changed, 23 insertions, 12 deletions
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index e6505e7a95..88637d2fcd 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -365,7 +365,8 @@ in C/C++.") (file-name (git-file-name "mozjs" version)) (sha256 (base32 - "1xl6avsj9gkgma71p56jzs7nasc767k3n1frnmri5pad4rj94bij")))) + "1xl6avsj9gkgma71p56jzs7nasc767k3n1frnmri5pad4rj94bij")) + (patches (search-patches "mozjs60-riscv64-support.patch")))) (arguments `(#:tests? #f ; FIXME: all tests pass, but then the check phase fails anyway. #:test-target "check-jstests" @@ -412,6 +413,14 @@ in C/C++.") (cons (string-append "--prefix=" out) configure-flags)) #t))) + (add-after 'unpack 'update-config-scripts + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (for-each (lambda (file) + (install-file + (search-input-file + (or native-inputs inputs) + (string-append "/bin/" file)) "build/autoconf")) + '("config.guess" "config.sub")))) (add-after 'unpack 'disable-broken-tests (lambda _ ;; This test assumes that /bin exists and contains certain @@ -421,6 +430,7 @@ in C/C++.") (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) + ("config" ,config) ("which" ,which) ("perl" ,perl) ("pkg-config" ,pkg-config) @@ -560,7 +570,8 @@ in C/C++.") (native-inputs `(("autoconf" ,autoconf-2.13) ("automake" ,automake) - ("llvm" ,llvm) ;for llvm-objdump + ;; TODO(staging): Use the default LLVM in the next rebuild cycle. + ("llvm" ,llvm-9) ;for llvm-objdump ("perl" ,perl) ("pkg-config" ,pkg-config) ("python" ,python-3) @@ -698,8 +709,8 @@ in C/C++.") ;; XXXX: Workaround 'snippet' limitations. (define computed-origin-method (@@ (guix packages) computed-origin-method)) -(define %icecat-version "91.5.0-guix0-preview1") -(define %icecat-build-id "20220111000000") ;must be of the form YYYYMMDDhhmmss +(define %icecat-version "91.7.0-guix0-preview1") +(define %icecat-build-id "20220307000000") ;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' @@ -721,11 +732,11 @@ in C/C++.") "firefox-" upstream-firefox-version ".source.tar.xz")) (sha256 (base32 - "04y8nj1f065b3dn354f1ns3cm9xp4kljr5ippvmfdqr7cb4xjp7l")))) + "0npf1w6ic14zjn2h5zp8il4l0s61l9mykgnbcinxc47gw6myjflw")))) - (upstream-icecat-base-version "91.5.0") ; maybe older than base-version + (upstream-icecat-base-version "91.7.0") ; maybe older than base-version ;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version)) - (gnuzilla-commit "c0a504578cb694522c65bb6c36396df8142d4a2a") + (gnuzilla-commit "76e23c5f1bcebc22f7936baa29f75c6c9415935e") (gnuzilla-source (origin (method git-fetch) @@ -737,7 +748,7 @@ in C/C++.") (string-take gnuzilla-commit 8))) (sha256 (base32 - "016g8vdr6w6six4f705cmbdrfknmy4bk1qjjrvsdpah4bf6c2s2c")))) + "1qvhpyws73f5is7l5isiag6lbqj9gkbdkc9gj29lhhhgla8j6qyg")))) ;; 'search-patch' returns either a valid file name or #f, so wrap it ;; in 'assume-valid-file-name' to avoid 'local-file' warnings. @@ -1320,11 +1331,11 @@ standards of the IceCat project.") (cpe-version . ,(first (string-split version #\-))))))) ;; Update this together with icecat! -(define %icedove-build-id "20220111000000") ;must be of the form YYYYMMDDhhmmss +(define %icedove-build-id "20220308000000") ;must be of the form YYYYMMDDhhmmss (define-public icedove (package (name "icedove") - (version "91.5") + (version "91.7") (source icecat-source) (properties `((cpe-name . "thunderbird_esr"))) @@ -1610,7 +1621,7 @@ standards of the IceCat project.") ;; in the Thunderbird release tarball. We don't use the release ;; tarball because it duplicates the Icecat sources and only adds the ;; "comm" directory, which is provided by this repository. - ,(let ((changeset "bcd2aab51cd0889d506d29455210d65602b97430")) + ,(let ((changeset "39ccd0b9ea033f3292af90667e470b98a79eb8c9")) (origin (method hg-fetch) (uri (hg-reference @@ -1619,7 +1630,7 @@ standards of the IceCat project.") (file-name (string-append "thunderbird-" version "-checkout")) (sha256 (base32 - "0aj8a8qbm71n34yi58y04bn4h9zz2rciz0cm3hh58rsmcqs1s9ym"))))) + "0zk6f3yxqq5dn4dh96jmip3xy66n4lnai5fan31kl2l63vfcm1ag"))))) ("cargo" ,rust "cargo") ("clang" ,clang-11) ("llvm" ,llvm-11) |