Attachment #247022 for bug #275671




PORTNAME=	nextcloudclient
PORTVERSION=	3.11.0
DISTVERSIONPREFIX=	v
CATEGORIES=	deskutils


		gnome iconv kde:5 localbase:ldflags pkgconfig qt:5 shared-mime-info \
		sqlite ssl
USE_KDE=	archive
USE_LDCONFIG=	yes
USE_QT=		buildtools:build concurrent core dbus declarative graphicaleffects \
		gui linguist:build network qmake:build quickcontrols \
		quickcontrols2 sql svg websockets widgets xml

CMAKE_ARGS=	-DBUILD_UPDATER:BOOL=OFF \
		-DCMAKE_INSTALL_MANDIR:STRING=man \
		-DWITH_STACK_PROTECTOR:BOOL=OFF

PLIST_SUB=	VERSION=${PORTVERSION}

USE_GITHUB=	yes
GH_ACCOUNT=	nextcloud
GH_PROJECT=	desktop

OPTIONS_DEFINE=			DOCS DEBUG GNOME KDE WEBENGINE
OPTIONS_DEFAULT=		GNOME
OPTIONS_DEFAULT_aarch64=	WEBENGINE
OPTIONS_DEFAULT_amd64=		WEBENGINE
OPTIONS_DEFAULT_i386=		WEBENGINE
OPTIONS_DEFAULT_aarch64=	WEBENGINE

OPTIONS_SUB=	yes

KDE_DESC=		KDE desktop environment 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_BOOL=	WITH_DOC
DOCS_VARS=		PORTDOCS=*

GNOME_CMAKE_BOOL=	BUILD_SHELL_INTEGRATION_NAUTILUS

KDE_USES=		xorg
KDE_USE=		KDE=completion,config,coreaddons,ecm,jobwidgets,kio,service,solid,widgetsaddons,windowsystem \
			XORG=x11
KDE_CMAKE_BOOL=		BUILD_SHELL_INTEGRATION_DOLPHIN

WEBENGINE_USE=		QT=webchannel,webengine,printsupport,location
WEBENGINE_CMAKE_BOOL=	BUILD_WITH_WEBENGINE

.include <bsd.port.pre.mk>


	@${REINPLACE_CMD} -e \
		's|.lst |.lst.sample |' ${WRKSRC}/CMakeLists.txt

post-patch-WEBENGINE-off:
	@${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)


Lines 1-3 Link Here

(-)b/deskutils/nextcloudclient/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1698434389	1	TIMESTAMP = 1702381709
2	SHA256 (nextcloud-desktop-v3.10.1_GH0.tar.gz) = 11355941f2b2d83a72868c3dd6101ec1968e6cabb67834a0684ba860faedcee4	2	SHA256 (nextcloud-desktop-v3.11.0_GH0.tar.gz) = 75d53751411a7544ed5b9f23c3e71c19a96f4096313d76dad77314c3773319d9
3	SIZE (nextcloud-desktop-v3.10.1_GH0.tar.gz) = 13519993	3	SIZE (nextcloud-desktop-v3.11.0_GH0.tar.gz) = 13595770

Lines 1-11 Link Here

(-)b/deskutils/nextcloudclient/files/patch-doc_CMakeLists.txt (-2 / +2 lines)
1	--- doc/CMakeLists.txt.orig 2017-12-20 15:03:02 UTC	1	--- doc/CMakeLists.txt.orig 2023-12-11 17:50:46 UTC
2	+++ doc/CMakeLists.txt	2	+++ doc/CMakeLists.txt
3	@@ -11,7 +11,7 @@ if(SPHINX_FOUND)	3	@@ -11,7 +11,7 @@ if(SPHINX_FOUND)
4	# assets	4	# assets
5	set(LATEX_LOGO "${CMAKE_CURRENT_SOURCE_DIR}/logo-blue.pdf")	5	set(LATEX_LOGO "${CMAKE_CURRENT_SOURCE_DIR}/logo-blue.pdf")
6		6
7	- set(APPLICATION_DOC_DIR "${CMAKE_INSTALL_DOCDIR}/${PACKAGE}")	7	- set(APPLICATION_DOC_DIR "${CMAKE_INSTALL_DOCDIR}/${PACKAGE}")
8	+ set(APPLICATION_DOC_DIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/owncloudclient")	8	+ set(APPLICATION_DOC_DIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/nextcloudclient")
9	install(DIRECTORY ${SPHINX_HTML_DIR} DESTINATION ${APPLICATION_DOC_DIR} OPTIONAL)	9	install(DIRECTORY ${SPHINX_HTML_DIR} DESTINATION ${APPLICATION_DOC_DIR} OPTIONAL)
10	install(DIRECTORY ${SPHINX_PDF_DIR} DESTINATION ${APPLICATION_DOC_DIR} OPTIONAL)	10	install(DIRECTORY ${SPHINX_PDF_DIR} DESTINATION ${APPLICATION_DOC_DIR} OPTIONAL)
11	install(DIRECTORY ${SPHINX_QCH_DIR} DESTINATION ${APPLICATION_DOC_DIR} OPTIONAL)	11	install(DIRECTORY ${SPHINX_QCH_DIR} DESTINATION ${APPLICATION_DOC_DIR} OPTIONAL)




