diff --git a/deskutils/syncthingtray/Makefile b/deskutils/syncthingtray/Makefile index a18b0a484f2f..d6bb31f9db68 100644 --- a/deskutils/syncthingtray/Makefile +++ b/deskutils/syncthingtray/Makefile @@ -1,124 +1,101 @@ PORTNAME= syncthingtray DISTVERSIONPREFIX= v -DISTVERSION= 2.0.9 +DISTVERSION= 2.0.10 CATEGORIES= deskutils MAINTAINER= dsh@bamus.cz -COMMENT= Qt ${FLAVOR:S/qt//}-based Syncthing tray application +COMMENT= Qt6-based Syncthing tray application WWW= https://martchus.github.io/syncthingtray/ 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 -FLAVORS= qt6 qt5 -FLAVOR?= ${FLAVORS:[1]} -FLAVORS_SUB= yes - -qt5_PKGNAMESUFFIX= -qt5 - -USES= cmake:insource iconv perl5 xorg +USES= cmake:insource gl iconv perl5 qt:6 xorg USE_GITHUB= nodefault GH_ACCOUNT= Martchus GH_TUPLE:= ${GH_ACCOUNT}:${PORTNAME}:${DISTVERSIONPREFIX}${DISTVERSION}:${PORTNAME}/../${PORTNAME} \ - ${GH_ACCOUNT}:cpp-utilities:v5.33.0:cpputilities/../c++utilities \ - ${GH_ACCOUNT}:qtutilities:v6.20.0:qtutilities/../qtutilities \ + ${GH_ACCOUNT}:cpp-utilities:v5.34.0:cpputilities/../c++utilities \ + ${GH_ACCOUNT}:qtutilities:v6.21.0:qtutilities/../qtutilities \ ${GH_ACCOUNT}:qtforkawesome:v0.3.2:qtforkawesome/../qtforkawesome \ ForkAwesome:Fork-Awesome:4fef70f:ForkAwesome/../forkawesome \ ${GH_ACCOUNT}:subdirs:9fb173e:subdirs/../subdirs +USE_GL= opengl USE_PERL5= build -USE_QT= declarative svg +USE_QT= base declarative svg tools:build USE_XORG= x11 CMAKE_ARGS= -DFORK_AWESOME_FONT_FILE=${WRKDIR}/forkawesome/fonts/forkawesome-webfont.ttf \ - -DFORK_AWESOME_ICON_DEFINITIONS=${WRKDIR}/forkawesome/src/icons/icons.yml + -DFORK_AWESOME_ICON_DEFINITIONS=${WRKDIR}/forkawesome/src/icons/icons.yml \ + -DKF_PACKAGE_PREFIX:STRING=KF6 \ + -DQT_PACKAGE_PREFIX:STRING=Qt6 CMAKE_ON= NO_DOXYGEN CMAKE_OFF= SYSTEMD_SUPPORT USE_STANDARD_FILESYSTEM CMAKE_SOURCE_PATH= ${WRKDIR}/subdirs/syncthingtray -.if ${FLAVOR} == qt5 -USES+= qt:5 -USE_QT+= concurrent core dbus gui location 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 qt:6 -USE_GL= opengl -USE_QT+= base positioning tools:build -.endif - CONFLICTS_INSTALL= ${PORTNAME} ${PORTNAME}-* BUILD_WRKSRC= ${WRKDIR} CONFIGURE_WRKSRC= ${WRKDIR} INSTALL_WRKSRC= ${WRKDIR} PATCH_WRKSRC= ${WRKDIR} OPTIONS_DEFINE= PLASMA WEBENGINE OPTIONS_DEFAULT= PLASMA WEBENGINE -OPTIONS_SUB= yes +OPTIONS_SUB= yes -PLASMA_DESC= Plasma integration (KF dependency) +PLASMA_DESC= Plasma integration (KF dependency) WEBENGINE_DESC= Built-in web view (webengine dependency) -PLASMA_USE= KDE=ecm:build +PLASMA_USES= kde:6 +PLASMA_USE= KDE=ecm:build,libplasma:build PLASMA_CMAKE_BOOL_OFF= NO_FILE_ITEM_ACTION_PLUGIN NO_PLASMOID -.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 - +WEBENGINE_USE= QT=positioning,webchannel,webengine WEBENGINE_CMAKE_ON= -DWEBVIEW_PROVIDER:STRING=webengine WEBENGINE_CMAKE_OFF= -DWEBVIEW_PROVIDER:STRING=none post-install: ${RM} -r \ ${STAGEDIR}${PREFIX}/include/c++utilities \ ${STAGEDIR}${PREFIX}/include/qtforkawesome \ ${STAGEDIR}${PREFIX}/include/qtquickforkawesome \ ${STAGEDIR}${PREFIX}/include/qtutilities \ ${STAGEDIR}${PREFIX}/include/syncthingconnector \ ${STAGEDIR}${PREFIX}/include/syncthingmodel \ ${STAGEDIR}${PREFIX}/include/syncthingwidgets \ ${STAGEDIR}${PREFIX}/lib/libc++utilities.a \ ${STAGEDIR}${PREFIX}/lib/libqtforkawesome.a \ ${STAGEDIR}${PREFIX}/lib/libqtquickforkawesome.a \ ${STAGEDIR}${PREFIX}/lib/libqtutilities.a \ ${STAGEDIR}${PREFIX}/lib/libsyncthingconnector.a \ ${STAGEDIR}${PREFIX}/lib/libsyncthingmodel.a \ ${STAGEDIR}${PREFIX}/lib/libsyncthingwidgets.a \ ${STAGEDIR}${PREFIX}/libdata/pkgconfig/c++utilities.pc \ ${STAGEDIR}${PREFIX}/libdata/pkgconfig/qtforkawesome.pc \ ${STAGEDIR}${PREFIX}/libdata/pkgconfig/qtforkawesomeiconengine.pc \ ${STAGEDIR}${PREFIX}/libdata/pkgconfig/qtquickforkawesome.pc \ ${STAGEDIR}${PREFIX}/libdata/pkgconfig/qtutilities.pc \ ${STAGEDIR}${PREFIX}/libdata/pkgconfig/syncthingconnector.pc \ ${STAGEDIR}${PREFIX}/libdata/pkgconfig/syncthingfileitemaction.pc \ ${STAGEDIR}${PREFIX}/libdata/pkgconfig/syncthingmodel.pc \ ${STAGEDIR}${PREFIX}/libdata/pkgconfig/syncthingplasmoid.pc \ ${STAGEDIR}${PREFIX}/libdata/pkgconfig/syncthingwidgets.pc \ ${STAGEDIR}${PREFIX}/share/c++utilities \ ${STAGEDIR}${PREFIX}/share/qtforkawesome \ ${STAGEDIR}${PREFIX}/share/qtforkawesomeiconengine \ ${STAGEDIR}${PREFIX}/share/qtquickforkawesome \ ${STAGEDIR}${PREFIX}/share/qtutilities \ ${STAGEDIR}${PREFIX}/share/syncthingconnector/cmake \ ${STAGEDIR}${PREFIX}/share/syncthingfileitemaction/cmake \ ${STAGEDIR}${PREFIX}/share/syncthingmodel/cmake \ ${STAGEDIR}${PREFIX}/share/syncthingplasmoid/cmake \ ${STAGEDIR}${PREFIX}/share/syncthingwidgets/cmake \ ${STAGEDIR}${QT_PLUGINDIR} \ ${STAGEDIR}${QT_LIBDIR} .include diff --git a/deskutils/syncthingtray/distinfo b/deskutils/syncthingtray/distinfo index 0ce5ada3b833..d7eed4c10f08 100644 --- a/deskutils/syncthingtray/distinfo +++ b/deskutils/syncthingtray/distinfo @@ -1,13 +1,13 @@ -TIMESTAMP = 1772898454 -SHA256 (Martchus-syncthingtray-v2.0.9_GH0.tar.gz) = bf9504f5aa2f3016d9ca98219163232b2448c34b213f07bfc76af0f0e8a2a81e -SIZE (Martchus-syncthingtray-v2.0.9_GH0.tar.gz) = 6701899 -SHA256 (Martchus-cpp-utilities-v5.33.0_GH0.tar.gz) = ae56ddd9a46751a63703b52cc4ea6abf2fff208b55e3434ac14fbd5c9ba00c67 -SIZE (Martchus-cpp-utilities-v5.33.0_GH0.tar.gz) = 215541 -SHA256 (Martchus-qtutilities-v6.20.0_GH0.tar.gz) = b70bb2365b7e83a949e4adc9c000aa771c402952f60ca8f5517ec619bff1b4d3 -SIZE (Martchus-qtutilities-v6.20.0_GH0.tar.gz) = 168086 +TIMESTAMP = 1775673095 +SHA256 (Martchus-syncthingtray-v2.0.10_GH0.tar.gz) = 0db2cd0117d4a6965e9a3c0187638256344a2aea82dc0a74f8fc2a582be809e5 +SIZE (Martchus-syncthingtray-v2.0.10_GH0.tar.gz) = 6709186 +SHA256 (Martchus-cpp-utilities-v5.34.0_GH0.tar.gz) = 7cb228606e79b9a33244cea062674d6339b0db00081f6cae9b3b7d12619fa7db +SIZE (Martchus-cpp-utilities-v5.34.0_GH0.tar.gz) = 216334 +SHA256 (Martchus-qtutilities-v6.21.0_GH0.tar.gz) = e50a9d0335f025e67a13e059d3625c5bea8988c647ad5f7f1da53530682af70d +SIZE (Martchus-qtutilities-v6.21.0_GH0.tar.gz) = 168428 SHA256 (Martchus-qtforkawesome-v0.3.2_GH0.tar.gz) = 9215162e9dd73eb64047de5f2a21c654ce8e6df2994ebe558b7fd7a31b28bb52 SIZE (Martchus-qtforkawesome-v0.3.2_GH0.tar.gz) = 19883 SHA256 (ForkAwesome-Fork-Awesome-4fef70f_GH0.tar.gz) = 93906cd38eb92fe853c9e3723b1f0fa56df6ddcd2d87ac82c97b5a188e5cdae6 SIZE (ForkAwesome-Fork-Awesome-4fef70f_GH0.tar.gz) = 1803875 SHA256 (Martchus-subdirs-9fb173e_GH0.tar.gz) = 972b6743fa78bf6cdfb8f4743a6e5d6c52035724cd3d8b67ff1f5c79a0a728f0 SIZE (Martchus-subdirs-9fb173e_GH0.tar.gz) = 14313 diff --git a/deskutils/syncthingtray/pkg-plist b/deskutils/syncthingtray/pkg-plist index ad9c53907bb9..2a118ca89565 100644 --- a/deskutils/syncthingtray/pkg-plist +++ b/deskutils/syncthingtray/pkg-plist @@ -1,62 +1,59 @@ bin/syncthingctl bin/syncthingtray share/applications/syncthingtray.desktop share/bash-completion/completions/syncthingctl share/bash-completion/completions/syncthingtray share/icons/hicolor/scalable/apps/syncthingtray.svg -%%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 %%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 +%%PLASMA%%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_ru_RU.qm share/syncthingconnector/translations/syncthingconnector_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_ru_RU.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_ru_RU.qm share/syncthingmodel/translations/syncthingmodel_zh_CN.qm %%PLASMA%%share/syncthingplasmoid/translations/syncthingplasmoid_cs_CZ.qm %%PLASMA%%share/syncthingplasmoid/translations/syncthingplasmoid_de_DE.qm %%PLASMA%%share/syncthingplasmoid/translations/syncthingplasmoid_en_US.qm %%PLASMA%%share/syncthingplasmoid/translations/syncthingplasmoid_ru_RU.qm %%PLASMA%%share/syncthingplasmoid/translations/syncthingplasmoid_zh_CN.qm %%DATADIR%%/translations/syncthingtray_cs_CZ.qm %%DATADIR%%/translations/syncthingtray_de_DE.qm %%DATADIR%%/translations/syncthingtray_en_US.qm %%DATADIR%%/translations/syncthingtray_ru_RU.qm %%DATADIR%%/translations/syncthingtray_zh_CN.qm share/syncthingwidgets/translations/syncthingwidgets_cs_CZ.qm share/syncthingwidgets/translations/syncthingwidgets_de_DE.qm share/syncthingwidgets/translations/syncthingwidgets_en_US.qm share/syncthingwidgets/translations/syncthingwidgets_ru_RU.qm share/syncthingwidgets/translations/syncthingwidgets_zh_CN.qm