git: c9b2d0e6b0b1 - main - deskutils/syncthingtray: update to 1.7.2

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Robert Clausecker <fuz_at_FreeBSD.org>
Date: Tue, 18 Feb 2025 14:26:31 UTC
The branch main has been updated by fuz:

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

commit c9b2d0e6b0b118b1990cbb2eaea8654ea2219a1e
Author:     Denis Shaposhnikov <dsh@bamus.cz>
AuthorDate: 2025-02-13 16:19:04 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2025-02-18 14:16:16 +0000

    deskutils/syncthingtray: update to 1.7.2
    
    Changelog: https://github.com/Martchus/syncthingtray/releases/tag/v1.7.2
    
    Also made dependency on Plasma optional (PLASMA option enabled by default).
    
    PR:             284534
---
 deskutils/syncthingtray/Makefile  | 52 ++++++++++++++++++--------------
 deskutils/syncthingtray/distinfo  | 18 ++++++------
 deskutils/syncthingtray/pkg-plist | 62 +++++++++++++++++++--------------------
 3 files changed, 70 insertions(+), 62 deletions(-)

diff --git a/deskutils/syncthingtray/Makefile b/deskutils/syncthingtray/Makefile
index dee1d787ad75..139b43d779b6 100644
--- a/deskutils/syncthingtray/Makefile
+++ b/deskutils/syncthingtray/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	syncthingtray
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.7.1
-PORTREVISION=	1
+DISTVERSION=	1.7.2
 CATEGORIES=	deskutils
 
 MAINTAINER=	dsh@bamus.cz
@@ -12,16 +11,14 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKDIR}/syncthingtray/LICENSE
 
 BUILD_DEPENDS=	p5-YAML-LibYAML>0:textproc/p5-YAML-LibYAML
-LIB_DEPENDS=	libboost_iostreams.so:devel/boost-libs \
-		libboost_regex.so:devel/boost-libs
+LIB_DEPENDS=	libboost_iostreams.so:devel/boost-libs
 
 FLAVORS=	qt5 qt6
 FLAVOR?=	${FLAVORS:[1]}
 FLAVORS_SUB=	yes
 
-qt5_CONFLICTS_INSTALL=	${PORTNAME}-qt6
 qt6_PKGNAMESUFFIX=	-qt6
-qt6_CONFLICTS_INSTALL=	${PORTNAME}
+CONFLICTS_INSTALL=	${PORTNAME} ${PORTNAME}-*
 
 USES=		cmake:insource iconv perl5 xorg
 
@@ -34,39 +31,50 @@ CMAKE_SOURCE_PATH=	${WRKDIR}/subdirs/syncthingtray
 USE_GITHUB=	nodefault
 GH_ACCOUNT=	Martchus
 GH_TUPLE:=	${GH_ACCOUNT}:${PORTNAME}:${DISTVERSIONPREFIX}${DISTVERSION}:${PORTNAME}/../${PORTNAME} \
-		${GH_ACCOUNT}:cpp-utilities:v5.27.1:cpputilities/../c++utilities \
-		${GH_ACCOUNT}:qtutilities:v6.14.5:qtutilities/../qtutilities \
-		${GH_ACCOUNT}:qtforkawesome:v0.2.3:qtforkawesome/../qtforkawesome \
+		${GH_ACCOUNT}:cpp-utilities:v5.27.3:cpputilities/../c++utilities \
+		${GH_ACCOUNT}:qtutilities:v6.14.6:qtutilities/../qtutilities \
+		${GH_ACCOUNT}:qtforkawesome:v0.3.0:qtforkawesome/../qtforkawesome \
 		ForkAwesome:Fork-Awesome:4fef70f:ForkAwesome/../forkawesome \
 		${GH_ACCOUNT}:subdirs:993f383:subdirs/../subdirs
 
-USE_KDE=	ecm:build
 USE_QT=		declarative svg
 USE_XORG=	x11
 
 .if ${FLAVOR} == qt5
-USES+=		kde:5 qt:5
-USE_KDE+=	plasma-framework:build
-USE_QT+=	concurrent core dbus gui location network qdbus \
-		quickcontrols2:build widgets x11extras:build buildtools:build \
-		linguist:build qmake:build testlib:build
-WEBENGINE_USE=	QT=printsupport,webchannel,webengine
+USES+=		qt:5
+USE_QT+=	concurrent core dbus gui network qdbus quickcontrols2:build \
+		widgets x11extras:build buildtools:build linguist:build \
+		qmake:build testlib:build
 .else
 CMAKE_ARGS+=	-DQT_PACKAGE_PREFIX:STRING=Qt6 -DKF_PACKAGE_PREFIX:STRING=KF6
-USES+=		gl kde:6 qt:6
+USES+=		gl qt:6
 USE_GL=		opengl
-USE_KDE+=	libplasma:build
-USE_QT+=	base positioning
-WEBENGINE_USE=	QT=webchannel,webengine
+USE_QT+=	base tools:build
 .endif
 
