* [bug#41111] gnu: claws-mail: Fix fhs directories.
@ 2020-05-06 13:06 Raghav Gururajan
2020-05-08 17:29 ` [bug#41111] claws-mail Danny Milosavljevic
2020-09-30 10:17 ` [bug#41111] Claws-Mail Raghav Gururajan
0 siblings, 2 replies; 17+ messages in thread
From: Raghav Gururajan @ 2020-05-06 13:06 UTC (permalink / raw)
To: 41111
[-- Attachment #1: Type: text/plain, Size: 0 bytes --]
[-- Attachment #2: 0001-gnu-claws-mail-Fix-fhs-directories.patch --]
[-- Type: application/octet-stream, Size: 6478 bytes --]
From b35b72a0c85b2b147067de563fde72fc50d1a3a4 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed, 6 May 2020 09:04:52 -0400
Subject: [PATCH] gnu: claws-mail: Fix fhs directories.
* gnu/packages/mail.scm (claws-mail):
[build-system]: Change from gnu to glib-or-gtk; as the latter is
more appropriate for glib/gtk based applications.
[inputs]: Add bash, cairo, compface, dbus, fontconfig, gdk-pibuf,
glib, gobject-introspection, gumbo-parser, libgdata, librsvg,
libsoup, mailutils, nettle, openldap, poppler, python-wrapper,
python2-pygtk and webkitgtk; for additional functionalities.
[inputs]: Remove hicolor-icon-theme, libsm and libxml2; as they are
no longer required.
[arguments]: Remove all configure flags; as they are not required.
[arguments]: Remove phase 'patch-mime.
[arguments]: Add phase 'patch-fhs-dirs.
---
gnu/packages/mail.scm | 74 ++++++++++++++++++++++++++++++-------------
1 file changed, 52 insertions(+), 22 deletions(-)
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 2a6286fb16..a5d06db8f6 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -72,6 +72,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)
@@ -97,10 +98,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)
@@ -138,6 +141,7 @@
#:use-module (guix download)
#:use-module (guix git-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)
@@ -1167,46 +1171,72 @@ compresses it.")
(sha256
(base32
"1gjrmdmhc7zzilrlss9yl86ybv9sra8v0qi7mkwv7d9azidx5kns"))))
- (build-system gnu-build-system)
+ (build-system glib-or-gtk-build-system)
(native-inputs `(("pkg-config" ,pkg-config)))
- (inputs `(("bogofilter" ,bogofilter)
+ (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)
("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)
("libetpan" ,libetpan)
+ ("libgdata" ,libgdata)
("libical" ,libical)
("libnotify" ,libnotify)
- ("libsm" ,libsm)
- ("libxml2" ,libxml2)
+ ("librsvg" ,librsvg)
+ ("libsoup" ,libsoup)
+ ("mailutils" ,mailutils)
+ ("nettle" ,nettle)
+ ("openldap" ,openldap)
("perl" ,perl)
+ ("poppler" ,poppler)
("python-2" ,python-2)
- ("mime-info" ,shared-mime-info)
- ("startup-notification" ,startup-notification)))
+ ("python-wrapper" ,python-wrapper)
+ ("python2-pygtk" ,python2-pygtk)
+ ("shared-mime-info" ,shared-mime-info)
+ ("startup-notification" ,startup-notification)
+ ("webkitgtk" ,webkitgtk)))
(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"))))))))
+ '(#: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-after 'unpack 'patch-fhs-dirs
+ (lambda* (#:key inputs #:allow-other-keys)
+ (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 "shared-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))))))
(synopsis "GTK-based Email client")
(description
"Claws-Mail is an email client (and news reader) based on GTK+. The
--
2.26.2
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [bug#41111] claws-mail
2020-05-06 13:06 [bug#41111] gnu: claws-mail: Fix fhs directories Raghav Gururajan
@ 2020-05-08 17:29 ` Danny Milosavljevic
2020-09-02 14:50 ` Ludovic Courtès
2020-09-30 10:17 ` [bug#41111] Claws-Mail Raghav Gururajan
1 sibling, 1 reply; 17+ messages in thread
From: Danny Milosavljevic @ 2020-05-08 17:29 UTC (permalink / raw)
To: 41111
[-- Attachment #1: Type: text/plain, Size: 209 bytes --]
Hi,
I think that this patch does a lot more than "Fix fhs directories".
Could you split it into multiple patches, each with a high-level subject that
allows the reviewer to find out the reason for it?
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread
* [bug#41111] claws-mail
2020-05-08 17:29 ` [bug#41111] claws-mail Danny Milosavljevic
@ 2020-09-02 14:50 ` Ludovic Courtès
0 siblings, 0 replies; 17+ messages in thread
From: Ludovic Courtès @ 2020-09-02 14:50 UTC (permalink / raw)
To: Danny Milosavljevic, Raghav Gururajan; +Cc: 41111
Hi!
Raghav, could you take a look at Danny’s suggestions below?
https://issues.guix.gnu.org/41111
Ludo’.
Danny Milosavljevic <dannym@scratchpost.org> skribis:
> Hi,
>
> I think that this patch does a lot more than "Fix fhs directories".
>
> Could you split it into multiple patches, each with a high-level subject that
> allows the reviewer to find out the reason for it?
^ permalink raw reply [flat|nested] 17+ messages in thread
* [bug#41111] Claws-Mail
2020-05-06 13:06 [bug#41111] gnu: claws-mail: Fix fhs directories Raghav Gururajan
2020-05-08 17:29 ` [bug#41111] claws-mail Danny Milosavljevic
@ 2020-09-30 10:17 ` Raghav Gururajan
2020-09-30 10:52 ` Tobias Geerinckx-Rice via Guix-patches via
2020-10-15 3:05 ` Raghav Gururajan
1 sibling, 2 replies; 17+ messages in thread
From: Raghav Gururajan @ 2020-09-30 10:17 UTC (permalink / raw)
To: 41111; +Cc: Danny Milosavljevic
[-- Attachment #1: Type: text/plain, Size: 110 bytes --]
Hi Danny!
Based on your feedback, I have split the changes. Please find the
attached patches.
Regards,
RG.
[-- Attachment #2: 0001-gnu-claws-mail-Make-some-cosmetic-changes.patch --]
[-- Type: text/x-patch, Size: 5167 bytes --]
From d6888dfabb15f4485d13de09e58c487e22ed3038 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed, 30 Sep 2020 05:31:43 -0400
Subject: [PATCH 1/5] gnu: claws-mail: Make some cosmetic changes.
* gnu/packages/mail.scm (claws-mail): Make some cosmetic changes.
---
gnu/packages/mail.scm | 105 ++++++++++++++++++++++--------------------
1 file changed, 56 insertions(+), 49 deletions(-)
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 70e2fcd76b..9da842bc1d 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -1317,58 +1317,65 @@ compresses it.")
(package
(name "claws-mail")
(version "3.17.6")
- (source (origin
- (method url-fetch)
- (uri (string-append
- "https://www.claws-mail.org/releases/claws-mail-" version
- ".tar.xz"))
- (sha256
- (base32
- "1s05qw0r0gqwvvkxvrrwbjkbi61dvilixiwrpgcq21qc9csc9r0m"))))
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append
+ "https://www.claws-mail.org/releases/claws-mail-"
+ version ".tar.xz"))
+ (sha256
+ (base32 "1s05qw0r0gqwvvkxvrrwbjkbi61dvilixiwrpgcq21qc9csc9r0m"))))
(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
+ (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.")
--
2.28.0
[-- Attachment #3: 0002-gnu-claws-mail-Change-build-system.patch --]
[-- Type: text/x-patch, Size: 1145 bytes --]
From 6a4fa215f4313f020fb1c98bcb5a679ade685e79 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed, 30 Sep 2020 05:34:21 -0400
Subject: [PATCH 2/5] 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 9da842bc1d..d0ad0e41d3 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -141,6 +141,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)
@@ -1326,7 +1327,7 @@ compresses it.")
version ".tar.xz"))
(sha256
(base32 "1s05qw0r0gqwvvkxvrrwbjkbi61dvilixiwrpgcq21qc9csc9r0m"))))
- (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-Update-to-3.17.7.patch --]
[-- Type: text/x-patch, Size: 5768 bytes --]
From 5e1c842fd4b4537cd83b4abf96f45a850ead8aa7 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed, 30 Sep 2020 05:52:34 -0400
Subject: [PATCH 3/5] gnu: claws-mail: Update to 3.17.7.
* gnu/packages/mail.scm (claws-mail) [version]: Update to 3.17.7.
[source]<origin>[sha256]: Modify base32.
[arguments]<#:configure-flags>: Remove all configure flags.
[arguments]<#:phases>['patch-mime]: Remove phase.
['patch-fhs-dirs]: New phase.
[inputs]: Add bash, cairo, compface, dbus, fontconfig, gdk-pibuf,
glib, gobject-introspection, gumbo-parser, libgdata, librsvg,
libsoup, mailutils, nettle, openldap, poppler, python,
python2-pygtk and webkitgtk. Remove hicolor-icon-theme, libsm and
libxml2.
---
gnu/packages/mail.scm | 64 +++++++++++++++++++++++++++++--------------
1 file changed, 44 insertions(+), 20 deletions(-)
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index d0ad0e41d3..febf207710 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -75,6 +75,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)
@@ -102,10 +103,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)
@@ -1317,25 +1320,19 @@ compresses it.")
(define-public claws-mail
(package
(name "claws-mail")
- (version "3.17.6")
+ (version "3.17.7")
(source
(origin
(method url-fetch)
(uri
(string-append
"https://www.claws-mail.org/releases/claws-mail-"
- version ".tar.xz"))
+ version ".tar.gz"))
(sha256
- (base32 "1s05qw0r0gqwvvkxvrrwbjkbi61dvilixiwrpgcq21qc9csc9r0m"))))
+ (base32 "0zqjfjy8qj6j6a6r0xs97si7hkcsb7jvxx4k2kkdxypqmdkwrn2q"))))
(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.
@@ -1343,37 +1340,64 @@ 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 "shared-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)
+ ("cairo" ,cairo)
("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)
("libetpan" ,libetpan)
+ ("libgdata" ,libgdata)
("libical" ,libical)
("libnotify" ,libnotify)
- ("libsm" ,libsm)
- ("libxml2" ,libxml2)
+ ("librsvg" ,librsvg)
+ ("libsoup" ,libsoup)
+ ("mailutils" ,mailutils)
+ ("nettle" ,nettle)
+ ("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)
+ ("webkitgtk" ,webkitgtk)))
(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
--
2.28.0
[-- Attachment #5: 0004-gnu-claws-mail-Update-license.patch --]
[-- Type: text/x-patch, Size: 956 bytes --]
From 13b08ee79c56eb39a044fe8492217a822053418b Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed, 30 Sep 2020 06:04:01 -0400
Subject: [PATCH 4/5] 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 febf207710..4a185235b1 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -1405,7 +1405,7 @@ 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 #6: 0005-gnu-claws-mail-Update-synopsis-and-description.patch --]
[-- Type: text/x-patch, Size: 1472 bytes --]
From 6c74dfc8d76d9ae447698c98eef4dbed7cee290e Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed, 30 Sep 2020 06:10:56 -0400
Subject: [PATCH 5/5] gnu: claws-mail: Update synopsis and description.
* gnu/packages/mail.scm (claws-mail) [synopsis]: Modify.
[description]: Modify.
---
gnu/packages/mail.scm | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 4a185235b1..ca0ec9d8de 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -1398,12 +1398,10 @@ compresses it.")
("mime-info" ,shared-mime-info)
("startup-notification" ,startup-notification)
("webkitgtk" ,webkitgtk)))
- (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
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [bug#41111] Claws-Mail
2020-09-30 10:17 ` [bug#41111] Claws-Mail Raghav Gururajan
@ 2020-09-30 10:52 ` Tobias Geerinckx-Rice via Guix-patches via
2020-10-15 3:05 ` Raghav Gururajan
1 sibling, 0 replies; 17+ messages in thread
From: Tobias Geerinckx-Rice via Guix-patches via @ 2020-09-30 10:52 UTC (permalink / raw)
To: Raghav Gururajan; +Cc: Danny Milosavljevic, 41111
[-- Attachment #1: Type: text/plain, Size: 563 bytes --]
Raghav,
Raghav Gururajan 写道：
> Based on your feedback, I have split the changes. Please find
> the
> attached patches.
I haven't been following this thread, but have updated claws-mail
to .7 on master in the meantime.
Your 0003-gnu-claws-mail-Update-to-3.17.7.patch does unrelated
things and deserves a different commit message.
> [source]<origin>[sha256]: Modify base32.
This isn't needed; <version> and <origin> changes are implicitly
covered by ‘Update to x.y’ to reduce noise in the common case.
Kind regards,
T G-R
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 247 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread
* [bug#41111] Claws-Mail
2020-09-30 10:17 ` [bug#41111] Claws-Mail Raghav Gururajan
2020-09-30 10:52 ` Tobias Geerinckx-Rice via Guix-patches via
@ 2020-10-15 3:05 ` Raghav Gururajan
2020-10-15 9:14 ` bug#41111: Claws-Mail Danny Milosavljevic
2020-10-15 16:40 ` [bug#41111] Claws-Mail Raghav Gururajan
1 sibling, 2 replies; 17+ messages in thread
From: Raghav Gururajan @ 2020-10-15 3:05 UTC (permalink / raw)
To: 41111; +Cc: Danny Milosavljevic, Tobias Geerinckx-Rice
[-- 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
^ permalink raw reply related [flat|nested] 17+ messages in thread
* bug#41111: Claws-Mail
2020-10-15 3:05 ` Raghav Gururajan
@ 2020-10-15 9:14 ` Danny Milosavljevic
2020-10-15 16:40 ` [bug#41111] Claws-Mail Raghav Gururajan
1 sibling, 0 replies; 17+ messages in thread
From: Danny Milosavljevic @ 2020-10-15 9:14 UTC (permalink / raw)
To: Raghav Gururajan; +Cc: 41111-done, Tobias Geerinckx-Rice
[-- Attachment #1: Type: text/plain, Size: 137 bytes --]
Hi RG,
pushed to master as commits b168f2ba53b938e1b322c79e5bfa47fcc506b803 and 7269a591361138ac6fc122d465e45e2b8c4944be.
Thanks!
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread
* [bug#41111] Claws-Mail
2020-10-15 3:05 ` Raghav Gururajan
2020-10-15 9:14 ` bug#41111: Claws-Mail Danny Milosavljevic
@ 2020-10-15 16:40 ` Raghav Gururajan
2020-10-15 20:07 ` Danny Milosavljevic
` (4 more replies)
1 sibling, 5 replies; 17+ messages in thread
From: Raghav Gururajan @ 2020-10-15 16:40 UTC (permalink / raw)
To: Danny Milosavljevic; +Cc: 41111-done, Tobias Geerinckx-Rice
Hi Danny!
> pushed to master as commits b168f2ba53b938e1b322c79e5bfa47fcc506b803 and
> 7269a591361138ac6fc122d465e45e2b8c4944be.
Thanks!
The patch-set had 6 patches, but only 2 were pushed?
Regards,
RG.
^ permalink raw reply [flat|nested] 17+ messages in thread
* [bug#41111] Claws-Mail
2020-10-15 16:40 ` [bug#41111] Claws-Mail Raghav Gururajan
@ 2020-10-15 20:07 ` Danny Milosavljevic
2020-10-15 20:08 ` Raghav Gururajan
` (3 subsequent siblings)
4 siblings, 0 replies; 17+ messages in thread
From: Danny Milosavljevic @ 2020-10-15 20:07 UTC (permalink / raw)
To: Raghav Gururajan; +Cc: Tobias Geerinckx-Rice, 41111
[-- Attachment #1: Type: text/plain, Size: 138 bytes --]
> The patch-set had 6 patches, but only 2 were pushed?
Whoops, yes. I only saw and pushed the first two.
Reopened the bug report.
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread
* [bug#41111] Claws-Mail
2020-10-15 16:40 ` [bug#41111] Claws-Mail Raghav Gururajan
2020-10-15 20:07 ` Danny Milosavljevic
@ 2020-10-15 20:08 ` Raghav Gururajan
2020-10-15 22:42 ` Danny Milosavljevic
` (2 subsequent siblings)
4 siblings, 0 replies; 17+ messages in thread
From: Raghav Gururajan @ 2020-10-15 20:08 UTC (permalink / raw)
To: Danny Milosavljevic; +Cc: Tobias Geerinckx-Rice, 41111
Hi Danny!
> Whoops, yes. I only saw and pushed the first two.
>
> Reopened the bug report.
Cool!
Regards,
RG.
^ permalink raw reply [flat|nested] 17+ messages in thread
* [bug#41111] Claws-Mail
2020-10-15 16:40 ` [bug#41111] Claws-Mail Raghav Gururajan
2020-10-15 20:07 ` Danny Milosavljevic
2020-10-15 20:08 ` Raghav Gururajan
@ 2020-10-15 22:42 ` Danny Milosavljevic
2020-10-15 22:48 ` Raghav Gururajan
2020-10-15 22:52 ` Raghav Gururajan
4 siblings, 0 replies; 17+ messages in thread
From: Danny Milosavljevic @ 2020-10-15 22:42 UTC (permalink / raw)
To: Raghav Gururajan; +Cc: Tobias Geerinckx-Rice, 41111
[-- Attachment #1: Type: text/plain, Size: 472 bytes --]
This patchset (mostly patch 4) increases claws-mail's closure size from 563 MiB to 1128 MiB.
That's a definition of "lightweight" (see revised synopsis and description) I was not aware of.
I'm not necessarily opposed--but for example does it really need webkitgtk ?
What does it do with it ?
(There were really bad security problems in Microsoft Outlook because they
were using a more-capable-than-necessary web browser to render HTML mail,
back in the day?)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread
* [bug#41111] Claws-Mail
2020-10-15 16:40 ` [bug#41111] Claws-Mail Raghav Gururajan
` (2 preceding siblings ...)
2020-10-15 22:42 ` Danny Milosavljevic
@ 2020-10-15 22:48 ` Raghav Gururajan
2020-10-15 22:52 ` Raghav Gururajan
4 siblings, 0 replies; 17+ messages in thread
From: Raghav Gururajan @ 2020-10-15 22:48 UTC (permalink / raw)
To: Danny Milosavljevic; +Cc: Tobias Geerinckx-Rice, 41111
Hi Danny!
> This patchset (mostly patch 4) increases claws-mail's closure size from 563 MiB to 1128 MiB.
>
> That's a definition of "lightweight" (see revised synopsis and description) I was not aware of.
I know :/
> I'm not necessarily opposed--but for example does it really need webkitgtk ?
> What does it do with it ?
Yeah, it enables a feature called "Fancy" (HTML stuff).
> (There were really bad security problems in Microsoft Outlook because they
> were using a more-capable-than-necessary web browser to render HTML mail,
> back in the day?)
The fancy is disabled my default. So, user should enable it only if required.
Regards,
RG.
^ permalink raw reply [flat|nested] 17+ messages in thread
* [bug#41111] Claws-Mail
2020-10-15 16:40 ` [bug#41111] Claws-Mail Raghav Gururajan
` (3 preceding siblings ...)
2020-10-15 22:48 ` Raghav Gururajan
@ 2020-10-15 22:52 ` Raghav Gururajan
2020-10-16 9:48 ` Danny Milosavljevic
2020-10-16 19:54 ` Raghav Gururajan
4 siblings, 2 replies; 17+ messages in thread
From: Raghav Gururajan @ 2020-10-15 22:52 UTC (permalink / raw)
To: Danny Milosavljevic; +Cc: Tobias Geerinckx-Rice, 41111
Hi Danny!
>> This patchset (mostly patch 4) increases claws-mail's closure size from 563 MiB to 1128 MiB.
>>
>> That's a definition of "lightweight" (see revised synopsis and description) I was not aware of.
>
> I know :/
>
>> I'm not necessarily opposed--but for example does it really need webkitgtk ?
>> What does it do with it ?
>
> Yeah, it enables a feature called "Fancy" (HTML stuff).
>
>> (There were really bad security problems in Microsoft Outlook because they
>> were using a more-capable-than-necessary web browser to render HTML mail,
>> back in the day?)
>
> The fancy is disabled my default. So, user should enable it only if required.
Hmm. Would you be able to comment-out the webkitgtk input while pushing? In future, if someone really needs it, then we can include it.
Regards,
RG.
^ permalink raw reply [flat|nested] 17+ messages in thread
* [bug#41111] Claws-Mail
2020-10-15 22:52 ` Raghav Gururajan
@ 2020-10-16 9:48 ` Danny Milosavljevic
2020-10-16 19:54 ` Raghav Gururajan
1 sibling, 0 replies; 17+ messages in thread
From: Danny Milosavljevic @ 2020-10-16 9:48 UTC (permalink / raw)
To: Raghav Gururajan; +Cc: Tobias Geerinckx-Rice, 41111
[-- Attachment #1: Type: text/plain, Size: 448 bytes --]
Hi RG,
On Thu, 15 Oct 2020 22:52:13 +0000
"Raghav Gururajan" <raghavgururajan@disroot.org> wrote:
> Hmm. Would you be able to comment-out the webkitgtk input while pushing? In future, if someone really needs it, then we can include it.
With your patchset I get:
$ guix gc --references /gnu/store/1lz5ax9j3wysl83qfzyh2c8212mh2dch-claws-mail-3.17.7 |grep -i webkit
$
So it's not using webkitgtk in the first place.
Still huge...
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread
* [bug#41111] Claws-Mail
2020-10-15 22:52 ` Raghav Gururajan
2020-10-16 9:48 ` Danny Milosavljevic
@ 2020-10-16 19:54 ` Raghav Gururajan
2020-10-17 10:08 ` Danny Milosavljevic
2020-10-17 11:26 ` Raghav Gururajan
1 sibling, 2 replies; 17+ messages in thread
From: Raghav Gururajan @ 2020-10-16 19:54 UTC (permalink / raw)
To: Danny Milosavljevic; +Cc: Tobias Geerinckx-Rice, 41111
[-- Attachment #1: Type: text/plain, Size: 405 bytes --]
Hi Danny!
> With your patchset I get:
>
> $ guix gc --references /gnu/store/1lz5ax9j3wysl83qfzyh2c8212mh2dch-claws-mail-3.17.7 |grep -i
> webkit
> $
>
> So it's not using webkitgtk in the first place.
>
> Still huge...
Thanks for catching that. The claws-mail wants WebKit-1.0 (older version of webkitgtk).
So I removed it.
Please find the revised patch attached.
Regards,
RG.
[-- Attachment #2: 0001-gnu-claws-mail-Make-some-cosmetic-changes.patch --]
[-- Type: application/octet-stream, Size: 5513 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 01/19] 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: 1147 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 02/19] 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: 3172 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 03/19] 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: 3998 bytes --]
From 1b555e0594c448c2e20edeef95fcea67da47937c Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed, 14 Oct 2020 22:00:25 -0400
Subject: [PATCH 04/19] 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 and ytnef.
Remove hicolor-icon-theme and libxml2.
---
gnu/packages/mail.scm | 34 ++++++++++++++++++++++++++++++----
1 file changed, 30 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 99b840f42e..8e8ce89c62 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,54 @@ 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)
+ ("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: 963 bytes --]
From f6e575e33a3ef78a9517443a069c09ace6229f0c Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed, 14 Oct 2020 22:03:01 -0400
Subject: [PATCH 05/19] 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 8e8ce89c62..db40d81c87 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -1418,7 +1418,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: 1900 bytes --]
From ad2d5248645b87708fd1c4414813651d60b13890 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed, 14 Oct 2020 22:38:47 -0400
Subject: [PATCH 06/19] 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 db40d81c87..96882bcf5d 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)
@@ -1411,12 +1411,10 @@ compresses it.")
("startup-notification" ,startup-notification)
("tnef" ,tnef)
("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
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [bug#41111] Claws-Mail
2020-10-16 19:54 ` Raghav Gururajan
@ 2020-10-17 10:08 ` Danny Milosavljevic
2020-10-17 11:26 ` Raghav Gururajan
1 sibling, 0 replies; 17+ messages in thread
From: Danny Milosavljevic @ 2020-10-17 10:08 UTC (permalink / raw)
To: Raghav Gururajan; +Cc: Tobias Geerinckx-Rice, 41111
[-- Attachment #1: Type: text/plain, Size: 80 bytes --]
How come gobject-introspection is in the regular inputs, not in native-inputs?
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread
* [bug#41111] Claws-Mail
2020-10-16 19:54 ` Raghav Gururajan
2020-10-17 10:08 ` Danny Milosavljevic
@ 2020-10-17 11:26 ` Raghav Gururajan
1 sibling, 0 replies; 17+ messages in thread
From: Raghav Gururajan @ 2020-10-17 11:26 UTC (permalink / raw)
To: Danny Milosavljevic; +Cc: Tobias Geerinckx-Rice, 41111
[-- Attachment #1: Type: text/plain, Size: 164 bytes --]
Hi Danny!
> How come gobject-introspection is in the regular inputs, not in native-inputs?
Oops! Performed lint on wrong branch. Fixed now.
Regards,
RG.
[-- Attachment #2: 0001-gnu-claws-mail-Make-some-cosmetic-changes.patch --]
[-- Type: application/octet-stream, Size: 5513 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 01/19] 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: 1147 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 02/19] 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: 3172 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 03/19] 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: 3994 bytes --]
From cdd96d30f59be5dd4ec26a771630380c35d8655c Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed, 14 Oct 2020 22:00:25 -0400
Subject: [PATCH 04/19] 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, gobject-introspection and
valgrind.
[inputs]: Add cairo, compface, dbus, fontconfig, gdk-pibuf, glib,
gumbo-parser, libcanberra-gtk, libgdata, librsvg, libsoup, nettle,
network-manager, openldap, poppler, python, python2-pygtk, tnef and
ytnef. Remove hicolor-icon-theme and libxml2.
---
gnu/packages/mail.scm | 34 ++++++++++++++++++++++++++++++----
1 file changed, 30 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 99b840f42e..c4c6f067d2 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,54 @@ compresses it.")
(("/usr/share/mime/globs") globs)))
#t))))))
(native-inputs
- `(("pkg-config" ,pkg-config)))
+ `(("bison" ,bison)
+ ("flex" ,flex)
+ ("gettext" ,gettext-minimal)
+ ("gobject-introspection" ,gobject-introspection)
+ ("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)
("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)
+ ("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-synopsis-and-description.patch --]
[-- Type: application/octet-stream, Size: 1471 bytes --]
From 715915a447f920a03a5f0a9273d08a140a1fc6d2 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sat, 17 Oct 2020 07:20:38 -0400
Subject: [PATCH 05/19] gnu: claws-mail: Update synopsis and description.
* gnu/packages/mail.scm (claws-mail) [synopsis]: Modify.
---
gnu/packages/mail.scm | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index c4c6f067d2..f01915101f 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -1411,12 +1411,10 @@ compresses it.")
("startup-notification" ,startup-notification)
("tnef" ,tnef)
("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 "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+))) ; most files are actually public domain or x11
--
2.28.0
[-- Attachment #7: 0006-gnu-claws-mail-Update-license.patch --]
[-- Type: application/octet-stream, Size: 850 bytes --]
From dfa04132b5cd5a06c5fa357703ad295db8580db0 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed, 14 Oct 2020 22:03:01 -0400
Subject: [PATCH 06/19] 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 f01915101f..fb53abd3d6 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -1416,7 +1416,7 @@ compresses it.")
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+))) ; most files are actually public domain or x11
+ (license license:gpl3+)))
(define-public msmtp
(package
--
2.28.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
end of thread, other threads:[~2020-10-17 11:27 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-05-06 13:06 [bug#41111] gnu: claws-mail: Fix fhs directories Raghav Gururajan
2020-05-08 17:29 ` [bug#41111] claws-mail Danny Milosavljevic
2020-09-02 14:50 ` Ludovic Courtès
2020-09-30 10:17 ` [bug#41111] Claws-Mail Raghav Gururajan
2020-09-30 10:52 ` Tobias Geerinckx-Rice via Guix-patches via
2020-10-15 3:05 ` Raghav Gururajan
2020-10-15 9:14 ` bug#41111: Claws-Mail Danny Milosavljevic
2020-10-15 16:40 ` [bug#41111] Claws-Mail Raghav Gururajan
2020-10-15 20:07 ` Danny Milosavljevic
2020-10-15 20:08 ` Raghav Gururajan
2020-10-15 22:42 ` Danny Milosavljevic
2020-10-15 22:48 ` Raghav Gururajan
2020-10-15 22:52 ` Raghav Gururajan
2020-10-16 9:48 ` Danny Milosavljevic
2020-10-16 19:54 ` Raghav Gururajan
2020-10-17 10:08 ` Danny Milosavljevic
2020-10-17 11:26 ` Raghav Gururajan
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).