--- 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)




lib/libnextcloud_csync.so
lib/libnextcloud_csync.so.0
lib/libnextcloud_csync.so.%%VERSION%%
%%KDE%%lib/libnextclouddolphinpluginhelper.so
lib/libnextcloudsync.so
lib/libnextcloudsync.so.0
lib/libnextcloudsync.so.%%VERSION%%
lib/nextcloudsync_vfs_suffix.so
%%DOCS%%man/man1/nextcloud.1.gz
%%DOCS%%man/man1/nextcloudcmd.1.gz
%%KDE%%%%QT_PLUGINDIR%%/kf5/kfileitemaction/nextclouddolphinactionplugin.so
%%KDE%%%%QT_PLUGINDIR%%/kf5/overlayicon/nextclouddolphinoverlayplugin.so
share/applications/com.nextcloud.desktopclient.nextcloud.desktop
%%GNOME%%share/caja-python/extensions/syncstate-Nextcloud.py
share/icons/hicolor/1024x1024/apps/Nextcloud.png
share/icons/hicolor/128x128/apps/Nextcloud.png
share/icons/hicolor/128x128/apps/Nextcloud_error.png

share/icons/hicolor/72x72/apps/Nextcloud_warn.png
share/icons/hicolor/72x72/apps/Nextcloud_warn_shared.png
share/mime/packages/nextcloud.xml
%%GNOME%%share/nautilus-python/extensions/syncstate-Nextcloud.py
%%GNOME%%share/nemo-python/extensions/syncstate-Nextcloud.py
share/nextcloud/i18n/client_TW.qm
share/nextcloud/i18n/client_af.qm
share/nextcloud/i18n/client_ar.qm

Return to bug 275671

Lines 1-5 Link Here

(-)b/deskutils/nextcloudclient/Makefile (-19 / +27 lines)
1	PORTNAME= nextcloudclient	1	PORTNAME= nextcloudclient
2	PORTVERSION= 3.10.1	2	PORTVERSION= 3.11.0
3	DISTVERSIONPREFIX= v	3	DISTVERSIONPREFIX= v
4	CATEGORIES= deskutils	4	CATEGORIES= deskutils
5		5
Lines 17-52 USES= cmake:noninja compiler:c++14-lang desktop-file-utils gmake \ Link Here
17	gnome iconv kde:5 localbase:ldflags pkgconfig qt:5 shared-mime-info \	17	gnome iconv kde:5 localbase:ldflags pkgconfig qt:5 shared-mime-info \
18	sqlite ssl	18	sqlite ssl
19	USE_KDE= archive	19	USE_KDE= archive
		20	USE_LDCONFIG= yes
20	USE_QT= buildtools:build concurrent core dbus declarative graphicaleffects \	21	USE_QT= buildtools:build concurrent core dbus declarative graphicaleffects \
21	gui linguist:build location network printsupport qmake:build \	22	gui linguist:build network qmake:build quickcontrols \
22	quickcontrols quickcontrols2 svg webchannel websockets \	23	quickcontrols2 sql svg websockets widgets xml
23	widgets xml	24
24	CMAKE_ARGS= -DBUILD_UPDATER:BOOL=OFF \	25	CMAKE_ARGS= -DBUILD_UPDATER:BOOL=OFF \
25	-DCMAKE_INSTALL_MANDIR:STRING=man \	26	-DCMAKE_INSTALL_MANDIR:STRING=man \
26	-DWITH_STACK_PROTECTOR:BOOL=OFF	27	-DWITH_STACK_PROTECTOR:BOOL=OFF
27	USE_LDCONFIG= yes	28
		29	PLIST_SUB= VERSION=${PORTVERSION}
