Attachment #249744 for bug #278142




PORTNAME=	syncthingtray
PORTVERSION=	1.5.1
DISTVERSIONPREFIX=	v
CATEGORIES=	deskutils


LIB_DEPENDS=	libboost_iostreams.so:devel/boost-libs \
		libboost_regex.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}

USES= cmake:insource compiler:c++17-lang desktop-file-utils iconv perl5

CMAKE_ARGS= -DFORK_AWESOME_FONT_FILE=${WRKDIR}/forkawesome/fonts/forkawesome-webfont.ttf \
	-DFORK_AWESOME_ICON_DEFINITIONS=${WRKDIR}/forkawesome/src/icons/icons.yml
CMAKE_OFF=  SYSTEMD_SUPPORT USE_STANDARD_FILESYSTEM
CMAKE_SOURCE_PATH= ${WRKDIR}/subdirs/syncthingtray

USE_GITHUB=	nodefault
GH_TUPLE=	Martchus:${PORTNAME}:${DISTVERSIONPREFIX}${DISTVERSION}:syncthingtray/../syncthingtray \
		Martchus:cpp-utilities:v5.24.7:cpputilities/../c++utilities \
		Martchus:qtutilities:v6.14.0:qtutilities/../qtutilities \
		Martchus:qtforkawesome:v0.2.0:qtforkawesome/../qtforkawesome \
		ForkAwesome:Fork-Awesome:4fef70f:ForkAwesome/../forkawesome \
		Martchus:subdirs:0ad32a0:subdirs/../subdirs

USE_QT=      declarative location svg webchannel doc:build
.if ${FLAVOR} == qt5
USES+=       kde:5 qt:5
USE_KDE=     plasma-framework
USE_QT+=     concurrent core dbus gui network printsupport qdbus quickcontrols2 \
	widgets x11extras 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
USE_GL=      opengl
USE_KDE=     libplasma
USE_QT+=     base
.endif

OPTIONS_DEFINE=  WEBENGINE
OPTIONS_DEFAULT= WEBENGINE
CMAKE_OFF=	SYSTEMD_SUPPORT USE_STANDARD_FILESYSTEM
CMAKE_SOURCE_PATH=	${WRKDIR}/subdirs/syncthingtray

WEBENGINE_DESC=      Built-in web view (webengine dependency)
WEBENGINE_USE=       QT=webengine
WEBENGINE_CMAKE_ON=  -DWEBVIEW_PROVIDER:STRING=webengine
WEBENGINE_CMAKE_OFF= -DWEBVIEW_PROVIDER:STRING=none

USE_PERL5=	build

BUILD_WRKSRC=     ${WRKDIR}
CONFIGURE_WRKSRC= ${WRKDIR}
INSTALL_WRKSRC=   ${WRKDIR}
PATCH_WRKSRC=     ${WRKDIR}
USE_QT+=	webkit
.endif

post-install:
	${RM} -r \

		${STAGEDIR}${QT_PLUGINDIR} \
		${STAGEDIR}${QT_LIBDIR}

.include <bsd.port.mk>

Lines 1-10 Link Here

