Date: Tue, 9 Apr 2024 07:14:09 GMT From: Nuno Teixeira <eduardo@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 0cc7fb1651f6 - main - deskutils/syncthingtray: Update to 1.5.1 / Flavorize Qt Message-ID: <202404090714.4397E9j7043555@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=0cc7fb1651f649a99f9fa5a9a1bcf9216b2a1615 commit 0cc7fb1651f649a99f9fa5a9a1bcf9216b2a1615 Author: Denis Shaposhnikov <dsh@bamus.cz> AuthorDate: 2024-04-09 07:10:10 +0000 Commit: Nuno Teixeira <eduardo@FreeBSD.org> CommitDate: 2024-04-09 07:13:56 +0000 deskutils/syncthingtray: Update to 1.5.1 / Flavorize Qt - Switch to DISTVERSION - Drop compiler from USES - Flavorize Qt - Remove dependency on deprecated webkit ChangeLog: https://github.com/Martchus/syncthingtray/releases/tag/v1.5.1 PR: 278142 --- deskutils/syncthingtray/Makefile | 69 ++++++++++++++-------- deskutils/syncthingtray/distinfo | 10 ++-- ...ch-syncthingtray_plasmoid_lib_syncthingapplet.h | 12 ++++ deskutils/syncthingtray/pkg-plist | 7 ++- 4 files changed, 65 insertions(+), 33 deletions(-) diff --git a/deskutils/syncthingtray/Makefile b/deskutils/syncthingtray/Makefile index 4df1fb2fa12c..548d77e485b5 100644 --- a/deskutils/syncthingtray/Makefile +++ b/deskutils/syncthingtray/Makefile @@ -1,10 +1,10 @@ PORTNAME= syncthingtray -PORTVERSION= 1.5.0 DISTVERSIONPREFIX= v +DISTVERSION= 1.5.1 CATEGORIES= deskutils MAINTAINER= dsh@bamus.cz -COMMENT= Qt 5-based Syncthing tray application +COMMENT= Qt ${FLAVOR:S/qt//}-based Syncthing tray application WWW= https://github.com/Martchus/syncthingtray LICENSE= GPLv2 @@ -16,41 +16,60 @@ BUILD_DEPENDS= ${LOCALBASE}/share/ECM/cmake/ECMConfig.cmake:devel/kf5-extra-cmak LIB_DEPENDS= libboost_iostreams.so:devel/boost-libs \ libboost_regex.so:devel/boost-libs -USES= cmake:insource compiler:c++11-lang desktop-file-utils iconv \ - kde:5 perl5 qt:5 +FLAVORS= qt5 qt6 +FLAVOR?= ${FLAVORS:[1]} +FLAVORS_SUB= yes + +qt5_CONFLICTS_INSTALL= ${PORTNAME}-qt6 +qt6_PKGNAMESUFFIX= -qt6 +qt6_CONFLICTS_INSTALL= ${PORTNAME} + +USES= cmake:insource iconv perl5 xorg + +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.13.5:qtutilities/../qtutilities \ + 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_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 \ - qmake:build testlib:build +USE_QT= declarative svg doc:build +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 +.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:build +USE_QT+= base positioning +WEBENGINE_USE= QT=webchannel,webengine +.endif -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 +OPTIONS_DEFINE= WEBENGINE +OPTIONS_DEFAULT= WEBENGINE + +WEBENGINE_DESC= Built-in web view (webengine dependency) +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} - -.include <bsd.port.pre.mk> - -.if ${ARCH} == amd64 || ${ARCH} == i386 -USE_QT+= webengine -.else -CMAKE_ARGS+= -DWEBVIEW_PROVIDER=webkit -USE_QT+= webkit -.endif +PATCH_WRKSRC= ${WRKDIR} post-install: ${RM} -r \ @@ -91,4 +110,4 @@ post-install: ${STAGEDIR}${QT_PLUGINDIR} \ ${STAGEDIR}${QT_LIBDIR} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/deskutils/syncthingtray/distinfo b/deskutils/syncthingtray/distinfo index 7c127c39d7ad..6c2216ad6979 100644 --- a/deskutils/syncthingtray/distinfo +++ b/deskutils/syncthingtray/distinfo @@ -1,10 +1,10 @@ -TIMESTAMP = 1710083644 -SHA256 (Martchus-syncthingtray-v1.5.0_GH0.tar.gz) = ddec89979a579b703de5324383f4171ab89844c83fbc725c663a81951ac4b070 -SIZE (Martchus-syncthingtray-v1.5.0_GH0.tar.gz) = 1895965 +TIMESTAMP = 1712148738 +SHA256 (Martchus-syncthingtray-v1.5.1_GH0.tar.gz) = 38350e7b69de42c0a736762f70cb90399637e3b8619eef50149115600273dbdd +SIZE (Martchus-syncthingtray-v1.5.1_GH0.tar.gz) = 1896270 SHA256 (Martchus-cpp-utilities-v5.24.7_GH0.tar.gz) = c3aa125933aaf9724eacca045f5d8278d524a4cef95ce54b89e88e1ac15684c2 SIZE (Martchus-cpp-utilities-v5.24.7_GH0.tar.gz) = 195153 -SHA256 (Martchus-qtutilities-v6.13.5_GH0.tar.gz) = ed6c438f4a1f0082558978a87be4608a5bd82cf6a4450798dd612d6087a639b4 -SIZE (Martchus-qtutilities-v6.13.5_GH0.tar.gz) = 103635 +SHA256 (Martchus-qtutilities-v6.14.0_GH0.tar.gz) = 4eab9ef26edf67c1c436596bea42890fcc0206f93c50413939ccce8c94bf7bc0 +SIZE (Martchus-qtutilities-v6.14.0_GH0.tar.gz) = 104258 SHA256 (Martchus-qtforkawesome-v0.2.0_GH0.tar.gz) = 42de641e79b22d4dd44eb179e8818a8a4bf424c3feec1d0d9524bae5fde458cc SIZE (Martchus-qtforkawesome-v0.2.0_GH0.tar.gz) = 19118 SHA256 (ForkAwesome-Fork-Awesome-4fef70f_GH0.tar.gz) = 93906cd38eb92fe853c9e3723b1f0fa56df6ddcd2d87ac82c97b5a188e5cdae6 diff --git a/deskutils/syncthingtray/files/patch-syncthingtray_plasmoid_lib_syncthingapplet.h b/deskutils/syncthingtray/files/patch-syncthingtray_plasmoid_lib_syncthingapplet.h new file mode 100644 index 000000000000..fb3d72c2ae6a --- /dev/null +++ b/deskutils/syncthingtray/files/patch-syncthingtray_plasmoid_lib_syncthingapplet.h @@ -0,0 +1,12 @@ +--- 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) diff --git a/deskutils/syncthingtray/pkg-plist b/deskutils/syncthingtray/pkg-plist index c77f60c38b93..dfb5f9b6272d 100644 --- a/deskutils/syncthingtray/pkg-plist +++ b/deskutils/syncthingtray/pkg-plist @@ -4,8 +4,8 @@ share/applications/syncthingtray.desktop share/bash-completion/completions/syncthingctl share/bash-completion/completions/syncthingtray share/icons/hicolor/scalable/apps/syncthingtray.svg -share/kservices5/plasma-applet-martchus.syncthingplasmoid.desktop -share/kservices5/syncthingfileitemaction.desktop +%%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 @@ -28,7 +28,8 @@ 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 -share/plasma/plasmoids/martchus.syncthingplasmoid/metadata.desktop +%%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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404090714.4397E9j7043555>