28		30
29	USE_GITHUB= yes	31	USE_GITHUB= yes
30	GH_ACCOUNT= nextcloud	32	GH_ACCOUNT= nextcloud
31	GH_PROJECT= desktop	33	GH_PROJECT= desktop
32		34
33	#OPTIONS_DEFINE= DEBUG DOCS	35	OPTIONS_DEFINE= DOCS DEBUG GNOME KDE WEBENGINE
34	OPTIONS_DEFINE= DEBUG WEBENGINE # DOCS doesn't build currently	36	OPTIONS_DEFAULT= GNOME
		37	OPTIONS_DEFAULT_aarch64= WEBENGINE
35	OPTIONS_DEFAULT_amd64= WEBENGINE	38	OPTIONS_DEFAULT_amd64= WEBENGINE
36	OPTIONS_DEFAULT_i386= WEBENGINE	39	OPTIONS_DEFAULT_i386= WEBENGINE
37	OPTIONS_DEFAULT_aarch64= WEBENGINE
38		40
		41	OPTIONS_SUB= yes
		42
		43	KDE_DESC= KDE desktop environment support
39	WEBENGINE_DESC= Use Webengine to provide web login flow	44	WEBENGINE_DESC= Use Webengine to provide web login flow
40		45
41	#DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx \	46	DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx \
42	# doxygen:devel/doxygen	47	doxygen:devel/doxygen
43	#DOCS_USES= tex	48	DOCS_USES= tex
44	#DOCS_USE= TEX=dvipsk:build,latex:build	49	DOCS_USE= TEX=dvipsk:build,latex:build
45	#DOCS_CMAKE_ON= -DWITH_DOC:BOOL=ON	50	DOCS_CMAKE_BOOL= WITH_DOC
		51	DOCS_VARS= PORTDOCS=*
46		52
47	WEBENGINE_VARS= USE_QT+=webengine	53	GNOME_CMAKE_BOOL= BUILD_SHELL_INTEGRATION_NAUTILUS
48		54
49	PLIST_SUB= VERSION=${PORTVERSION}	55	KDE_USES= xorg
		56	KDE_USE= KDE=completion,config,coreaddons,ecm,jobwidgets,kio,service,solid,widgetsaddons,windowsystem \
		57	XORG=x11
		58	KDE_CMAKE_BOOL= BUILD_SHELL_INTEGRATION_DOLPHIN
		59
		60	WEBENGINE_USE= QT=webchannel,webengine,printsupport,location
		61	WEBENGINE_CMAKE_BOOL= BUILD_WITH_WEBENGINE
50		62
51	.include <bsd.port.pre.mk>	63	.include <bsd.port.pre.mk>
52		64
Lines 58-67 post-patch: Link Here
58	@${REINPLACE_CMD} -e \	70	@${REINPLACE_CMD} -e \
59	's\|.lst \|.lst.sample \|' ${WRKSRC}/CMakeLists.txt	71	's\|.lst \|.lst.sample \|' ${WRKSRC}/CMakeLists.txt
60		72
61	post-patch-WEBENGINE-off:
62	@${REINPLACE_CMD} -e '/add_compile_definitions(WITH_WEBENGINE=1)/d' \
63	${WRKSRC}/src/CMakeLists.txt
64
65	pre-configure:	73	pre-configure:
66	@(cd ${WRKSRC} && ${CP} -f sync-exclude.lst sync-exclude.lst.sample)	74	@(cd ${WRKSRC} && ${CP} -f sync-exclude.lst sync-exclude.lst.sample)
67		75

Removed Link Here

