Date: Thu, 7 Oct 2021 20:22:46 GMT From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 4f1fb2e1b233 - 2021Q4 - deskutils/nextcloudclient: Update to 3.3.5 Message-ID: <202110072022.197KMkN1022021@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2021Q4 has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=4f1fb2e1b23346894fdc2c8ce1e623ab7e4d1510 commit 4f1fb2e1b23346894fdc2c8ce1e623ab7e4d1510 Author: Guido Falsi <madpilot@FreeBSD.org> AuthorDate: 2021-10-07 20:20:48 +0000 Commit: Guido Falsi <madpilot@FreeBSD.org> CommitDate: 2021-10-07 20:22:33 +0000 deskutils/nextcloudclient: Update to 3.3.5 Add a WEBENGINE option (on by default) to disable webengine dependency and usage. This update contains a fix for a regression causing authentication issues with 3.3.2 and a fix for a ghost dependency on libargp if present at build time. PR: 257945 Approved by: maintainer timeout, fixit blanket MFH: 2021Q4 (cherry picked from commit 620bc0a83dc9d36b1c43ff434da9d66603f34942) --- deskutils/nextcloudclient/Makefile | 17 ++++++++++++++--- deskutils/nextcloudclient/distinfo | 6 +++--- .../files/patch-src_csync_ConfigureChecks.cmake | 12 ++++++++++++ 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/deskutils/nextcloudclient/Makefile b/deskutils/nextcloudclient/Makefile index 52a21e0638c8..7ec08a9744b2 100644 --- a/deskutils/nextcloudclient/Makefile +++ b/deskutils/nextcloudclient/Makefile @@ -1,7 +1,7 @@ # Created by: Mathieu Arnold PORTNAME= nextcloudclient -PORTVERSION= 3.3.2 +PORTVERSION= 3.3.5 DISTVERSIONPREFIX= v CATEGORIES= deskutils @@ -22,7 +22,7 @@ USES= cmake:noninja compiler:c++14-lang desktop-file-utils gmake \ sqlite ssl USE_QT= buildtools_build concurrent core dbus declarative graphicaleffects \ gui linguist_build location network printsupport qmake_build \ - quickcontrols2 sql svg testlib webchannel webengine websockets \ + quickcontrols2 sql svg testlib webchannel websockets \ widgets xml CMAKE_ARGS= -DBUILD_UPDATER:BOOL=OFF \ -DCMAKE_INSTALL_MANDIR:STRING=man \ @@ -36,13 +36,20 @@ GH_ACCOUNT= nextcloud GH_PROJECT= desktop #OPTIONS_DEFINE= DEBUG DOCS -OPTIONS_DEFINE= DEBUG # DOCS doesn't build currently +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 #DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx \ # doxygen:devel/doxygen #DOCS_USE= tex=dvipsk:build,latex:build #DOCS_CMAKE_ON= -DWITH_DOC:BOOL=ON +WEBENGINE_VARS= USE_QT+=webengine + PLIST_SUB= VERSION=${PORTVERSION} .include <bsd.port.pre.mk> @@ -55,6 +62,10 @@ 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' \ + ${WRKSRC}/src/CMakeLists.txt + pre-configure: @(cd ${WRKSRC} && ${CP} -f sync-exclude.lst sync-exclude.lst.sample) diff --git a/deskutils/nextcloudclient/distinfo b/deskutils/nextcloudclient/distinfo index e38ca0bfad74..fe33643b8d62 100644 --- a/deskutils/nextcloudclient/distinfo +++ b/deskutils/nextcloudclient/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1630005562 -SHA256 (nextcloud-desktop-v3.3.2_GH0.tar.gz) = 6ea5ccc9579339f2d1652f26582dbdd8212dd5e0c28659dce7fe9ddece8a59c5 -SIZE (nextcloud-desktop-v3.3.2_GH0.tar.gz) = 13987162 +TIMESTAMP = 1633008527 +SHA256 (nextcloud-desktop-v3.3.5_GH0.tar.gz) = 5e952be36ab6806ffbab6d216b05bfbd9d7e72687e0d281f492e1059cd34b419 +SIZE (nextcloud-desktop-v3.3.5_GH0.tar.gz) = 14060100 diff --git a/deskutils/nextcloudclient/files/patch-src_csync_ConfigureChecks.cmake b/deskutils/nextcloudclient/files/patch-src_csync_ConfigureChecks.cmake new file mode 100644 index 000000000000..52cb079bdbc4 --- /dev/null +++ b/deskutils/nextcloudclient/files/patch-src_csync_ConfigureChecks.cmake @@ -0,0 +1,12 @@ +--- src/csync/ConfigureChecks.cmake.orig 2021-09-03 09:40:46 UTC ++++ src/csync/ConfigureChecks.cmake +@@ -14,9 +14,6 @@ set(SYSCONFDIR ${SYSCONF_INSTALL_DIR}) + set(BINARYDIR ${CMAKE_CURRENT_BINARY_DIR}) + set(SOURCEDIR ${CMAKE_CURRENT_SOURCE_DIR}) + +-# HEADER FILES +-check_include_file(argp.h HAVE_ARGP_H) +- + # FUNCTIONS + if (NOT LINUX) + # librt
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202110072022.197KMkN1022021>