Bug 278142

Comment 1 Nuno Teixeira 2024-04-03 16:03:19 UTC

Hello,

According to https://cgit.freebsd.org/ports/commit/?id=a5a118a0c713b0c3c793d8dc03e944192865d8ff , webkit was removed.

This condition should be fixed to webengine only.

---
.if ${ARCH} == amd64 || ${ARCH} == i386
USE_QT+=        webengine
.else
CMAKE_ARGS+=    -DWEBVIEW_PROVIDER=webkit
USE_QT+=        webkit
.endif
---

Thanks

Comment 2 Nuno Teixeira 2024-04-03 16:14:43 UTC

(In reply to Nuno Teixeira from comment #1)

(...)

**According with:
MOVED
www/qt5-webkit||2023-12-31|Has expired: No longer actively maintained, increasing security concerns

URL commit above is an example of one of the fixes.

(In reply to Nuno Teixeira from comment #1)
Thank you. I'll make using of webengine unconditionally and upload new patch.

Created attachment 249744 [details]
update to 1.5.1

I updated the patch. Now webengine dependency is optional and enabled by default. Also I added flavors for qt5 and qt6 builds. By default it builds qt5 flavor.

Comment 5 Nuno Teixeira 2024-04-06 21:32:38 UTC

- portlint complains about using spaces instead of tabs after variables

- desktop-file-utils dependancy could be safely removed since .desktop file doesn't include MimeType entry.

- Q/A checks warnings:

@qt5:
====> Running Q/A tests (stage-qa)
Warning: you may not need USES=desktop-file-utils
Error: /usr/local/bin/syncthingtray is linked to /usr/local/lib/libX11.so.6 from x11/libX11 but it is not declared as a dependency
Warning: you need USE_XORG+=x11
Warning: you might not need LIB_DEPENDS on libKF5Plasma.so
Warning: you might not need LIB_DEPENDS on libQt5Location.so
Warning: you might not need LIB_DEPENDS on libQt5QuickControls2.so
Warning: you might not need LIB_DEPENDS on libQt5X11Extras.so

@qt6:
====> Running Q/A tests (stage-qa)
Warning: you may not need USES=desktop-file-utils
Error: /usr/local/bin/syncthingtray is linked to /usr/local/lib/libX11.so.6 from x11/libX11 but it is not declared as a dependency
Warning: you need USE_XORG+=x11
Error: /usr/local/bin/syncthingtray is linked to /usr/local/lib/qt6/libQt6Positioning.so.6 from devel/qt6-positioning but it is not declared as a dependency
Warning: you might not need LIB_DEPENDS on libPlasma.so
Warning: you might not need LIB_DEPENDS on libQt6Location.so

Note: tested with WEBENGINE option ON.

Cheers

Created attachment 249807 [details]
update to 1.5.1

Hi,

I updated the patch and fixed testport warnings.

Comment 7 Nuno Teixeira 2024-04-08 10:33:51 UTC

(In reply to Denis Shaposhnikov from comment #6)

Just some final adjustments (against your patch):

Update COMMENT to show what qt version is in use (auto-generated)
< COMMENT=      Qt 5-based Syncthing tray application
---
> COMMENT=      Qt ${FLAVOR:S/qt//}-based Syncthing tray application


Add xorg to USES so USE_XORG could be read.
< USES=         cmake:insource compiler:c++17-lang iconv perl5
---
> USES=         cmake:insource compiler:c++17-lang iconv perl5 xorg


Fix "+=" to "="
< USE_XORG+=    x11
---
> USE_XORG=     x11


Pet qt6 Q/A check (linking to positioning)
< USE_QT+=      base positioning:build
---
> USE_QT+=      base positioning


==============================
While we are here some important recommendations:

1. Switch PORTVERSION to DISTVERSION:
https://docs.freebsd.org/en/books/porters-handbook/book/#makefile-master_sites-github

2. Remove "compiler:c++17-lang" from USES:
https://docs.freebsd.org/en/books/porters-handbook/book/#uses-compiler

available compilers are capable of that feature and also because cmake defines upstream feature.
==============================

No need to upload a new patch.

If you plan to include 1. and 2. changes, please confirm so I can commit.

Cheers

(In reply to Nuno Teixeira from comment #7)
Thank you. Please go on and do all changes, I agree.

Comment 9 commit-hook 2024-04-09 07:14:43 UTC

A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0cc7fb1651f649a99f9fa5a9a1bcf9216b2a1615

commit 0cc7fb1651f649a99f9fa5a9a1bcf9216b2a1615
Author:     Denis Shaposhnikov <dsh@bamus.cz>
AuthorDate: 2024-04-09 07:10:10 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2024-04-09 07:13:56 +0000

    deskutils/syncthingtray: Update to 1.5.1 / Flavorize Qt

    - Switch to DISTVERSION
    - Drop compiler from USES
    - Flavorize Qt
    - Remove dependency on deprecated webkit

    ChangeLog:      https://github.com/Martchus/syncthingtray/releases/tag/v1.5.1
    PR:             278142

 deskutils/syncthingtray/Makefile                   | 69 ++++++++++++++--------
 deskutils/syncthingtray/distinfo                   | 10 ++--
 ...cthingtray_plasmoid_lib_syncthingapplet.h (new) | 12 ++++
 deskutils/syncthingtray/pkg-plist                  |  7 ++-
 4 files changed, 65 insertions(+), 33 deletions(-)

Comment 10 Nuno Teixeira 2024-04-09 07:18:58 UTC

Committed, thanks!