[bug#41111] Claws-Mail

["Raghav Gururajan" <raghavgururajan@disroot.org>]

[-- Attachment #1: Type: text/plain, Size: 108 bytes --]

@Danny

Please find the revised patches.

@Tobias

I have fixed the commit message.

Regards,
RG.

[-- Attachment #2: 0001-gnu-claws-mail-Make-some-cosmetic-changes.patch --]
[-- Type: application/octet-stream, Size: 5511 bytes --]

From f6fc8f8d539662cc432c20662488f0bcd8bd25a4 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed, 14 Oct 2020 21:15:28 -0400
Subject: [PATCH 1/6] gnu: claws-mail: Make some cosmetic changes.

* gnu/packages/mail.scm (claws-mail): Make some cosmetic changes.
---
 gnu/packages/mail.scm | 111 ++++++++++++++++++++++--------------------
 1 file changed, 59 insertions(+), 52 deletions(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 87c7529180..2234168eeb 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -1320,61 +1320,68 @@ compresses it.")
   (package
     (name "claws-mail")
     (version "3.17.7")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://www.claws-mail.org/releases/claws-mail-" version
-                    ".tar.xz"))
-              (sha256
-               (base32
-                "1j6x09621wng0lavh53nwzh9vqjzpspl8kh5azh7kbihpi4ldfb0"))))
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append
+         "https://www.claws-mail.org/releases/claws-mail-"
+         version ".tar.xz"))
+       (sha256
+        (base32 "1j6x09621wng0lavh53nwzh9vqjzpspl8kh5azh7kbihpi4ldfb0"))))
     (build-system gnu-build-system)
