Attachment 253933 Details for Bug 281544 – Fix guiaddons conflict

[patch] Fix guiaddons conflict

nc.diff (text/plain), 1.57 KB, created by Guido Falsi on 2024-10-01 11:14:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guido Falsi

Created: 2024-10-01 11:14:53 UTC

Size: 1.57 KB

patch

obsolete

>diff --git a/deskutils/nextcloudclient/Makefile b/deskutils/nextcloudclient/Makefile
>index dcd74cb4a227..464f42897405 100644
>--- a/deskutils/nextcloudclient/Makefile
>+++ b/deskutils/nextcloudclient/Makefile
>@@ -30,7 +30,7 @@ USE_GITHUB=	yes
> GH_ACCOUNT=	nextcloud
> GH_PROJECT=	desktop
> 
>-OPTIONS_DEFINE=			DOCS DEBUG GNOME KDE WEBENGINE
>+OPTIONS_DEFINE=			DOCS DEBUG GNOME GUIADDONS KDE WEBENGINE
> OPTIONS_DEFAULT=		GNOME
> OPTIONS_DEFAULT_aarch64=	WEBENGINE
> OPTIONS_DEFAULT_amd64=		WEBENGINE
>@@ -38,6 +38,7 @@ OPTIONS_DEFAULT_i386=		WEBENGINE
> 
> OPTIONS_SUB=	yes
> 
>+GUIADDONS_DESC=		Use KDE guiaddons (implies KDE)
> KDE_DESC=		KDE desktop environment support
> WEBENGINE_DESC=		Use Webengine to provide web login flow
> 
>@@ -51,10 +52,13 @@ DOCS_VARS=		PORTDOCS=*
> GNOME_CMAKE_BOOL=	BUILD_SHELL_INTEGRATION_NAUTILUS
> 
> KDE_USES=		xorg
>-KDE_USE=		KDE=completion,config,coreaddons,ecm:build,guiaddons,jobwidgets,kio,service,solid,widgetsaddons,windowsystem \
>+KDE_USE=		KDE=completion,config,coreaddons,ecm:build,jobwidgets,kio,service,solid,widgetsaddons,windowsystem \
> 			XORG=x11
> KDE_CMAKE_BOOL=		BUILD_SHELL_INTEGRATION_DOLPHIN
> 
>+GUIADDONS_IMPLIES=	KDE
>+GUIADDONS_USE=		KDE=guiaddons
>+
> WEBENGINE_USE=		QT=location,webchannel,webengine
> WEBENGINE_CMAKE_BOOL=	BUILD_WITH_WEBENGINE
> 
>@@ -68,6 +72,10 @@ post-patch:
> 	@${REINPLACE_CMD} -e \
> 		's|.lst |.lst.sample |' ${WRKSRC}/CMakeLists.txt
> 
>+post-patch-GUIADDONS-off:
>+	@${REINPLACE_CMD} -e '/^find_package.*KF6GuiAddons/d' \
>+		${WRKSRC}/src/gui/CMakeLists.txt
>+
> pre-configure:
> 	@(cd ${WRKSRC} && ${CP} -f sync-exclude.lst sync-exclude.lst.sample)
>

Flags:

madpilot: maintainer-approval? (vvd)
madpilot: maintainer-approval? (mr)

Actions: View | Diff

Attachments on bug 281544: 253611 | 253630 | 253861 | 253933 | 254471 | 255702