Attachment 228107 Details for Bug 257945 – Update to 3.3.4, WEBENGINE option, argp dependency fix

[patch] Update to 3.3.4, WEBENGINE option, argp dependency fix

nextcloud.diff (text/plain), 3.02 KB, created by Guido Falsi on 2021-09-21 20:59:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guido Falsi

Created: 2021-09-21 20:59:34 UTC

Size: 3.02 KB

patch

obsolete

>diff --git a/deskutils/nextcloudclient/Makefile b/deskutils/nextcloudclient/Makefile
>index 7e15a77d45a2..232a958b8447 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.4
> 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>
>@@ -59,6 +66,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..f41ddac0d156 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 = 1632237782
>+SHA256 (nextcloud-desktop-v3.3.4_GH0.tar.gz) = 571e6e3906dcadc8cc4866f54e3535111fefe795ef30622e2502b53a57db9294
>+SIZE (nextcloud-desktop-v3.3.4_GH0.tar.gz) = 14032214
>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

Actions: View | Diff

Attachments on bug 257945: 227326 | 227489 | 227835 | 228057 | 228107 | 228286