From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id oDcbK+cjfWGwpgAAgWs5BA (envelope-from ) for ; Sat, 30 Oct 2021 12:52:23 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id CJ3FJucjfWEAHQAAB5/wlQ (envelope-from ) for ; Sat, 30 Oct 2021 10:52:23 +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 E175735B89 for ; Sat, 30 Oct 2021 12:52:22 +0200 (CEST) Received: from localhost ([::1]:56068 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mglyI-0004Q9-3P for larch@yhetil.org; Sat, 30 Oct 2021 06:52:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53354) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mglxy-0004Pz-1Q for guix-patches@gnu.org; Sat, 30 Oct 2021 06:52:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45210) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mglxx-0004Au-Pb for guix-patches@gnu.org; Sat, 30 Oct 2021 06:52:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mglxx-0002xQ-OU for guix-patches@gnu.org; Sat, 30 Oct 2021 06:52:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51508] [PATCH 2/2] gnu: icedove: Update to 91.2.1. Resent-From: Jonathan Brielmaier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 30 Oct 2021 10:52:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51508 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51508@debbugs.gnu.org Cc: mhw@netris.org, Jonathan Brielmaier Received: via spool by 51508-submit@debbugs.gnu.org id=B51508.163559106611287 (code B ref 51508); Sat, 30 Oct 2021 10:52:01 +0000 Received: (at 51508) by debbugs.gnu.org; 30 Oct 2021 10:51:06 +0000 Received: from localhost ([127.0.0.1]:56755 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mglww-0002vT-Pm for submit@debbugs.gnu.org; Sat, 30 Oct 2021 06:51:06 -0400 Received: from mout.web.de ([217.72.192.78]:33393) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mglws-0002uy-S2 for 51508@debbugs.gnu.org; Sat, 30 Oct 2021 06:50:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1635591048; bh=2PmYSO2qpEsrq/41iu9Fl+OWQx1FSSAf+nbm8Ts5+kI=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=b7o5NfzWJz57ypWptFzc5149eqW+SL7jnWnhoU3CSjTovmF4iw9lVti0orSl0BwTM nZUim93U12pExNwRPbpDiWLc4om66HztgLqvxrUK+494wkcoTyIooz8y3BwxoiBOmC v2LV7IUM78Xk725wgMGxB/Ymkv+yosw/HcPn61zE= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from 3700X.fritz.box ([77.189.189.108]) by smtp.web.de (mrweb102 [213.165.67.124]) with ESMTPSA (Nemesis) id 0MN4Kq-1maCNE1gYy-006eby; Sat, 30 Oct 2021 12:50:48 +0200 From: Jonathan Brielmaier Date: Sat, 30 Oct 2021 12:50:38 +0200 Message-Id: <20211030105038.12529-2-jonathan.brielmaier@web.de> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211030105038.12529-1-jonathan.brielmaier@web.de> References: <20211030104659.12458-1-jonathan.brielmaier@web.de> <20211030105038.12529-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:YZJ8uyd86VZowM4/6K5e7x5hZgOnMCp7FgPeddzKGSjr/jFpfH/ 8pO6BIwUFTD1PcnCWf6PR9go5aZfLvjql2VJwKMfi+ZYZTnBIpzCzgHuTlqjbHI2W3m6dhG zSS3h1yJ/CnJRZzMaGyHejo67aiSBL0IfuTxDtWBYAO93SAWJC46g99ZBr1o2L+qxXEPKik Ht0yaWqPysGyy+nLF69RQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:XeVMDe4KUyE=:hMoZrl+5uoNhQ+xnYchmKJ zQUQJheF/F6yK8TrkABA5bA4MJRuOLg+J8roAPwfY3lY8VWZ80a7yA0N+ZtSA9RsFFl/DuGMC irRUEJDIrSlD916cAxOtx7PzUWzLqOhsoRN6Vflf86TvCa0QqeZxanKasIADjMOK+8xR5wAsm WrHuCUEkSLLuRzJIPLQpEa+02TEeIjNuEq5T4izd35HnB6Exitt/IpoXFJKDrK6LatQHRsLMW IZarqVjVMFhSYa/rrBcZZmNTViX1jhdABCx5MfdUeU3Zz0Hpd3/oi71h949giLPyH71Tns2y0 aI0TCTgkdKQFVX7b5a/Wxa89iWNLgB+Us0JDVqtlrRNFf8W93AiBXsmHn8iQhPYbjeYkkHpms 66hUDQhfsTSnM8tEarGmxQZRyEbc6PUA3qMfWdl6MHyhNXHqX/Usdpu1Q4CI+LXZqTB/vBfL3 K8kNJfZKVQSr7psQbz9aIGd20H2OYssGGmqrnMJ5S1paMLPHC2jvhZnRR6I/k/Yy5MqPmcee4 4ODwfHWvmv7MLxEyBt9XCxJ/fgSrzIw3lqR1uMkdisY+6nqSJgYvnKesitfQCv2HGUEEafwgU 4et+LcfY0S4mo1Q1D0CB+mZ30G9B2fqOUw6W+jLkSMJeGJJ/uAo0lSmj4mgFveDUW7vNnotzk eioCtLXiucpZqfRxaWyvMqrLJnMbeRjzq72IrmAiv3f15JYlPDHQ/tiOmTod+NW26Y1J3PPIm 8jYtZ8edv80FlC1J4EtTNYAQJa+wemTMFw69zlY1cmYwUkwbW00+X73pSMhVCamwXQ4CtahzT 1ZI+vxOn6+Eb9OVbZrRHkLfk+oUEYvx+PlyL0FPp7u82xT9BKQ8O7sApIjGD23sfhP4TmPGnb kHzKba8g/9Iz155NfK0s1Br4Q+v2384LxxDb7HWOU0ZrgU2zy0AaAmSfufJZVNm0cXo2rSml2 EZHa/AqYKb+Qox5Y2L5ZOKhQSoNPad0CVHSxjBQExQJnW31B4HZgJ4wR/e9KddgRwXXYtyB9k z8cGjj57wAjRp5DhIFbdkgg9khRsw+srXYOlLw50/UQ5bUfvVxdWjT3vhL4hwYZDjiDbTCSUe vO5zhIwkS8M5rU= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1635591143; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=ZRKZB3nFzH3tS77mKiDy9UplloX7Fm3BBPLErIW4yyE=; b=pVd7T+VWUSsZ+nDlUJz6fagu/yeh2g2IErxWcf9Apjiv5xp7klfu+sAsMXmfLRhUaXbBih aoNh3NQ1pbf2NbHgk/jxBmjlCb7i3895arwhtEsGEOsNF8wmL7vN1xUd7ufO1cekfaNfEe 2T0mjkrSJnE98+Zvff2Yu5mooEK7ZyLxsQvtay+cd/SM3bJnje3GVWdRg0eSoxZQtBGrlB Xk14JhYu2bFuKZJDZRt9jM9eESwzWnpmdcw+sNujfgNI3gALl28Yu4vFC8fK9tycsZaISO bSF3pgJ/4YwD9k9ijf19hhUsru59okk8iMRuA5q6a6SxKM7hWHGNtCAhPfJ+1Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1635591143; a=rsa-sha256; cv=none; b=HsO8DpAs/iPkRe/KnDtTQy/qWZhHqrHWpnCedIbe+mFZpF7vZ3ZZD25i413vKKPdX7UCfT dfenrNmAEWO/4C92EE/b14uGcrVC0Dl7MUBMOOfc+p7TSphVq3JEvhQT2DvgsB0BEbJrAG g1l+q3CLYrd70j8NuKyetIBys1nUc3FkitPfabnwHKfjQAtQx6+beO4VrxaVPH3ce7LR9U j+wMQjeculW+cvpkoH9AsWv0X6WYPUjA6E2wv3KXLTp1JesgKkoo36h5L3DfXU24YqAyUt y4j27pFU57cbHG6eyFtBsrKzuzGVdIwgjEciFpTueMo3RGh1wTEDb0sfw+v5vg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=web.de header.s=dbaedf251592 header.b=b7o5NfzW; dmarc=fail reason="SPF not aligned (relaxed)" header.from=web.de (policy=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-Migadu-Spam-Score: -0.32 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=web.de header.s=dbaedf251592 header.b=b7o5NfzW; dmarc=fail reason="SPF not aligned (relaxed)" header.from=web.de (policy=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-Migadu-Queue-Id: E175735B89 X-Spam-Score: -0.32 X-Migadu-Scanner: scn0.migadu.com X-TUID: gnFXgrb/Z1+G The profile folder moved from `~/.icedove` to `~/.thunderbird`. You may need to migrate (copy) your profile over. * gnu/packages/gnuzilla.scm (icedove): Update to 91.2.1. [source]: Switch back to icecat-source. [arguments]: `obj-x86_64-pc-linux-gnu` folder is now generated during build, so it can't deleted in front. Remove surounding `'` from MOZ_DEDICATED_PROFILES to follow source code. MOZ_APP_BASENAME and MOZ_APP_DISPLAYNAME are no longer set in `comm/mail/confvars.sh`. Update path of `customizeToolbar.js`. Delete `'bootstrap` phase and no longer set AUTOCONF variable as the autoconf build part was removed. Set MACH_USE_SYSTEM_PYTHON and MOZ_APP_NAME, the latter is the binary name. `--enable-calendar` flag got removed. Use bundled NSS until core-updates merge. [inputs]: Update to `icu4c-69` and `nspr-4.32`. Use bundled NSS for now. [native-inputs]: Switch to comm-esr91 branch. Remove autoconf, add m4. Update rust and cargo to 1.51. Use `rust-cbindgen-0.19`. =2D-- gnu/packages/gnuzilla.scm | 49 ++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 26 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 3aa39bc806..30b5d6544e 100644 =2D-- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -13,7 +13,7 @@ ;;; Copyright =C2=A9 2020 Oleg Pykhalov ;;; Copyright =C2=A9 2020 Jakub K=C4=85dzio=C5=82ka ;;; Copyright =C2=A9 2019, 2020 Adrian Malacoda -;;; Copyright =C2=A9 2020 Jonathan Brielmaier +;;; Copyright =C2=A9 2020, 2021 Jonathan Brielmaier ;;; Copyright =C2=A9 2020 Marius Bakke ;;; Copyright =C2=A9 2021 Brice Waegeneire ;;; @@ -1590,12 +1590,12 @@ (define icecat-78-source #t)))))))) ;; Update this together with icecat! -(define %icedove-build-id "20211008000000") ;must be of the form YYYYMMDD= hhmmss +(define %icedove-build-id "20211021000000") ;must be of the form YYYYMMDD= hhmmss (define-public icedove (package (name "icedove") - (version "78.15.0") - (source icecat-78-source) + (version "91.2.1") + (source icecat-source) (properties `((cpe-name . "thunderbird_esr"))) (build-system gnu-build-system) @@ -1613,7 +1613,6 @@ (define-public icedove (mkdir "comm") (copy-recursively (assoc-ref inputs "thunderbird-sources") "comm") - (delete-file-recursively "obj-x86_64-pc-linux-gnu") (delete-file "sourcestamp.txt") #t)) (add-after 'patch-source-shebangs 'patch-cargo-checksums @@ -1635,14 +1634,12 @@ (define-public icedove (add-after 'patch-source-shebangs 'fix-profile-setting (lambda _ (substitute* "comm/mail/moz.configure" - (("'MOZ_DEDICATED_PROFILES', True") - "'MOZ_DEDICATED_PROFILES', False")) + (("MOZ_DEDICATED_PROFILES, True") + "MOZ_DEDICATED_PROFILES, False")) #t)) (add-after 'prepare-thunderbird-sources 'rename-to-icedove (lambda _ (substitute* "comm/mail/confvars.sh" - (("MOZ_APP_BASENAME=3DThunderbird") - "MOZ_APP_BASENAME=3DIcedove\nMOZ_APP_DISPLAYNAME=3DIcedov= e") (("MOZ_APP_NAME=3Dthunderbird") "MOZ_APP_NAME=3Dicedove") (("MOZ_UPDATER=3D1") @@ -1686,7 +1683,8 @@ (define-public icedove "enterprisepolicies/schemas/moz.build") (("Thunderbird") "Icedove"))) (substitute* '("comm/mailnews/base/prefs/content/accountUtil= s.js" - "comm/common/src/customizeToolbar.js") + "comm/mail/base/content/customizeToolbar.js" + "comm/suite/components/customizeToolbar.js") (("AppConstants.MOZ_APP_NAME (.)=3D \"thunderbird" _ e) (format #f "AppConstants.MOZ_APP_NAME ~a=3D \"icedove" e)= )) @@ -1720,6 +1718,7 @@ (define-public icedove "" (string-drop hash 8)))) #t)) + (delete 'bootstrap) (replace 'configure (lambda* (#:key inputs outputs configure-flags #:allow-other-k= eys) (let* ((out (assoc-ref outputs "out")) @@ -1730,10 +1729,6 @@ (define-public icedove ,@configure-flags)) (mozconfig (string-append (getcwd) "/.mozconfig"))) (setenv "SHELL" bash) - (setenv "AUTOCONF" - (string-append (assoc-ref %build-inputs - "autoconf") - "/bin/autoconf")) (setenv "CONFIG_SHELL" bash) (setenv "QA_CONFIGURE_OPTIONS" ".*") (setenv "MOZBUILD_STATE_PATH" @@ -1742,10 +1737,12 @@ (define-public icedove (string-append (getcwd) "/.mozconfig")) (setenv "CC" "gcc") (setenv "MOZ_NOSPAM" "1") + (setenv "MACH_USE_SYSTEM_PYTHON" "1") (setenv "PYTHON" (string-append (assoc-ref inputs "python2") "/bin/python")) (setenv "MOZ_BUILD_DATE" ,%icedove-build-id) ; avoid times= tamp + (setenv "MOZ_APP_NAME" "icedove") (setenv "LDFLAGS" (string-append "-Wl,-rpath=3D" (assoc-ref outputs "out") "/lib/icedove")) @@ -1765,7 +1762,6 @@ (define-public icedove "ac_add_options --disable-updater\n" "ac_add_options --disable-webrtc\n" "ac_add_options --enable-application=3Dcomm/mail\n" - "ac_add_options --enable-calendar\n" "ac_add_options --enable-default-toolkit=3D\"cairo-g= tk3\"\n" "ac_add_options --enable-optimize\n" "ac_add_options --enable-pulseaudio\n" @@ -1782,7 +1778,7 @@ (define-public icedove "ac_add_options --with-system-jpeg\n" "ac_add_options --with-system-libevent\n" "ac_add_options --with-system-nspr\n" - "ac_add_options --with-system-nss\n" + ;"ac_add_options --with-system-nss\n" "ac_add_options --with-system-zlib\n" "ac_add_options --with-user-appdir=3D\\.icedove\n" "mk_add_options MOZ_MAKE_FLAGS=3D-j" @@ -1847,7 +1843,7 @@ (define-public icedove ("gtk+" ,gtk+) ("gtk+-2" ,gtk+-2) ("hunspell" ,hunspell) - ("icu4c" ,icu4c-67) + ("icu4c" ,icu4c-69) ("libcanberra" ,libcanberra) ("libevent" ,libevent) ("libffi" ,libffi) @@ -1862,8 +1858,9 @@ (define-public icedove ("libxt" ,libxt) ("mesa" ,mesa) ("mit-krb5" ,mit-krb5) - ("nspr" ,nspr) - ("nss" ,nss) + ("nspr" ,nspr-4.32) + ; FIXME: create nss >=3D 3.68 after core-updates merge + ;("nss" ,nss) ("pango" ,pango) ("pixman" ,pixman) ("pulseaudio" ,pulseaudio) @@ -1879,28 +1876,28 @@ (define-public icedove ;; 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 "2aa18076f0c3bc49d0e216798b3640891e68fada")) + ,(let ((changeset "a7150951959d1e337fe38d06039a0cc1618ade79")) (origin (method hg-fetch) (uri (hg-reference - (url "https://hg.mozilla.org/releases/comm-esr78") + (url "https://hg.mozilla.org/releases/comm-esr91") (changeset changeset))) (file-name (string-append "thunderbird-" version "-checkout"= )) (sha256 (base32 - "0ww1rgm8hpmji9fjhinqrwf07j2jikdq8j2x87h5s3naw5898fr3"))))= ) - ("autoconf" ,autoconf-2.13) - ("cargo" ,rust-1.41 "cargo") + "142r9yv9d8zxjz24wgyi7gjg31wn4k5ndn2qan5ldh4b4hm5pab8"))))= ) + ("cargo" ,rust-1.51 "cargo") ("clang" ,clang) ("llvm" ,llvm) + ("m4" ,m4) ("nasm" ,nasm) ("node" ,node) ("perl" ,perl) ("pkg-config" ,pkg-config) ("python" ,python) ("python2" ,python-2.7) - ("rust" ,rust-1.41) - ("rust-cbindgen" ,rust-cbindgen-0.14) + ("rust" ,rust-1.51) + ("rust-cbindgen" ,rust-cbindgen-0.19) ("which" ,which) ("yasm" ,yasm))) (home-page "https://www.thunderbird.net") =2D- 2.33.1