From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id IO1NDp1tcF8KVgAA0tVLHw (envelope-from ) for ; Sun, 27 Sep 2020 10:46:53 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id kGYsCp1tcF8pfQAAbx9fmQ (envelope-from ) for ; Sun, 27 Sep 2020 10:46:53 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id CFB219401BD for ; Sun, 27 Sep 2020 10:46:52 +0000 (UTC) Received: from localhost ([::1]:57464 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kMUCh-0000ZK-Jl for larch@yhetil.org; Sun, 27 Sep 2020 06:46:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38826) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kMUBv-0000Wr-Mh for guix-patches@gnu.org; Sun, 27 Sep 2020 06:46:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36887) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kMUBu-0005G3-Hg for guix-patches@gnu.org; Sun, 27 Sep 2020 06:46:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kMUBu-0007vA-Gn for guix-patches@gnu.org; Sun, 27 Sep 2020 06:46:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43647] [PATCH 2/3] gnu: icedove: Update to 78.3.0. Resent-From: Jonathan Brielmaier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 27 Sep 2020 10:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43647 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43647@debbugs.gnu.org Cc: Jonathan Brielmaier Received: via spool by 43647-submit@debbugs.gnu.org id=B43647.160120352030378 (code B ref 43647); Sun, 27 Sep 2020 10:46:02 +0000 Received: (at 43647) by debbugs.gnu.org; 27 Sep 2020 10:45:20 +0000 Received: from localhost ([127.0.0.1]:48429 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMUB8-0007th-Sh for submit@debbugs.gnu.org; Sun, 27 Sep 2020 06:45:20 -0400 Received: from mout.web.de ([212.227.15.3]:40217) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMUB6-0007tN-91 for 43647@debbugs.gnu.org; Sun, 27 Sep 2020 06:45:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1601203506; bh=smVvfcc0vXcmHQAcCGuzpnPFJoR2es4D+H7i8u9V9Vs=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=WjmDffHZ4pwjFsvXsNSV0OlzLLYyZULwM469wu+ds/JA2eSucHcv09emNVcENGy8C tByNQHfvHh6zxM0siOZr0pq79rhQegqhkLf6qqL63jLi6JIqCUGgdpA5DRTF9EhuTA Ak87KvhHfDoppuX/P540e3MGV06CDsE/qDebCn4E= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from x250.fritz.box ([217.64.127.195]) by smtp.web.de (mrweb002 [213.165.67.108]) with ESMTPSA (Nemesis) id 0MCqSB-1kETgX1TZz-009hg4; Sun, 27 Sep 2020 12:45:06 +0200 From: Jonathan Brielmaier Date: Sun, 27 Sep 2020 12:44:19 +0200 Message-Id: <20200927104420.4091-2-jonathan.brielmaier@web.de> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200927104420.4091-1-jonathan.brielmaier@web.de> References: <20200927104111.2522-1-jonathan.brielmaier@web.de> <20200927104420.4091-1-jonathan.brielmaier@web.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:mFMHvrKQtlx+AtcOR0eBWB8Dab6FrLzifi4T3jm/Qafw4z9+dR/ wrwCQC7YdGyZHLsqDrc4jcTX8DrDj2NgGGWy4iHw0zGW59p9gxaQKfPqH77lHYj6d0aIZzM vysBGXs0izmx+mL+s9gjDz+blLr3nVU/NJVxiGljVCepS7L4uxoyKS0KqR2DMDdrWtDptw4 ewWF5yVWkSU9N+tLGM8KQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:4cTJOhokex0=:205gfaL3u2tEc4XhnEohc/ 5L0En91vwRYw7uovlL8qcFOsZz7ohMqVWS/41MgzrU+oKwoaaNqH+B6oH7zF3QJzZ76gYDpab HIRd5jOOxrg5G+2AW2q1MpfcmiZ+kN9oTVqeP8Lw5y9Z0BMmBhHoWufc5aJR8jbKkUUiZfyGb SkMXYouJ8nDUKGFd+TUj6Bvh+CzHetIjDJgqc+YgYDe3nqZCGScOVoFfPyJPwijyKIW0j7VvG Nf4LXOF2tk/fuyTmPU8IWj6c390x2ECW/qcccnc6PBNfDr3tWdVJihutluz8m0KNgTLIvRFTR Uyfz+5JyDddrFElHUv0vRTBDG2hwHrT3s4f2AS7wobXdbbzBXJ1mOUa6fGILnIk8cILG+vxtG zJmmizoQL15n+hkoFgwJ5PYHi5De9U6bwtOlCSf263GxovCjOhwlUwtI340zfrd/b2bA0UsQa thc/OqwxmuWmzT7S4zFMT1ootf+kl80BUZv9B3K7yp3fnTX/6+3vrrBZqvZfMnh322b95q+lD P29m+mSvw64re5jjGy+F2SyFcQ1GKqv5ew2MslKkckNST1uXMq2789dQwFJhK6aNg9l4ay4qZ 95DQOoBi5yX0DoK6STvoDPqd1mwebWKrN1S9dKajks2PURXp+9Dus5/fyn7Ikp6RrTrJEvPYv OUG1ltTLcXbJEwtOfaOOXh+ICt7QUmLPbW6e5mOmzwM7Z1234n2rOn8EjfUdF5uTVL437SbTe qO/Vu2oNA/Lp0x2ocTMUAJ1MnrorHyqzihch4NIXPbEd/+W7idOS/GuZf1WTttwovdwjHeOs1 kka9GnpHQ4oJQKz1Zx5bpTMrAS/ZrQjbTTOL4KpsfGUhwOQx0MVKRLbmrDgQ3tmheDRSSCKJh 99D2ITn0loJic9uTh6BlFU6Ha68wEUbhMKbnYPHIVW004wlGqnLAbtF/GrntCLheB0yY2Vu60 5EUZR090dx7gL8dvNmkLunzEsQeK5GhPcZxgJZKR+BYo3Sc5zvEyLK0mHsM36WSp2fdmHJcma Gg9VyRGgzc2IVG/NvuRv3BqbJW8QADjxW2dGH9zMuybCSJCJQ4Rbj8sLAHMIZpte9IwA4SND6 26AzqCkkmiVBA/KocRwb5WWgF01DKtv+NkAJt3lU//NuS8rnQHOfiCoJ67vou8hcR/MjZ/W1x xAFlxtsE/YDJmvDxX/gBBgfgzjQeuwj0u204H9hgEMCQCqL7DbWU18AcO3rHIfK1JvUDqRxzk 8sFnGN79SC9K/i8SP4OMWMlBhPn+6PWLolwDFkA== X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=web.de header.s=dbaedf251592 header.b=WjmDffHZ; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 3.49 X-TUID: fIZ4RoiF2JYw * gnu/packages/gnuzilla.scm (icedove): Update to 78.3.0. [source]: Use source from Icecat 78. [arguments]: Use more flexible approach for generating cargo checksums from icecat. Update files in 'rename-to-icedove phase. Remove gone configure flags and rename `--disable-ion` to `--disable-jit`. [inputs]: Update icu4c to version 67 and nss to 3.56. [native-inputs]: Use ESR 78 mercurial repo for thunderbird soruces. Update rust and cargo to 1.41, rust-cbindgen to 0.14 and node to 10.22. Tested-by: Jonathan Brielmaier =2D-- gnu/packages/gnuzilla.scm | 56 +++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 31 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 85ad9678d0..873cccaa9c 100644 =2D-- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1430,12 +1430,12 @@ standards of the IceCat project.") #t)))))))) ;; Update this together with icecat! -(define %icedove-build-id "20200825000000") ;must be of the form YYYYMMDD= hhmmss +(define %icedove-build-id "20200924000000") ;must be of the form YYYYMMDD= hhmmss (define-public icedove (package (name "icedove") - (version "68.12.0") - (source icecat-68-source) + (version "78.3.0") + (source icecat-source) (properties `((cpe-name . "thunderbird_esr"))) (build-system gnu-build-system) @@ -1460,10 +1460,15 @@ standards of the IceCat project.") (lambda _ (use-modules (guix build cargo-utils)) (let ((null-hash "e3b0c44298fc1c149afbf4c8996fb92427ae41e464= 9b934ca495991b7852b855")) - (substitute* '("Cargo.lock" "gfx/wr/Cargo.lock") - (("(\"checksum .* =3D )\".*\"" all name) - (string-append name "\"" null-hash "\""))) - (generate-all-checksums "third_party/rust")) + (for-each (lambda (file) + (format #t "patching checksums in ~a~%" file) + (substitute* (find-files "." "Cargo.lock$") + (("^checksum =3D \".*\"") + (string-append "checksum =3D \"" null-hash = "\"")))) + (find-files "." "Cargo.lock$")) + (for-each generate-all-checksums + '("third_party/rust" + "toolkit/library/rust"))) #t)) ;; Fixes issue where each installation directory generates its o= wn profile. ;; See e.g. https://trac.torproject.org/projects/tor/ticket/3145= 7 @@ -1505,12 +1510,10 @@ standards of the IceCat project.") (("mozilla.org") "guix.gnu.org"))) ;; Remove other mentions of Thunderbird in user-visible text= . (with-directory-excursion "comm/mail/base/content" - (substitute* '("newInstallPage.xhtml" - "overrides/app-license-name.html" - "newInstall.xul") + (substitute* '("overrides/app-license-name.html") (("Thunderbird") "Icedove"))) (with-directory-excursion "comm/mail/components/" - (substitute* '("mailGlue.js" + (substitute* '("MailGlue.jsm" "extensions/schemas/addressBook.json" "extensions/schemas/tabs.json" "extensions/schemas/cloudFile.json" @@ -1520,14 +1523,9 @@ standards of the IceCat project.") "im/messages/mail/Info.plist" "enterprisepolicies/moz.build" "enterprisepolicies/helpers/moz.build" - "enterprisepolicies/schemas/moz.build" - "preferences/chat.inc.xul") + "enterprisepolicies/schemas/moz.build") (("Thunderbird") "Icedove"))) - (substitute* "comm/calendar/lightning/lightning-packager.mk" - (("ifeq \\(thunderbird") - "ifeq (icedove")) (substitute* '("comm/mailnews/base/prefs/content/accountUtil= s.js" - "comm/mailnews/extensions/newsblog/content/fe= ed-subscriptions.js" "comm/common/src/customizeToolbar.js") (("AppConstants.MOZ_APP_NAME (.)=3D \"thunderbird" _ e) (format #f "AppConstants.MOZ_APP_NAME ~a=3D \"icedove" e)= )) @@ -1600,8 +1598,7 @@ standards of the IceCat project.") "ac_add_options --disable-debug\n" "ac_add_options --disable-debug-symbols\n" "ac_add_options --disable-elf-hack\n" - "ac_add_options --disable-gconf\n" - "ac_add_options --disable-ion\n" + "ac_add_options --disable-jit\n" "ac_add_options --disable-necko-wifi\n" "ac_add_options --disable-official-branding\n" "ac_add_options --disable-tests\n" @@ -1609,16 +1606,13 @@ standards of the IceCat project.") "ac_add_options --disable-webrtc\n" "ac_add_options --enable-application=3Dcomm/mail\n" "ac_add_options --enable-calendar\n" - "ac_add_options --enable-content-sandbox\n" "ac_add_options --enable-default-toolkit=3D\"cairo-g= tk3\"\n" "ac_add_options --enable-optimize\n" "ac_add_options --enable-pulseaudio\n" "ac_add_options --enable-release\n" - "ac_add_options --enable-startup-notification\n" "ac_add_options --enable-strip\n" "ac_add_options --enable-system-ffi\n" "ac_add_options --enable-system-pixman\n" - "ac_add_options --enable-system-sqlite\n" "ac_add_options --prefix=3D" out "\n" "ac_add_options --with-clang-path=3D" (assoc-ref %bu= ild-inputs "clang") "/bin/clang\n" "ac_add_options --with-distribution-id=3Dorg.gnu\n" @@ -1689,7 +1683,7 @@ standards of the IceCat project.") ("gtk+" ,gtk+) ("gtk+-2" ,gtk+-2) ("hunspell" ,hunspell) - ("icu4c" ,icu4c) + ("icu4c" ,icu4c-67) ("libcanberra" ,libcanberra) ("libevent" ,libevent) ("libffi" ,libffi) @@ -1705,7 +1699,7 @@ standards of the IceCat project.") ("mesa" ,mesa) ("mit-krb5" ,mit-krb5) ("nspr" ,nspr) - ("nss" ,nss) + ("nss" ,nss-3.56) ("pango" ,pango) ("pixman" ,pixman) ("pulseaudio" ,pulseaudio) @@ -1720,28 +1714,28 @@ 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 "b41cdff70b185358d9c4c1d4a36cfad15a24f001")) + ,(let ((changeset "35e647ebd4fa09407a0fe151d3823b1b58172a2a")) (origin (method hg-fetch) (uri (hg-reference - (url "https://hg.mozilla.org/releases/comm-esr68") + (url "https://hg.mozilla.org/releases/comm-esr78") (changeset changeset))) (file-name (string-append "thunderbird-" version "-checkout"= )) (sha256 (base32 - "1xvky8p5r41mxdyg9amydy94p51wmmdwdz0zq2vzspr9viixf7xm"))))= ) + "0g27rapn1xf19i5pl2g12hndb55shzsk4vrrc6bnj4vf2q49zcwy"))))= ) ("autoconf" ,autoconf-2.13) - ("cargo" ,rust "cargo") + ("cargo" ,rust-1.41 "cargo") ("clang" ,clang) ("llvm" ,llvm) ("nasm" ,nasm) - ("node" ,node) + ("node" ,node-10.22) ("perl" ,perl) ("pkg-config" ,pkg-config) ("python" ,python) ("python2" ,python-2.7) - ("rust" ,rust) - ("rust-cbindgen" ,rust-cbindgen) + ("rust" ,rust-1.41) + ("rust-cbindgen" ,rust-cbindgen-0.14) ("which" ,which) ("yasm" ,yasm))) (home-page "https://www.thunderbird.net") =2D- 2.28.0