-OPTIONS_DEFINE=		WEBENGINE
-OPTIONS_DEFAULT=	WEBENGINE
+OPTIONS_DEFINE=		PLASMA WEBENGINE
+OPTIONS_DEFAULT=	PLASMA WEBENGINE
+
+PLASMA_DESC=	Plasma integration (KF dependency)
+PLASMA_USE=	KDE=ecm:build
+PLASMA_CMAKE_BOOL_OFF=	NO_FILE_ITEM_ACTION_PLUGIN NO_PLASMOID
 
 WEBENGINE_DESC=		Built-in web view (webengine dependency)
 WEBENGINE_CMAKE_ON=	-DWEBVIEW_PROVIDER:STRING=webengine
 WEBENGINE_CMAKE_OFF=	-DWEBVIEW_PROVIDER:STRING=none
 
+OPTIONS_SUB=	yes
+
+.if ${FLAVOR} == qt5
+PLASMA_USES=	kde:5
+PLASMA_USE+=	KDE=plasma-framework:build
+WEBENGINE_USE=	QT=printsupport,webchannel,webengine
+.else
+PLASMA_USES=	kde:6
+PLASMA_USE+=	KDE=libplasma:build
+WEBENGINE_USE=	QT=webchannel,webengine
+.endif
+
 USE_PERL5=	build
 
 BUILD_WRKSRC=		${WRKDIR}
diff --git a/deskutils/syncthingtray/distinfo b/deskutils/syncthingtray/distinfo
index 1971389c876d..e325079c9665 100644
--- a/deskutils/syncthingtray/distinfo
+++ b/deskutils/syncthingtray/distinfo
@@ -1,12 +1,12 @@
-TIMESTAMP = 1736522340
-SHA256 (Martchus-syncthingtray-v1.7.1_GH0.tar.gz) = 2c9cc5bef94736688ce2862f987cc6732dee25768b61a33b24ff1258a0a66b7a
-SIZE (Martchus-syncthingtray-v1.7.1_GH0.tar.gz) = 2138303
-SHA256 (Martchus-cpp-utilities-v5.27.1_GH0.tar.gz) = a6c35cda6cee50e053a9bb405e8fa35fd7bf75561f10ee1a4c3fc85de5c5fb97
-SIZE (Martchus-cpp-utilities-v5.27.1_GH0.tar.gz) = 204479
-SHA256 (Martchus-qtutilities-v6.14.5_GH0.tar.gz) = f4f3fbb57402f476a027c4d334ff410d6ff5eafbdf45c5d65fda822335cc37d7
-SIZE (Martchus-qtutilities-v6.14.5_GH0.tar.gz) = 100260
-SHA256 (Martchus-qtforkawesome-v0.2.3_GH0.tar.gz) = aec0f5e52223d5d1d5fc0a860b626bdecb67df32471f2304b0d9ddf4c5af01ac
-SIZE (Martchus-qtforkawesome-v0.2.3_GH0.tar.gz) = 19301
+TIMESTAMP = 1738509861
+SHA256 (Martchus-syncthingtray-v1.7.2_GH0.tar.gz) = fdea38ae68ff64bdfb00d09e2cccfb509bb44eafcd33f62998a3811a4910b9ea
+SIZE (Martchus-syncthingtray-v1.7.2_GH0.tar.gz) = 2144765
+SHA256 (Martchus-cpp-utilities-v5.27.3_GH0.tar.gz) = ec1e88177f8541c73ba75c6b46cc610046f77ff2a00ff961f8f9bb5e6ab13dcf
+SIZE (Martchus-cpp-utilities-v5.27.3_GH0.tar.gz) = 206685
+SHA256 (Martchus-qtutilities-v6.14.6_GH0.tar.gz) = cfa243a8b60beb7298cee44ca38e0e4af25ea76f33fc4aca2456fb902029f370
+SIZE (Martchus-qtutilities-v6.14.6_GH0.tar.gz) = 100252
+SHA256 (Martchus-qtforkawesome-v0.3.0_GH0.tar.gz) = 114737588168065e0b5ccc5d67a6f69a11fb3a3b74fdb381e132c92db115db97
+SIZE (Martchus-qtforkawesome-v0.3.0_GH0.tar.gz) = 19596
 SHA256 (ForkAwesome-Fork-Awesome-4fef70f_GH0.tar.gz) = 93906cd38eb92fe853c9e3723b1f0fa56df6ddcd2d87ac82c97b5a188e5cdae6
 SIZE (ForkAwesome-Fork-Awesome-4fef70f_GH0.tar.gz) = 1803875
 SHA256 (Martchus-subdirs-993f383_GH0.tar.gz) = 322ed074ce8d292689e57820b83b6eb27b63fb80aed23c4932b4def66d612279
diff --git a/deskutils/syncthingtray/pkg-plist b/deskutils/syncthingtray/pkg-plist
index c2aba15ad83d..3d4cb0aea9c9 100644
--- a/deskutils/syncthingtray/pkg-plist
+++ b/deskutils/syncthingtray/pkg-plist
@@ -4,46 +4,46 @@ share/applications/syncthingtray.desktop
 share/bash-completion/completions/syncthingctl
 share/bash-completion/completions/syncthingtray
 share/icons/hicolor/scalable/apps/syncthingtray.svg
