diff --git a/deskutils/nextcloudclient/Makefile b/deskutils/nextcloudclient/Makefile index f813752f1246..fcdc524f0710 100644 --- a/deskutils/nextcloudclient/Makefile +++ b/deskutils/nextcloudclient/Makefile @@ -1,72 +1,73 @@ PORTNAME= nextcloudclient -PORTVERSION= 3.6.6 +PORTVERSION= 3.7.4 #PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= deskutils MAINTAINER= mr@FreeBSD.org COMMENT= NextCloud Desktop Syncing Client WWW= https://github.com/nextcloud/desktop LICENSE= GPLv2 BUILD_DEPENDS= inkscape:graphics/inkscape LIB_DEPENDS= libinotify.so:devel/libinotify \ libqt5keychain.so:security/qtkeychain@qt5 USES= cmake:noninja compiler:c++14-lang desktop-file-utils gmake \ - gnome iconv localbase:ldflags pkgconfig qt:5 shared-mime-info \ + gnome iconv kde:5 localbase:ldflags pkgconfig qt:5 shared-mime-info \ sqlite ssl +USE_KDE= archive USE_QT= buildtools:build concurrent core dbus declarative graphicaleffects \ gui linguist:build location network printsupport qmake:build \ quickcontrols quickcontrols2 sql svg testlib webchannel websockets \ widgets xml CMAKE_ARGS= -DBUILD_UPDATER:BOOL=OFF \ -DCMAKE_INSTALL_MANDIR:STRING=man \ -DWITH_STACK_PROTECTOR:BOOL=OFF USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= nextcloud GH_PROJECT= desktop #OPTIONS_DEFINE= DEBUG DOCS OPTIONS_DEFINE= DEBUG WEBENGINE # DOCS doesn't build currently OPTIONS_DEFAULT_amd64= WEBENGINE OPTIONS_DEFAULT_i386= WEBENGINE OPTIONS_DEFAULT_aarch64= WEBENGINE -WEBENGINE_DESC= QT5 Webengine support +WEBENGINE_DESC= Use Webengine to provide web login flow #DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx \ # doxygen:devel/doxygen #DOCS_USES= tex #DOCS_USE= TEX=dvipsk:build,latex:build #DOCS_CMAKE_ON= -DWITH_DOC:BOOL=ON WEBENGINE_VARS= USE_QT+=webengine PLIST_SUB= VERSION=${PORTVERSION} .include .ifdef WITH_DEBUG CMAKE_ARGS+= -DCMAKE_BUILD_TYPE:STRING=Debug .endif post-patch: @${REINPLACE_CMD} -e \ 's|.lst |.lst.sample |' ${WRKSRC}/CMakeLists.txt post-patch-WEBENGINE-off: - @${REINPLACE_CMD} -e '/^find_package.*COMPONENTS WebEngineWidgets WebEngine/d' \ + @${REINPLACE_CMD} -e '/add_compile_definitions(WITH_WEBENGINE=1)/d' \ ${WRKSRC}/src/CMakeLists.txt pre-configure: @(cd ${WRKSRC} && ${CP} -f sync-exclude.lst sync-exclude.lst.sample) post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/sync-exclude.lst ${STAGEDIR}${EXAMPLESDIR} .include diff --git a/deskutils/nextcloudclient/distinfo b/deskutils/nextcloudclient/distinfo index 15d3a5e3116d..410bde3898af 100644 --- a/deskutils/nextcloudclient/distinfo +++ b/deskutils/nextcloudclient/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1674408218 -SHA256 (nextcloud-desktop-v3.6.6_GH0.tar.gz) = 04b3be9ab62eec7b81c971dc50c4e40666ee2d76c19cb72d9ad52e5a4d2edd47 -SIZE (nextcloud-desktop-v3.6.6_GH0.tar.gz) = 15497450 +TIMESTAMP = 1678375641 +SHA256 (nextcloud-desktop-v3.7.4_GH0.tar.gz) = 0d7b888b315293953ac33cb6eb8faa3bbc5b6201896c54c71b4648ec4d6ff597 +SIZE (nextcloud-desktop-v3.7.4_GH0.tar.gz) = 15701243 diff --git a/deskutils/nextcloudclient/files/patch-src_CMakeLists.txt b/deskutils/nextcloudclient/files/patch-src_CMakeLists.txt new file mode 100644 index 000000000000..047f46c2bb70 --- /dev/null +++ b/deskutils/nextcloudclient/files/patch-src_CMakeLists.txt @@ -0,0 +1,41 @@ +--- src/CMakeLists.txt.orig 2023-02-09 20:54:58 UTC ++++ src/CMakeLists.txt +@@ -31,30 +31,16 @@ find_package(Qt5WebEngineWidgets ${REQUIRED_QT_VERSION + ) + + find_package(Qt5WebEngineWidgets ${REQUIRED_QT_VERSION} CONFIG QUIET) +-if(APPLE) +- set_package_properties(Qt5WebEngineWidgets PROPERTIES +- DESCRIPTION "Qt5 WebEngineWidgets component." +- TYPE RECOMMENDED +- ) +-else() +- set_package_properties(Qt5WebEngineWidgets PROPERTIES +- DESCRIPTION "Qt5 WebEngineWidgets component." +- TYPE REQUIRED +- ) +-endif() ++set_package_properties(Qt5WebEngineWidgets PROPERTIES ++ DESCRIPTION "Qt5 WebEngineWidgets component." ++ TYPE RECOMMENDED ++) + + find_package(Qt5WebEngine ${REQUIRED_QT_VERSION} CONFIG QUIET) +-if(APPLE) +- set_package_properties(Qt5WebEngine PROPERTIES +- DESCRIPTION "Qt5 WebEngine component." +- TYPE RECOMMENDED +- ) +-else() +- set_package_properties(Qt5WebEngine PROPERTIES +- DESCRIPTION "Qt5 WebEngine component." +- TYPE REQUIRED +- ) +-endif() ++set_package_properties(Qt5WebEngine PROPERTIES ++ DESCRIPTION "Qt5 WebEngine component." ++ TYPE RECOMMENDED ++) + + if(Qt5WebEngine_FOUND AND Qt5WebEngineWidgets_FOUND) + add_compile_definitions(WITH_WEBENGINE=1)