-    (native-inputs `(("pkg-config" ,pkg-config)))
-    (inputs `(("bogofilter" ,bogofilter)
-              ("curl" ,curl)
-              ("dbus-glib" ,dbus-glib)
-              ("enchant" ,enchant)
-              ("expat" ,expat)
-              ("ghostscript" ,ghostscript)
-              ("hicolor-icon-theme" ,hicolor-icon-theme)
-              ("gnupg" ,gnupg)
-              ("gnutls" ,gnutls)
-              ("gpgme" ,gpgme)
-              ("gtk" ,gtk+-2)
-              ("libarchive" ,libarchive)
-              ("libcanberra" ,libcanberra)
-              ("libetpan" ,libetpan)
-              ("libical" ,libical)
-              ("libnotify" ,libnotify)
-              ("libsm" ,libsm)
-              ("libxml2" ,libxml2)
-              ("perl" ,perl)
-              ("python-2" ,python-2)
-              ("mime-info" ,shared-mime-info)
-              ("startup-notification" ,startup-notification)))
     (arguments
-      '(#:configure-flags
-        '("--enable-gnutls" "--enable-pgpmime-plugin" "--enable-enchant"
-          "--enable-ldap")
-        #:make-flags
-        ;; Disable updating icon cache since it's done by the profile hook.
-        ;; Conflict with other packages in the profile would be inevitable
-        ;; otherwise.
-        '("gtk_update_icon_cache=true")
-        #:phases (modify-phases %standard-phases
-                   (add-before 'build 'patch-mime
-                     (lambda* (#:key inputs #:allow-other-keys)
-                       (substitute* "src/procmime.c"
-                         (("/usr/share/mime/globs")
-                          (string-append (assoc-ref inputs "mime-info")
-                                         "/share/mime/globs"))))))))
+     `(#:configure-flags
+       (list
+        "--enable-gnutls"
+        "--enable-pgpmime-plugin"
+        "--enable-enchant"
+        "--enable-ldap")
+       #:make-flags
+       ;; Disable updating icon cache since it's done by the profile hook.
+       ;; Conflict with other packages in the profile would be inevitable
+       ;; otherwise.
+       (list
+        "gtk_update_icon_cache=true")
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'build 'patch-mime
+           (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* "src/procmime.c"
+               (("/usr/share/mime/globs")
+                (string-append (assoc-ref inputs "mime-info")
+                               "/share/mime/globs"))))))))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("bogofilter" ,bogofilter)
+       ("curl" ,curl)
+       ("dbus-glib" ,dbus-glib)
+       ("enchant" ,enchant)
+       ("expat" ,expat)
+       ("ghostscript" ,ghostscript)
+       ("hicolor-icon-theme" ,hicolor-icon-theme)
+       ("gnupg" ,gnupg)
+       ("gnutls" ,gnutls)
+       ("gpgme" ,gpgme)
+       ("gtk" ,gtk+-2)
+       ("libarchive" ,libarchive)
+       ("libcanberra" ,libcanberra)
+       ("libetpan" ,libetpan)
+       ("libical" ,libical)
+       ("libnotify" ,libnotify)
+       ("libsm" ,libsm)
+       ("libxml2" ,libxml2)
+       ("perl" ,perl)
+       ("python-2" ,python-2)
+       ("mime-info" ,shared-mime-info)
+       ("startup-notification" ,startup-notification)))
     (synopsis "GTK-based Email client")
-    (description
-     "Claws-Mail is an email client (and news reader) based on GTK+.  The
-appearance and interface are designed to be familiar to new users coming from
-other popular email clients, as well as experienced users.  Almost all commands
-are accessible with the keyboard.  Plus, Claws-Mail is extensible via addons
-which can add many functionalities to the base client.")
+    (description "Claws-Mail is an email client (and news reader) based on GTK+.
+The appearance and interface are designed to be familiar to new users coming
+from other popular email clients, as well as experienced users.  Almost all
+commands are accessible with the keyboard.  Plus, Claws-Mail is extensible via
+addons which can add many functionalities to the base client.")
     (home-page "https://www.claws-mail.org/")
     (license license:gpl3+))) ; most files are actually public domain or x11
 
-- 
2.28.0


[-- Attachment #3: 0002-gnu-claws-mail-Change-build-system.patch --]
[-- Type: application/octet-stream, Size: 1145 bytes --]

From 2007b75c6fa312e56e9354f5d73651cb1cb32bbb Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed, 14 Oct 2020 21:18:29 -0400
Subject: [PATCH 2/6] gnu: claws-mail: Change build-system.

* gnu/packages/mail.scm (claws-mail) [build-system]: Change from
gnu to glib-or-gtk.
---
 gnu/packages/mail.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 2234168eeb..87e45fa988 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -142,6 +142,7 @@
   #:use-module (guix git-download)
   #:use-module (guix svn-download)
   #:use-module (guix utils)
+  #:use-module (guix build-system glib-or-gtk)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system guile)
   #:use-module (guix build-system perl)
@@ -1329,7 +1330,7 @@ compresses it.")
          version ".tar.xz"))
        (sha256
         (base32 "1j6x09621wng0lavh53nwzh9vqjzpspl8kh5azh7kbihpi4ldfb0"))))
-    (build-system gnu-build-system)
+    (build-system glib-or-gtk-build-system)
     (arguments
      `(#:configure-flags
        (list
-- 
2.28.0


[-- Attachment #4: 0003-gnu-claws-mail-Revise-package-arguments.patch --]
[-- Type: application/octet-stream, Size: 3170 bytes --]

From 01bea09c90cd416b717ec5defebd87ad1e820981 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed, 14 Oct 2020 21:26:01 -0400
Subject: [PATCH 3/6] gnu: claws-mail: Revise package arguments.

* gnu/packages/mail.scm (claws-mail): Remove obsolete arguments
and add new arguments.
[arguments]<#:configure-flags>: Remove all configure flags.
<#:phases>['patch-mime]: Remove phase.
['patch-fhs-dirs]: New phase.
[inputs]: Add bash and mailutils.
---
 gnu/packages/mail.scm | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 87e45fa988..99b840f42e 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -1332,13 +1332,7 @@ compresses it.")
         (base32 "1j6x09621wng0lavh53nwzh9vqjzpspl8kh5azh7kbihpi4ldfb0"))))
     (build-system glib-or-gtk-build-system)
     (arguments
-     `(#:configure-flags
-       (list
-        "--enable-gnutls"
-        "--enable-pgpmime-plugin"
-        "--enable-enchant"
-        "--enable-ldap")
-       #:make-flags
+     `(#:make-flags
        ;; Disable updating icon cache since it's done by the profile hook.
        ;; Conflict with other packages in the profile would be inevitable
        ;; otherwise.
@@ -1346,16 +1340,29 @@ compresses it.")
         "gtk_update_icon_cache=true")
        #:phases
        (modify-phases %standard-phases
-         (add-before 'build 'patch-mime
+         (add-after 'unpack 'patch-fhs-dirs
            (lambda* (#:key inputs #:allow-other-keys)
-             (substitute* "src/procmime.c"
-               (("/usr/share/mime/globs")
-                (string-append (assoc-ref inputs "mime-info")
-                               "/share/mime/globs"))))))))
+             (let*
+                 ((sh (string-append (assoc-ref inputs "bash")
+                                     "/bin/sh"))
+                  (inc (string-append (assoc-ref inputs "mailutils")
+                                      "/bin/mu-mh/inc"))
+                  (send (string-append (assoc-ref inputs "mailutils")
+                                       "/bin/mu-mh/send"))
+                  (globs (string-append (assoc-ref inputs "mime-info")
+                                        "/share/mime/globs")))
+               (with-directory-excursion "src"
+                 (substitute* '("action.c" "common/defs.h" "etpan/imap-thread.c")
+                   (("/bin/sh") sh)
+                   (("/usr/bin/mh/inc") inc)
+                   (("/usr/sbin/sendmail") send)
+                   (("/usr/share/mime/globs") globs)))
+               #t))))))
     (native-inputs
      `(("pkg-config" ,pkg-config)))
     (inputs
-     `(("bogofilter" ,bogofilter)
+     `(("bash" ,bash)
+       ("bogofilter" ,bogofilter)
        ("curl" ,curl)
        ("dbus-glib" ,dbus-glib)
        ("enchant" ,enchant)
@@ -1373,6 +1380,7 @@ compresses it.")
        ("libnotify" ,libnotify)
        ("libsm" ,libsm)
        ("libxml2" ,libxml2)
+       ("mailutils" ,mailutils)
        ("perl" ,perl)
        ("python-2" ,python-2)
        ("mime-info" ,shared-mime-info)
-- 
2.28.0


[-- Attachment #5: 0004-gnu-claws-mail-Revise-package-inputs.patch --]
[-- Type: application/octet-stream, Size: 4041 bytes --]

From 4a086deeecc5f518fca24ff6b4d9912357179306 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed, 14 Oct 2020 22:00:25 -0400
Subject: [PATCH 4/6] gnu: claws-mail: Revise package inputs.

* gnu/packages/mail.scm (claws-mail): Remove obsolete inputs and
add new inputs.
[native-inputs]: Add bison, flex, gettext and valgrind.
[inputs]: Add cairo, compface, dbus, fontconfig, gdk-pibuf, glib,
gobject-introspection, gumbo-parser, libcanberra-gtk, libgdata,
librsvg, libsoup, nettle, network-manager, openldap, poppler, python,
python2-pygtk, tnef, webkitgtk and ytnef.
Remove hicolor-icon-theme and libxml2.
---
 gnu/packages/mail.scm | 35 +++++++++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 99b840f42e..ddf951d563 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -76,6 +76,7 @@
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages emacs)
   #:use-module (gnu packages enchant)
+  #:use-module (gnu packages fontutils)
   #:use-module (gnu packages gdb)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages ghostscript)
@@ -103,10 +104,12 @@
   #:use-module (gnu packages m4)
   #:use-module (gnu packages man)
   #:use-module (gnu packages ncurses)
+  #:use-module (gnu packages nettle)
   #:use-module (gnu packages networking)
   #:use-module (gnu packages openldap)
   #:use-module (gnu packages onc-rpc)
   #:use-module (gnu packages pcre)
+  #:use-module (gnu packages pdf)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages perl-check)
   #:use-module (gnu packages perl-web)
@@ -129,6 +132,7 @@
   #:use-module (gnu packages texinfo)
   #:use-module (gnu packages time)
   #:use-module (gnu packages tls)
+  #:use-module (gnu packages valgrind)
   #:use-module (gnu packages version-control)
   #:use-module (gnu packages w3m)
   #:use-module (gnu packages web)
@@ -1359,32 +1363,55 @@ compresses it.")
                    (("/usr/share/mime/globs") globs)))
                #t))))))
     (native-inputs
-     `(("pkg-config" ,pkg-config)))
+     `(("bison" ,bison)
+        ("flex" ,flex)
+        ("gettext" ,gettext-minimal)
+        ("pkg-config" ,pkg-config)
+        ("valgrind" ,valgrind)))
     (inputs
      `(("bash" ,bash)
        ("bogofilter" ,bogofilter)
+       ("cairo" ,cairo)
+       ("compface" ,compface)
        ("curl" ,curl)
        ("dbus-glib" ,dbus-glib)
+       ("dbus" ,dbus)
        ("enchant" ,enchant)
        ("expat" ,expat)
+       ("fontconfig" ,fontconfig)
+       ("gdk-pxbuf" ,gdk-pixbuf+svg)
        ("ghostscript" ,ghostscript)
-       ("hicolor-icon-theme" ,hicolor-icon-theme)
+       ("glib" ,glib)
        ("gnupg" ,gnupg)
        ("gnutls" ,gnutls)
+       ("gobject-introspection" ,gobject-introspection)
        ("gpgme" ,gpgme)
        ("gtk" ,gtk+-2)
+       ("gumbo-parser" ,gumbo-parser)
        ("libarchive" ,libarchive)
        ("libcanberra" ,libcanberra)
+       ("libcanberra-gtk" ,libcanberra/gtk+-2)
        ("libetpan" ,libetpan)
+       ("libgdata" ,libgdata)
        ("libical" ,libical)
        ("libnotify" ,libnotify)
+       ("librsvg" ,librsvg)
        ("libsm" ,libsm)
-       ("libxml2" ,libxml2)
+       ("libsoup" ,libsoup)
        ("mailutils" ,mailutils)
+       ("nettle" ,nettle)
+       ("networkmanager" ,network-manager)
+       ("openldap" ,openldap)
        ("perl" ,perl)
+       ("poppler" ,poppler)
+       ("python" ,python)
        ("python-2" ,python-2)
+       ("python2-pygtk" ,python2-pygtk)
        ("mime-info" ,shared-mime-info)
-       ("startup-notification" ,startup-notification)))
+       ("startup-notification" ,startup-notification)
+       ("tnef" ,tnef)
+       ("webkitgtk" ,webkitgtk)
+       ("ytnef" ,ytnef)))
     (synopsis "GTK-based Email client")
     (description "Claws-Mail is an email client (and news reader) based on GTK+.
 The appearance and interface are designed to be familiar to new users coming
-- 
2.28.0


[-- Attachment #6: 0005-gnu-claws-mail-Update-license.patch --]
[-- Type: application/octet-stream, Size: 961 bytes --]

From 1632c75b36987bb759f090a3124ac9d67faca7b8 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed, 14 Oct 2020 22:03:01 -0400
Subject: [PATCH 5/6] gnu: claws-mail: Update license.

* gnu/packages/mail.scm (claws-mail) [license]: Remove comment.
---
 gnu/packages/mail.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index ddf951d563..1da8151e00 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -1419,7 +1419,7 @@ from other popular email clients, as well as experienced users.  Almost all
 commands are accessible with the keyboard.  Plus, Claws-Mail is extensible via
 addons which can add many functionalities to the base client.")
     (home-page "https://www.claws-mail.org/")
-    (license license:gpl3+))) ; most files are actually public domain or x11
+    (license license:gpl3+)))
 
 (define-public msmtp
   (package
-- 
2.28.0


[-- Attachment #7: 0006-gnu-claws-mail-Update-synopsis-and-description.patch --]
[-- Type: application/octet-stream, Size: 1876 bytes --]

From ecb0eee3830ee6dcabcb1af17e4c80a34d19265c Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed, 14 Oct 2020 22:38:47 -0400
Subject: [PATCH 6/6] gnu: claws-mail: Update synopsis and description.

* gnu/packages/mail.scm (claws-mail) [synopsis]: Modify.
[description]: Modify.
---
 gnu/packages/mail.scm | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 1da8151e00..5cce2d5408 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -1364,10 +1364,10 @@ compresses it.")
                #t))))))
     (native-inputs
      `(("bison" ,bison)
-        ("flex" ,flex)
-        ("gettext" ,gettext-minimal)
-        ("pkg-config" ,pkg-config)
-        ("valgrind" ,valgrind)))
+       ("flex" ,flex)
+       ("gettext" ,gettext-minimal)
+       ("pkg-config" ,pkg-config)
+       ("valgrind" ,valgrind)))
     (inputs
      `(("bash" ,bash)
        ("bogofilter" ,bogofilter)
@@ -1412,12 +1412,10 @@ compresses it.")
        ("tnef" ,tnef)
        ("webkitgtk" ,webkitgtk)
        ("ytnef" ,ytnef)))
-    (synopsis "GTK-based Email client")
-    (description "Claws-Mail is an email client (and news reader) based on GTK+.
-The appearance and interface are designed to be familiar to new users coming
-from other popular email clients, as well as experienced users.  Almost all
-commands are accessible with the keyboard.  Plus, Claws-Mail is extensible via
-addons which can add many functionalities to the base client.")
+    (synopsis "A GTK+ lightweight and fast e-mail client")
+    (description "Claws-Mail is a lightweight and highly configurable email
+client and news reader based on the GTK+ GUI toolkit.  It runs on the X Window
+System.")
     (home-page "https://www.claws-mail.org/")
     (license license:gpl3+)))
 
-- 
2.28.0