Bug 278274 - net-p2p/tremotesf: Update to 2.6.2
Summary: net-p2p/tremotesf: Update to 2.6.2
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: Zsolt Udvari
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2024-04-09 12:40 UTC by Anton Saietskii
Modified: 2024-04-29 17:51 UTC (History)
1 user (show)

See Also:
vsasjason: merge-quarterly?


Attachments
v0 (apply via `git am`) (1.36 KB, patch)
2024-04-09 12:40 UTC, Anton Saietskii
vsasjason: maintainer-approval+
Details | Diff
poudriere build -t log (qt5 flavor) (12.89 KB, application/x-xz)
2024-04-09 12:41 UTC, Anton Saietskii
no flags Details
poudriere build -t log (qt6 flavor) (12.91 KB, application/x-xz)
2024-04-09 15:06 UTC, Anton Saietskii
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description Anton Saietskii 2024-04-09 12:40:45 UTC
Created attachment 249850 [details]
v0 (apply via `git am`)

It's a bugfix-only release:

Fixed
  * Application being closed when opening file picker in Qt 6 builds

Actual change is just 'QCoreApplication::setQuitLockEnabled(false);' call, thus I'm requesting merge to quarterly branch.
Comment 1 Anton Saietskii 2024-04-09 12:41:21 UTC
Created attachment 249851 [details]
poudriere build -t log (qt5 flavor)
Comment 2 Anton Saietskii 2024-04-09 15:06:15 UTC
Created attachment 249858 [details]
poudriere build -t log (qt6 flavor)
Comment 3 Zsolt Udvari freebsd_committer freebsd_triage 2024-04-26 07:36:30 UTC
Could you please check 'portclippy Makefile'? (part of ports-mgmt/portfmt package)
Thanks!
Comment 4 Anton Saietskii 2024-04-26 10:33:26 UTC
(In reply to Zsolt Udvari from comment #3)

Of course I'm doing that (along with portfmt & portlint) on each op change.

Unfortunately, portclippy doesn't handle '.if' properly: for example, it suggests moving CMAKE_OFF below CMAKE_ARGS, what isn't really possible -- first variable is specific to flavor, while second is for port regardless of flavor.
If we'll move entire '.if' block below CMAKE_ARGS -- portclippy will complain about USE_QT and USE_GL (and these variables can't be moved to suggested places as well).

So, no matter how one will reroll makefile (keeping '.if' block) -- portclippy will complain about different variables until it will learn to process conditionals as a subblock, which in turn can contain its own USES, USE_*, etc blocks.
Comment 5 Zsolt Udvari freebsd_committer freebsd_triage 2024-04-26 12:22:15 UTC
(In reply to Anton Saietskii from comment #4)
Sorry, you've right. I saw your diff some days ago and I notice this but I forget it.
Comment 6 Anton Saietskii 2024-04-26 14:17:52 UTC
(In reply to Zsolt Udvari from comment #5)

Created bug #278591 for that.
Comment 7 Zsolt Udvari freebsd_committer freebsd_triage 2024-04-27 05:31:41 UTC
I'll commit when mentor(s) approve it (https://reviews.freebsd.org/D44981).
Comment 8 commit-hook freebsd_committer freebsd_triage 2024-04-29 12:11:38 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1752db72ddd89f09363a4688342d1b5039fc9e44

commit 1752db72ddd89f09363a4688342d1b5039fc9e44
Author:     Anton Saietskii <vsasjason@gmail.com>
AuthorDate: 2024-04-27 05:22:30 +0000
Commit:     Zsolt Udvari <uzsolt@FreeBSD.org>
CommitDate: 2024-04-29 12:08:40 +0000

    net-p2p/tremotesf: update to 2.6.2

    Add compiler:c++20-lang to USES.

    Changelog: https://github.com/equeim/tremotesf2/releases/tag/2.6.2

    PR:             278274
    Approved by:    Submitter is maintainer, diizzy (mentor)
    Differential Revision: https://reviews.freebsd.org/D44981

 net-p2p/tremotesf/Makefile | 5 +++--
 net-p2p/tremotesf/distinfo | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)
Comment 9 Zsolt Udvari freebsd_committer freebsd_triage 2024-04-29 12:12:24 UTC
Committed, thanks!
Comment 10 Anton Saietskii 2024-04-29 12:26:02 UTC
(In reply to Zsolt Udvari from comment #9)

Zsolt, I'm afraid you forgot about quarterly. 2.6.2 is a bugfix-only release, which fixes crash in 2.6.1, which in turn is in quarterly now.
Comment 11 commit-hook freebsd_committer freebsd_triage 2024-04-29 17:48:41 UTC
A commit in branch 2024Q2 references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3e07ec5fc79aeba1f97c38c375d5291d2e5066db

commit 3e07ec5fc79aeba1f97c38c375d5291d2e5066db
Author:     Anton Saietskii <vsasjason@gmail.com>
AuthorDate: 2024-04-27 05:22:30 +0000
Commit:     Zsolt Udvari <uzsolt@FreeBSD.org>
CommitDate: 2024-04-29 17:41:17 +0000

    net-p2p/tremotesf: update to 2.6.2

    Add compiler:c++20-lang to USES.

    Changelog: https://github.com/equeim/tremotesf2/releases/tag/2.6.2

    PR:             278274
    Approved by:    Submitter is maintainer, diizzy (mentor)
    Differential Revision: https://reviews.freebsd.org/D44981

    (cherry picked from commit 1752db72ddd89f09363a4688342d1b5039fc9e44)

 net-p2p/tremotesf/Makefile | 5 +++--
 net-p2p/tremotesf/distinfo | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)
Comment 12 Zsolt Udvari freebsd_committer freebsd_triage 2024-04-29 17:51:39 UTC
(In reply to Anton Saietskii from comment #10)
Sorry, I forget it. Done.
Thanks!