-%%QT5%%share/kservices5/plasma-applet-martchus.syncthingplasmoid.desktop
-%%QT5%%share/kservices5/syncthingfileitemaction.desktop
-share/metainfo/io.github.martchus.syncthingfileitemaction.metainfo.xml
-share/metainfo/io.github.martchus.syncthingplasmoid.metainfo.xml
+%%PLASMA%%%%QT5%%share/kservices5/plasma-applet-martchus.syncthingplasmoid.desktop
+%%PLASMA%%%%QT5%%share/kservices5/syncthingfileitemaction.desktop
+%%PLASMA%%share/metainfo/io.github.martchus.syncthingfileitemaction.metainfo.xml
+%%PLASMA%%share/metainfo/io.github.martchus.syncthingplasmoid.metainfo.xml
 share/metainfo/io.github.martchus.syncthingtray.metainfo.xml
-share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/CompactRepresentation.qml
-share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/DetailItem.qml
-share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/DetailView.qml
-share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/DevicesPage.qml
-share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/DirectoriesPage.qml
-share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/DownloadsPage.qml
-share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/FullRepresentation.qml
-share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/IconLabel.qml
-share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/RecentChangesPage.qml
-share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/StatisticsView.qml
-share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/TabButton.qml
-share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/TinyButton.qml
-share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/ToolBar.qml
-share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/ToolButton.qml
-share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/ToolTipTrigger.qml
-share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/ToolTipView.qml
-share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/TopLevelItem.qml
-share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/TopLevelView.qml
-share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/main.qml
-%%QT5%%share/plasma/plasmoids/martchus.syncthingplasmoid/metadata.desktop
-%%QT6%%share/plasma/plasmoids/martchus.syncthingplasmoid/metadata.json
+%%PLASMA%%share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/CompactRepresentation.qml
+%%PLASMA%%share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/DetailItem.qml
+%%PLASMA%%share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/DetailView.qml
+%%PLASMA%%share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/DevicesPage.qml
+%%PLASMA%%share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/DirectoriesPage.qml
+%%PLASMA%%share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/DownloadsPage.qml
+%%PLASMA%%share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/FullRepresentation.qml
+%%PLASMA%%share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/IconLabel.qml
+%%PLASMA%%share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/RecentChangesPage.qml
+%%PLASMA%%share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/StatisticsView.qml
+%%PLASMA%%share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/TabButton.qml
+%%PLASMA%%share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/TinyButton.qml
+%%PLASMA%%share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/ToolBar.qml
+%%PLASMA%%share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/ToolButton.qml
+%%PLASMA%%share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/ToolTipTrigger.qml
+%%PLASMA%%share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/ToolTipView.qml
+%%PLASMA%%share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/TopLevelItem.qml
+%%PLASMA%%share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/TopLevelView.qml
+%%PLASMA%%share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/main.qml
+%%PLASMA%%%%QT5%%share/plasma/plasmoids/martchus.syncthingplasmoid/metadata.desktop
+%%PLASMA%%%%QT6%%share/plasma/plasmoids/martchus.syncthingplasmoid/metadata.json
 share/syncthingconnector/translations/syncthingconnector_cs_CZ.qm
 share/syncthingconnector/translations/syncthingconnector_de_DE.qm
 share/syncthingconnector/translations/syncthingconnector_en_US.qm
 share/syncthingconnector/translations/syncthingconnector_zh_CN.qm
-share/syncthingfileitemaction/translations/syncthingfileitemaction_cs_CZ.qm
-share/syncthingfileitemaction/translations/syncthingfileitemaction_de_DE.qm
-share/syncthingfileitemaction/translations/syncthingfileitemaction_en_US.qm
-share/syncthingfileitemaction/translations/syncthingfileitemaction_zh_CN.qm
+%%PLASMA%%share/syncthingfileitemaction/translations/syncthingfileitemaction_cs_CZ.qm
+%%PLASMA%%share/syncthingfileitemaction/translations/syncthingfileitemaction_de_DE.qm
+%%PLASMA%%share/syncthingfileitemaction/translations/syncthingfileitemaction_en_US.qm
+%%PLASMA%%share/syncthingfileitemaction/translations/syncthingfileitemaction_zh_CN.qm
 share/syncthingmodel/translations/syncthingmodel_cs_CZ.qm
 share/syncthingmodel/translations/syncthingmodel_de_DE.qm
 share/syncthingmodel/translations/syncthingmodel_en_US.qm
 share/syncthingmodel/translations/syncthingmodel_zh_CN.qm
-share/syncthingplasmoid/translations/syncthingplasmoid_de_DE.qm
-share/syncthingplasmoid/translations/syncthingplasmoid_en_US.qm
+%%PLASMA%%share/syncthingplasmoid/translations/syncthingplasmoid_de_DE.qm
+%%PLASMA%%share/syncthingplasmoid/translations/syncthingplasmoid_en_US.qm
 %%DATADIR%%/translations/syncthingtray_cs_CZ.qm
 %%DATADIR%%/translations/syncthingtray_de_DE.qm
 %%DATADIR%%/translations/syncthingtray_en_US.qm