diff --git a/deskutils/syncthingtray/Makefile b/deskutils/syncthingtray/Makefile index 5fd602ceeab7..6c2b312e9c0d 100644 --- a/deskutils/syncthingtray/Makefile +++ b/deskutils/syncthingtray/Makefile @@ -1,108 +1,108 @@ PORTNAME= syncthingtray DISTVERSIONPREFIX= v -DISTVERSION= 2.1.5 +DISTVERSION= 2.1.6 CATEGORIES= deskutils MAINTAINER= dsh@bamus.cz 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 -USES= cmake:insource gl iconv perl5 qt:6 xorg +USES= cmake:insource compiler:c++20-lang 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.35.0:cpputilities/../c++utilities \ + ${GH_ACCOUNT}:cpp-utilities:v5.36.0:cpputilities/../c++utilities \ ${GH_ACCOUNT}:qtutilities:v6.22.2:qtutilities/../qtutilities \ ${GH_ACCOUNT}:qtforkawesome:v0.3.4:qtforkawesome/../qtforkawesome \ ForkAwesome:Fork-Awesome:4fef70f:ForkAwesome/../forkawesome \ ${GH_ACCOUNT}:subdirs:b922c49:subdirs/../subdirs USE_GL= opengl USE_PERL5= build 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 \ -DKF_PACKAGE_PREFIX:STRING=KF6 \ -DQT_PACKAGE_PREFIX:STRING=Qt6 \ -DQUICK_GUI=ON -DQUICK_GUI_CONTROLS_STYLE=dynamic CMAKE_ON= NO_DOXYGEN CMAKE_OFF= SYSTEMD_SUPPORT USE_STANDARD_FILESYSTEM CMAKE_SOURCE_PATH= ${WRKDIR}/subdirs/syncthingtray BUILD_WRKSRC= ${WRKDIR} CONFIGURE_WRKSRC= ${WRKDIR} INSTALL_WRKSRC= ${WRKDIR} PATCH_WRKSRC= ${WRKDIR} PLIST_SUB= LIBVERSION=${DISTVERSION} OPTIONS_DEFINE= PLASMA WEBENGINE OPTIONS_DEFAULT= PLASMA WEBENGINE OPTIONS_SUB= yes PLASMA_DESC= Plasma integration (KF dependency) WEBENGINE_DESC= Built-in web view (webengine dependency) PLASMA_USES= kde:6 PLASMA_USE= KDE=bookmarks,completion,config,coreaddons,ecm:build \ KDE=jobwidgets,itemviews,kio,libplasma,jobwidgets \ KDE=kirigami2,service,solid,widgetsaddons # PLASMA option now requires `-DBUILD_SHARED_LIBS=ON`. See # https://github.com/Martchus/syncthingtray/issues/451 PLASMA_CMAKE_BOOL_OFF= NO_FILE_ITEM_ACTION_PLUGIN NO_PLASMOID PLASMA_CMAKE_ON= -DBUILD_SHARED_LIBS=ON PLASMA_CONFLICTS_INSTALL= cpp-utilities qtutilities 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}/lib/libsyncthingwidgetsplugin.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}/iconengines .include diff --git a/deskutils/syncthingtray/distinfo b/deskutils/syncthingtray/distinfo index 2b75fa55cf81..31a1701bc104 100644 --- a/deskutils/syncthingtray/distinfo +++ b/deskutils/syncthingtray/distinfo @@ -1,13 +1,13 @@ -TIMESTAMP = 1789399968 -SHA256 (Martchus-syncthingtray-v2.1.5_GH0.tar.gz) = fc6439ecb4cb31ce253dd16586b522f3342eb66ece211b303a8a86ff10e1cee3 -SIZE (Martchus-syncthingtray-v2.1.5_GH0.tar.gz) = 6828411 -SHA256 (Martchus-cpp-utilities-v5.35.0_GH0.tar.gz) = f9e2171ba59a6588afac03b7a8f019ea3170522e96786b2ade5f8f2c9a9157bb -SIZE (Martchus-cpp-utilities-v5.35.0_GH0.tar.gz) = 218761 +TIMESTAMP = 1789997536 +SHA256 (Martchus-syncthingtray-v2.1.6_GH0.tar.gz) = aab82815261a5ef9688b944d6d1d4f8b41e178d39a5b69da56d719e3ec5b70cc +SIZE (Martchus-syncthingtray-v2.1.6_GH0.tar.gz) = 6830238 +SHA256 (Martchus-cpp-utilities-v5.36.0_GH0.tar.gz) = 364d43b7cf0ac9225300231d1c3da1f87b9c4a8cb03c24594df505ecb55594d2 +SIZE (Martchus-cpp-utilities-v5.36.0_GH0.tar.gz) = 218935 SHA256 (Martchus-qtutilities-v6.22.2_GH0.tar.gz) = c6ecf769a5544865e9e1e6c54d881caed8e0c0102a36025199d9cd18748b0afd SIZE (Martchus-qtutilities-v6.22.2_GH0.tar.gz) = 176294 SHA256 (Martchus-qtforkawesome-v0.3.4_GH0.tar.gz) = 001324d008b44a136ec296733d5ef9bd519ea93ec820d5144163b98dc888f23b SIZE (Martchus-qtforkawesome-v0.3.4_GH0.tar.gz) = 20258 SHA256 (ForkAwesome-Fork-Awesome-4fef70f_GH0.tar.gz) = 93906cd38eb92fe853c9e3723b1f0fa56df6ddcd2d87ac82c97b5a188e5cdae6 SIZE (ForkAwesome-Fork-Awesome-4fef70f_GH0.tar.gz) = 1803875 SHA256 (Martchus-subdirs-b922c49_GH0.tar.gz) = cf1a6753328ade3643ee7399e63db8918252affbdf57bf71a24713fb0ce7aa8f SIZE (Martchus-subdirs-b922c49_GH0.tar.gz) = 14055 diff --git a/deskutils/syncthingtray/files/patch-syncthingtray_plasmoid_lib_syncthingapplet.h b/deskutils/syncthingtray/files/patch-syncthingtray_plasmoid_lib_syncthingapplet.h deleted file mode 100644 index 62e0b70051b5..000000000000 --- a/deskutils/syncthingtray/files/patch-syncthingtray_plasmoid_lib_syncthingapplet.h +++ /dev/null @@ -1,39 +0,0 @@ ---- syncthingtray/plasmoid/lib/syncthingapplet.h.orig 2026-09-13 15:05:04 UTC -+++ syncthingtray/plasmoid/lib/syncthingapplet.h -@@ -83,7 +83,9 @@ class SyncthingApplet : public Plasma::Applet { - currentConnectionConfigIndexChanged) - Q_PROPERTY(int defaultTab READ defaultTab CONSTANT) - Q_PROPERTY(bool startStopEnabled READ isStartStopEnabled NOTIFY settingsChanged) -+#ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD - Q_PROPERTY(QObject *startStopButtonTarget READ service CONSTANT) -+#endif - Q_PROPERTY(bool hasInternalErrors READ hasInternalErrors NOTIFY hasInternalErrorsChanged) - Q_PROPERTY(QSize size READ size WRITE setSize NOTIFY sizeChanged) - Q_PROPERTY(bool showTabTexts READ isShowingTabTexts WRITE setShowingTabTexts NOTIFY showTabTextsChanged) -@@ -113,7 +115,9 @@ class SyncthingApplet : public Plasma::Applet { - #if defined(SYNCTHINGWIDGETS_GUI_QTQUICK_MODE_DESKTOP) - QtGui::QuickUI *quickUI() const; - #endif -+#ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD - Data::SyncthingService *service() const; -+#endif - QIcon syncthingIcon() const; - QString incomingTraffic() const; - bool hasIncomingTraffic() const; -@@ -283,14 +287,12 @@ inline QtGui::QuickUI *SyncthingApplet::quickUI() cons - } - #endif - -+#ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD - inline Data::SyncthingService *SyncthingApplet::service() const - { --#ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD - return const_cast(&m_service); --#else -- return nullptr; --#endif - } -+#endif - - inline int SyncthingApplet::currentConnectionConfigIndex() const - { diff --git a/deskutils/syncthingtray/files/patch-syncthingtray_syncthingconnector_runtimecondition.cpp b/deskutils/syncthingtray/files/patch-syncthingtray_syncthingconnector_runtimecondition.cpp deleted file mode 100644 index 662e1b069898..000000000000 --- a/deskutils/syncthingtray/files/patch-syncthingtray_syncthingconnector_runtimecondition.cpp +++ /dev/null @@ -1,18 +0,0 @@ ---- syncthingtray/syncthingconnector/runtimecondition.cpp.orig 2026-09-13 15:05:04 UTC -+++ syncthingtray/syncthingconnector/runtimecondition.cpp -@@ -108,6 +108,7 @@ static std::pair lo - } - #endif - -+#ifdef SYNCTHINGCONNECTION_SUPPORT_BATTERY_MONITORING - /*! - * \brief The BatteryMonitorBase class is a base class for battery monitoring, - * providing the capability to query and update battery states across all runtime condition instances. -@@ -145,6 +146,7 @@ class BatteryMonitorBase { (protected) - std::optional m_batteryLevel; /*!< The current battery level percentage (0-100). */ - std::optional m_batterySaving; /*!< Whether battery saving mode is enabled. */ - }; -+#endif - - #if defined(Q_OS_ANDROID) - /*! diff --git a/deskutils/syncthingtray/pkg-plist b/deskutils/syncthingtray/pkg-plist index 150b5dcc3ee8..0753eb386139 100644 --- a/deskutils/syncthingtray/pkg-plist +++ b/deskutils/syncthingtray/pkg-plist @@ -1,89 +1,89 @@ bin/syncthingctl bin/syncthingtray %%PLASMA%%lib/libc++utilities.so %%PLASMA%%lib/libc++utilities.so.5 -%%PLASMA%%lib/libc++utilities.so.5.35.0 +%%PLASMA%%lib/libc++utilities.so.5.36.0 %%PLASMA%%lib/libqtforkawesome.so %%PLASMA%%lib/libqtforkawesome.so.0.3.4 %%PLASMA%%lib/libqtforkawesome.so.1 %%PLASMA%%lib/libqtquickforkawesome.so %%PLASMA%%lib/libqtquickforkawesome.so.0.3.4 %%PLASMA%%lib/libqtquickforkawesome.so.1 %%PLASMA%%lib/libqtutilities.so %%PLASMA%%lib/libqtutilities.so.6 %%PLASMA%%lib/libqtutilities.so.6.22.2 %%PLASMA%%lib/libsyncthingconnector.so %%PLASMA%%lib/libsyncthingconnector.so.%%LIBVERSION%% %%PLASMA%%lib/libsyncthingconnector.so.40 %%PLASMA%%lib/libsyncthingmodel.so %%PLASMA%%lib/libsyncthingmodel.so.%%LIBVERSION%% %%PLASMA%%lib/libsyncthingmodel.so.40 %%PLASMA%%lib/libsyncthingwidgets.so %%PLASMA%%lib/libsyncthingwidgets.so.%%LIBVERSION%% %%PLASMA%%lib/libsyncthingwidgets.so.40 %%PLASMA%%%%QT_PLUGINDIR%%/kf6/kfileitemaction/libsyncthingfileitemaction.so %%PLASMA%%%%QT_PLUGINDIR%%/plasma/applets/martchus.syncthingplasmoid.so share/applications/syncthingtray.desktop share/bash-completion/completions/syncthingctl share/bash-completion/completions/syncthingtray share/icons/hicolor/scalable/apps/syncthingtray.svg %%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/FilterTextField.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/SectionHeader.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/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%%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_fr_FR.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_fr_FR.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_fr_FR.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_fr_FR.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_fr_FR.qm share/syncthingwidgets/translations/syncthingwidgets_ru_RU.qm share/syncthingwidgets/translations/syncthingwidgets_zh_CN.qm @dir %%QT_PLUGINDIR%%