Bug 273252
|
Description
Alastair Hogge
2023-08-21 00:46:13 UTC
Hi Alastair, thanks for the patch. What do you think about adding a flavor for qt6, and keep a fallback option for qt5 for users who don't want to move to qt6 yet? Similarly how it's done in `security/gpgme` or any other port found by `egrep -r ".*FLAVOR.*qt[56].*"` Challenge accepted. Created attachment 244276 [details]
www/qutebrowser: Update to 3.0.0 and flavourise WebEngine with Qt-5 or Qt-6 sprinkles
Update to 3, tho restructure the port for Qt-5 or Qt-6 flavours of WebEngine.
(In reply to Roman Bogorodskiy from comment #1) Hey Roman, I think the recent patch addresses your idea of adding ${FLAVORS}, also does the following handle the fallback you are referring to? FLAVORS= qt5 qt6 FLAVOR?= ${FLAVORS:[1]} Hello! This is really good news and I will try new version with qt6 flavor asap! I have some ports flavorized with qt5/qt6 and some being using qt6 as default depending on upstream recomendation which is the case of qutebrowser. Cheers (In reply to Nuno Teixeira from comment #5) Hey Nuno, I would be interested in hearing your thoughts, as initially, on my host the Qt-6 variant appears sluggish over the Qt-5 variant. (In reply to Alastair Hogge from comment #6) Sure! I'm doing a major rebuilding of my ports on 14-ALPHA2 and tomorrow morning I will have both flavors fresh and ready to do some comparisons. (In reply to Alastair Hogge from comment #6) Testing qt6 flavor: tabs opened: - mail.google.com OK - youtube.com (1080p, sound) OK - facebook.com OK - wirple.com (gl tests) OK - github.com OK All smooth and stable,low cpu, processes spawn and memory Very curious to test it on my rpi4! My source of comparison is firefox that I use for many years. I will switch to qt5 flavor when I have a better experience with qt6. If/when I switch flavors I will use clean configs: rm -r .config/qutebrowser rm -r .local/share/qutebrowser ----- Questions/Notes: - :config-edit calls 'gvim' that I don't use. I will search for a way to use 'nvi'(base) if that possible - Any specific situation/test that I should compare between flavors? - Does port needs flavor CONFLICTS or it is possible to install both? ----- (In reply to Nuno Teixeira from comment #8) > - :config-edit calls 'gvim' that I don't use. I will search for a way to use > 'nvi'(base) if that possible It seems that it only works with gui editors. We don't have gvim, but I'm working on flavorize editors/neovim-qt and add qt6 to it. (In reply to Nuno Teixeira from comment #9) > We don't have gvim, ... editors/vim: . for F in (...) gvim (...) ${LN} -sf vim ${STAGEDIR}${PREFIX}/bin/$F Will try both, but I think neovim-qt will be best since it shares qt5/qt6 flavors when flavorized port is done. Tomorrow morning I will have results. (In reply to Nuno Teixeira from comment #10) Nice! Now port have the possibility of depending on upstream default editor gvim from editors/vim or flavored editors/neovim-qt which is nice because it shares same deps as qutebrowser on selected flavor. https://cgit.freebsd.org/ports/commit/?id=759dd1d9268bede36ef83561616c6f9d46d48549 Cheers (In reply to Nuno Teixeira from comment #11) That is so cool! I will try and translate that, to the patch here...when I get a booting system again. - I guess we'd need to have CONFLICTS_INSTALL between flavors as most of the plist files will be the same, not allowing packages to be installed at the same time, - Also, it looks like we'd need to add a MOVED entry for the smooth transition from the non-flavored version. In the meantime I've briefly tested the qt5 version, and plan to test the qt6 soon. PS The patch itself looks good, wondering about the ADBLOCK_DESC formatting changes, is that caused by the linter complain? (In reply to Roman Bogorodskiy from comment #13) Yes, a double tab was from removed from ${ADBLOCK_DESC} due to a warning from portlint. I am still stuck with tracing a boot panic, and an old classic (root mount hang on CAM) on my 15-CURRENT desktop/build box, so I might be a few more days away before I can continue, if someone else beats me, awesome, otherwise I will work at all the suggestions when I can. Thanks. Created attachment 244650 [details] www/qutebrowser: Update to 3.0.0 and flavourise WebEngine with Qt-5 or Qt-6 Hi all, Latest .diff: • install man page • add ${flavor_CONFLICTS_INSTALL} • add local patches to modify the default GUI editor from gvim to neovim-qt Regarding the MOVED entry, I added an entry similar to security/gpgme-qt5: > www/qutebrowser|www/qutebrowser@qt5|2023-09-05|Flavorize, qutebrowser@qt5 (default), or use www/qutebrowser@qt6 However, this prevented me from building the -qt6 variation. I have only tested the Qt6 variation, and it works great, with nvim-qt too. Created attachment 244654 [details]
www/qutebrowser: Update to 3.0.0 and flavourise WebEngine with Qt-5 or Qt-6
• Update local patches to provide some more info about editor.command regarding nvim-qt.
Hello!
Sugestions:
-qt5_RUN_DEPENDS= nvim-qt:editors/neovim-qt@qt5
-qt6_RUN_DEPENDS= nvim-qt:editors/neovim-qt@qt6
+RUN_DEPENDS= (...)
+ nvim-qt:editors/neovim-qt@${FLAVOR}
[1]
${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.1 \
- ${STAGEDIR}${MAN1PREFIX}/man/man1
+ ${STAGEDIR}${PREFIX}/share/man/man1
-PLIST_FILES= man/man1/${PORTNAME}.1.gz \
share/applications/${PORTNAME}-${PYTHON_VER}.desktop
+PLIST_FILES= share/man/man1/${PORTNAME}.1.gz \
share/applications/${PORTNAME}-${PYTHON_VER}.desktop
[1]
20200115:
AUTHOR: bapt@FreeBSD.org
${PREFIX}/share/man is now a valid location for manpages ${PREFIX}/man being
considered as deprecated.
Cheers
Created attachment 244661 [details] www/qutebrowser: Update to 3.0.0 and flavourise WebEngine with Qt-5 or Qt-6 Thanks Nuno, awesome suggestions (comment #17), updated diff to reflect that, thanks so much. Created attachment 244663 [details]
www/qutebrowser: Update to 3.0.0 and flavourise WebEngine with Qt-5 or Qt-6
• add dos2unix for use with one patch file, and regenerate patch (portlint)
• fix ordering of Uses block (portlint)
I'm not sure I like the runtime dependency on nvim-qt. I don't use qt flavors of vim and with this change there's no way for me to opt out of that feature. I'm imagine this scenario is valid not only for me. (In reply to Alastair Hogge from comment #6) Is that still a case that qt6 flavor is more sluggish for you? I gave it some testing and qt6 flavors feels a little better than qt5 on my system. (In reply to Roman Bogorodskiy from comment #20) Fair enuf, I will remove the nvim-qt patches. (In reply to Roman Bogorodskiy from comment #21) I am unable to build WebEngine-5 at all on any release anymore, so I can no longer test the qt5 variation, the qt6 variation tho, that runs very well at the moment. I think the previous sluggishness may have resulted from pkg updates between 14 and 15. Created attachment 244669 [details]
www/qutebrowser: Update to 3.0.0 and flavourise WebEngine with Qt-5 or Qt-6
• drop local patches to make nvim-qt default editor
• remove runtime dependency on nvim-qt
(In reply to Alastair Hogge from comment #16) > • Update local patches to provide some more info about editor.command > regarding nvim-qt. Could you open an PR or a pull request for those changes at upstream? It would be nice to have it documented. Thanks. (In reply to Alastair Hogge from comment #23) Great, if qt6 version works good for you too, I'll make it default to follow upstream here, and push the commit after some testing. Created attachment 244683 [details]
updated patch without MOVED changes
I have to apologize because, apparently, my recommendation about the MOVED entry was incorrect, and according to Tools/scripts/MOVEDlint.awk, the entry shouldn't point to the flavorized version of itself.
What I did is the following:
- Removed the MOVED entry
- Removed pkg suffix for qt6 flavor, i.e. qt6 flavor is now just "qutebrowser", and the qt5 flavor is "qutebrowser-qt5". I've also updated CONFLICTS accordingly.
I'm still running test builds as it take a while.
(In reply to Nuno Teixeira from comment #25) Sure, will do that, and record the issue here. (In reply to Roman Bogorodskiy from comment #26) That would be so awesome, thanking you very much. (In reply to Roman Bogorodskiy from comment #27) I am still confused, because the MOVED entry did not point to the flavourised -qt5 Port: > www/qutebrowser||2023-09-05|Flavorize, use qutebrowser@qt5 (default), or www/qutebrowser@qt6 The second column between the two |'s is empty. Regardless, thanks for your help. (In reply to Alastair Hogge from comment #29) Yes, I should have elaborated about MOVED: - With the second column empty, it'd mean the port is deleted, which is not applicable to our situation - With the second column pointing to the flavorized version it doesn't work properly due to reasons described above (In reply to Roman Bogorodskiy from comment #30) That makes sense, thanks for that. (In reply to Roman Bogorodskiy from comment #30) e.g.: audio/kid3-qt5|audio/kid3@qt5|2022-09-13|Merged into flavorized version net-im/qxmpp-qt5|net-im/qxmpp|2023-05-26|Port flavorized for Qt 5 and 6 (etc) The oposit doesn't work as jbeich replied to ea3553f: --- Note, MOVED doesn't support flavors as "from port" field e.g., $ echo "x11/waybar@hyprland|x11/waybar|2023-09-03|Test" >>MOVED $ poudriere bulk -Nj 132amd64 x11/waybar@hyprland [...] [00:00:02] Ignoring x11/waybar@hyprland | waybar-hyprland-0.9.22: Unknown flavor 'hyprland', possible flavors: default nopulse [...] --- But I think considering 'qt6' flavor as 'qt' and 'qt5' as 'qt5' when upstream defaults to qt6. (In reply to Nuno Teixeira from comment #32) (...) But I think considering 'qt6' flavor as 'qt' and 'qt5' as 'qt5' when upstream defaults to qt6 a very nice decision. I will do the same for some ports I maintain when upstream defaults/sugests to qt6. A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=7129b6aed00364678b9380fa036fb471fac2f91e commit 7129b6aed00364678b9380fa036fb471fac2f91e Author: Alastair Hogge <agh@riseup.net> AuthorDate: 2023-09-06 16:35:10 +0000 Commit: Roman Bogorodskiy <novel@FreeBSD.org> CommitDate: 2023-09-07 17:54:25 +0000 www/qutebrowser: Update to 3.0.0 and flavourise - Update to 3.0.0 - Flavourise WebEngine with Qt-5 or Qt-6, Qt-6 being default version as per upstream - Add ${LICENSE_FILE} - Pet portlint PR: 273252 Reviewed by: eduardo, novel Approved by: novel (maintainer) www/qutebrowser/Makefile | 48 ++++++++++++++++++++++++++++++++++++------------ www/qutebrowser/distinfo | 6 +++--- 2 files changed, 39 insertions(+), 15 deletions(-) (In reply to Nuno Teixeira from comment #33) I think the "qt" flavor doesn't add too much value as qutebrowser cannot be used without qt, so it's implied that qt is always there. Committed, thanks! (In reply to Nuno Teixeira from comment #25) Hello, > Could you open an PR or a pull request for those changes at upstream? > It would be nice to have it documented. I previously said I would do this, however, I am well over Surveillance Capitalism and the struggle to reduce my exposure to it, on top of the absurd workflow that GitHub brings, to an already laughable dumpster fire that is git(1), I will not be pursuing this for the time being. Sorry compas. |
