From nobody Mon Nov 1 02:41:53 2021 X-Original-To: dev-commits-ports-all@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 1FD091818052; Mon, 1 Nov 2021 02:41:54 +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 4HjHNy0MnFz3lkS; Mon, 1 Nov 2021 02:41:54 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 E0E6B16C1; Mon, 1 Nov 2021 02:41:53 +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 1A12frmA063302; Mon, 1 Nov 2021 02:41:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1A12frvu063301; Mon, 1 Nov 2021 02:41:53 GMT (envelope-from git) Date: Mon, 1 Nov 2021 02:41:53 GMT Message-Id: <202111010241.1A12frvu063301@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: faf97a481bfd - main - devel/gammaray: make it possible to build without webengine List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: faf97a481bfd54f1ebaa205508234cedd6a0aaef Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=faf97a481bfd54f1ebaa205508234cedd6a0aaef commit faf97a481bfd54f1ebaa205508234cedd6a0aaef Author: Piotr Kubaj AuthorDate: 2021-11-01 02:40:27 +0000 Commit: Piotr Kubaj CommitDate: 2021-11-01 02:40:27 +0000 devel/gammaray: make it possible to build without webengine --- devel/gammaray/Makefile | 12 ++++++++++-- devel/gammaray/pkg-plist | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/devel/gammaray/Makefile b/devel/gammaray/Makefile index 9de624d0149a..851930070528 100644 --- a/devel/gammaray/Makefile +++ b/devel/gammaray/Makefile @@ -14,14 +14,22 @@ USES= cmake kde:5 pkgconfig qt:5 USE_QT= 3d concurrent core declarative designer gui help linguisttools \ location network printsupport script scripttools svg uiplugin \ - webchannel webengine widgets xml buildtools_build qdoc_build \ - qmake_build + webchannel widgets xml buildtools_build qdoc_build qmake_build USE_KDE= coreaddons syntaxhighlighting USE_GITHUB= yes GH_ACCOUNT= KDAB GH_PROJECT= GammaRay +.include + +.if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == i386 +PLIST_SUB= WEBENGINE="" +USE_QT+= webengine +.else +PLIST_SUB= WEBENGINE="@comment " +.endif + PLIST_SUB+= ARCH=${ARCH:S/amd64/x86_64/} \ PORTMAJMIN=${PORTVERSION:C/(.*)\..*/\1/} \ PORTVERSION=${PORTVERSION} \ diff --git a/devel/gammaray/pkg-plist b/devel/gammaray/pkg-plist index fc21ed34f78c..3c34c48a9c47 100644 --- a/devel/gammaray/pkg-plist +++ b/devel/gammaray/pkg-plist @@ -117,7 +117,7 @@ lib/gammaray/%%PORTMAJMIN%%/qt%%QTVER%%-%%ARCH%%/gammaray_timertop_ui_plugin.so lib/gammaray/%%PORTMAJMIN%%/qt%%QTVER%%-%%ARCH%%/gammaray_translatorinspector_ui.so lib/gammaray/%%PORTMAJMIN%%/qt%%QTVER%%-%%ARCH%%/gammaray_translatorinspector.so lib/gammaray/%%PORTMAJMIN%%/qt%%QTVER%%-%%ARCH%%/gammaray_webinspector_plugin.so -lib/gammaray/%%PORTMAJMIN%%/qt%%QTVER%%-%%ARCH%%/gammaray_webinspector_ui_plugin.so +%%WEBENGINE%%lib/gammaray/%%PORTMAJMIN%%/qt%%QTVER%%-%%ARCH%%/gammaray_webinspector_ui_plugin.so lib/gammaray/%%PORTMAJMIN%%/qt%%QTVER%%-%%ARCH%%/gammaray_widgetinspector_plugin.so lib/gammaray/%%PORTMAJMIN%%/qt%%QTVER%%-%%ARCH%%/gammaray_widgetinspector_ui_plugin.so lib/gammaray/%%PORTMAJMIN%%/qt%%QTVER%%-%%ARCH%%/gammaray_wlcompositorinspector_ui.so