Bug 267043 - mail/claws-mail: Add GTK2 and GTK3 options
Summary: mail/claws-mail: Add GTK2 and GTK3 options
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Juraj Lutter
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2022-10-14 10:25 UTC by bsd
Modified: 2022-10-31 22:00 UTC (History)
3 users (show)

See Also:
portmaster: maintainer-feedback+


Attachments
mail/claws-mail: patch to add GTK2/GTK3 options (17.34 KB, patch)
2022-10-14 10:25 UTC, bsd
portmaster: maintainer-approval+
Details | Diff
additions to previously submitted patch (5.29 KB, patch)
2022-10-14 20:02 UTC, Chris Hutchinson
portmaster: maintainer-approval?
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description bsd 2022-10-14 10:25:15 UTC
Created attachment 237292 [details]
mail/claws-mail: patch to add GTK2/GTK3 options

Claws Mail team released GTK3 versin for some time along with older GTK2. Development focus slowly shifts to GTK3, but FreeBSD port does not reflect this. Patch presented add radio buttons for GTK2/GTK3 selection while keeping GTK2 as default for now.

Makefile is being portclippy'ed and portfmt'ed.

All Claws Mail plugin ports reflect the choice made by master port properly.
Comment 1 Chris Hutchinson 2022-10-14 14:15:53 UTC
(In reply to bsd from comment #0)
LGTM but it doesn't appear you've tested it.
I will need to do that anyway. I should be able
to have something before the end of the weekend.

Thanks for all your time and effort!

--chris
Comment 2 bsd 2022-10-14 14:22:32 UTC
(In reply to Chris Hutchinson from comment #1)
All ports, main, slave and metaport for plugins were fully tested for build with both GTK2 and GTK3 option. Do you see a problem anywhere?
Comment 3 Chris Hutchinson 2022-10-14 15:01:26 UTC
(In reply to bsd from comment #2)
> All ports, main, slave and metaport for plugins were
> fully tested for build with both GTK2 and GTK3 option.
Oh. Good.

> Do you see a problem anywhere?
No I do not -- LGTM :-)
But as a maintainer, I am required to test, or otherwise
*prove* it works as intended. Uncommiting a commit, or
committing twice to make a correction, is considered
wasted effort(s). I don't make the rules. I just try to
follow them whenever possible. ;-)

--chris
Comment 4 bsd 2022-10-14 15:45:00 UTC
(In reply to Chris Hutchinson from comment #3)
OK. An additional note - GTK2 version is just what we actually have in port now. I am using it all the time, I am sure it works. Also, I did some limited run test for GTK3 version. I did not run test all the plugins, just load them.
Comment 5 Chris Hutchinson 2022-10-14 20:02:44 UTC
Created attachment 237308 [details]
additions to previously submitted patch

This makes a couple of additions to the original
patch attached to this pr(1).

Corrections / additions:
liblber.so:net/openldap26-client \
libldap.so:net/openldap26-client

I *could* have added the strip_cmd for keyword_warner.
But I'll save that for a new pr.

Thanks for all your time and efforts on this! :-)

This passes all tests on 13.1 amd64 && fresh ports tree.

Please commit.

Thanks!

--chris
Comment 6 bsd 2022-10-15 06:42:19 UTC
(In reply to Chris Hutchinson from comment #5)
I think including

liblber.so:net/openldap26-client \
libldap.so:net/openldap26-client

is wrong for two reasons. First, when building without LDAP option, there should not be a reason to depend on OPENLDAP.

Second, you are forcing version 2.6, while we have versions 2.4, 2.5 and 2.6 in out ports tree. Correct dependency should be handled by USE= OPENLDAP=yes (as done under option LDAP in Claws Mail port before).

Additionally, I have Claws Mail built withoup LDAP option, with no OpenLDAP client port installed, and there is no problem using it.

Please reconsider. This unconditional dependency is unnecessary and potentially harmfull.
Comment 7 Chris Hutchinson 2022-10-16 04:34:21 UTC
(In reply to bsd from comment #6)
I'm not surprised to hear this. I was unhappy
with the version "lock in". But the package
framework insisted I use those 2 Includes to
give me a pass on the changes.
In the end, it makes no sense to insist on
openldap in all configurations. Even less
to lock it at 2.6.
I'll change the maintainer+ accordingly.
Comment 8 Chris Hutchinson 2022-10-16 04:35:11 UTC
Comment on attachment 237308 [details]
additions to previously submitted patch

Incorrect choice of patch approval.
Comment 9 Chris Hutchinson 2022-10-16 04:37:36 UTC
Comment on attachment 237292 [details]
mail/claws-mail: patch to add GTK2/GTK3 options

Please commit this patch. It works as intended.

Thanks for all your the time and effort you've put into this Milan!
Comment 10 Chris Hutchinson 2022-10-16 04:38:29 UTC
Approved.
Comment 11 bsd 2022-10-16 05:32:24 UTC
(In reply to Chris Hutchinson from comment #7)
> But the package framework insisted I use those 2 Includes to give me a pass on the changes.

Which package framework? Do you mean some testing tool? Which one?
Comment 12 Chris Hutchinson 2022-10-16 05:38:41 UTC
(In reply to bsd from comment #11)
Ports framework.
You wouldn't experience these errors without flipping
the developer switch in make.conf(5).
DEVELOPER=yes

Then performing the following sequence:
$ make -DBATCH check-plist
$ make -DBATCH stage-qa
$ make check-sanity
$ portlint

I couldn't get through these without a fail/error
unless I added the Includes I added in the patch I submitted.
Comment 13 bsd 2022-10-16 05:54:06 UTC
(In reply to Chris Hutchinson from comment #12)
Thanks for list... I'll try to see, probably later (there are still more changes being worked on) - maybe even a bug in some of these steps... after all, ports framework is really complex, provides place for bugs as well :)
Comment 14 Chris Hutchinson 2022-10-24 16:12:40 UTC
(In reply to bsd from comment #13)
What's your status on this, Milan? I'm ready to sign off
on this if you don't experience any problems.
Comment 15 Juraj Lutter freebsd_committer freebsd_triage 2022-10-24 16:24:17 UTC
I have some minor objections, will come back to you later on this topic.
Comment 16 commit-hook freebsd_committer freebsd_triage 2022-10-31 21:58:53 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=362d1c601c4ce43ad6463dec09e2a7b99b8f170d

commit 362d1c601c4ce43ad6463dec09e2a7b99b8f170d
Author:     Milan Obuch <bsd@dino.sk>
AuthorDate: 2022-10-31 21:14:18 +0000
Commit:     Juraj Lutter <otis@FreeBSD.org>
CommitDate: 2022-10-31 21:57:46 +0000

    mail/claws-mail: Allow for GTK2 or GTK3 variants

    Claws Mail team released GTK3 version for some time along with older
    GTK2. Development focus slowly shifts to GTK3.

    Add the option to select GTK2 and GTK3 version, keeping GTK2 as default
    for now.

    PR:             267043
    Approved by:    Chris Hutchinson (maintainer)

 mail/claws-mail/Makefile                           | 22 ++++++++++++++++++++--
 mail/claws-mail/Makefile.claws                     |  4 ++++
 mail/claws-mail/Makefile.ver                       |  9 +++++++++
 mail/claws-mail/distinfo                           |  3 +--
 ...patch-configure.ac => extra-patch-configure.ac} |  6 +++---
 mail/claws-mail/pkg-plist                          |  6 +++---
 6 files changed, 40 insertions(+), 10 deletions(-)
Comment 17 Juraj Lutter freebsd_committer freebsd_triage 2022-10-31 22:00:01 UTC
Committed, thanks.