Attachment 232461 Details for Bug 262558 – Patch

[patch] Patch

pyside.patch (text/plain), 2.19 KB, created by Dmitry Marakasov on 2022-03-14 19:47:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Marakasov

Created: 2022-03-14 19:47:27 UTC

Size: 2.19 KB

patch

obsolete

>commit 21ab8ace240dd2380276c5758a97c71b7c57fc97
>Author: Dmitry Marakasov <amdmi3@FreeBSD.org>
>Date:   Wed Mar 2 15:08:56 2022 +0300
>
>    devel/pyside2*: optionize webengine support
>
>diff --git devel/pyside2-tools/Makefile devel/pyside2-tools/Makefile
>index 91efc9a1ecbe..c67e47025397 100644
>--- devel/pyside2-tools/Makefile
>+++ devel/pyside2-tools/Makefile
>@@ -30,12 +30,21 @@ SHEBANG_FILES=	pyside_tool.py
> 
> CMAKE_ARGS+=	"-DUSE_PYTHON_VERSION=${PYTHON_VER}"
> 
>-.include <bsd.port.pre.mk>
>-
> WRKSRC=		${WRKDIR}/pyside-setup-opensource-src-${DISTVERSION:C/^([0-9].[0-9]+.[0-9])(.[0-9])?/\1/}/sources/pyside2-tools
> 
>-.if ${ARCH} == amd64 || ${ARCH} == i386
>+OPTIONS_DEFINE_i386=	WEBENGINE
>+OPTIONS_DEFINE_amd64=	WEBENGINE
>+OPTIONS_DEFAULT_i386=	WEBENGINE
>+OPTIONS_DEFAULT_amd64=	WEBENGINE
>+
>+WEBENGINE_DESC=	Enable QtWebEngine support
>+
>+.include <bsd.port.options.mk>
>+
>+.if ${PORT_OPTIONS:MWEBENGINE}
> USE_QT+=	webengine
>+.else
>+CMAKE_ARGS+=	-DDISABLE_QtWebEngine:BOOL=TRUE
> .endif
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff --git devel/pyside2/Makefile devel/pyside2/Makefile
>index e7211fb4fc05..e79b08c266ff 100644
>--- devel/pyside2/Makefile
>+++ devel/pyside2/Makefile
>@@ -28,18 +28,26 @@ USE_QT=		3d buildtools_build charts concurrent core datavis3d declarative \
> CMAKE_ARGS+=	"-DUSE_PYTHON_VERSION=${PYTHON_VER}" \
> 		"-DPYTHON_EXECUTABLE=${PYTHON_CMD}"
> 
>-.include <bsd.port.pre.mk>
>+OPTIONS_DEFINE_i386=	WEBENGINE
>+OPTIONS_DEFINE_amd64=	WEBENGINE
>+OPTIONS_DEFAULT_i386=	WEBENGINE
>+OPTIONS_DEFAULT_amd64=	WEBENGINE
>+
>+WEBENGINE_DESC=	Enable QtWebEngine support
> 
> PLIST_SUB+=	PYVERSTR=.cpython-${PYTHON_SUFFIX}${PYTHON_ABIVER}
> PLIST_SUB+=	DISTVERSION=${DISTVERSION}
> 
> WRKSRC=		${WRKDIR}/pyside-setup-opensource-src-${DISTVERSION:C/^([0-9].[0-9]+.[0-9])(.[0-9])?/\1/}/sources/pyside2
> 
>-.if ${ARCH} == amd64 || ${ARCH} == i386
>+.include <bsd.port.options.mk>
>+
>+.if ${PORT_OPTIONS:MWEBENGINE}
> PLIST_SUB+=	WEBENGINE=""
> USE_QT+=	webengine
> .else
> PLIST_SUB+=	WEBENGINE="@comment "
>+CMAKE_ARGS+=	-DDISABLE_QtWebEngine:BOOL=TRUE
> .endif
> 
> post-install:
>@@ -50,4 +58,4 @@ post-install:
> 		-f -d ${PYTHONPREFIX_SITELIBDIR} \
> 		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>

Actions: View | Diff

Attachments on bug 262558: 232461