(-)deskutils/syncthingtray/distinfo (-5 / +5 lines)
1	TIMESTAMP = 1710083644	1	TIMESTAMP = 1712148738
2	SHA256 (Martchus-syncthingtray-v1.5.0_GH0.tar.gz) = ddec89979a579b703de5324383f4171ab89844c83fbc725c663a81951ac4b070	2	SHA256 (Martchus-syncthingtray-v1.5.1_GH0.tar.gz) = 38350e7b69de42c0a736762f70cb90399637e3b8619eef50149115600273dbdd
3	SIZE (Martchus-syncthingtray-v1.5.0_GH0.tar.gz) = 1895965	3	SIZE (Martchus-syncthingtray-v1.5.1_GH0.tar.gz) = 1896270
4	SHA256 (Martchus-cpp-utilities-v5.24.7_GH0.tar.gz) = c3aa125933aaf9724eacca045f5d8278d524a4cef95ce54b89e88e1ac15684c2	4	SHA256 (Martchus-cpp-utilities-v5.24.7_GH0.tar.gz) = c3aa125933aaf9724eacca045f5d8278d524a4cef95ce54b89e88e1ac15684c2
5	SIZE (Martchus-cpp-utilities-v5.24.7_GH0.tar.gz) = 195153	5	SIZE (Martchus-cpp-utilities-v5.24.7_GH0.tar.gz) = 195153
6	SHA256 (Martchus-qtutilities-v6.13.5_GH0.tar.gz) = ed6c438f4a1f0082558978a87be4608a5bd82cf6a4450798dd612d6087a639b4	6	SHA256 (Martchus-qtutilities-v6.14.0_GH0.tar.gz) = 4eab9ef26edf67c1c436596bea42890fcc0206f93c50413939ccce8c94bf7bc0
7	SIZE (Martchus-qtutilities-v6.13.5_GH0.tar.gz) = 103635	7	SIZE (Martchus-qtutilities-v6.14.0_GH0.tar.gz) = 104258
8	SHA256 (Martchus-qtforkawesome-v0.2.0_GH0.tar.gz) = 42de641e79b22d4dd44eb179e8818a8a4bf424c3feec1d0d9524bae5fde458cc	8	SHA256 (Martchus-qtforkawesome-v0.2.0_GH0.tar.gz) = 42de641e79b22d4dd44eb179e8818a8a4bf424c3feec1d0d9524bae5fde458cc
9	SIZE (Martchus-qtforkawesome-v0.2.0_GH0.tar.gz) = 19118	9	SIZE (Martchus-qtforkawesome-v0.2.0_GH0.tar.gz) = 19118
10	SHA256 (ForkAwesome-Fork-Awesome-4fef70f_GH0.tar.gz) = 93906cd38eb92fe853c9e3723b1f0fa56df6ddcd2d87ac82c97b5a188e5cdae6	10	SHA256 (ForkAwesome-Fork-Awesome-4fef70f_GH0.tar.gz) = 93906cd38eb92fe853c9e3723b1f0fa56df6ddcd2d87ac82c97b5a188e5cdae6




