gnu: claws-mail: Fix fhs directories.

  • Open
  • quality assurance status badge
Details
4 participants
  • Danny Milosavljevic
  • Ludovic Courtès
  • Tobias Geerinckx-Rice
  • Raghav Gururajan
Owner
unassigned
Submitted by
Raghav Gururajan
Severity
normal
R
D
D
Danny Milosavljevic wrote on 8 May 2020 19:29
claws-mail
(address . 41111@debbugs.gnu.org)
20200508192929.07cad57b@scratchpost.org
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?
-----BEGIN PGP SIGNATURE-----

iQEzBAEBCgAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl61lvoACgkQ5xo1VCww
uqV74Af+PB0CSohcqkB0qaJnPyBgP7BmKSFIEmo7hp8QMLNqgO+5oZnxFBGd1SEa
/JZH3CMxEaxegSmsQVnuUlhXznS9y2FGC5PUCToJVAkJyt5392HoUKWwE8yGs06g
dpDs026KJ22JzdK6RiujFQC6567hPBbLer+6FahhhwN2jSq84jdJnv5OSIf5YOk9
UCs5GE3N0RwLr6zVhJrK4x0Tj6L9OXREuT16QPB2D14Gojy3BURxijDoG3boOgxg
j3ILMDmH+35IVf9Mc4+ThLRF0N+ZPUTNwJ1qms/p7X8auEC9c69995j+l5DUrlJM
1w4acvXEWL6lwxNwGQ/vp8Q5SoVD5A==
=WmQz
-----END PGP SIGNATURE-----


L
L
Ludovic Courtès wrote on 2 Sep 2020 16:50
(address . 41111@debbugs.gnu.org)
87ft805j27.fsf@gnu.org
Hi!

Raghav, could you take a look at Danny’s suggestions below?


Ludo’.

Danny Milosavljevic <dannym@scratchpost.org> skribis:

Toggle quote (6 lines)
> 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?
R
R
Raghav Gururajan wrote on 30 Sep 2020 12:17
Claws-Mail
(address . 41111@debbugs.gnu.org)(name . Danny Milosavljevic)(address . dannym@scratchpost.org)
d95e34dc-cc97-1033-de64-b31b9071115e@disroot.org
Hi Danny!

Based on your feedback, I have split the changes. Please find the
attached patches.

Regards,
RG.
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(-)

Toggle diff (23 lines)
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
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(-)

Toggle diff (15 lines)
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
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(-)

Toggle diff (23 lines)
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
T
T
Tobias Geerinckx-Rice wrote on 30 Sep 2020 12:52
(name . Raghav Gururajan)(address . raghavgururajan@disroot.org)
87v9fvzgdn.fsf@nckx
Raghav,

Raghav Gururajan ???
Toggle quote (4 lines)
> 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.