(-)a/deskutils/nextcloudclient/files/patch-src_CMakeLists.txt (-41 lines)
1	--- src/CMakeLists.txt.orig 2023-02-09 20:54:58 UTC
2	+++ src/CMakeLists.txt
3	@@ -31,30 +31,16 @@ find_package(Qt5WebEngineWidgets ${REQUIRED_QT_VERSION
4	)
5
6	find_package(Qt5WebEngineWidgets ${REQUIRED_QT_VERSION} CONFIG QUIET)
7	-if(APPLE)
8	- set_package_properties(Qt5WebEngineWidgets PROPERTIES
9	- DESCRIPTION "Qt5 WebEngineWidgets component."
10	- TYPE RECOMMENDED
11	- )
12	-else()
13	- set_package_properties(Qt5WebEngineWidgets PROPERTIES
14	- DESCRIPTION "Qt5 WebEngineWidgets component."
15	- TYPE REQUIRED
16	- )
17	-endif()
18	+set_package_properties(Qt5WebEngineWidgets PROPERTIES
19	+ DESCRIPTION "Qt5 WebEngineWidgets component."
20	+ TYPE RECOMMENDED
21	+)
22
23	find_package(Qt5WebEngine ${REQUIRED_QT_VERSION} CONFIG QUIET)
24	-if(APPLE)
25	- set_package_properties(Qt5WebEngine PROPERTIES
26	- DESCRIPTION "Qt5 WebEngine component."
27	- TYPE RECOMMENDED
28	- )
29	-else()
30	- set_package_properties(Qt5WebEngine PROPERTIES
31	- DESCRIPTION "Qt5 WebEngine component."
32	- TYPE REQUIRED
33	- )
34	-endif()
35	+set_package_properties(Qt5WebEngine PROPERTIES
36	+ DESCRIPTION "Qt5 WebEngine component."
37	+ TYPE RECOMMENDED
38	+)
39
40	if(Qt5WebEngine_FOUND AND Qt5WebEngineWidgets_FOUND)
41	add_compile_definitions(WITH_WEBENGINE=1)

Lines 13-24 include/nextcloudsync/mirall/syncresult.h Link Here

(-)b/deskutils/nextcloudclient/pkg-plist (-3 / +8 lines)
13	lib/libnextcloud_csync.so	13	lib/libnextcloud_csync.so
14	lib/libnextcloud_csync.so.0	14	lib/libnextcloud_csync.so.0
15	lib/libnextcloud_csync.so.%%VERSION%%	15	lib/libnextcloud_csync.so.%%VERSION%%
		16	%%KDE%%lib/libnextclouddolphinpluginhelper.so
16	lib/libnextcloudsync.so	17	lib/libnextcloudsync.so
17	lib/libnextcloudsync.so.0	18	lib/libnextcloudsync.so.0
18	lib/libnextcloudsync.so.%%VERSION%%	19	lib/libnextcloudsync.so.%%VERSION%%
19	lib/nextcloudsync_vfs_suffix.so	20	lib/nextcloudsync_vfs_suffix.so
		21	%%DOCS%%man/man1/nextcloud.1.gz
		22	%%DOCS%%man/man1/nextcloudcmd.1.gz
		23	%%KDE%%%%QT_PLUGINDIR%%/kf5/kfileitemaction/nextclouddolphinactionplugin.so
		24	%%KDE%%%%QT_PLUGINDIR%%/kf5/overlayicon/nextclouddolphinoverlayplugin.so
20	share/applications/com.nextcloud.desktopclient.nextcloud.desktop	25	share/applications/com.nextcloud.desktopclient.nextcloud.desktop
21	share/caja-python/extensions/syncstate-Nextcloud.py	26	%%GNOME%%share/caja-python/extensions/syncstate-Nextcloud.py
22	share/icons/hicolor/1024x1024/apps/Nextcloud.png	27	share/icons/hicolor/1024x1024/apps/Nextcloud.png
23	share/icons/hicolor/128x128/apps/Nextcloud.png	28	share/icons/hicolor/128x128/apps/Nextcloud.png
24	share/icons/hicolor/128x128/apps/Nextcloud_error.png	29	share/icons/hicolor/128x128/apps/Nextcloud_error.png
Lines 85-92 share/icons/hicolor/72x72/apps/Nextcloud_sync_shared.png Link Here
85	share/icons/hicolor/72x72/apps/Nextcloud_warn.png	90	share/icons/hicolor/72x72/apps/Nextcloud_warn.png
86	share/icons/hicolor/72x72/apps/Nextcloud_warn_shared.png	91	share/icons/hicolor/72x72/apps/Nextcloud_warn_shared.png
87	share/mime/packages/nextcloud.xml	92	share/mime/packages/nextcloud.xml
88	share/nautilus-python/extensions/syncstate-Nextcloud.py	93	%%GNOME%%share/nautilus-python/extensions/syncstate-Nextcloud.py
89	share/nemo-python/extensions/syncstate-Nextcloud.py	94	%%GNOME%%share/nemo-python/extensions/syncstate-Nextcloud.py
90	share/nextcloud/i18n/client_TW.qm	95	share/nextcloud/i18n/client_TW.qm
91	share/nextcloud/i18n/client_af.qm	96	share/nextcloud/i18n/client_af.qm
92	share/nextcloud/i18n/client_ar.qm	97	share/nextcloud/i18n/client_ar.qm