From: "Raghav Gururajan" <raghavgururajan@disroot.org>
To: "Danny Milosavljevic" <dannym@scratchpost.org>
Cc: Tobias Geerinckx-Rice <me@tobias.gr>, 41111@debbugs.gnu.org
Subject: [bug#41111] Claws-Mail
Date: Sat, 17 Oct 2020 11:26:11 +0000 [thread overview]
Message-ID: <bb52a6e06aaf7b89bdff0df8413ed87c@disroot.org> (raw)
In-Reply-To: <20201017120805.7529a031@scratchpost.org>
[-- 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
prev parent reply other threads:[~2020-10-17 11:27 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=bb52a6e06aaf7b89bdff0df8413ed87c@disroot.org \
--to=raghavgururajan@disroot.org \
--cc=41111@debbugs.gnu.org \
--cc=dannym@scratchpost.org \
--cc=me@tobias.gr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.