From 3c1b0b92d1641616f4cb404740447b9565569e0b Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Sat, 10 Oct 2020 11:38:21 +0200 Subject: gnu: icedove: Update to 78.3.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnuzilla.scm (icedove): Update to 78.3.2. Signed-off-by: Ludovic Courtès --- gnu/packages/gnuzilla.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/gnuzilla.scm') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 365626a62a..af436a1dfd 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1157,11 +1157,11 @@ standards of the IceCat project.") (cpe-version . ,(first (string-split version #\-))))))) ;; Update this together with icecat! -(define %icedove-build-id "20200926000000") ;must be of the form YYYYMMDDhhmmss +(define %icedove-build-id "20201007000000") ;must be of the form YYYYMMDDhhmmss (define-public icedove (package (name "icedove") - (version "78.3.1") + (version "78.3.2") (source icecat-source) (properties `((cpe-name . "thunderbird_esr"))) @@ -1441,7 +1441,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 "00912779d73faef4277c57fe99aa5259b11d244d")) + ,(let ((changeset "6ee0e0ff64f4ccda9c478426d0b5d15cd583f8e6")) (origin (method hg-fetch) (uri (hg-reference @@ -1450,7 +1450,7 @@ standards of the IceCat project.") (file-name (string-append "thunderbird-" version "-checkout")) (sha256 (base32 - "12isvk6q8miwn81kimrgcmjh4vsmdbbx93q9pafgxlx3p92s5v8h"))))) + "0w8p35x53g5anck69xnpn688600n2pyx9c7y640szl1ssdsgch82"))))) ("autoconf" ,autoconf-2.13) ("cargo" ,rust-1.41 "cargo") ("clang" ,clang) -- cgit v1.2.3 From 27913a6d3862a858269ada931f51e0ba03912e8c Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 16 Oct 2020 14:59:28 +0200 Subject: gnu: gnuzilla: Use 'assume-valid-file-name' where appropriate. This avoids spurious 'local-file' warnings when running "make". * gnu/packages/gnuzilla.scm (icecat-source): Wrap 'search-patch' calls in 'assume-valid-file-name'. --- gnu/packages/gnuzilla.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'gnu/packages/gnuzilla.scm') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index af436a1dfd..4dbe864598 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2015 Andreas Enge -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Mark H Weaver ;;; Copyright © 2015 Sou Bunnbu ;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner @@ -591,10 +591,14 @@ from forcing GEXP-PROMISE." (base32 "0266gp8vs4avlfdnr8dj7b47msxv1vkd0xpnifp04v4scvgj0yaj")))) + ;; 'search-patch' returns either a valid file name or #f, so wrap it + ;; in 'assume-valid-file-name' to avoid 'local-file' warnings. (gnuzilla-fixes-patch - (local-file (search-patch "icecat-use-older-reveal-hidden-html.patch"))) + (local-file (assume-valid-file-name + (search-patch "icecat-use-older-reveal-hidden-html.patch")))) (makeicecat-patch - (local-file (search-patch "icecat-makeicecat.patch")))) + (local-file (assume-valid-file-name + (search-patch "icecat-makeicecat.patch"))))) (origin (method computed-origin-method) -- cgit v1.2.3