From nobody Tue Mar 22 19:56:40 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 2F9B21A24499; Tue, 22 Mar 2022 19:56:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KNMgs0gHYz4bwT; Tue, 22 Mar 2022 19:56:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647979001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7sfJ9pWtqVFaYqqrN66/hnIkR0EH2yZwAahSDuDZ7Po=; b=hy+elkHDZT/Nee3GK4w9TlgHCKs+hDOx0HCYC2O1zDgq4tQKGPkdjPq3POjt9mzODeaUDr sUBuai9eNujVaRO8A0ihRsqV8QkQNRlSAG9ZJrps0dWQtY0lMmZa13M3EFmaAAT9XhbaEz opYiHZJJEsAWl9lcwIUCuR1bAFL7a6jgeVKH03QwvUqxru71jCwlNwUNc0i0bNCvcWoMOT W9tXKGzhk4XyfWvVUfhtpc2lFE7KwaRFu95XIomcUR7/XMbv409WNXvmEdM842fjb/nOGW ozk787W7nySvL843jjrRPhOzXbKDZj4GpyXnLa7jjjAPiWg59axbdAJtVnfe4A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EAFAA15CF1; Tue, 22 Mar 2022 19:56:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22MJue9H081180; Tue, 22 Mar 2022 19:56:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22MJueCJ081179; Tue, 22 Mar 2022 19:56:40 GMT (envelope-from git) Date: Tue, 22 Mar 2022 19:56:40 GMT Message-Id: <202203221956.22MJueCJ081179@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: 05149951ce60 - main - devel/pyside2*: optionize webengine support List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 05149951ce605c2781167299653b81577e5a2b64 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647979001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7sfJ9pWtqVFaYqqrN66/hnIkR0EH2yZwAahSDuDZ7Po=; b=lFYubivr1hBcIvRj5hzBGFL5pPOcmtfLDce5uW/vcoWY2jg36pLLqcAFjlYBCtdIMDlH2J Yiu7FHp5yhQJDv/cCMc4lYc4M05/eGONwhegs4ExJQ9EyEPWc/wxBR9M/8Fog9EcH8tRno 1717OsFbBQDCJm27L7oGpZcaCQlkL1TQHpggY7gzwp4tnYrPWAOvzmdkmE2S0w3ljoEkVy r/dz6PZd7S0et9s39eoJyXgYo1iYOJlW/i5XeX9FZ8bz445QDIPeNqi6YBxVyQBEjuFl7L OcxMFPnQ73AU5MeWn6MW9j4OSfNxVb05ZgIZ/Qs16+WskzffRhjNiBFrSQYaiQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647979001; a=rsa-sha256; cv=none; b=kNXrC9qm4xyuw0nTxg7qVHComB7sSFau5n3/t3Ulej6SKK94wKtq/v5OSPI7q4637YvAni qg6yclbIFKTO0zYvnpxmzpPYSpskbGHNofvlm8rq7KjWy+TZVBnN7rnrGcB0Xqy2EZEFSF XKAAhjhQnqamwrp0+e1yZpQ9e6z1MR6b/SUOfremClGboOIJOBkSElj5qoVETCyIhpynS8 1MiWZf96pV6GaEKceJ7+/Br+mV5VlFxehpV1xgv5kJRJqYcxdl4JTgfqn6j2PgRdxNU+7B MqNKu+cHWEM+DlYroaMNkHcSsdxc1b25LZlLuyLjMhwuXSAlsaYl34yLxGsReQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=05149951ce605c2781167299653b81577e5a2b64 commit 05149951ce605c2781167299653b81577e5a2b64 Author: Dmitry Marakasov AuthorDate: 2022-03-02 12:08:56 +0000 Commit: Dmitry Marakasov CommitDate: 2022-03-22 19:50:31 +0000 devel/pyside2*: optionize webengine support PR: 262558 Approved by: tcberner --- devel/pyside2-tools/Makefile | 17 +++++++++++++---- devel/pyside2/Makefile | 14 +++++++++++--- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/devel/pyside2-tools/Makefile b/devel/pyside2-tools/Makefile index 91efc9a1ecbe..c67e47025397 100644 --- a/devel/pyside2-tools/Makefile +++ b/devel/pyside2-tools/Makefile @@ -30,12 +30,21 @@ SHEBANG_FILES= pyside_tool.py CMAKE_ARGS+= "-DUSE_PYTHON_VERSION=${PYTHON_VER}" -.include - 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 + +.if ${PORT_OPTIONS:MWEBENGINE} USE_QT+= webengine +.else +CMAKE_ARGS+= -DDISABLE_QtWebEngine:BOOL=TRUE .endif -.include +.include diff --git a/devel/pyside2/Makefile b/devel/pyside2/Makefile index e7211fb4fc05..e79b08c266ff 100644 --- a/devel/pyside2/Makefile +++ b/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 +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 + +.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 +.include