git: f2305421c610 - main - deskutils/syncthingtray: Update version 1.1.8=>1.4.1
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 27 Apr 2023 12:18:49 UTC
The branch main has been updated by bofh:
URL: https://cgit.FreeBSD.org/ports/commit/?id=f2305421c6104f9be7cfd8c57e172165db0ba195
commit f2305421c6104f9be7cfd8c57e172165db0ba195
Author: Li-Wen Hsu <lwhsu@FreeBSD.org>
AuthorDate: 2023-04-27 12:16:12 +0000
Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-04-27 12:18:14 +0000
deskutils/syncthingtray: Update version 1.1.8=>1.4.1
- Pass maintainership to lwhsu@ who actually uses it
Changelog: https://github.com/Martchus/syncthingtray/releases/tag/v1.4.1
PR: 267164
---
deskutils/syncthingtray/Makefile | 64 ++++++++++++++--------
deskutils/syncthingtray/distinfo | 22 +++++---
.../files/patch-plasmoid-lib-syncthingapplet.cpp | 11 ----
deskutils/syncthingtray/pkg-plist | 10 ++++
4 files changed, 63 insertions(+), 44 deletions(-)
diff --git a/deskutils/syncthingtray/Makefile b/deskutils/syncthingtray/Makefile
index 8d484497e05f..b25ebe645c1c 100644
--- a/deskutils/syncthingtray/Makefile
+++ b/deskutils/syncthingtray/Makefile
@@ -1,10 +1,9 @@
PORTNAME= syncthingtray
-PORTVERSION= 1.1.8
-PORTREVISION= 4
+PORTVERSION= 1.4.1
DISTVERSIONPREFIX= v
CATEGORIES= deskutils
-MAINTAINER= bofh@FreeBSD.org
+MAINTAINER= lwhsu@FreeBSD.org
COMMENT= Qt 5-based Syncthing tray application
WWW= https://github.com/Martchus/syncthingtray
@@ -12,30 +11,37 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKDIR}/syncthingtray/LICENSE
BUILD_DEPENDS= ${LOCALBASE}/share/ECM/cmake/ECMConfig.cmake:devel/kf5-extra-cmake-modules \
- doxygen:devel/doxygen
+ doxygen:devel/doxygen \
+ p5-YAML-LibYAML>0:textproc/p5-YAML-LibYAML
LIB_DEPENDS= libboost_iostreams.so:devel/boost-libs \
libboost_regex.so:devel/boost-libs
-USES= cmake:insource compiler:c++11-lang iconv kde:5 qt:5
+USES= cmake:insource compiler:c++11-lang desktop-file-utils iconv \
+ kde:5 perl5 qt:5
USE_GITHUB= nodefault
GH_TUPLE= Martchus:${PORTNAME}:${DISTVERSIONPREFIX}${DISTVERSION}:syncthingtray/../syncthingtray \
- Martchus:cpp-utilities:v5.10.5:cpputilities/../c++utilities \
- Martchus:qtutilities:v6.4.2:qtutilities/../qtutilities \
- Martchus:subdirs:f3b12f9:subdirs/../subdirs
+ Martchus:cpp-utilities:v5.22.0:cpputilities/../c++utilities \
+ Martchus:qtutilities:v6.12.0:qtutilities/../qtutilities \
+ Martchus:qtforkawesome:v0.1.0:qtforkawesome/../qtforkawesome \
+ ForkAwesome:Fork-Awesome:015e526:ForkAwesome/../forkawesome \
+ Martchus:subdirs:6be9741:subdirs/../subdirs
USE_KDE= plasma-framework
+USE_PERL5= build
USE_QT= concurrent core dbus declarative gui location network \
- printsupport qdbus quickcontrols2 svg webchannel \
- widgets x11extras buildtools:build doc:build linguist:build \
+ printsupport qdbus quickcontrols2 svg webchannel widgets \
+ x11extras buildtools:build doc:build linguist:build \
qmake:build testlib:build
-CMAKE_OFF= USE_STANDARD_FILESYSTEM SYSTEMD_SUPPORT
+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
-CONFIGURE_WRKSRC= ${WRKDIR}
BUILD_WRKSRC= ${WRKDIR}
+CONFIGURE_WRKSRC= ${WRKDIR}
INSTALL_WRKSRC= ${WRKDIR}
-CMAKE_SOURCE_PATH= ${WRKDIR}/subdirs/syncthingtray
.include <bsd.port.pre.mk>
@@ -49,29 +55,39 @@ USE_QT+= webkit
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}${PREFIX}/include/syncthingconnector \
- ${STAGEDIR}${PREFIX}/include/syncthingmodel \
- ${STAGEDIR}${PREFIX}/include/syncthingwidgets \
- ${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}/lib/libsyncthingconnector.a \
- ${STAGEDIR}${PREFIX}/lib/libsyncthingmodel.a \
- ${STAGEDIR}${PREFIX}/lib/libsyncthingwidgets.a \
${STAGEDIR}${QT_PLUGINDIR} \
${STAGEDIR}${QT_LIBDIR}
diff --git a/deskutils/syncthingtray/distinfo b/deskutils/syncthingtray/distinfo
index ed8a1e8a5648..b45e7175eb89 100644
--- a/deskutils/syncthingtray/distinfo
+++ b/deskutils/syncthingtray/distinfo
@@ -1,9 +1,13 @@
-TIMESTAMP = 1626355716
-SHA256 (Martchus-syncthingtray-v1.1.8_GH0.tar.gz) = 82a3ca453dd74bd2d73b49a5288eb52683ce26fbc7d4a2f6445aa57df6dc2f35
-SIZE (Martchus-syncthingtray-v1.1.8_GH0.tar.gz) = 1563970
-SHA256 (Martchus-cpp-utilities-v5.10.5_GH0.tar.gz) = 36005e493e0db4605f3270d6b7ccb3ee4b42da7a70636b00f914425ec9fe3ec6
-SIZE (Martchus-cpp-utilities-v5.10.5_GH0.tar.gz) = 168627
-SHA256 (Martchus-qtutilities-v6.4.2_GH0.tar.gz) = a09decbde9ddbeefe09b4c3febeea4cbadaf5eb0da1533acd9c03eb046b75026
-SIZE (Martchus-qtutilities-v6.4.2_GH0.tar.gz) = 109593
-SHA256 (Martchus-subdirs-f3b12f9_GH0.tar.gz) = b4879e20a46ea6b24558264dbd9f20072de94fa32b71b4d60e0d39523aae769f
-SIZE (Martchus-subdirs-f3b12f9_GH0.tar.gz) = 8834
+TIMESTAMP = 1682508656
+SHA256 (Martchus-syncthingtray-v1.4.1_GH0.tar.gz) = 6a2102c82dc6a8d9b0cf72941e997bb300b5011fe877696edc762e1440abd133
+SIZE (Martchus-syncthingtray-v1.4.1_GH0.tar.gz) = 1862209
+SHA256 (Martchus-cpp-utilities-v5.22.0_GH0.tar.gz) = ea68a894f9d5879dc247c1a08172319ca34d2a0022bbc0412e9428c011ffaba2
+SIZE (Martchus-cpp-utilities-v5.22.0_GH0.tar.gz) = 186252
+SHA256 (Martchus-qtutilities-v6.12.0_GH0.tar.gz) = d3b8bc68c82d195cfeb4aa8d599c020774322aea7faebf5243e139088d89a82c
+SIZE (Martchus-qtutilities-v6.12.0_GH0.tar.gz) = 100495
+SHA256 (Martchus-qtforkawesome-v0.1.0_GH0.tar.gz) = 2d71cc6824148194263fda763a78d3ae7ed5a4d0e673181fc5afeabc47e2445e
+SIZE (Martchus-qtforkawesome-v0.1.0_GH0.tar.gz) = 18476
+SHA256 (ForkAwesome-Fork-Awesome-015e526_GH0.tar.gz) = 7d533a22406c6467785555cba8894c8e5721358c9920e878cd0515b98406141b
+SIZE (ForkAwesome-Fork-Awesome-015e526_GH0.tar.gz) = 1808469
+SHA256 (Martchus-subdirs-6be9741_GH0.tar.gz) = 02f90a1aee098bbc2cac56a643899f06e6609bd00d9898516cc6d301191f9e3d
+SIZE (Martchus-subdirs-6be9741_GH0.tar.gz) = 9431
diff --git a/deskutils/syncthingtray/files/patch-plasmoid-lib-syncthingapplet.cpp b/deskutils/syncthingtray/files/patch-plasmoid-lib-syncthingapplet.cpp
deleted file mode 100644
index 482b042a1ff1..000000000000
--- a/deskutils/syncthingtray/files/patch-plasmoid-lib-syncthingapplet.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../syncthingtray/plasmoid/lib/syncthingapplet.cpp.orig 2021-07-15 09:55:51.079368000 -0400
-+++ ../syncthingtray/plasmoid/lib/syncthingapplet.cpp 2021-07-15 09:56:54.332702000 -0400
-@@ -226,7 +226,7 @@
- const auto systemdConsideredForReconnect
- = settings.systemd.apply(m_connection, currentConnectionConfig(), reconnectRequired).consideredForReconnect;
- #else
-- const auto systemdRelevantForReconnect = false;
-+ const auto systemdConsideredForReconnect = false;
- #endif
- if (!systemdConsideredForReconnect && (reconnectRequired || !m_connection.isConnected())) {
- m_connection.reconnect();
diff --git a/deskutils/syncthingtray/pkg-plist b/deskutils/syncthingtray/pkg-plist
index 64048db2672c..c77f60c38b93 100644
--- a/deskutils/syncthingtray/pkg-plist
+++ b/deskutils/syncthingtray/pkg-plist
@@ -6,6 +6,8 @@ share/bash-completion/completions/syncthingtray
share/icons/hicolor/scalable/apps/syncthingtray.svg
share/kservices5/plasma-applet-martchus.syncthingplasmoid.desktop
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/CompactRepresentation.qml
share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/DetailItem.qml
@@ -17,7 +19,10 @@ share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/FullRepresentation
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
@@ -27,17 +32,22 @@ share/plasma/plasmoids/martchus.syncthingplasmoid/metadata.desktop
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
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
%%DATADIR%%/translations/syncthingtray_cs_CZ.qm
%%DATADIR%%/translations/syncthingtray_de_DE.qm
%%DATADIR%%/translations/syncthingtray_en_US.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_zh_CN.qm