--- syncthingtray/plasmoid/lib/syncthingapplet.h.orig	2024-04-02 09:09:30 UTC
+++ syncthingtray/plasmoid/lib/syncthingapplet.h
@@ -61,7 +61,9 @@ class SyncthingApplet : public Plasma::Applet {
     Q_PROPERTY(Data::SyncthingDownloadModel *downloadModel READ downloadModel NOTIFY downloadModelChanged)
     Q_PROPERTY(Data::SyncthingRecentChangesModel *recentChangesModel READ recentChangesModel NOTIFY recentChangesModelChanged)
     Q_PROPERTY(Data::SyncthingStatusSelectionModel *passiveSelectionModel READ passiveSelectionModel NOTIFY passiveSelectionModelChanged)
+#ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD
     Q_PROPERTY(Data::SyncthingService *service READ service NOTIFY serviceChanged)
+#endif
     Q_PROPERTY(bool local READ isLocal NOTIFY localChanged)
     Q_PROPERTY(QString statusText READ statusText NOTIFY connectionStatusChanged)
     Q_PROPERTY(QString additionalStatusText READ additionalStatusText NOTIFY connectionStatusChanged)




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/syncthingfileitemaction.appdata.xml
share/metainfo/syncthingplasmoid.appdata.xml
share/metainfo/syncthingtray.appdata.xml

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
share/syncthingconnector/translations/syncthingconnector_cs_CZ.qm
share/syncthingconnector/translations/syncthingconnector_de_DE.qm
share/syncthingconnector/translations/syncthingconnector_en_US.qm

Return to bug 278142

Lines 1-5 Link Here

(-)deskutils/syncthingtray/Makefile (-25 / +41 lines)
1	PORTNAME= syncthingtray	1	PORTNAME= syncthingtray
2	PORTVERSION= 1.5.0	2	PORTVERSION= 1.5.1
3	DISTVERSIONPREFIX= v	3	DISTVERSIONPREFIX= v
4	CATEGORIES= deskutils	4	CATEGORIES= deskutils
5		5
Lines 16-56 BUILD_DEPENDS= ${LOCALBASE}/share/ECM/cmake/ECMConfig.cmake:devel/kf5-extra-cmak Link Here
16	LIB_DEPENDS= libboost_iostreams.so:devel/boost-libs \	16	LIB_DEPENDS= libboost_iostreams.so:devel/boost-libs \
17	libboost_regex.so:devel/boost-libs	17	libboost_regex.so:devel/boost-libs
18		18
19	USES= cmake:insource compiler:c++11-lang desktop-file-utils iconv \	19	FLAVORS= qt5 qt6
20	kde:5 perl5 qt:5	20	FLAVOR?= ${FLAVORS:[1]}
		21	FLAVORS_SUB= yes
		22
		23	qt5_CONFLICTS_INSTALL= ${PORTNAME}-qt6
		24	qt6_PKGNAMESUFFIX= -qt6
		25	qt6_CONFLICTS_INSTALL= ${PORTNAME}
		26
		27	USES= cmake:insource compiler:c++17-lang desktop-file-utils iconv perl5
		28
		29	CMAKE_ARGS= -DFORK_AWESOME_FONT_FILE=${WRKDIR}/forkawesome/fonts/forkawesome-webfont.ttf \
		30	-DFORK_AWESOME_ICON_DEFINITIONS=${WRKDIR}/forkawesome/src/icons/icons.yml
		31	CMAKE_OFF= SYSTEMD_SUPPORT USE_STANDARD_FILESYSTEM
		32	CMAKE_SOURCE_PATH= ${WRKDIR}/subdirs/syncthingtray
21		33
22	USE_GITHUB= nodefault	34	USE_GITHUB= nodefault
23	GH_TUPLE= Martchus:${PORTNAME}:${DISTVERSIONPREFIX}${DISTVERSION}:syncthingtray/../syncthingtray \	35	GH_TUPLE= Martchus:${PORTNAME}:${DISTVERSIONPREFIX}${DISTVERSION}:syncthingtray/../syncthingtray \
24	Martchus:cpp-utilities:v5.24.7:cpputilities/../c++utilities \	36	Martchus:cpp-utilities:v5.24.7:cpputilities/../c++utilities \
25	Martchus:qtutilities:v6.13.5:qtutilities/../qtutilities \	37	Martchus:qtutilities:v6.14.0:qtutilities/../qtutilities \
26	Martchus:qtforkawesome:v0.2.0:qtforkawesome/../qtforkawesome \	38	Martchus:qtforkawesome:v0.2.0:qtforkawesome/../qtforkawesome \
27	ForkAwesome:Fork-Awesome:4fef70f:ForkAwesome/../forkawesome \	39	ForkAwesome:Fork-Awesome:4fef70f:ForkAwesome/../forkawesome \
28	Martchus:subdirs:0ad32a0:subdirs/../subdirs	40	Martchus:subdirs:0ad32a0:subdirs/../subdirs
29		41
30	USE_KDE= plasma-framework	42	USE_QT= declarative location svg webchannel doc:build
31	USE_PERL5= build	43	.if ${FLAVOR} == qt5
32	USE_QT= concurrent core dbus declarative gui location network \	44	USES+= kde:5 qt:5
33	printsupport qdbus quickcontrols2 svg webchannel widgets \	45	USE_KDE= plasma-framework
34	x11extras buildtools:build doc:build linguist:build \	46	USE_QT+= concurrent core dbus gui network printsupport qdbus quickcontrols2 \
35	qmake:build testlib:build	47	widgets x11extras buildtools:build linguist:build qmake:build testlib:build
		48	.else
		49	CMAKE_ARGS+= -DQT_PACKAGE_PREFIX:STRING=Qt6 -DKF_PACKAGE_PREFIX:STRING=KF6
		50	USES+= gl kde:6 qt:6
		51	USE_GL= opengl
		52	USE_KDE= libplasma
		53	USE_QT+= base
		54	.endif
36		55
37	CMAKE_ARGS= -DFORK_AWESOME_FONT_FILE=${WRKDIR}/forkawesome/fonts/forkawesome-webfont.ttf \	56	OPTIONS_DEFINE= WEBENGINE
38	-DFORK_AWESOME_ICON_DEFINITIONS=${WRKDIR}/forkawesome/src/icons/icons.yml	57	OPTIONS_DEFAULT= WEBENGINE
39	CMAKE_OFF= SYSTEMD_SUPPORT USE_STANDARD_FILESYSTEM
40	CMAKE_SOURCE_PATH= ${WRKDIR}/subdirs/syncthingtray
41		58
42	BUILD_WRKSRC= ${WRKDIR}	59	WEBENGINE_DESC= Built-in web view (webengine dependency)
43	CONFIGURE_WRKSRC= ${WRKDIR}	60	WEBENGINE_USE= QT=webengine
44	INSTALL_WRKSRC= ${WRKDIR}	61	WEBENGINE_CMAKE_ON= -DWEBVIEW_PROVIDER:STRING=webengine
		62	WEBENGINE_CMAKE_OFF= -DWEBVIEW_PROVIDER:STRING=none
45		63
46	.include <bsd.port.pre.mk>	64	USE_PERL5= build
47		65
48	.if ${ARCH} == amd64 \|\| ${ARCH} == i386	66	BUILD_WRKSRC= ${WRKDIR}
49	USE_QT+= webengine	67	CONFIGURE_WRKSRC= ${WRKDIR}
50	.else	68	INSTALL_WRKSRC= ${WRKDIR}
51	CMAKE_ARGS+= -DWEBVIEW_PROVIDER=webkit	69	PATCH_WRKSRC= ${WRKDIR}
52	USE_QT+= webkit
53	.endif
54		70
55	post-install:	71	post-install:
56	${RM} -r \	72	${RM} -r \
Lines 91-94 post-install: Link Here
91	${STAGEDIR}${QT_PLUGINDIR} \	107	${STAGEDIR}${QT_PLUGINDIR} \
92	${STAGEDIR}${QT_LIBDIR}	108	${STAGEDIR}${QT_LIBDIR}
93		109
94	.include <bsd.port.post.mk>	110	.include <bsd.port.mk>

Added Link Here

(-)deskutils/syncthingtray/files/patch-syncthingtray_plasmoid_lib_syncthingapplet.h (+12 lines)
1	--- syncthingtray/plasmoid/lib/syncthingapplet.h.orig 2024-04-02 09:09:30 UTC
2	+++ syncthingtray/plasmoid/lib/syncthingapplet.h
3	@@ -61,7 +61,9 @@ class SyncthingApplet : public Plasma::Applet {
4	Q_PROPERTY(Data::SyncthingDownloadModel *downloadModel READ downloadModel NOTIFY downloadModelChanged)
5	Q_PROPERTY(Data::SyncthingRecentChangesModel *recentChangesModel READ recentChangesModel NOTIFY recentChangesModelChanged)
6	Q_PROPERTY(Data::SyncthingStatusSelectionModel *passiveSelectionModel READ passiveSelectionModel NOTIFY passiveSelectionModelChanged)
7	+#ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD
8	Q_PROPERTY(Data::SyncthingService *service READ service NOTIFY serviceChanged)
9	+#endif
10	Q_PROPERTY(bool local READ isLocal NOTIFY localChanged)
11	Q_PROPERTY(QString statusText READ statusText NOTIFY connectionStatusChanged)
12	Q_PROPERTY(QString additionalStatusText READ additionalStatusText NOTIFY connectionStatusChanged)

Lines 4-11 share/applications/syncthingtray.desktop Link Here

(-)deskutils/syncthingtray/pkg-plist (-3 / +4 lines)
4	share/bash-completion/completions/syncthingctl	4	share/bash-completion/completions/syncthingctl
5	share/bash-completion/completions/syncthingtray	5	share/bash-completion/completions/syncthingtray
6	share/icons/hicolor/scalable/apps/syncthingtray.svg	6	share/icons/hicolor/scalable/apps/syncthingtray.svg
7	share/kservices5/plasma-applet-martchus.syncthingplasmoid.desktop	7	%%QT5%%share/kservices5/plasma-applet-martchus.syncthingplasmoid.desktop
8	share/kservices5/syncthingfileitemaction.desktop	8	%%QT5%%share/kservices5/syncthingfileitemaction.desktop
9	share/metainfo/syncthingfileitemaction.appdata.xml	9	share/metainfo/syncthingfileitemaction.appdata.xml
10	share/metainfo/syncthingplasmoid.appdata.xml	10	share/metainfo/syncthingplasmoid.appdata.xml
11	share/metainfo/syncthingtray.appdata.xml	11	share/metainfo/syncthingtray.appdata.xml
Lines 28-34 share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/ToolTipView.qml Link Here
28	share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/TopLevelItem.qml	28	share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/TopLevelItem.qml
29	share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/TopLevelView.qml	29	share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/TopLevelView.qml
30	share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/main.qml	30	share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/main.qml
31	share/plasma/plasmoids/martchus.syncthingplasmoid/metadata.desktop	31	%%QT5%%share/plasma/plasmoids/martchus.syncthingplasmoid/metadata.desktop
		32	%%QT6%%share/plasma/plasmoids/martchus.syncthingplasmoid/metadata.json
32	share/syncthingconnector/translations/syncthingconnector_cs_CZ.qm	33	share/syncthingconnector/translations/syncthingconnector_cs_CZ.qm
33	share/syncthingconnector/translations/syncthingconnector_de_DE.qm	34	share/syncthingconnector/translations/syncthingconnector_de_DE.qm
34	share/syncthingconnector/translations/syncthingconnector_en_US.qm	35	share/syncthingconnector/translations/syncthingconnector_en_US.qm