Toggle quote (2 lines)
> [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
-----BEGIN PGP SIGNATURE-----

iIMEARYKACsWIQT12iAyS4c9C3o4dnINsP+IT1VteQUCX3RjVA0cbWVAdG9iaWFz
LmdyAAoJEA2w/4hPVW15Xa0BAN3eiH0hE08xHTDXs1Zj/11MSo1KtcOg2Nio/ywV
6lYYAPsERCixnHc/4C1J6vGzth1v0jfCaURpdOhb+YjzqI+7Dw==
=lV86
-----END PGP SIGNATURE-----

R
R
Raghav Gururajan wrote on 15 Oct 2020 05:05
(address . 41111@debbugs.gnu.org)
c2a17c5ec91c05c8134604eb5322b269@disroot.org
@Danny

Please find the revised patches.

@Tobias

I have fixed the commit message.

Regards,
RG.
D
D
Danny Milosavljevic wrote on 15 Oct 2020 11:14
(name . Raghav Gururajan)(address . raghavgururajan@disroot.org)
20201015111402.2b205ce7@scratchpost.org
Hi RG,

pushed to master as commits b168f2ba53b938e1b322c79e5bfa47fcc506b803 and 7269a591361138ac6fc122d465e45e2b8c4944be.

Thanks!
-----BEGIN PGP SIGNATURE-----

iQEzBAEBCgAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl+IEtoACgkQ5xo1VCww
uqUv9wf/aRqfEHTOSvQScSjkBUkTwBrl0C6PTELsevPVpEYQG1wXhL5LzCXiSeD/
x+dkNr2OW7qrp/3nYPcLNJIWe9soIvFpofVnJ/yhxVBh5oogQjkrxhKOyxwQ8Ifi
8e1wQfuu9wXBtZYPL7Xmdj5hJnERLO6z6djfisQMH0WSCy/Cw7vh/R0ulZO9dlF/
3MidIv+NnOmxH/IRHJ+s76ZzD49GzQe9p09xBwjsiXi64TE2B3Drzof0JJ3K8Oe7
t0Are5gifX6jE9NTbf2M0D0CQg/CaOr2a9cnXA4rh4HM2k6ebCbnPfiX71KW3nTx
P6QItP29blLJS0T3sgLbcNepyZHjdw==
=8Jgi
-----END PGP SIGNATURE-----


Closed
R
R
Raghav Gururajan wrote on 15 Oct 2020 18:40
(name . Danny Milosavljevic)(address . dannym@scratchpost.org)
cbc4a86742d8c608d9cd6895a89d6e86@disroot.org
Hi Danny!

Toggle quote (3 lines)
> pushed to master as commits b168f2ba53b938e1b322c79e5bfa47fcc506b803 and
> 7269a591361138ac6fc122d465e45e2b8c4944be.

Thanks!

The patch-set had 6 patches, but only 2 were pushed?

Regards,
RG.
Closed
D
D
Danny Milosavljevic wrote on 15 Oct 2020 22:07
(name . Raghav Gururajan)(address . raghavgururajan@disroot.org)
20201015220717.50c1ddf9@scratchpost.org
Toggle quote (2 lines)
> 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.
-----BEGIN PGP SIGNATURE-----

iQEzBAEBCgAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl+Iq/UACgkQ5xo1VCww
uqWf2Qf9FtKdN55SRA153G3EYqpyKLlhOzvN3TcZRrLjB9ZxKgNsgjtK9poO1AXX
f9+OoHTwPvEIebNuGGRV6s2Aysooh5njDBiZcVM7gKfNh98xd9kk4wSkosYGQ6zk
JBJTffeW6VwFU0m8Xas03NZoQD/8FaJSe9zkPr1rBtl1HF3g1N60j7MKF0fJURAZ
KBGl/Jo/TUivknf6RmoE6je+3KZlogICha91EiHlwBzX3b3JnvCOTRsRiQXdOAXo
SewlBEvujRYMUT14NdK3efa+C7WsvQJ4zXuoO+laZT4KPtp3AKV1muVLfKn1k6rr
vEx7yR8swQ2BLi8306A0wRyxU//SFg==
=81Xg
-----END PGP SIGNATURE-----


R
R
Raghav Gururajan wrote on 15 Oct 2020 22:08
(name . Danny Milosavljevic)(address . dannym@scratchpost.org)
4b9c66981d11a90ed297b2213b74fd35@disroot.org
Hi Danny!

Toggle quote (4 lines)
> Whoops, yes. I only saw and pushed the first two.
>
> Reopened the bug report.

Cool!

Regards,
RG.
D
D
Danny Milosavljevic wrote on 16 Oct 2020 00:42
(name . Raghav Gururajan)(address . raghavgururajan@disroot.org)
20201016004243.66186743@scratchpost.org
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?)
-----BEGIN PGP SIGNATURE-----

iQEzBAEBCgAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl+I0GMACgkQ5xo1VCww
uqUonwgAiCymiTPfhT03jCUrEWu8FZZkFT51UBJ9XX8jbQ1UWZPI7J23dJay85Tg
hyZMDWx4j2+gzGRQBG8x5sXKCzD7fmw1fgybFeQDe/OBKKwF5P4uzFAPOxiV95sq
fPPb+XQ8fJrnlQcmWQXq1agSalFCoJuR2fc2Zhz6aMzgfyFfHf6zK3TyzhkiWpYa
ZI1KaWCuDfSIMjRmXxnzAiR9JBq2QeQhf0Yxb1SZtF2xSxJANhMZd0IpqLrsteiv
PpgH5yjfFV807VlADWtsN827KmahA958IvdaDmcuQPhE/ySoU6GMI2aDm9txI5ki
BCGI5doInNM25XjeU4Lt3CjTd0Avmg==
=1KqT
-----END PGP SIGNATURE-----


