From unknown Sun Jun 22 22:45:50 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#43647] [PATCH 0/3] Update icedove to 78 Resent-From: Jonathan Brielmaier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 27 Sep 2020 10:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 43647 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43647@debbugs.gnu.org Cc: Jonathan Brielmaier X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.160120333730042 (code B ref -1); Sun, 27 Sep 2020 10:43:02 +0000 Received: (at submit) by debbugs.gnu.org; 27 Sep 2020 10:42:17 +0000 Received: from localhost ([127.0.0.1]:48421 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMU8D-0007oQ-1A for submit@debbugs.gnu.org; Sun, 27 Sep 2020 06:42:17 -0400 Received: from lists.gnu.org ([209.51.188.17]:49796) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMU87-0007oB-7Y for submit@debbugs.gnu.org; Sun, 27 Sep 2020 06:42:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38148) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kMU86-0007nA-Vh for guix-patches@gnu.org; Sun, 27 Sep 2020 06:42:07 -0400 Received: from mout.web.de ([212.227.15.14]:37777) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kMU81-0004jF-9F for guix-patches@gnu.org; Sun, 27 Sep 2020 06:42:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1601203318; bh=kNXuoUF6XAydKkjjX7A/qVG5J0hM70+8IFmeDLvDeqk=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=s423/PYsizvjitPWv0Ix/dj2K/qBvWz5uuta+3mu3O9tc6bcl5SgXdldbQpokMuDA cd+tRhWghFOnKLr0JvcRNeO9ahaCY8fKDqt8hZg1x8AByrOrfKA0K43DgqVkOBFaNN mAww/GQ3al0IGzx7nFCplILK/OOCK85jZK8KS8z0= 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 0LaCqs-1kqpGF3x3W-00m3jJ; Sun, 27 Sep 2020 12:41:58 +0200 From: Jonathan Brielmaier Date: Sun, 27 Sep 2020 12:41:11 +0200 Message-Id: <20200927104111.2522-1-jonathan.brielmaier@web.de> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:Ze1O9hyBYi9Qt1Z04bJyyTMu3cD6apYrmNOZR+QtplTlZAHKJra C/HA9N+SCV2DqNDrXtPQlbz2f7PJ7t/9IPZmxGqi47kmd8osPNWxQbKBBoePO5s6XURbk9q NLvD+1WFhhG+x0wvxBRoXpwwi8O1xTFasbQg/L4QZ6xT5Ht5FH83q1s6rD4B3wuFOyF9lCY bLMq1XzhX5MSMlEwkRV2Q== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:US23imSmF2I=:cUqVLS8i6o9zbV1VrKHRvT 6NNkuiL/kLWppyIte2fW9A5zTiFwxmCpdloRBwQDGoASc9g6vpIbt5AzfsWfqSwSBrubaIsNS Y96nUyNp47bymPsRxAZuylQxFfgW/llaQoaTKILTQHkJQD9lsHGj1himKDsljWM0gM8uN/7Ia u4S759PVOodY51h/CbqaBThE51CdYl+VeUgzsM/zay/56uy4RNppI4YwnXxUXI9PiAKSStuyT GG18jfSho2muGiI/D50tWMGrT6EquwIQUrNQ07piO57zZq6uhyscS1a3FeEPe2Om5N5VeD527 xrL2TuokwU9J2mUSv1VFQHBZO/vHFFMsSIWQuBss1Ucw2Etno+XZuLZs729b0IPyFdLDE1YN8 Pwu/5/XBB3aFCuDpiNhXBpf4RV1iyurL8F6Fm68OQkrqiZAf/fro5kzS6c9mzgKFsB0Twl3wq IJEgSQPksm7Z+4/OgB348EnE6l3an4fAwznF/abseWzwgtjIN/VRfNgSV5lTjgclyUtR392kv Ot2aW3aRNBFD1BKT6BEWa11wLq0QyG7tlJbLZJeUFVwEUEnGkmzU0mzi6q17r5JnEUMJZH/7B Ean4YXVBLd4Eo7ceNyIbpTLaW/Ih3F9kPdhSfi64b5WHIvqqlvoTRbn6RrhUPinkr7RuqxhUr fmVf2k36X+qxdHrutGv2UbuANKwcbcNF8tMkqaJAhM3kTeKYx/maJi++fVouTlS+Dm2/ACIZu hYkChj+hVto3WvkOxlzqLPdZeb2HdYYG25GU/lEkmZpVh5sOXArVb3gZyq3jASFgLg93bcKOD /GzcRAP6VEswB5QpzaflCwVxmrgLsFmM8xOCt/WlLmFaIbTy7oatP+IltHH9CSXoS0zmCHCPh oaT317sO9uWA81V/w6Nf+aJhYvyoVQTZZPvqHEJUdtnePX8FUYfNg/iUMVSoS6e6vzXNcCguA YleWQo8ycUnpCH7BlxLDDkcFvjgCFkOrJuGWCadW4uCcXrOhRzBsv06Y3aaDOBWSyNFppYEwm DVS4ORMI2l0iPywinoPTGKQoHHOpLHvqJXXSq5WMaMWsyZ4DkAQiOOu4n3a7c2WZfgvX/Hdof 6VQPEigBmWV4Sp+yfl+Ounoqz1UA4QikTOt9QXnny/YbA1ek7mfSVmh/fGl3mKfITwXaV6fk/ 2mnUpuL5TR0SfEKxMz/ia1vi4H/suBPDn/r8O/1fe5pbg/CNEOcWDOVk8D161NVGRTN2ncGXa Y8oPW6Nwyvx/TfVPRvDKg6Y+cxeA4wpj5tFiUoA== Received-SPF: pass client-ip=212.227.15.14; envelope-from=jonathan.brielmaier@web.de; helo=mout.web.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/27 06:41:58 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.6 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) Hi, this patch series updates icedove to 78.3.0. So the new ESR line based on icecat 78. We need nss@3.56 to build icedove 78. The last patch removes the temporary workarounds from Mark in c7011ff850420fdbe1319b3d218bd362f2f= 9d618. I'm using the new icedove for several days and it's quite nice :) Jonathan Brielmaier (3): gnu: Add nss@3.56. gnu: icedove: Update to 78.3.0. gnu: Remove icecat-68 signs. gnu/local.mk | 1 + gnu/packages/gnuzilla.scm | 329 ++---------------- gnu/packages/nss.scm | 92 +++++ gnu/packages/patches/nss-3.56-pkgconfig.patch | 228 ++++++++++++ 4 files changed, 346 insertions(+), 304 deletions(-) create mode 100644 gnu/packages/patches/nss-3.56-pkgconfig.patch =2D- 2.28.0 From unknown Sun Jun 22 22:45:50 2025 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-Spam-Flag: NO 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 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 From unknown Sun Jun 22 22:45:50 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#43647] [PATCH 1/3] gnu: Add nss@3.56. 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.160120352730393 (code B ref 43647); Sun, 27 Sep 2020 10:46:02 +0000 Received: (at 43647) by debbugs.gnu.org; 27 Sep 2020 10:45:27 +0000 Received: from localhost ([127.0.0.1]:48431 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMUBE-0007tv-FS for submit@debbugs.gnu.org; Sun, 27 Sep 2020 06:45:27 -0400 Received: from mout.web.de ([212.227.15.3]:37663) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMUB5-0007tJ-BG for 43647@debbugs.gnu.org; Sun, 27 Sep 2020 06:45:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1601203505; bh=Fyv4si2+GG8wgnlf9TNT9YLtgcqunu81mGt2TBn/O0Q=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=iFQL2TvuMGfeybjL1HF8NDWOdHq6gcqI3n3nsAkuWcz7t0FrcgdKW3xeL2FflnIWI Fm35Hem06H0fWck8IGhxxS3XCZTTaK+LcrQtM69j7s5dalh/HK2f+mDZ2mCBeuhMS/ XxZvkXJgA6I0ff1Z/2nHA9oajnOpWjTkVW6+eiew= 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 0Letgd-1kmiZb3PlH-00qkau; Sun, 27 Sep 2020 12:45:05 +0200 From: Jonathan Brielmaier Date: Sun, 27 Sep 2020 12:44:18 +0200 Message-Id: <20200927104420.4091-1-jonathan.brielmaier@web.de> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200927104111.2522-1-jonathan.brielmaier@web.de> References: <20200927104111.2522-1-jonathan.brielmaier@web.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:RpZ1O7DMUsQf5Mk2ZJ8KWjjhHQl2JFjy0IM7tWyzZhWyn6q/JSe MWq2O0OCDYJyOotfWugem6TQIojbbjHmfeJQOhVn2IRaT3xj5VGCH9+PMo0nvEOsUKqg/+k qVvGY851tZXhRXmnvrXEQXqUyGHP5cen4EnwcmZ61SoqRSLtgFThOfxrt/w1oEwROhEdjpK JpL50oE2MTYWOcoya5Trw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:N4okY+/fQ4o=:FWpzuSMskKSLIPulCYxCb/ cYfwYS0gjT75kH3C5YbC24gCDuKq4ImniXm9XfX0q+edgPSrZcULDeOQsqPHF7Rtnx/AZOqb7 2VTd+svV95ZDSD6H6/srKL7gim1RTCv7MZC2SMHqblS/Ut+NW2vZ5V7A6FOZaEysz241z6lRm 0ZRf6gVJoljI03u3ez7adn6F+w7yL8glNu2GKHHPEVpYLT2E1InF18RWIgDrHT1AfBKt2guaA MlHJY9Q2d31/cEkmxjut0GXyUHv+3hLUliUoYOWtEuOPOM3ckLNmFVWAoVuXTuZp/ni4b63mf 3uSLlqd2kJe+J7OssjCl44ueMFQSSN9mI4OzMK99Qi6jRusL10VJDarKk8e01dQkAeW50ujEw N6bWxKAlmnyhJeM6PvdsZdRaexgc59E432baZx7MugoMnZCl1BT7mxXJWn/gmCvEpT/Z1eO0g TDZjQOANybpLhwvZVdRuTXr3jqqCJf7gVXr+Pfg8b6WQC1OyiA6eg6nENPZ3x3aiiGwb/aBYw KyKFfHPDNsD3DvQ4iz6+wORxsaaFYUEC639gpHUDiKacEZ3HPsqBHXOcIV0OhZq7ZEaIMHZ05 ibfyXDUrmxMaMSAKJ+Q2JNDIHgfYmD+wDeiQ0m4PdatscjqFosUhC8m0Wtd5rkO7743xW+BSL 1U3DeajDN8JY1gOjelPz88faw5T3r4vWArPry1HaB45qGAkhGtpBeGwXxLwZFRM96dvEeyWxv jSnY1WZhJmpry5VzDLOf8CkmZ/CrHMABaw0MafC4KAWu/3Gra4A+R6GQdVPNRZ0tvpXbVJIh6 2Yv1OvtkgaL+2mKCSc13AgvJ7e1G1Ztu1gOpc7usf2ca26IDlm6SgC6lMnGoHGoy5NMrSizm9 mwMQ4n3ToblX4x3T9Q1GOi1lwpHZKz15CJVR2rVngULOVDp8u2+hkJjmRlJNgARKQAqqz3bpc Tzq6RWjjVcomT8GKSpBiu5/KPcLNdr8omhTkeblQK27YSV74HDobM671t29b3xiF96gcpYvlN 8CpRdTgVVMdyv1rfZEKYz+0SXAD3Ea8AYOurmV2wdAar6nS/G94PetM/EaxwDF+ynxXFPHlaX UKdx/xofOoJqCAR1OsUq0ERNDxrqLjERcsw5+QtLENI+wPK0Zq2mQjbSTL8ebiaivaGQs9rIE HapawXUfNpBrS7fBV5v8udwLUBlClahFpaKD09azL+yhXeLJGerwcIvW8I5IBTLsmQw3AvhYv utnfAy22JbJmj3EA5oIj0rKhXeTTw5uhrEyTSoA== X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Icedove 78 requires nss > 3.53. This version is the only one building out-of-the-box. * gnu/packages/nss.scm (nss-3.56): New variable. * gnu/packages/patches/nss-3.56-pkgconfig.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. =2D-- gnu/local.mk | 1 + gnu/packages/nss.scm | 92 +++++++ gnu/packages/patches/nss-3.56-pkgconfig.patch | 228 ++++++++++++++++++ 3 files changed, 321 insertions(+) create mode 100644 gnu/packages/patches/nss-3.56-pkgconfig.patch diff --git a/gnu/local.mk b/gnu/local.mk index f3b5b17e84..da56f8a6ab 100644 =2D-- a/gnu/local.mk +++ b/gnu/local.mk @@ -1361,6 +1361,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/nsis-env-passthru.patch \ %D%/packages/patches/nss-increase-test-timeout.patch \ %D%/packages/patches/nss-pkgconfig.patch \ + %D%/packages/patches/nss-3.56-pkgconfig.patch \ %D%/packages/patches/ntfs-3g-CVE-2019-9755.patch \ %D%/packages/patches/nvi-assume-preserve-path.patch \ %D%/packages/patches/nvi-dbpagesize-binpower.patch \ diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index b19ad7e1e9..32267b0a83 100644 =2D-- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -4,6 +4,7 @@ ;;; Copyright =C2=A9 2016, 2017, 2018, 2019 Efraim Flashner ;;; Copyright =C2=A9 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright =C2=A9 2020 Marius Bakke +;;; Copyright =C2=A9 2020 Jonathan Brielmaier ;;; ;;; This file is part of GNU Guix. ;;; @@ -191,3 +192,94 @@ applications. Applications built with NSS can suppor= t SSL v2 and v3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 v3 certificates, and = other security standards.") (license license:mpl2.0))) + +(define-public nss-3.56 + (package + (inherit nss) + (version "3.56") + (source (origin + (method url-fetch) + (uri (let ((version-with-underscores + (string-join (string-split version #\.) "_"))) + (string-append + "https://ftp.mozilla.org/pub/mozilla.org/security/n= ss/" + "releases/NSS_" version-with-underscores "_RTM/src/= " + "nss-" version ".tar.gz"))) + (sha256 + (base32 + "174f0ki2f8szkgv02jlsg2ci332sl9dabr2vcwnyjp1vxplf0xgq")) + ;; Create nss.pc and nss-config. + (patches (search-patches "nss-3.56-pkgconfig.patch" + "nss-increase-test-timeout.patch")= ) + (modules '((guix build utils))) + (snippet + '(begin + ;; Delete the bundled copy of these libraries. + (delete-file-recursively "nss/lib/zlib") + (delete-file-recursively "nss/lib/sqlite") + #t)))) + (arguments + `(#:parallel-build? #f ; not supported + #:make-flags + (let* ((out (assoc-ref %outputs "out")) + (nspr (string-append (assoc-ref %build-inputs "nspr"))) + (rpath (string-append "-Wl,-rpath=3D" out "/lib/nss"))) + (list "-C" "nss" (string-append "PREFIX=3D" out) + "NSDISTMODE=3Dcopy" + "NSS_USE_SYSTEM_SQLITE=3D1" + (string-append "NSPR_INCLUDE_DIR=3D" nspr "/include/nspr") + ;; Add $out/lib/nss to RPATH. + (string-append "RPATH=3D" rpath) + (string-append "LDFLAGS=3D" rpath))) + #:modules ((guix build gnu-build-system) + (guix build utils) + (ice-9 ftw) + (ice-9 match) + (srfi srfi-26)) + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda _ + (setenv "CC" "gcc") + ;; Tells NSS to build for the 64-bit ABI if we are 64-bit sy= stem. + ,@(match (%current-system) + ((or "x86_64-linux" "aarch64-linux") + `((setenv "USE_64" "1"))) + (_ + '())) + #t)) + (replace 'check + (lambda _ + ;; Use 127.0.0.1 instead of $HOST.$DOMSUF as HOSTADDR for te= sting. + ;; The later requires a working DNS or /etc/hosts. + (setenv "DOMSUF" "localdomain") + (setenv "USE_IP" "TRUE") + (setenv "IP_ADDRESS" "127.0.0.1") + + ;; The "PayPalEE.cert" certificate expires every six months, + ;; leading to test failures: + ;; . = To + ;; work around that, set the time to roughly the release dat= e. + (invoke "faketime" "2020-02-01" "./nss/tests/all.sh"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append (assoc-ref outputs "bin") "/bin= ")) + (inc (string-append out "/include/nss")) + (lib (string-append out "/lib/nss")) + (obj (match (scandir "dist" (cut string-suffix? "OB= J" <>)) + ((obj) (string-append "dist/" obj))))) + ;; Install nss-config to $out/bin. + (install-file (string-append obj "/bin/nss-config") + (string-append out "/bin")) + (delete-file (string-append obj "/bin/nss-config")) + ;; Install nss.pc to $out/lib/pkgconfig. + (install-file (string-append obj "/lib/pkgconfig/nss.pc"= ) + (string-append out "/lib/pkgconfig")) + (delete-file (string-append obj "/lib/pkgconfig/nss.pc")= ) + (rmdir (string-append obj "/lib/pkgconfig")) + ;; Install other files. + (copy-recursively "dist/public/nss" inc) + (copy-recursively (string-append obj "/bin") bin) + (copy-recursively (string-append obj "/lib") lib) + #t)))))))) diff --git a/gnu/packages/patches/nss-3.56-pkgconfig.patch b/gnu/packages/= patches/nss-3.56-pkgconfig.patch new file mode 100644 index 0000000000..42fff822bc =2D-- /dev/null +++ b/gnu/packages/patches/nss-3.56-pkgconfig.patch @@ -0,0 +1,228 @@ +Description: Create nss.pc and nss-config +Author: Lars Wendler +Source: http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/= nss/files/nss-3.17.1-gentoo-fixups.patch + +Modifications: + Change libdir from ${prefix}/lib64 to ${prefix}/lib/nss. + Remove optional patching in nss/Makefile. + Include -L$libdir in output from "nss-config --libs". + +Later adapted to apply cleanly to nss-3.53. + +--- nss-3.21/nss/config/Makefile ++++ nss-3.21/nss/config/Makefile +@@ -0,0 +1,40 @@ ++CORE_DEPTH =3D .. ++DEPTH =3D .. ++ ++include $(CORE_DEPTH)/coreconf/config.mk ++ ++NSS_MAJOR_VERSION =3D `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print = $$3}'` ++NSS_MINOR_VERSION =3D `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print = $$3}'` ++NSS_PATCH_VERSION =3D `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print = $$3}'` ++PREFIX =3D /usr ++ ++all: export libs ++ ++export: ++ # Create the nss.pc file ++ mkdir -p $(DIST)/lib/pkgconfig ++ sed -e "s,@prefix@,$(PREFIX)," \ ++ -e "s,@exec_prefix@,\$${prefix}," \ ++ -e "s,@libdir@,\$${prefix}/lib/nss," \ ++ -e "s,@includedir@,\$${prefix}/include/nss," \ ++ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \ ++ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \ ++ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \ ++ nss.pc.in > nss.pc ++ chmod 0644 nss.pc ++ cp nss.pc $(DIST)/lib/pkgconfig ++ ++ # Create the nss-config script ++ mkdir -p $(DIST)/bin ++ sed -e "s,@prefix@,$(PREFIX)," \ ++ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \ ++ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \ ++ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \ ++ nss-config.in > nss-config ++ chmod 0755 nss-config ++ cp nss-config $(DIST)/bin ++ ++libs: ++ ++dummy: all export libs ++ +--- nss-3.21/nss/config/nss-config.in ++++ nss-3.21/nss/config/nss-config.in +@@ -0,0 +1,145 @@ ++#!/bin/sh ++ ++prefix=3D@prefix@ ++ ++major_version=3D@NSS_MAJOR_VERSION@ ++minor_version=3D@NSS_MINOR_VERSION@ ++patch_version=3D@NSS_PATCH_VERSION@ ++ ++usage() ++{ ++ cat <&2 ++fi ++ ++lib_ssl=3Dyes ++lib_smime=3Dyes ++lib_nss=3Dyes ++lib_nssutil=3Dyes ++ ++while test $# -gt 0; do ++ case "$1" in ++ -*=3D*) optarg=3D`echo "$1" | sed 's/[-_a-zA-Z0-9]*=3D//'` ;; ++ *) optarg=3D ;; ++ esac ++ ++ case $1 in ++ --prefix=3D*) ++ prefix=3D$optarg ++ ;; ++ --prefix) ++ echo_prefix=3Dyes ++ ;; ++ --exec-prefix=3D*) ++ exec_prefix=3D$optarg ++ ;; ++ --exec-prefix) ++ echo_exec_prefix=3Dyes ++ ;; ++ --includedir=3D*) ++ includedir=3D$optarg ++ ;; ++ --includedir) ++ echo_includedir=3Dyes ++ ;; ++ --libdir=3D*) ++ libdir=3D$optarg ++ ;; ++ --libdir) ++ echo_libdir=3Dyes ++ ;; ++ --version) ++ echo ${major_version}.${minor_version}.${patch_version} ++ ;; ++ --cflags) ++ echo_cflags=3Dyes ++ ;; ++ --libs) ++ echo_libs=3Dyes ++ ;; ++ ssl) ++ lib_ssl=3Dyes ++ ;; ++ smime) ++ lib_smime=3Dyes ++ ;; ++ nss) ++ lib_nss=3Dyes ++ ;; ++ nssutil) ++ lib_nssutil=3Dyes ++ ;; ++ *) ++ usage 1 1>&2 ++ ;; ++ esac ++ shift ++done ++ ++# Set variables that may be dependent upon other variables ++if test -z "$exec_prefix"; then ++ exec_prefix=3D`pkg-config --variable=3Dexec_prefix nss` ++fi ++if test -z "$includedir"; then ++ includedir=3D`pkg-config --variable=3Dincludedir nss` ++fi ++if test -z "$libdir"; then ++ libdir=3D`pkg-config --variable=3Dlibdir nss` ++fi ++ ++if test "$echo_prefix" =3D "yes"; then ++ echo $prefix ++fi ++ ++if test "$echo_exec_prefix" =3D "yes"; then ++ echo $exec_prefix ++fi ++ ++if test "$echo_includedir" =3D "yes"; then ++ echo $includedir ++fi ++ ++if test "$echo_libdir" =3D "yes"; then ++ echo $libdir ++fi ++ ++if test "$echo_cflags" =3D "yes"; then ++ echo -I$includedir ++fi ++ ++if test "$echo_libs" =3D "yes"; then ++ libdirs=3D-L$libdir ++ if test -n "$lib_ssl"; then ++ libdirs=3D"$libdirs -lssl${major_version}" ++ fi ++ if test -n "$lib_smime"; then ++ libdirs=3D"$libdirs -lsmime${major_version}" ++ fi ++ if test -n "$lib_nss"; then ++ libdirs=3D"$libdirs -lnss${major_version}" ++ fi ++ if test -n "$lib_nssutil"; then ++ libdirs=3D"$libdirs -lnssutil${major_version}" ++ fi ++ echo $libdirs ++fi ++ +--- nss-3.21/nss/config/nss.pc.in ++++ nss-3.21/nss/config/nss.pc.in +@@ -0,0 +1,12 @@ ++prefix=3D@prefix@ ++exec_prefix=3D@exec_prefix@ ++libdir=3D@libdir@ ++includedir=3D@includedir@ ++ ++Name: NSS ++Description: Network Security Services ++Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@ ++Requires: nspr >=3D 4.8 ++Libs: -L${libdir} -lssl3 -lsmime3 -lnss3 -lnssutil3 ++Cflags: -I${includedir} ++ +--- nss-3.21/nss/manifest.mn ++++ nss-3.21/nss/manifest.mn +@@ -10,7 +10,7 @@ + + RELEASE =3D nss + +-DIRS =3D coreconf lib cmd cpputil gtests ++DIRS =3D coreconf lib cmd cpputil gtests config + + lib: coreconf + cmd: lib =2D- 2.28.0 From unknown Sun Jun 22 22:45:50 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#43647] [PATCH 3/3] gnu: Remove icecat-68 signs. Resent-From: Jonathan Brielmaier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 27 Sep 2020 10:46:03 +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.160120352730400 (code B ref 43647); Sun, 27 Sep 2020 10:46:03 +0000 Received: (at 43647) by debbugs.gnu.org; 27 Sep 2020 10:45:27 +0000 Received: from localhost ([127.0.0.1]:48433 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMUBL-0007uA-7B for submit@debbugs.gnu.org; Sun, 27 Sep 2020 06:45:27 -0400 Received: from mout.web.de ([212.227.15.14]:41177) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMUB7-0007tP-N0 for 43647@debbugs.gnu.org; Sun, 27 Sep 2020 06:45:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1601203507; bh=i3k+57Nv0Btwjtv2A4kkaxLqgDieqSgvbplu3pPraag=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=gGm6CURI7RGnTWj9kuFNjpYE3x8SydW1OUJjGgBXfDNWTkat8zBLzsdzjjvMyi8b+ uieLdPXvGQYxvLAv/0cUrGfbZhonYC0416DCDgDD3DA8tu2DKbqLwLiRtBX2eN+irQ uhwTLOH9X5dUNCuoj4oVm/fc9qf4ogzwjzTMsI18= 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 0M2dt7-1kfWX01eD7-00sM7O; Sun, 27 Sep 2020 12:45:07 +0200 From: Jonathan Brielmaier Date: Sun, 27 Sep 2020 12:44:20 +0200 Message-Id: <20200927104420.4091-3-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:oimH/AxvL6+h9MjxP0ZDTIzYuXkiQXpH7zbQk53Jn0IXbahxtXn /19H3xiZgtJxpHIa9pdl3NduT99r6yJSoKldHHrL93PuXXjmz/C6CVzOma148FLnj602ZF+ Y4RUCJoO3K/R015DAaKNeaaYrr0u/e2vVo5jcps2eLaY4QFKFlLTrQAmH89cdaMYM7ldvld G2jpYclXhpEWC3ZhfNKig== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:y3CrfaxHST0=:+kZWdCmFDw4qGVBiCy4QMs 0gqsdBAZjDhJeDjS/CeKznwMEpo/FUQ7CWKhPdULRAGoiyeeyNNnNlfoo8B+CbVlOHvd7m2bD hpL00HJve98/RtkCy0HU3FOlqUz8KHFeWcKqK5LbXJdYshN2G3okqq4Q1T5L5ZIBo7FMS2L8g 29XgH11fZ4HW708Jwpjh0E8bADwoBBo/FXaQPe9e92ozPAe7MuJRQj5LAIzXUd8roAdOcqrN5 US9SNrPPTc8wPT2x3jTNPABqdzExH5hl8Yf9dnoglwwvPa3FIL1aJUfnuI4N/9YHZVlhBYQe4 JvZJF6aLl0ru14PoA12r7SurplJ4I6CaJoznjTV+NHc/fiF+Z/j54/nqMCRkLC70r+jb0lODZ IeL2eDdo5HQlcsCaXDHlRklz2WhhZSH/qyY4FaSRM+BDdNIg9luxaa1mFWfn9QKDOEGdfY+ci Hjz25E8zPjZ8tVt1NSHv5bE3VkqFwnajRB94+xm9qmzsYR1meows4IBpoT8dpFRzIVLW+OqHQ Lp2n6KZgCWM1AY9nrJva7uhB8KGtBD86jlnZVLij+dGbiGHcFX4UeGqqZo7p9roxg3IwOzStQ 9KtKdm+LRiUhTTb5C1izevFkHjeXoOw0PmZ3i7qACkZsMSsR//ffRDUkWOkouaMlKimM1kqAm 8sa8zxTMDyP4po/q0yxsmAdhBykn2R+RtX/rGO6/LaTBvJUvanK9wLz798pAnU3GwCLUc2rs8 vQkXeNuRuL6eoWiZcmDAdCuSjzGd0JaZAf91K2qm24ySejWAqkn5OxKMJbqXGYsEaWT0uskm5 kx8ZtrKMXc2GnAYHJLl/jEP8wFdxSc+KRP0S7zI5p4wN4OWyYl4XwgPwQx8vc0ir6yCUnQfKg ptIOoch3kBaPyNjcTjL0Ucsw6hi4las0ILjk11AfVH7tta+r+QYRn4oL/o2nKQstKrW9LdR91 n36CdItRMoQFLWpQxipRW4ViV0CIzGfXuMOgIbjyk7vJeBKL/z/0V8nsbVx889uK2n98bI2ii gxqAe2Z4M84wQjbw9yac8MqC0E8MgyV1Af/a9wCtqi7AFC5QpJRKp1Tr2pePhCGBpdtk6++fM D6SS4cUT8vJg/4c2TOb9ssVQy3cZvS/RFkgYh/I+BLnmi/dMBcF1TSH7B54iJ5QUObHlxOWYz fP1F6KQvJ5krxnyksaw9uYjGcgFtiWrPWobI36vC2MUf3FRR2mE1Ra8hp/Av8hT/n+80Lr9LJ R2qQU9vTP9NiP69m9RXuzh8qlltBjCRVd9KJA4Q== X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) It was necessary for icedove@68 which is now based on icecat@78. * gnu/packages/gnuzilla.scm (mozilla-68-compare-locales): Remove. (all-mozilla-68-locales): Remove. (%icecat-68-version): Remove. (icecat-68-source): Remove. =2D-- gnu/packages/gnuzilla.scm | 273 -------------------------------------- 1 file changed, 273 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 873cccaa9c..ddbc483d32 100644 =2D-- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1156,279 +1156,6 @@ standards of the IceCat project.") (cpe-name . "firefox_esr") (cpe-version . ,(first (string-split version #\-))))))) -(define mozilla-68-compare-locales - (origin - (method hg-fetch) - (uri (hg-reference - (url "https://hg.mozilla.org/l10n/compare-locales/") - (changeset "RELEASE_3_3_0"))) - (file-name "mozilla-68-compare-locales") - (sha256 (base32 "0biazbq7vbi99b99rfn4szwyx032dkpi09c9z4zs6f1br0f86iy1= ")))) - -(define all-mozilla-68-locales - (mozilla-locales - ;; sha256 changeset = locale - ;;--------------------------------------------------------------------= ------- - ("0pybx6j2ycbrr1xmv0spv19sd8a1dyzcs8kf6pzn71w8y6kiagcf" "35959cf2343c"= "ach") - ("0dixmkha738w7fkx20nx95xkfyrqb9vczpy6m03qnqfvb76xaxj5" "e8dc1010f909"= "af") - ("124j09va25gwfxdzyfixrli0skxv53c7niagjyp7g3a3kcv2lbhc" "4c67f6b96a7b"= "an") - ("0flgqll3xx0ym0zj0w9j2jw3fmhs6h9m4l5da6m0bpnk5ff80r06" "34cbea5f44a5"= "ar") - ("0kdb1yqfbfz508f4p77z3p1v6fwy190vs5ipj58hgdixjgbxkqay" "b4790b27633c"= "ast") - ("1vm5xw6wg12pygswd3p0qpkaxyryah6nif5n15chb4sb42c1gqcm" "96d341bf49d4"= "az") - ("1j2qrrws51qij6haz5b77n5vzqhsxgs1ppqqw4mdrkacwvz4ciwh" "4adaede00646"= "be") - ("0ydr8f9lbd51prgcbjb5yacb461j8va0s5bqfs0rnglkvhmk6ard" "d1140972aefe"= "bg") - ("0wyw90zjp8kpd1gljng00in9wr2cf59ww6z002lgx5k4gibnqcfd" "2b3ce92c2310"= "bn") - ("0kkq621h1qdmimyrmms9g5p70m54z2ddw4cd962nqbkrnmabq9vn" "426896350893"= "br") - ("0vibhnb3cbpbgf10db04g6vm372kb9i27p0jkwif019f7qprswd8" "7463f339ce07"= "bs") - ("1l8cn2fqfvx7bswzfy9vavv8cd32ha9ygdxxdbxi64wcgw0f80bf" "dab3f05125e4"= "ca") - ("0fik17y8zyg9w82lq501ic73a53c0q9r8v4zgn9bnzgsygig8qpq" "ebb9d989275a"= "cak") - ("0sj29v6144h39wzb4rvxph3cwgvs4gzkgpr0463d3fcs6jdi0kjs" "522352780348"= "cs") - ("1nz8jlx62l69jcdi59hlk8jysm15sh3d1cxqginjmx7w351wsidm" "0791b954c333"= "cy") - ("1vc01q1vlq26xm1vm1x0119jawxxp975p9k8ashmiwncl1bvqb48" "121f5f876f4c"= "da") - ("1iqny61rg57banfbbskc2y3pr6d35fabnxmynv7vxm9jd86pndz3" "95fb3e99a2bc"= "de") - ("06v9j8acx5h8za7m65v6qm0wjbkx6vm46m8sigcp69phyg3fjc96" "90e681b74587"= "dsb") - ("0lbk90x2dxdbh63fycqxspx6jqq2zlzys6grg45balw8yyvzqrkz" "58ba4c13fd42"= "el") - ("0c2ypvy0z8g78s5158v6h9khckq1xps34r5wbiiciix289m43dgl" "8953d8c98a30"= "en-CA") - ("0z3riz3w2z6p710p90ridmwwam4snnz5mn90gd4jc1h2n7vc9mr0" "5a2b9bca3f52"= "en-GB") - ("102gn3h4ap8c3x1p7vfc88vapkfiz6264y6byhxy1axxjk3x3a77" "e87cb1c61d6e"= "eo") - ("148wj6wsx0aq7cpaxk8njj7cb1wfjr2m96dgxq6b3qcv781ldvjn" "5db15fdf95d5"= "es-AR") - ("0r11d8vzvbyz17n371byvkrnszcv1zhr7rg64i58xra3y6d7is7n" "ce2ee0e51a92"= "es-CL") - ("1xmqa8p7lpqvkgg879hfnmf6kxcpawjk8z31cdzfp1hrdlmxg8n7" "7346617620f3"= "es-ES") - ("0jxv3jh2018lnybr9mzqrffvwmr87yab9bh8lxqjj294fxw1hrxm" "687f05eb0c58"= "es-MX") - ("1rpgv7pajv4xldsn1xxsia5j72vn3x8zl5wmbzkyw56lvn9fckvf" "839a5029c496"= "et") - ("0hxp4fr3y05rkpamdb1hlmybn6d3bv3rcawjm3axbpqxbyfdpfzc" "54e8d87230c9"= "eu") - ("1y50knymnmcihw8bhvahicc386mjm6dx4hx0j6fv8sl23wzx2h9m" "c5ffca960f9c"= "fa") - ("0pj9zgi0c3yl3myhvb5afiijayp2lqzhlk630ahxn5hgjgkz0lx7" "75c000a8538d"= "ff") - ("199jg0zv7wp1cq0ik2hf84j99jx5vq2jwac0gaayvjzkh2z83jqr" "f11b2e689e7b"= "fi") - ("1vxkiwwni7470ywy99arxxa56ljkhjrhxslsp1l1l61g6gdbbspr" "49ec4f791806"= "fr") - ("0d8gwdcj0jpjv03nhjds8jrg86pg371xpylaibwri76wlyl7m54i" "faa761a5cfdc"= "fy-NL") - ("0nipbxx11a2sjadzhbi88vgknw5hzr4nqy2722q3kc1212jbi754" "5bd9466f9f9d"= "ga-IE") - ("0bay8mrm65cvmnvqpwqgzr0h3cb18ifzg5kbsbxcvdfm9xv0zi9g" "a4f6a47e82dd"= "gd") - ("00kn5w3nnpw1pxg6hhrn9asf9hgpjd6ia4038iwzcqs68w887qcy" "6c2aa01ada4e"= "gl") - ("0jj13i0ach85c975vaz2rr83mibs29ipssa7qsjkb0y2ch6xya1k" "c2d607e36cb5"= "gn") - ("1nhqbgzilcb0pr7941dxkhg079bf8v7ldikp1s5xli34wf9sabm2" "f34465d6ac1c"= "gu-IN") - ("11bh0541d996cfin1zy72l66753q94i4idgv2waf0h40h9g3z1bm" "c2ecb2762274"= "he") - ("1lslji7hh5lx5ig1xgfjh4cdindsgh3n2a7qlvzwz96gda43lvv4" "94d2bb10ee03"= "hi-IN") - ("1nx5yw00l25i3m3grdm29mi9mi7h0cy5qx02pypir754pk3hiwcc" "08df0d94edd5"= "hr") - ("19yc9dk2pwqycynmx58d1ik6x4mnyfxscgr6sg676dpl613xd7nq" "21b614e77025"= "hsb") - ("0l3z64jlx6b6ivk1b5hwqyx9hm1m5721ywnb2m4zmg3g9fw4vn7f" "f82cad7170af"= "hu") - ("1sn0dxbbf2zwcpybwcw77qb4p0hf6fxapnsnn4avaab5g55dlgz4" "d94c30920396"= "hy-AM") - ("0c92cqxrhv4317kirmhpjk7mrq44yn6fp3v6syxnhz7xwxnhshjm" "6a5f176b0626"= "ia") - ("03gyg9gqsd6pwb9nydglhm46fi2wk2p2qygmhmrf8hnav3ba7n0r" "94e4302e0f85"= "id") - ("0ky8aaps92mn56rvkwn0i13wg8av8hzi1fvr0ahqhjcpj5sfgdwq" "eca348a59888"= "is") - ("01py0sfg7nljcsgpivryrvai4p4wzbcvhgc2ymr19r579nv1vw7g" "d541a6197359"= "it") - ("0iv7vmj43njmi7g1gjzsv68ax4j502d2wnkvbfz1rx11lrqs7yw1" "a5ab3a1d95b7"= "ja") - ("1sr9ccshcw6agbj4hbnpblxixb1jz0m36glas6f9ahxmi7m605si" "63763ffa5a94"= "ja-JP-mac") - ("1as33pzcsdkynrj16dv7w642vl6plbhk650am4l5djwm64f2rgms" "aa83e8555ddc"= "ka") - ("1jwaqb5qps3i5y9iw8l2hrwa0n8lfnx1k9x0p54y3jkh6p3q3fzc" "0e0e25c26247"= "kab") - ("0cjfiwv0q5i8d7fpwb4m2w5ahq687dqjlwlicgpa443yi2zsxr4s" "33117723ceb1"= "kk") - ("0k5b56cv39aaxf9r0p9c27f3fp6yq2ffd4w6qmd0ibpl69sm629d" "aff7b2a7825e"= "km") - ("1a0zg96jgq4zn9cz0h2qwc0vv1fbkfzs5qrgabg62wqgz286jvvv" "ea91638cb1dd"= "kn") - ("0jhmv2n3yx55r6fg3myg7j1c1nhsv25g016m6lh2j023xbr723gp" "88821009b5b3"= "ko") - ("06bybgv4m4i7r9p0qld65j31vbrnljhsdj649dl93msv2r69ilif" "88685d5f07b3"= "lij") - ("1bzjf8smw6ngi88j5g3fawrg54m8fifbhshwjbgkpj7rnrpjgh4w" "e046c7ffa7d0"= "lt") - ("18dmzmpavijb7fwzffas0j5nb6byqp8h6ki7hhf6qb35diqgfq6n" "c520ef4f576c"= "lv") - ("055zf7xj5h1h8mzxj1cjzhngpcvg2p5vs2dmffsa5zfprj02d0dm" "9e43723f18ad"= "mk") - ("1496fbyyzcl075gzcd3xy50h9jyhnzgb544k1scji56yhyfajacb" "ce615fef92c1"= "mr") - ("1wc1q8ksry181pvnysqsq4dhhsg5adw5vgqafmmq5sf6i2bwn2z0" "4fefe88cfaee"= "ms") - ("0awf6mrdwdhy2yvxynssvp1zg1nc2fqbmg2d2bhjcib69zx944xw" "3987a06866fd"= "my") - ("1hycvz7i4jd40hfs5abx6sgfdkafg0jhdgqih9b7lb08aqcl35pj" "2b3b8997d9a1"= "nb-NO") - ("048z1ib46izwryyy8l1x71kq4775n7l2ilbskhsyrbxqryma13k8" "f25324281615"= "ne-NP") - ("1qkxqpyr4la9bn1bqsgc2h9869arglh9n2kwpkq6722jzdbynkz2" "04c7d32c57f6"= "nl") - ("08gnmdll55dbqj7qs63gq1kljbvg24nzns6q4m0av3sszsic0jv5" "5587520e5019"= "nn-NO") - ("1yh2p4ipj5p2b7gh0xxj0n7ndvwn5bw2773ibrh7vz932mkzhhjn" "499386b02695"= "oc") - ("0kjbnixjzv9hvyba4ll20gs76vx84pviy134fvpjp9lfjpnpib55" "31c01c325675"= "pa-IN") - ("0g61imvr4639bbydyi0kwc1il7l1gzlfij4ywx7hdcmq2x6vgb9v" "fb5f3b8dea09"= "pl") - ("13n68d7z94d7943m6fwl4kizbqm3wp82xz69vng4w9vyqlvv7d41" "9a541cbdc748"= "pt-BR") - ("1j8afvrl1afmj2zixrp91rrhag5w4xw90raca1ic6mxyih9kvdi4" "edc959a685c2"= "pt-PT") - ("0wf4a6q9nvcmam2g8ksbymjdnrz59pdr5nirfpjprfhifjmxx4nn" "d2699db715cd"= "rm") - ("1k9qalir5pbh490w1mxyq31yhy9hbxsyrrk11hwlwlgn6syp9nvp" "b5460a9017bc"= "ro") - ("1avy6wyfa5lbvy36wai6mwhhh6x1y8a0jyjk8hvjn52yfxj1gypk" "59ffa8ad047a"= "ru") - ("1cakhm4jxcw1ij0l1vhxw74hsp5wg68i3319dkdncyyc5a2s1qv9" "8b3c8a7ebdfa"= "si") - ("0s534r09bqdfvw3q17y9b1035kzzlafjv656v73mqhyz3fkffsx5" "cb39dc77980e"= "sk") - ("1s58vgmnb9aiaiaqwwcivq3iyzpzj527w2aqh2nrh6xmaw7f43sr" "17d7969b1d9a"= "sl") - ("147qm7x5z8rkf24jpqvkdlqg0fjz1l3zwnaxvkh9y2jpzv7m0x7z" "c55b0e9ff99d"= "son") - ("0nn4r1rxi8cy7x9nmn5ljd8gcsn2rjl2ma2j7waxkafkm4rs6n20" "2bb3808072da"= "sq") - ("0jsb01b94z7qbm59yaj56nb7yx7a6hpgw8v6nzwhbvmnmcsird4p" "c323c0d02d61"= "sr") - ("1n7vv9y4sk3gig56rgfd2jk8jr2160grxk31bd1wkm7fvbndd259" "4220ce487cbc"= "sv-SE") - ("06270mq7gajxfrsb8gqd25v2dac68ask5vvlh6kkkp3hrgy02vid" "6a1dbc2fe1d3"= "ta") - ("10az7pd3npa7n8wq0qywvsj2qrx9592i2wffs3rnc1fviv1i1q0y" "028505b5ecd1"= "te") - ("0yj0c3iyibb3jyypvyiyhbr9asxa48v0nq21kcf9gphi8fnyp5if" "e44d38b6a67b"= "th") - ("1qc4nvhw834lx7p304fxma0fjdr4xfj4lf69dhh6biqz795lx45p" "1e0771d95708"= "tr") - ("1g4y2yq5xp61ncy7c08j7fqqr1jc0m1hjxmbg5659wzif3b3dkg4" "e3c96943e98f"= "uk") - ("1zbi28z1c3p5il7ndixyjsv4nrimzq36zjvlmq10am38ycqr9df8" "f35da1b02691"= "ur") - ("1jrxjjj8k771y0wljqbadxdj4pasg0771jmg4l3hvpgs929i3j9g" "6fd2084b3efe"= "uz") - ("1f8sqgxzgqmw6vzjv3f49lg43q09i3j62f471864vr71815agl8n" "33b5dfd0cd63"= "vi") - ("0ssnsbxw3q5k88fa081gkn1mbqn4j7bm6vb7yvz6h44j214xkz9x" "2d87c0740715"= "xh") - ("0kd3mrvvgczhsmw4rvpxxxc71bb469ayr8r4azf7gc0y5nmlm950" "a2b6625688d3"= "zh-CN") - ("0qy1asyfplkyc89z3g3gfm7b32aka92350b3ayv9d9dcgwxmfdwz" "4d6e959a13d1"= "zh-TW"))) - -(define %icecat-68-version "68.12.0-guix0-preview1") - -;; 'icecat-68-source' is a "computed" origin that generates an IceCat 68 -;; tarball from the corresponding upstream Firefox ESR tarball, using the -;; 'makeicecat' script from the upstream IceCat project. -(define icecat-68-source - (let* ((base-version (first (string-split %icecat-68-version #\-))) - - (major-version (first (string-split base-version #\.))) - (minor-version (second (string-split base-version #\.))) - (sub-version (third (string-split base-version #\.))) - - (upstream-firefox-version (string-append 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 - "1k17pi4zh9hrvkzbw4rzzw879a15hpvwriylp75wl22rl7r2nsdf")))) - - (upstream-icecat-base-version "68.12.0") ; maybe older than base= -version - ;;(gnuzilla-commit (string-append "v" upstream-icecat-base-versi= on)) - (gnuzilla-commit "15a7c3d991a670b6489d4f432b52a188358f4ca5") - (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" - ;;upstream-icecat-base-version - (string-take gnuzilla-commit 8))) - (sha256 - (base32 - "0n7p067yay413iy0gzprz0xrdkcxj5f8ywhkcghhhzw1nwajckba")))) - - (makeicecat-patch - (local-file (search-patch "icecat-68-makeicecat.patch"))) - (gnuzilla-fixes-patch - (local-file (search-patch "icecat-use-older-reveal-hidden-html.= patch")))) - - (origin - (method computed-origin-method) - (file-name (string-append "icecat-" %icecat-68-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-" #$base-version)) - (icecat-dir - (string-append "icecat-" #$%icecat-68-version))) - - (mkdir "/tmp/bin") - (set-path-environment-variable - "PATH" '("bin") - (list "/tmp" - #+(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) - #+rename)) - - (symlink #+(file-append rename "/bin/rename") - "/tmp/bin/prename") - - ;; We copy the gnuzilla source directory because it is - ;; read-only in 'gnuzilla-source', and the makeicecat scr= ipt - ;; 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) - (invoke "patch" "--force" "--no-backup-if-mismatch" - "-p1" "--input" #+gnuzilla-fixes-patch) - (patch-shebang "makeicecat") - (substitute* "makeicecat" - (("^FFMAJOR=3D(.*)" all ffmajor) - (unless (string=3D? #$major-version - (string-trim-both ffmajor)) - ;; The makeicecat script cannot be expected to wor= k - ;; properly on a different version of Firefox, eve= n if - ;; no errors occur during execution. - (error "makeicecat major version mismatch")) - (string-append "FFMAJOR=3D" #$major-version "\n")) - (("^FFMINOR=3D.*") - (string-append "FFMINOR=3D" #$minor-version "\n")) - (("^FFSUB=3D.*") - (string-append "FFSUB=3D" #$sub-version "\n")) - (("^DATA=3D.*") - "DATA=3D/tmp/gnuzilla/data\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-dir) - (let ((locale - (string-drop (basename locale-dir) - (+ 32 ; length of hash - (string-length "-mozilla-lo= cale-"))))) - (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/advanc= ed-scripts.dtd" - (lambda (port) #f))))) - '#+all-mozilla-68-locales) - (copy-recursively #+mozilla-68-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) - (invoke "tar" "cfa" #$output - ;; Avoid non-determinism in the archive. We set = the - ;; mtime of files in the archive to early 1980 be= cause - ;; the build process fails if the mtime of source - ;; files is pre-1980, due to the creation of zip - ;; archives. - "--mtime=3D@315619200" ; 1980-01-02 UTC - "--owner=3Droot:0" - "--group=3Droot:0" - "--sort=3Dname" - icecat-dir) - - #t)))))))) - ;; Update this together with icecat! (define %icedove-build-id "20200924000000") ;must be of the form YYYYMMDD= hhmmss (define-public icedove =2D- 2.28.0 From unknown Sun Jun 22 22:45:50 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#43647] [PATCH 2/3] gnu: icedove: Update to 78.3.0. Resent-From: Mark H Weaver Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 27 Sep 2020 23:27: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: Jonathan Brielmaier Cc: 43647@debbugs.gnu.org Received: via spool by 43647-submit@debbugs.gnu.org id=B43647.160124920013410 (code B ref 43647); Sun, 27 Sep 2020 23:27:02 +0000 Received: (at 43647) by debbugs.gnu.org; 27 Sep 2020 23:26:40 +0000 Received: from localhost ([127.0.0.1]:50667 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMg40-0003UD-EN for submit@debbugs.gnu.org; Sun, 27 Sep 2020 19:26:40 -0400 Received: from world.peace.net ([64.112.178.59]:58080) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMg3y-0003Tz-TH for 43647@debbugs.gnu.org; Sun, 27 Sep 2020 19:26:39 -0400 Received: from mhw by world.peace.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kMg3s-0002iz-RB; Sun, 27 Sep 2020 19:26:32 -0400 From: Mark H Weaver In-Reply-To: <20200927104420.4091-2-jonathan.brielmaier@web.de> References: <20200927104111.2522-1-jonathan.brielmaier@web.de> <20200927104420.4091-1-jonathan.brielmaier@web.de> <20200927104420.4091-2-jonathan.brielmaier@web.de> Date: Sun, 27 Sep 2020 19:25:11 -0400 Message-ID: <87mu1a7qfh.fsf@netris.org> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Jonathan, > * 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 Thanks very much for this, Jonathan! It looks good to me except for one minor issue which is my fault: > diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm > index 85ad9678d0..873cccaa9c 100644 > --- a/gnu/packages/gnuzilla.scm > +++ b/gnu/packages/gnuzilla.scm [...] > (lambda _ > (use-modules (guix build cargo-utils)) > (let ((null-hash "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855")) > - (substitute* '("Cargo.lock" "gfx/wr/Cargo.lock") > - (("(\"checksum .* = )\".*\"" 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 = \".*\"") > + (string-append "checksum = \"" null-hash "\"")))) > + (find-files "." "Cargo.lock$")) > + (for-each generate-all-checksums > + '("third_party/rust" > + "toolkit/library/rust"))) > #t)) This change was inherited from a change I made in the IceCat 78 update (commit c7011ff850420fdbe1319b3d218bd362f2f9d618), and as Zhu Zihao recently pointed out on guix-devel, it has a problem which turns out to be harmless but wasteful: the argument to the second call to 'substitute*' should be 'files' instead of (find-files "." "Cargo.lock$"). I'm currently testing the 'icedove' build with this minor fix applied. Thank you! Mark From unknown Sun Jun 22 22:45:50 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#43647] [PATCH 3/3] gnu: Remove icecat-68 signs. Resent-From: Mark H Weaver Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 27 Sep 2020 23:35:01 +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: Jonathan Brielmaier Cc: 43647@debbugs.gnu.org Received: via spool by 43647-submit@debbugs.gnu.org id=B43647.160124968114231 (code B ref 43647); Sun, 27 Sep 2020 23:35:01 +0000 Received: (at 43647) by debbugs.gnu.org; 27 Sep 2020 23:34:41 +0000 Received: from localhost ([127.0.0.1]:50672 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMgBg-0003hO-7x for submit@debbugs.gnu.org; Sun, 27 Sep 2020 19:34:41 -0400 Received: from world.peace.net ([64.112.178.59]:58098) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMgBa-0003h5-EN for 43647@debbugs.gnu.org; Sun, 27 Sep 2020 19:34:35 -0400 Received: from mhw by world.peace.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kMgBS-0002o9-DV; Sun, 27 Sep 2020 19:34:22 -0400 From: Mark H Weaver In-Reply-To: <20200927104420.4091-3-jonathan.brielmaier@web.de> References: <20200927104111.2522-1-jonathan.brielmaier@web.de> <20200927104420.4091-1-jonathan.brielmaier@web.de> <20200927104420.4091-3-jonathan.brielmaier@web.de> Date: Sun, 27 Sep 2020 19:33:02 -0400 Message-ID: <87k0we7q2e.fsf@netris.org> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Jonathan, Jonathan Brielmaier wrote: > It was necessary for icedove@68 which is now based on icecat@78. > > * gnu/packages/gnuzilla.scm (mozilla-68-compare-locales): Remove. > (all-mozilla-68-locales): Remove. > (%icecat-68-version): Remove. > (icecat-68-source): Remove. This commit looks good, except that it should also remove icecat-68-makeicecat.patch and update gnu/local.mk accordingly. Also, maybe the last word of "gnu: Remove icecat-68 signs" should be changed to "source". Unless I hear otherwise, I'll probably go ahead and push your commits with the minor fixes that I've suggested, after I finish building it. Thanks! Mark From unknown Sun Jun 22 22:45:50 2025 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: Mon, 28 Sep 2020 09:43: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: Mark H Weaver Cc: 43647@debbugs.gnu.org Received: via spool by 43647-submit@debbugs.gnu.org id=B43647.160128614723515 (code B ref 43647); Mon, 28 Sep 2020 09:43:02 +0000 Received: (at 43647) by debbugs.gnu.org; 28 Sep 2020 09:42:27 +0000 Received: from localhost ([127.0.0.1]:51441 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMpfv-00067D-0s for submit@debbugs.gnu.org; Mon, 28 Sep 2020 05:42:27 -0400 Received: from mout.web.de ([212.227.15.14]:41407) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMpfs-00066y-MG for 43647@debbugs.gnu.org; Mon, 28 Sep 2020 05:42:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1601286138; bh=bufH4uTSXCrML1goERJa3fxNrDZjhMLWPY1X0ygAdtM=; h=X-UI-Sender-Class:Subject:To:Cc:References:From:Date:In-Reply-To; b=V1Sh4gG02n9hHKH1N2bpfVeIKUwFtCgrnf5pLB+qo1tMUtYmjbgjLgw85iTxX38rn ala9WMl1eTpE49C/DYKOBSMIWyQAwQ00+Ae1ouFlO1JvSlhkDLhlHrdvg4C2BDvPCY 1um7rU6Qx/DIjJ9i+TVq3dI13iyTJVby6/8ahiYA= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from [192.168.178.25] ([88.152.185.253]) by smtp.web.de (mrweb004 [213.165.67.108]) with ESMTPSA (Nemesis) id 0MZAp2-1k8aZi0dJM-00KxkQ; Mon, 28 Sep 2020 11:42:18 +0200 References: <20200927104111.2522-1-jonathan.brielmaier@web.de> <20200927104420.4091-1-jonathan.brielmaier@web.de> <20200927104420.4091-2-jonathan.brielmaier@web.de> <87mu1a7qfh.fsf@netris.org> From: Jonathan Brielmaier Message-ID: Date: Mon, 28 Sep 2020 11:41:38 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Icedove/78.3.0 MIME-Version: 1.0 In-Reply-To: <87mu1a7qfh.fsf@netris.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: de-DE Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:B6hVXyzCozlgKahRdL1RcpnESH+84FiuLT9HAWZNizYDxPRerrn I+0rNyCdgNuwNxOGwFzGVaqdwsU9uoinNVoGCVtJDI0Ko6xXSiBTycubduNGqUSW+h9aETH 4YCMrI0X17iBHKp6RduyBb/6RFAtS4RnvEBdPbgwaQeSJE2pUExWe94okLMyeSxkklUk9Pn TCOX8+QVp96dDrOtJJWiA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:N43d16Ym/nA=:K3JzKLvdE5uimvkbp/GxxL VebSh9Dbs9Zu8/tAma6wmcntDnCcjzoaohBzHnhrbTXsf1dXtDNn0X/RH3I4QrdtQwxXvZ4eO ZNd6xSn0I6HfN42ZRmTiNLbisPYcRL+TMStrWpHi3IMY/BN9Lqwax5iP4L1bVBeicrXi0TkqQ lS5I5vyufUDtM8PucmXooSLyAk6L9MYfDSPSXbP0I6/CdU2pzD5bR5sEDQFcwTenNYNbnKi9i RFu/uPNnOXUm8HQJDOHH4teDZN397x5VfGNxdYwA63s/Ej42SAY3ExqZl8SH4Z7aGP8dXJbNp SBCbBa8HUmb5fEwkJ5AyYm1WShYYCrcuUTwwkHisUGuvczqd5STA9WbH+Z5SyS2yTUpmUS0X7 jKzjhY4jonIK9yFRFE9I9HVvfZ4+Ggos7E8ZOKXbi894ySyrg3NyUSFZPiNEuax1iXvvi75ot e680bbo91dC3dyDZ+zIeRX26/n0Ix/8i1XG23sE3pp7ERGVUFLSdZuwiUJirg4LQO1Jf2obNW 9uKKef3hGGnHZ+n5h9/EXuU0m9vPgkoP1GWkckhjN0ZHNsNuVPKM3odQDRoyD6ohUUQzOjgfI 6Up7XHfwnC4hBq5MyyJ8AZlfae3/dpm1CLR8B4zPdcCYw9i1mzyteeaZes72mTewciQgb3sgs e8Vaef6tseNFOJi0wPsED2+lqjlSW7pB8Ur8/d8Y1oT7A48COQZEHIToDwO2GfrfGNaaktc3N omylC8PvjoGO7MJlRuk/FPLGiRmY8+GyQ/SasBw7I0lt5tSEv4nyauJrWj6YS653sJAoqV3YV Qht0WsH87RZIIbsT+zLii5E5/zI55TTIsc2gHlXBN7/rjmB9pLzcyM8EFv0yPU1VjuLGFrlSo QOaN+Ag3PBQ+gouCnldmRCUoNl5cmxxHh7ils3kKKwjpFaOZxQEzlZvOjFqAzHllWD6pnbGBZ eH7mvJNqeOZ8jvyYaGTbouuxAQf0Htqbqz/mbUjlkbeBiScuzBA7/zHIbMN8++coybK0c6aZh oT6Iu/xn7/TCW7yvV6JG5kUUkdb+1NWfBbiev7uxcQYU0W53qp6ePCUzaDimkj7H1qc5BRneO Fem1b32Dn6+Rd9zTYgsaF2/drjI5mkSOaRkYWkOSWA5lhNwH8IRyf/wnq6/6EbyL1w3fcq7z7 8tg/8Jb4tL96YccZQfCMWCpyLr+B9Ddl8KqGYbn3P04cucalX++s8tuya7tDiSGfTKSkPe4yz cVQysaeTb43msc7FHX1GcJpsvTpHIof9LrQLIzg== X-Spam-Score: -1.2 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.2 (--) >> (lambda _ >> (use-modules (guix build cargo-utils)) >> (let ((null-hash "e3b0c44298fc1c149afbf4c8996fb92427ae41= e4649b934ca495991b7852b855")) >> - (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~%" fil= e) >> + (substitute* (find-files "." "Cargo.lock$") >> + (("^checksum =3D \".*\"") >> + (string-append "checksum =3D \"" null-ha= sh "\"")))) >> + (find-files "." "Cargo.lock$")) >> + (for-each generate-all-checksums >> + '("third_party/rust" >> + "toolkit/library/rust"))) >> #t)) > > This change was inherited from a change I made in the IceCat 78 update > (commit c7011ff850420fdbe1319b3d218bd362f2f9d618), and as Zhu Zihao > recently pointed out on guix-devel, it has a > problem which turns out to be harmless but wasteful: the argument to the > second call to 'substitute*' should be 'files' instead of > (find-files "." "Cargo.lock$"). > > I'm currently testing the 'icedove' build with this minor fix applied. I saw this proposal already on the ML and it's a good one :) From unknown Sun Jun 22 22:45:50 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#43647] [PATCH 3/3] gnu: Remove icecat-68 signs. Resent-From: Jonathan Brielmaier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Sep 2020 09:44:01 +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: Mark H Weaver Cc: 43647@debbugs.gnu.org Received: via spool by 43647-submit@debbugs.gnu.org id=B43647.160128618623591 (code B ref 43647); Mon, 28 Sep 2020 09:44:01 +0000 Received: (at 43647) by debbugs.gnu.org; 28 Sep 2020 09:43:06 +0000 Received: from localhost ([127.0.0.1]:51444 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMpgT-00067z-B7 for submit@debbugs.gnu.org; Mon, 28 Sep 2020 05:43:06 -0400 Received: from mout.web.de ([212.227.15.4]:57335) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMpgN-00067i-H6 for 43647@debbugs.gnu.org; Mon, 28 Sep 2020 05:43:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1601286169; bh=1NdZqwrv+qCsXHWql2fBYLaCoFKQQyp8aT22tPvIvtM=; h=X-UI-Sender-Class:Subject:To:Cc:References:From:Date:In-Reply-To; b=rDhAyTfeqM0zJyU6v57j+s5V6+NDas7PrgAh5X4QvM3Q6qRu1BmaTg0RsnjD9N/Sl IJInREAkKTW/d4FFD560G8SSYb1sKlJaxZgmRLB+zYLlYB85HE20yMuv/Awip8z5cV dJUsUJglQVCVPBj7cEhOKonn+MrZGZRivzJT3L2A= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from [192.168.178.25] ([88.152.185.253]) by smtp.web.de (mrweb002 [213.165.67.108]) with ESMTPSA (Nemesis) id 0MEmOw-1kCLIJ0zww-00G35Q; Mon, 28 Sep 2020 11:42:49 +0200 References: <20200927104111.2522-1-jonathan.brielmaier@web.de> <20200927104420.4091-1-jonathan.brielmaier@web.de> <20200927104420.4091-3-jonathan.brielmaier@web.de> <87k0we7q2e.fsf@netris.org> From: Jonathan Brielmaier Message-ID: <1e21e4b1-d867-9cf3-b20e-bb1c8edd94b1@web.de> Date: Mon, 28 Sep 2020 11:42:09 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Icedove/78.3.0 MIME-Version: 1.0 In-Reply-To: <87k0we7q2e.fsf@netris.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: de-DE Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:4I1NvhFpWdFOhvz58aaTq0Fp9ndTrS8wDS6K+GKcBd+qQn3/f6K ++v4QH0p0vnFpPpx4jgtqIFT+csnwa99di3KnzzowOD1CJvAw8RRjaE/+TBfy9DQS8STahR U2IFk8m18gKjPR1l+BFK/LjA4D1ElsG70h/K6s1mbAK4nE+ZK6zchvYNciyyDvH82hV8qH9 2poRPAWlpPM+QTUNNY7Bw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:wT0r3CAREXI=:alKxia0/6fctQq4+mdICnJ ocnRr8UhsLKuhrlQVGIF14O2J6edaliMrMR6ifF+8+lws3KcYoFbySRcjbIV6Da1PJ5vejDUa m6zCn+mbKo/i3i1YDKQ9GlWMX2748D2r1KuYU2BNMxyYj18FogpUtcvvrOl4zuC2rFZDDPnLJ zKH5z7GMH7hf8t5gjVP8TOh8d7vzk0FfVAqPaaNES9M27D5KCAIDdTp6J01fX96awkjQKFJOJ cSfdknBX5xR6+JLvf3lf1eED6u46VgXilaFMiI2xAs8701nHsni/pTiCMCXxXUDRA6hljkfZQ /txCmYbI/tVtAM8GzSfcYGaTQGmcy9KWE9XvK/XiDCi/QxRLoQvy4GO6Y8X07n1WfY+9OgbjV yhRhI0bb+D7EddLsnSPuvm7hx+hhLMnAOSxx7TrBYer6IRG3QOiTH2thM9bRqDatt98GqGigX Ld6JW5iMehle0XuQHQN2SxP7QKwJzF5Jum22DqNjG1Zqe+NCpm1iMh/38BMJQg0hlgxyxU7ZN 81DC8HaRI/EAPjPaWuRa3kFZpuoY+CECKg/20mgrXydtALqoKp3I7XzPhYAwUWl8D4HYlDD+D GtRiqBFEVwgp4MpWllC3xG/VUu/Cq/vPTzb8wotcty8PMv8B15dW+9VkbQSfcd1J46ZBTfwg5 zAQdj4MSeyNKdFTFPs93qbEFKEv1t0EdquRo8U8GALIHB7xlmT+9+DLrkIfaUGk7LQxqTXxK5 lQvNI7pTIZTjE5PModR3uv3It060aT4uS9d75aoAmkD2Sa6L4akdvrLVEyMZfbo+kk1lsypXp Jj8TAkxPZG/815ZHHCRq+RypxRkkG7f4yeKp9FHHppAp3QZH2kIbIy0VVqR4QZt3Rs1Bqjm3+ wEz3sU8gTZxzCJYiPTM+tD6va7xcnje4x+Lvd9f58NKDSzy46cQ8eGuw04ZfPtW2U2xAVigAG n88VZYGddm9HJF2U9vtOhb49nfCGho7eUAjoD7uLRtSJ7mdcbvkqgcIp/e8vGsBLcKHQnOLtE COfydrjJBMPWP9vot9i5um8GhFr+FDyyMpUgxlsbCZOXiMawNeLpIcgponnSQLJxb2jbHqStI k8zdAmPb9q+bewMM4rdiciXJUAwyJ0AMsbNj20LWGlBoR21dZdBx2u8hy2xfbvipDA4E1QD5d I7XguQPvr+YYGSHBZTUKmxm9LRuSZTgPKqkptJLXQfTZ+k9uRLeB5zvSxG5/IIhNtm3ROscU9 xCWjGxjddENg9I5bepNzvEC0AFT9a8OamHayuhQ== X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On 28.09.20 01:33, Mark H Weaver wrote: > Hi Jonathan, > > Jonathan Brielmaier wrote: > >> It was necessary for icedove@68 which is now based on icecat@78. >> >> * gnu/packages/gnuzilla.scm (mozilla-68-compare-locales): Remove. >> (all-mozilla-68-locales): Remove. >> (%icecat-68-version): Remove. >> (icecat-68-source): Remove. > > This commit looks good, except that it should also remove > icecat-68-makeicecat.patch and update gnu/local.mk accordingly. Also, > maybe the last word of "gnu: Remove icecat-68 signs" should be changed > to "source". > > Unless I hear otherwise, I'll probably go ahead and push your commits > with the minor fixes that I've suggested, after I finish building it. That would be nice :) From unknown Sun Jun 22 22:45:50 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Jonathan Brielmaier Subject: bug#43647: closed (Re: [bug#43647] [PATCH 0/3] Update icedove to 78) Message-ID: References: <87wo0dhgq1.fsf@netris.org> <20200927104111.2522-1-jonathan.brielmaier@web.de> X-Gnu-PR-Message: they-closed 43647 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 43647@debbugs.gnu.org Date: Mon, 28 Sep 2020 18:59:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1601319542-29988-1" This is a multi-part message in MIME format... ------------=_1601319542-29988-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #43647: [PATCH 0/3] Update icedove to 78 which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 43647@debbugs.gnu.org. --=20 43647: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D43647 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1601319542-29988-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 43647-done) by debbugs.gnu.org; 28 Sep 2020 18:58:28 +0000 Received: from localhost ([127.0.0.1]:53994 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMyM0-0007mu-7Z for submit@debbugs.gnu.org; Mon, 28 Sep 2020 14:58:28 -0400 Received: from world.peace.net ([64.112.178.59]:60724) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMyLy-0007mh-3H for 43647-done@debbugs.gnu.org; Mon, 28 Sep 2020 14:58:26 -0400 Received: from mhw by world.peace.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kMyLr-0005Sd-UF; Mon, 28 Sep 2020 14:58:20 -0400 From: Mark H Weaver To: Jonathan Brielmaier Subject: Re: [bug#43647] [PATCH 0/3] Update icedove to 78 In-Reply-To: <20200927104111.2522-1-jonathan.brielmaier@web.de> References: <20200927104111.2522-1-jonathan.brielmaier@web.de> Date: Mon, 28 Sep 2020 14:56:59 -0400 Message-ID: <87wo0dhgq1.fsf@netris.org> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 43647-done Cc: 43647-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Jonathan, Jonathan Brielmaier wrote: > this patch series updates icedove to 78.3.0. So the new ESR line based > on icecat 78. We need nss@3.56 to build icedove 78. The last patch removes > the temporary workarounds from Mark in c7011ff850420fdbe1319b3d218bd362f2f9d618. I pushed these to 'master', with the minor tweaks mentioned in my earlier emails, and indentation changes in the nss@3.56 patch, as commits: 1896c0c6ea3597c917bb57d41a7ca0ba29dbf3b1 gnu: Add nss@3.56. 597aa644afd5cc89c6224e9fbe61e6e03ccf465b gnu: icedove: Update to 78.3.0. e6485333117f14492c19d974bf520a619bffb51f gnu: Remove icecat-68 source. Thank you! Mark ------------=_1601319542-29988-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 27 Sep 2020 10:42:17 +0000 Received: from localhost ([127.0.0.1]:48421 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMU8D-0007oQ-1A for submit@debbugs.gnu.org; Sun, 27 Sep 2020 06:42:17 -0400 Received: from lists.gnu.org ([209.51.188.17]:49796) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMU87-0007oB-7Y for submit@debbugs.gnu.org; Sun, 27 Sep 2020 06:42:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38148) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kMU86-0007nA-Vh for guix-patches@gnu.org; Sun, 27 Sep 2020 06:42:07 -0400 Received: from mout.web.de ([212.227.15.14]:37777) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kMU81-0004jF-9F for guix-patches@gnu.org; Sun, 27 Sep 2020 06:42:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1601203318; bh=kNXuoUF6XAydKkjjX7A/qVG5J0hM70+8IFmeDLvDeqk=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=s423/PYsizvjitPWv0Ix/dj2K/qBvWz5uuta+3mu3O9tc6bcl5SgXdldbQpokMuDA cd+tRhWghFOnKLr0JvcRNeO9ahaCY8fKDqt8hZg1x8AByrOrfKA0K43DgqVkOBFaNN mAww/GQ3al0IGzx7nFCplILK/OOCK85jZK8KS8z0= 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 0LaCqs-1kqpGF3x3W-00m3jJ; Sun, 27 Sep 2020 12:41:58 +0200 From: Jonathan Brielmaier To: guix-patches@gnu.org Subject: [PATCH 0/3] Update icedove to 78 Date: Sun, 27 Sep 2020 12:41:11 +0200 Message-Id: <20200927104111.2522-1-jonathan.brielmaier@web.de> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:Ze1O9hyBYi9Qt1Z04bJyyTMu3cD6apYrmNOZR+QtplTlZAHKJra C/HA9N+SCV2DqNDrXtPQlbz2f7PJ7t/9IPZmxGqi47kmd8osPNWxQbKBBoePO5s6XURbk9q NLvD+1WFhhG+x0wvxBRoXpwwi8O1xTFasbQg/L4QZ6xT5Ht5FH83q1s6rD4B3wuFOyF9lCY bLMq1XzhX5MSMlEwkRV2Q== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:US23imSmF2I=:cUqVLS8i6o9zbV1VrKHRvT 6NNkuiL/kLWppyIte2fW9A5zTiFwxmCpdloRBwQDGoASc9g6vpIbt5AzfsWfqSwSBrubaIsNS Y96nUyNp47bymPsRxAZuylQxFfgW/llaQoaTKILTQHkJQD9lsHGj1himKDsljWM0gM8uN/7Ia u4S759PVOodY51h/CbqaBThE51CdYl+VeUgzsM/zay/56uy4RNppI4YwnXxUXI9PiAKSStuyT GG18jfSho2muGiI/D50tWMGrT6EquwIQUrNQ07piO57zZq6uhyscS1a3FeEPe2Om5N5VeD527 xrL2TuokwU9J2mUSv1VFQHBZO/vHFFMsSIWQuBss1Ucw2Etno+XZuLZs729b0IPyFdLDE1YN8 Pwu/5/XBB3aFCuDpiNhXBpf4RV1iyurL8F6Fm68OQkrqiZAf/fro5kzS6c9mzgKFsB0Twl3wq IJEgSQPksm7Z+4/OgB348EnE6l3an4fAwznF/abseWzwgtjIN/VRfNgSV5lTjgclyUtR392kv Ot2aW3aRNBFD1BKT6BEWa11wLq0QyG7tlJbLZJeUFVwEUEnGkmzU0mzi6q17r5JnEUMJZH/7B Ean4YXVBLd4Eo7ceNyIbpTLaW/Ih3F9kPdhSfi64b5WHIvqqlvoTRbn6RrhUPinkr7RuqxhUr fmVf2k36X+qxdHrutGv2UbuANKwcbcNF8tMkqaJAhM3kTeKYx/maJi++fVouTlS+Dm2/ACIZu hYkChj+hVto3WvkOxlzqLPdZeb2HdYYG25GU/lEkmZpVh5sOXArVb3gZyq3jASFgLg93bcKOD /GzcRAP6VEswB5QpzaflCwVxmrgLsFmM8xOCt/WlLmFaIbTy7oatP+IltHH9CSXoS0zmCHCPh oaT317sO9uWA81V/w6Nf+aJhYvyoVQTZZPvqHEJUdtnePX8FUYfNg/iUMVSoS6e6vzXNcCguA YleWQo8ycUnpCH7BlxLDDkcFvjgCFkOrJuGWCadW4uCcXrOhRzBsv06Y3aaDOBWSyNFppYEwm DVS4ORMI2l0iPywinoPTGKQoHHOpLHvqJXXSq5WMaMWsyZ4DkAQiOOu4n3a7c2WZfgvX/Hdof 6VQPEigBmWV4Sp+yfl+Ounoqz1UA4QikTOt9QXnny/YbA1ek7mfSVmh/fGl3mKfITwXaV6fk/ 2mnUpuL5TR0SfEKxMz/ia1vi4H/suBPDn/r8O/1fe5pbg/CNEOcWDOVk8D161NVGRTN2ncGXa Y8oPW6Nwyvx/TfVPRvDKg6Y+cxeA4wpj5tFiUoA== Received-SPF: pass client-ip=212.227.15.14; envelope-from=jonathan.brielmaier@web.de; helo=mout.web.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/27 06:41:58 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.6 (/) X-Debbugs-Envelope-To: submit Cc: Jonathan Brielmaier X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) Hi, this patch series updates icedove to 78.3.0. So the new ESR line based on icecat 78. We need nss@3.56 to build icedove 78. The last patch removes the temporary workarounds from Mark in c7011ff850420fdbe1319b3d218bd362f2f= 9d618. I'm using the new icedove for several days and it's quite nice :) Jonathan Brielmaier (3): gnu: Add nss@3.56. gnu: icedove: Update to 78.3.0. gnu: Remove icecat-68 signs. gnu/local.mk | 1 + gnu/packages/gnuzilla.scm | 329 ++---------------- gnu/packages/nss.scm | 92 +++++ gnu/packages/patches/nss-3.56-pkgconfig.patch | 228 ++++++++++++ 4 files changed, 346 insertions(+), 304 deletions(-) create mode 100644 gnu/packages/patches/nss-3.56-pkgconfig.patch =2D- 2.28.0 ------------=_1601319542-29988-1--