[bug#51508] [PATCH 0/2] Update icedove to 91 branch

[bug#51508] [PATCH 0/2] Update icedove to 91 branch

[Jonathan Brielmaier]

Hi folks,

the following patch series updates Icedove to the 91 ESR branch.

One big outstanding issue, is that thunderbird uses now the
~/.thunderbird folder for the profiles. I did not get it using
~/.icedove like before. So you need to migrate (copy) your profile. I
can live with that, who can't: have fun finding out how to get back the
old behaviour :)

I'll make the switch to clang/llvm build in a seperate commit. As I want
to compare both builds a bit on their snapiness...

Kind regards
Jonathan Brielmaier (2):
  gnu: Add nspr@4.32.
  gnu: icedove: Update to 91.2.1.

 gnu/packages/gnuzilla.scm | 49 ++++++++++++++++++---------------------
 gnu/packages/nss.scm      | 13 +++++++++++
 2 files changed, 36 insertions(+), 26 deletions(-)

--
2.33.1

[bug#51508] [PATCH 1/2] gnu: Add nspr@4.32.

[Jonathan Brielmaier]

Required for icecat/icedove 91.

* gnu/packages/nss.scm (nspr-4.32): New variable.
---
 gnu/packages/nss.scm | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm
index 0444b47071..25203deb31 100644
--- a/gnu/packages/nss.scm
+++ b/gnu/packages/nss.scm
@@ -70,6 +70,19 @@ (define-public nspr
 in the Mozilla clients.")
     (license license:mpl2.0)))

+(define-public nspr-4.32
+  (package
+    (inherit nspr)
+    (version "4.32")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append
+                   "https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v"
+                   version "/src/nspr-" version ".tar.gz"))
+             (sha256
+              (base32
+               "0v3zds1id71j5a5si42a658fjz8nv2f6zp6w4gqrqmdr6ksz8sxv"))))))
+
 (define-public nss
   (package
     (name "nss")
--
2.33.1

[bug#51508] [PATCH 2/2] gnu: icedove: Update to 91.2.1.

[Jonathan Brielmaier]

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`.
---
 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
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -13,7 +13,7 @@
 ;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
 ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
 ;;; Copyright © 2019, 2020 Adrian Malacoda <malacoda@monarch-pass.net>
-;;; Copyright © 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de>
+;;; Copyright © 2020, 2021 Jonathan Brielmaier <jonathan.brielmaier@web.de>
 ;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
 ;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
 ;;;
@@ -1590,12 +1590,12 @@ (define icecat-78-source
                 #t))))))))

 ;; Update this together with icecat!
-(define %icedove-build-id "20211008000000") ;must be of the form YYYYMMDDhhmmss
+(define %icedove-build-id "20211021000000") ;must be of the form YYYYMMDDhhmmss
 (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=Thunderbird")
-                "MOZ_APP_BASENAME=Icedove\nMOZ_APP_DISPLAYNAME=Icedove")
                (("MOZ_APP_NAME=thunderbird")
                 "MOZ_APP_NAME=icedove")
                (("MOZ_UPDATER=1")
@@ -1686,7 +1683,8 @@ (define-public icedove
                               "enterprisepolicies/schemas/moz.build")
                  (("Thunderbird") "Icedove")))
              (substitute* '("comm/mailnews/base/prefs/content/accountUtils.js"
-                            "comm/common/src/customizeToolbar.js")
+                            "comm/mail/base/content/customizeToolbar.js"
+                            "comm/suite/components/customizeToolbar.js")
                (("AppConstants.MOZ_APP_NAME (.)= \"thunderbird" _ e)
                 (format #f "AppConstants.MOZ_APP_NAME ~a= \"icedove" e)))

@@ -1720,6 +1718,7 @@ (define-public icedove
                                "<!-- Guix: not a runtime dependency -->"
                                (string-drop hash 8))))
              #t))
+         (delete 'bootstrap)
          (replace 'configure
            (lambda* (#:key inputs outputs configure-flags #:allow-other-keys)
              (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 timestamp
+               (setenv "MOZ_APP_NAME" "icedove")
                (setenv "LDFLAGS" (string-append "-Wl,-rpath="
                                                 (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=comm/mail\n"
-                     "ac_add_options --enable-calendar\n"
                      "ac_add_options --enable-default-toolkit=\"cairo-gtk3\"\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=\\.icedove\n"
                      "mk_add_options MOZ_MAKE_FLAGS=-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 >= 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")
--
2.33.1

[bug#51508] [PATCH 0/2] Update icedove to 91 branch

[Mark H Weaver]

Hi Jonathan,

Jonathan Brielmaier <jonathan.brielmaier@web.de> writes:
> the following patch series updates Icedove to the 91 ESR branch.

Thanks very much for this!

> One big outstanding issue, is that thunderbird uses now the
> ~/.thunderbird folder for the profiles. I did not get it using
> ~/.icedove like before. So you need to migrate (copy) your profile. I
> can live with that, who can't: have fun finding out how to get back the
> old behaviour :)

Before this is pushed to 'master', I'd like to take a day or two to see
if I can find out how to make it use ~/.icedove like before.

    Thanks again,
        Mark

-- 
Disinformation flourishes because many people care deeply about injustice
but very few check the facts.  Ask me about <https://stallmansupport.org>.

[bug#51508] [PATCH 0/2] Update icedove to 91 branch

[Mark H Weaver]

Hi Jonathan,

Jonathan Brielmaier <jonathan.brielmaier@web.de> writes:
> One big outstanding issue, is that thunderbird uses now the
> ~/.thunderbird folder for the profiles. I did not get it using
> ~/.icedove like before. So you need to migrate (copy) your profile. I
> can live with that, who can't: have fun finding out how to get back the
> old behaviour :)

Here's a proposed patch that might be what's needed:

--8<---------------cut here---------------start------------->8---
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 30b5d6544e..39d67641ff 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -1687,6 +1687,9 @@ standards of the IceCat project.")
                             "comm/suite/components/customizeToolbar.js")
                (("AppConstants.MOZ_APP_NAME (.)= \"thunderbird" _ e)
                 (format #f "AppConstants.MOZ_APP_NAME ~a= \"icedove" e)))
+             (substitute* "comm/suite/components/migration/src/nsThunderbirdProfileMigrator.cpp"
+               (("\"Thunderbird\"") "\"Icedove\"")
+               (("\"\\.thunderbird\"") "\".icedove\""))
 
              ;; Override addon URLs and settings
              (substitute* "comm/mail/app/profile/all-thunderbird.js"
--8<---------------cut here---------------end--------------->8---

Would you like to test it?

       Mark

-- 
Disinformation flourishes because many people care deeply about injustice
but very few check the facts.  Ask me about <https://stallmansupport.org>.

[bug#51508] [PATCH 0/2] Update icedove to 91 branch

[Jonathan Brielmaier]

On 31.10.21 06:43, Mark H Weaver wrote:
> Hi Jonathan,
>
> Jonathan Brielmaier <jonathan.brielmaier@web.de> writes:
>> One big outstanding issue, is that thunderbird uses now the
>> ~/.thunderbird folder for the profiles. I did not get it using
>> ~/.icedove like before. So you need to migrate (copy) your profile. I
>> can live with that, who can't: have fun finding out how to get back the
>> old behaviour :)
>
> Here's a proposed patch that might be what's needed:
>
> --8<---------------cut here---------------start------------->8---
> diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
> index 30b5d6544e..39d67641ff 100644
> --- a/gnu/packages/gnuzilla.scm
> +++ b/gnu/packages/gnuzilla.scm
> @@ -1687,6 +1687,9 @@ standards of the IceCat project.")
>                               "comm/suite/components/customizeToolbar.js")
>                  (("AppConstants.MOZ_APP_NAME (.)= \"thunderbird" _ e)
>                   (format #f "AppConstants.MOZ_APP_NAME ~a= \"icedove" e)))
> +             (substitute* "comm/suite/components/migration/src/nsThunderbirdProfileMigrator.cpp"
> +               (("\"Thunderbird\"") "\"Icedove\"")
> +               (("\"\\.thunderbird\"") "\".icedove\""))
>
>                ;; Override addon URLs and settings
>                (substitute* "comm/mail/app/profile/all-thunderbird.js"
> --8<---------------cut here---------------end--------------->8---
>
> Would you like to test it?

Does not work for me. So icedove still looks up at .thunderbird.

[bug#51508] [PATCH 0/2] Update icedove to 91 branch

[Mark H Weaver]

Hi,

Jonathan Brielmaier <jonathan.brielmaier@web.de> writes:
> Does not work for me. So icedove still looks up at .thunderbird.

Thanks for testing it.  It didn't work for me either.  I spent some more
time looking for the relevant code, but alas, I wasn't able to find it
in the time available to me.

It would be great if someone else could pick this up.  I can't afford to
spend more time on this in the next few days.

Perhaps someone could ask the Thunderbird developers for clues, or if
all else fails, at least use the Guix news feed functionality to notify
existing Icedove users about the change and what they will need to do.

      Regards,
        Mark

-- 
Disinformation flourishes because many people care deeply about injustice
but very few check the facts.  Ask me about <https://stallmansupport.org>.

[bug#51508] [PATCH 0/2] Update icedove to 91 branch

[Ludovic Courtès]

Hi,

Jonathan Brielmaier <jonathan.brielmaier@web.de> skribis:

> Does not work for me. So icedove still looks up at .thunderbird.

Was any of you able to find more clues?

If not, like Mark wrote, better apply the update and add an entry in
etc/news.scm.

Thanks,
Ludo’.

bug#51508: [PATCH 0/2] Update icedove to 91 branch

[Jonathan Brielmaier]

On 13.11.21 23:06, Ludovic Courtès wrote:
> If not, like Mark wrote, better apply the update and add an entry in
> etc/news.scm.

I finally did this today. Pushed starting
f1a2e90409622b37b3975cd566c8c0b019e6f7a3.

~Jonathan

[bug#51508] [PATCH 0/2] Update icedove to 91 branch

[pelzflorian (Florian Pelz)]

On Wed, Dec 01, 2021 at 11:24:44PM +0100, Jonathan Brielmaier wrote:
> On 13.11.21 23:06, Ludovic Courtès wrote:
> > If not, like Mark wrote, better apply the update and add an entry in
> > etc/news.scm.
> 
> I finally did this today. Pushed starting
> f1a2e90409622b37b3975cd566c8c0b019e6f7a3.
> 
> ~Jonathan

Thank you for the update and news entry plus translation!

Will you add your copyright line to etc/news.scm?

Regards,
Florian

[bug#51508] [PATCH 0/2] Update icedove to 91 branch

[Jonathan Brielmaier]

On 03.12.21 23:33, pelzflorian (Florian Pelz) wrote:
> On Wed, Dec 01, 2021 at 11:24:44PM +0100, Jonathan Brielmaier wrote:
>> On 13.11.21 23:06, Ludovic Courtès wrote:
>>> If not, like Mark wrote, better apply the update and add an entry in
>>> etc/news.scm.
>>
>> I finally did this today. Pushed starting
>> f1a2e90409622b37b3975cd566c8c0b019e6f7a3.
>>
>> ~Jonathan
>
> Thank you for the update and news entry plus translation!

It was a kind of bidirectional translation between English and German :)

> Will you add your copyright line to etc/news.scm?

Ah, good hint. Done in 1e5656e7bd27220ad98a312ff5f293549bfe1912.