Attachment 225755 Details for Bug 256076 – Patch to make samba a run-time dep

[patch] Patch to make samba a run-time dep

devel-libsoup.patch (text/plain), 2.00 KB, created by Adriaan de Groot on 2021-06-12 14:28:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adriaan de Groot

Created: 2021-06-12 14:28:27 UTC

Size: 2.00 KB

patch

obsolete

>diff --git devel/libsoup/Makefile devel/libsoup/Makefile
>index ab65d9a4bc01..484dcb010f92 100644
>--- devel/libsoup/Makefile
>+++ devel/libsoup/Makefile
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	libsoup
> PORTVERSION=	2.72.0
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	devel gnome
> MASTER_SITES=	GNOME
> DIST_SUBDIR=	gnome
>@@ -25,7 +25,13 @@ OPTIONS_SINGLE=			GSSAPI
> OPTIONS_SINGLE_GSSAPI=		GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
> OPTIONS_DEFAULT=		SMB GSSAPI_${${SSL_DEFAULT} == base :?BASE :NONE}
> 
>-SMB_USES=			samba:build
>+# Circular dependency samba -> tracker -> libsoup if the SPOTLIGHT
>+# option is turned on in samba. Since samba is a **runtime** only
>+# dependency, we can just tell it to be used. However, the Meson
>+# build does a **build** time check for samba (even though the code does
>+# a run-time check, too).
>+#
>+SMB_USES=			samba:run
> SMB_MESON_ENABLED=		ntlm
> 
> GSSAPI_BASE_USES=		gssapi
>@@ -53,4 +59,9 @@ MESON_ARGS=	-Dvapi=disabled \
> LIBVERSION=	1.11.0
> PLIST_SUB=	VERSION="2.4" LIBVERSION=${LIBVERSION}
> 
>+post-patch:
>+	${REINPLACE_CMD} \
>+		-e 's+@@NTLM_AUTH@@+${LOCALBASE}/bin/ntlm_auth+' \
>+		${WRKSRC}/meson.build
>+
> .include <bsd.port.mk>
>diff --git devel/libsoup/files/patch-meson.build devel/libsoup/files/patch-meson.build
>new file mode 100644
>index 000000000000..a5c6a02454bb
>--- /dev/null
>+++ devel/libsoup/files/patch-meson.build
>@@ -0,0 +1,17 @@
>+--- meson.build.orig	2021-06-12 13:43:16 UTC
>++++ meson.build
>+@@ -340,11 +340,11 @@ endif
>+ ################
>+ # NTLM not supported on Windows
>+ if host_machine.system() != 'windows'
>+-  ntlm_auth = find_program(get_option('ntlm_auth'), required: get_option('ntlm'))
>++  # ntlm_auth = find_program(get_option('ntlm_auth'), required: get_option('ntlm'))
>+ 
>+-  if ntlm_auth.found()
>++  if get_option('ntlm').enabled()
>+     add_project_arguments('-DUSE_NTLM_AUTH=1', language : 'c')
>+-    add_project_arguments('-DNTLM_AUTH="' + ntlm_auth.path() + '"', language : 'c')
>++    add_project_arguments('-DNTLM_AUTH="@@NTLM_AUTH@@"', language : 'c')
>+   endif
>+ endif
>+

Actions: View | Diff

Attachments on bug 256076: 225755