[bug#61391] [PATCH 0/6] Improvements to Icedove (icons, gexps, un-bundling)

[bug#61391] [PATCH 0/6] Improvements to Icedove (icons, gexps, un-bundling)

[Maxim Cournoyer]

Hi Guix,

This series improves our Icedove package a bit, unbundling NSS and producing
its icon so that it looks more tidy in GNOME or other desktop environments.

Thanks!

Maxim Cournoyer (6):
  gnu: icedove-wayland: Use gexps.
  gnu: Add nspr-next.
  gnu: Add nss-next.
  gnu: icedove: Unbundle NSS.
  gnu: icedove: Use more gexps.
  gnu: icedove: Install icons.

 gnu/packages/gnuzilla.scm | 64 ++++++++++++++++++++++-----------------
 gnu/packages/nss.scm      | 32 +++++++++++++++++++-
 2 files changed, 67 insertions(+), 29 deletions(-)


base-commit: d934f36096142257e192e3029895b3a054bf3537
-- 
2.39.1

[bug#61391] [PATCH 1/6] gnu: icedove-wayland: Use gexps.

[Maxim Cournoyer]

* gnu/packages/gnuzilla.scm (icedove/wayland)
[inputs]: Set to the empty list.
[arguments]: Use gexps.
---

 gnu/packages/gnuzilla.scm | 35 ++++++++++++++---------------------
 1 file changed, 14 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 0b39774a2e..15472ffed2 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -1420,37 +1420,30 @@ (define-public icedove/wayland
   (package
     (inherit icedove)
     (name "icedove-wayland")
-    (native-inputs '())
-    (inputs
-     `(("bash" ,bash-minimal)
-       ("icedove" ,icedove)))
     (build-system trivial-build-system)
     (arguments
-      '(#:modules ((guix build utils))
-        #:builder
-        (begin
+     (list
+      #:modules '((guix build utils))
+      #:builder
+      #~(begin
           (use-modules (guix build utils))
-          (let* ((bash    (assoc-ref %build-inputs "bash"))
-                 (icedove (assoc-ref %build-inputs "icedove"))
-                 (out     (assoc-ref %outputs "out"))
-                 (exe     (string-append out "/bin/icedove")))
+          (let* ((exe (string-append #$output "/bin/icedove")))
             (mkdir-p (dirname exe))
-
             (call-with-output-file exe
               (lambda (port)
                 (format port "#!~a
  MOZ_ENABLE_WAYLAND=1 exec ~a $@"
-                        (string-append bash "/bin/bash")
-                        (string-append icedove "/bin/icedove"))))
+                        #$(file-append bash-minimal "/bin/bash")
+                        #$(file-append icedove "/bin/icedove"))))
             (chmod exe #o555)
-
             ;; Provide the manual and .desktop file.
-            (copy-recursively (string-append icedove "/share")
-                              (string-append out "/share"))
-            (substitute* (string-append
-                          out "/share/applications/icedove.desktop")
-              ((icedove) out))
-            #t))))))
+            (copy-recursively (string-append #$icedove "/share")
+                              (string-append #$output "/share"))
+            (substitute* (string-append #$output
+                                        "/share/applications/icedove.desktop")
+              ((#$icedove) #$output))))))
+    (native-inputs '())
+    (inputs '())))
 
 (define-public firefox-decrypt
   (package
-- 
2.39.1

[bug#61391] [PATCH 2/6] gnu: Add nspr-next.

[Maxim Cournoyer]

* gnu/packages/nss.scm (nspr-next): New variable.
---

 gnu/packages/nss.scm | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm
index 0d18592be4..b24f9abdde 100644
--- a/gnu/packages/nss.scm
+++ b/gnu/packages/nss.scm
@@ -5,7 +5,7 @@
 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2020, 2021 Marius Bakke <marius@gnu.org>
 ;;; Copyright © 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de>
-;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -107,6 +107,19 @@ (define-public nspr-4.32
               (base32
                "0v3zds1id71j5a5si42a658fjz8nv2f6zp6w4gqrqmdr6ksz8sxv"))))))
 
+(define-public nspr-next
+  (package
+    (inherit nspr)
+    (version "4.35")
+    (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
+                "13xwda56yhp1w7v02qvlxvlqiniw8kr4g3fxlljmv6wnlmz2k8vy"))))))
+
 (define-public nss
   (package
     (name "nss")
-- 
2.39.1

[bug#61391] [PATCH 3/6] gnu: Add nss-next.

[Maxim Cournoyer]

* gnu/packages/nss.scm (nss-next): New variable.
---

 gnu/packages/nss.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm
index b24f9abdde..7101dbfdd3 100644
--- a/gnu/packages/nss.scm
+++ b/gnu/packages/nss.scm
@@ -242,3 +242,20 @@ (define-public nss
 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-next
+  (package
+    (inherit nss)
+    (version "3.83")
+    (source (origin
+              (inherit (package-source nss))
+              (uri (let ((version-with-underscores
+                          (string-join (string-split version #\.) "_")))
+                     (string-append
+                      "https://ftp.mozilla.org/pub/mozilla.org/security/nss/"
+                      "releases/NSS_" version-with-underscores "_RTM/src/"
+                      "nss-" version ".tar.gz")))
+              (sha256
+               (base32
+                "0a01xwfrr334mibj1agbykjkc72ph906f2n8ff5hn2b4z5kyl8xb"))))
+    (propagated-inputs (list nspr-next))))
-- 
2.39.1

[bug#61391] [PATCH 4/6] gnu: icedove: Unbundle NSS.

[Maxim Cournoyer]

* gnu/packages/gnuzilla.scm (icedove) [inputs]: Add nss-next.  Remove nspr-4.32.
[configure]: Add "ac_add_options --with-system-nss".
---

 gnu/packages/gnuzilla.scm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 15472ffed2..44e56a6573 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -1306,7 +1306,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 --without-wasm-sandboxed-libraries\n"
                       "mk_add_options MOZ_MAKE_FLAGS=-j"
@@ -1383,9 +1383,7 @@ (define-public icedove
            libxt
            mesa
            mit-krb5
-           nspr-4.32
-           ;; FIXME: create nss >= 3.68 after core-updates merge
-           ;;nss
+           nss-next
            pango
            pixman
            pulseaudio
-- 
2.39.1

[bug#61391] [PATCH 5/6] gnu: icedove: Use more gexps.

[Maxim Cournoyer]

* gnu/packages/gnuzilla.scm (icedove)
[configure]: Use search-input-file and this-package-native-input.
---

 gnu/packages/gnuzilla.scm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 44e56a6573..ecb8edd914 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -1246,7 +1246,8 @@ (define-public icedove
                                 (string-drop hash 8))))))
           (delete 'bootstrap)
           (replace 'configure
-            (lambda* (#:key inputs configure-flags #:allow-other-keys)
+            (lambda* (#:key native-inputs inputs configure-flags
+                      #:allow-other-keys)
               (let* ((bash (which "bash"))
                      (abs-srcdir (getcwd))
                      (srcdir (string-append "../" (basename abs-srcdir)))
@@ -1298,9 +1299,12 @@ (define-public icedove
                       "ac_add_options --enable-system-ffi\n"
                       "ac_add_options --enable-system-pixman\n"
                       "ac_add_options --prefix=" #$output "\n"
-                      "ac_add_options --with-clang-path=" (assoc-ref %build-inputs "clang") "/bin/clang\n"
+                      "ac_add_options --with-clang-path="
+                      (search-input-file (or native-inputs inputs)
+                                         "bin/clang") "\n"
                       "ac_add_options --with-distribution-id=org.gnu\n"
-                      "ac_add_options --with-libclang-path=" (assoc-ref %build-inputs "clang") "/lib\n"
+                      "ac_add_options --with-libclang-path="
+                      #$(this-package-native-input "clang") "/lib\n"
                       "ac_add_options --with-system-bz2\n"
                       "ac_add_options --with-system-icu\n"
                       "ac_add_options --with-system-jpeg\n"
-- 
2.39.1

[bug#61391] [PATCH 6/6] gnu: icedove: Install icons.

[Maxim Cournoyer]

* gnu/packages/gnuzilla.scm (icedove) [phases]: Add install-icons phase.

---

 gnu/packages/gnuzilla.scm | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index ecb8edd914..ec9a3409ba 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -1347,6 +1347,19 @@ (define-public icedove
                             Name=Write new message~@
                             Exec=~@*~a/bin/icedove -compose~%"
                             #$output))))))
+          (add-after 'install-desktop-file 'install-icons
+            (lambda _
+              (with-directory-excursion "browser/branding/official"
+                (for-each
+                 (lambda (file)
+                   (let* ((size (string-filter char-numeric? file))
+                          (icons (string-append #$output "/share/icons/hicolor/"
+                                                size "x" size "/apps")))
+                     (mkdir-p icons)
+                     (copy-file file (string-append icons "/icedove.png"))))
+                 '("default16.png" "default22.png" "default24.png"
+                   "default32.png" "default48.png" "content/icon64.png"
+                   "mozicon128.png" "default256.png")))))
           (add-after 'install 'wrap-program
             (lambda* (#:key inputs #:allow-other-keys)
               (let* ((lib (string-append #$output "/lib"))
-- 
2.39.1

[bug#61391] [PATCH 0/6] Improvements to Icedove (icons, gexps, un-bundling)

[Morgan Smith]

Hello,

Maxim Cournoyer <maxim.cournoyer@gmail.com> writes:
> -           nspr-4.32

I'm not sure if I'm missing something but as far as I can tell you added
nspr-next, then never used it, and also removed nspr-4.32 from the
inputs here.  Did you (or I) miss a nspr-next somewhere?


Morgan

[bug#61391] [PATCH 0/6] Improvements to Icedove (icons, gexps, un-bundling)

[Maxim Cournoyer]

Hi,

Morgan Smith <Morgan.J.Smith@outlook.com> writes:

> Hello,
>
> Maxim Cournoyer <maxim.cournoyer@gmail.com> writes:
>> -           nspr-4.32
>
> I'm not sure if I'm missing something but as far as I can tell you added
> nspr-next, then never used it, and also removed nspr-4.32 from the
> inputs here.  Did you (or I) miss a nspr-next somewhere?

nspr is now propagated by nss, that's why it can be removed from
thunderbird.  I've added the ";required by nss.pc" inline comment
locally next where it's propagated to mention why.

-- 
Thanks,
Maxim

[bug#61391] [PATCH 0/6] Improvements to Icedove (icons, gexps, un-bundling)

[Morgan Smith]

Hello,

Maxim Cournoyer <maxim.cournoyer@gmail.com> writes:
> nspr is now propagated by nss, that's why it can be removed from
> thunderbird.  I've added the ";required by nss.pc" inline comment
> locally next where it's propagated to mention why.

Ah perfect.  My bad, I missed a nspr-next.

In the current icedove there are there are icons at this path:
"lib/icedove/chrome/icons/default".  What's up with that?  I only ask
because you don't copy them to the wayland package and I don't know if
that's an issue or not.

Everything else LGTM, not that I'm actually a reviewer.  Just an overly
involved citizen.


Morgan

[bug#61391] [PATCH 0/6] Improvements to Icedove (icons, gexps, un-bundling)

[Maxim Cournoyer]

Hi Morgan,

Morgan Smith <Morgan.J.Smith@outlook.com> writes:

> Hello,
>
> Maxim Cournoyer <maxim.cournoyer@gmail.com> writes:
>> nspr is now propagated by nss, that's why it can be removed from
>> thunderbird.  I've added the ";required by nss.pc" inline comment
>> locally next where it's propagated to mention why.
>
> Ah perfect.  My bad, I missed a nspr-next.
>
> In the current icedove there are there are icons at this path:
> "lib/icedove/chrome/icons/default".  What's up with that?

That's why it doesn't find its icon :-).  Its icon per the
icedove.desktop file should be named 'icedove', not default; the later
seems to be a consequence of the re-branding.  I basically copied the
fix that is applied to IceCat.

> I only ask because you don't copy them to the wayland package and I
> don't know if that's an issue or not.

About the icedove/wayland package, that appears to be a solely a
wrapper, so I don't think the fix needs to be propagated there.

> Everything else LGTM, not that I'm actually a reviewer.  Just an overly
> involved citizen.

Your over-involvement is much welcome :-).

-- 
Thanks,
Maxim

[bug#61391] [PATCH 0/6] Improvements to Icedove (icons, gexps, un-bundling)

[Morgan Smith]

Hi Maxim,

Maxim Cournoyer <maxim.cournoyer@gmail.com> writes:

> About the icedove/wayland package, that appears to be a solely a
> wrapper, so I don't think the fix needs to be propagated there.

Since it's a wrapper the original files aren't installed into the
profile, only the files in the wrapper.  So if anyone wanted to look for
icons at "lib/icedove/chrome/icons/default" they might be fine for the
original package but not the wrapper.  The wrapper copies "share" in
though so the icons you copy there will be found just fine.

I was simply questioning if someone else would try to find the icons at
"lib/icedove/chrome/icons/default and if they would be out of luck since
they don't exist in the wrapper.

From what you're saying, it sounds like this isn't an issue at all
because no-one cares about those icons.


Also you might want to take a look at bug#61438 as someone is trying to
update icedove.  Also, the reason I discovered this patch series is
because I expereinced bug#61438 and wanted to see if anyone had a fix
;).


Morgan

bug#61391: [PATCH 0/6] Improvements to Icedove (icons, gexps, un-bundling)

[Maxim Cournoyer]

Hi,

Morgan Smith <Morgan.J.Smith@outlook.com> writes:

> Hi Maxim,
>
> Maxim Cournoyer <maxim.cournoyer@gmail.com> writes:
>
>> About the icedove/wayland package, that appears to be a solely a
>> wrapper, so I don't think the fix needs to be propagated there.
>
> Since it's a wrapper the original files aren't installed into the
> profile, only the files in the wrapper.  So if anyone wanted to look for
> icons at "lib/icedove/chrome/icons/default" they might be fine for the
> original package but not the wrapper.  The wrapper copies "share" in
> though so the icons you copy there will be found just fine.
>
> I was simply questioning if someone else would try to find the icons at
> "lib/icedove/chrome/icons/default and if they would be out of luck since
> they don't exist in the wrapper.
>
>>From what you're saying, it sounds like this isn't an issue at all
> because no-one cares about those icons.

Indeed, that's my understanding too.

> Also you might want to take a look at bug#61438 as someone is trying to
> update icedove.  Also, the reason I discovered this patch series is
> because I expereinced bug#61438 and wanted to see if anyone had a fix
> ;).

I see the above as been merged already, great!  And I'll have more
Icedove fixes coming that enables its language support.

-- 
Thanks,
Maxim