R
R
Raghav Gururajan wrote on 16 Oct 2020 00:48
(name . Danny Milosavljevic)(address . dannym@scratchpost.org)
fb8455f79f97cb40a9bfed806bef1392@disroot.org
Hi Danny!

Toggle quote (4 lines)
> 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 :/

Toggle quote (3 lines)
> 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).

Toggle quote (4 lines)
> (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.
R
R
Raghav Gururajan wrote on 16 Oct 2020 00:52
(name . Danny Milosavljevic)(address . dannym@scratchpost.org)
de75c29a60924f5c13a222528cd41b6e@disroot.org
Hi Danny!

Toggle quote (17 lines)
>> 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.
D
D
Danny Milosavljevic wrote on 16 Oct 2020 11:48
(name . Raghav Gururajan)(address . raghavgururajan@disroot.org)
20201016114822.2153a45f@scratchpost.org
Hi RG,

On Thu, 15 Oct 2020 22:52:13 +0000
"Raghav Gururajan" <raghavgururajan@disroot.org> wrote:

Toggle quote (2 lines)
> 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...
-----BEGIN PGP SIGNATURE-----

iQEzBAEBCgAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl+JbG0ACgkQ5xo1VCww
uqWNRwf5AQ7/f5IV7KkGVmV0COEtUK1dTKtz/Ll9+cE/dbe1hwxGVMZNHobGL8k/
mc4fMc8LNkQ5TtzDNOfdDFmKaWVQuTmcWYD1h8Q/lyMQfmayifMRJdHmG0leFdJ6
sWYvEWEKxy7uoCyjuv8il2DYhQ8WQ7Ou1zRhv68iZUJyX+Kf6jyxYYQZsKu7MB8p
b2Kw+E4xG2j8ouuaaykC1PjNyxfc918y7+D54PSZ/Ud7RreF5Wou81PQwAyy8AYV
o4XFV8IYWF4QSiIbx4svWYc5/PaJBd884+06bmDW+DUrU4TxhQ7OCraypJDulTVb
hGQnZnjl2gDwUrhhBEtOMInF2J131w==
=9B+3
-----END PGP SIGNATURE-----


R
R
Raghav Gururajan wrote on 16 Oct 2020 21:54
(name . Danny Milosavljevic)(address . dannym@scratchpost.org)
8d403b4a20b29d305e4d10807e918f43@disroot.org
Hi Danny!

Toggle quote (10 lines)
> 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.
D
D
Danny Milosavljevic wrote on 17 Oct 2020 12:08
(name . Raghav Gururajan)(address . raghavgururajan@disroot.org)
20201017120805.7529a031@scratchpost.org
How come gobject-introspection is in the regular inputs, not in native-inputs?
-----BEGIN PGP SIGNATURE-----

iQEzBAEBCgAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl+KwoUACgkQ5xo1VCww
uqUW6ggAlzQ9mlqsCbUQaIw9N+Jizj0Hi1RvOzgbXfCdraDdpn0l4hKqmHzljalL
1mla8HMLPk4AWKtBUs/owRRj6KPX8jtwc8lBvfnwE2v6ssnH7KgZCxzuS/zVgQ7J
ttN2J5P16RwJKHrJaZ2qZsXMIxcpIxMj6yiS9ve+leONSx2pYoBNcH9SjKewnmbD
dFkhPYxQLu01c0KQXqeMbdTgG1VRjmYcPkVTCnpVJnpQHn2+4BriMhTZ2Gk9f6JG
ZdKOd34ezdfMapnkSrXMwSo5GHVUDWA0MirPmVsFL+ykOsGCs4y/Je2SxpFLRq2l
4iZY0e1uQkpzO6eEP5cyerHb2H/H6w==
=SHLO
-----END PGP SIGNATURE-----


R
R
Raghav Gururajan wrote on 17 Oct 2020 13:26
(name . Danny Milosavljevic)(address . dannym@scratchpost.org)
bb52a6e06aaf7b89bdff0df8413ed87c@disroot.org
Hi Danny!

Toggle quote (2 lines)
> How come gobject-introspection is in the regular inputs, not in native-inputs?

Oops! Performed lint on wrong branch. Fixed now.

Regards,
RG.
?