Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 25 Dec 2021 14:48:04 GMT
From:      Piotr Kubaj <pkubaj@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: dc123a0b00ae - main - deskutils/mindforger: fix build on non-aarch64 non-x86
Message-ID:  <202112251448.1BPEm4H3036173@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by pkubaj:

URL: https://cgit.FreeBSD.org/ports/commit/?id=dc123a0b00ae563e1fcdbca99934d8a7398bc0b5

commit dc123a0b00ae563e1fcdbca99934d8a7398bc0b5
Author:     Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2021-12-25 14:41:49 +0000
Commit:     Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2021-12-25 14:41:49 +0000

    deskutils/mindforger: fix build on non-aarch64 non-x86
---
 deskutils/mindforger/Makefile | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/deskutils/mindforger/Makefile b/deskutils/mindforger/Makefile
index cd0e1d333d93..ff215988020e 100644
--- a/deskutils/mindforger/Makefile
+++ b/deskutils/mindforger/Makefile
@@ -11,14 +11,14 @@ LICENSE=	GPLv2+
 
 USES=		qmake qt:5
 USE_QT=		buildtools_build core declarative gui location network \
-		printsupport webchannel webengine widgets
+		printsupport webchannel widgets
 USE_GITHUB=	yes
 GH_ACCOUNT=	dvorka
 GH_PROJECT=	cmark:cm
 GH_TAGNAME=	f06d944:cm
 GH_SUBDIR=	deps/cmark-gfm:cm
 
-QMAKE_ARGS=	CONFIG+="mfnocxx mfwebengine"
+QMAKE_ARGS=	CONFIG+="mfnocxx"
 
 OPTIONS_DEFINE=	CMARK
 OPTIONS_DEFAULT=	CMARK
@@ -27,6 +27,15 @@ CMARK_DESC=	CommonMark support (Markdown -> HTML rendering)
 CMARK_BUILD_DEPENDS=	cmake:devel/cmake
 CMARK_QMAKE_OFF=	CONFIG+="mfnomd2html"
 
+.include <bsd.port.options.mk>
+
+.if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == i386
+USE_QT+=	webengine
+QMAKE_ARGS+=	CONFIG+="mfwebengine"
+.else
+USE_QT+=	webkit
+.endif
+
 pre-build-CMARK-on:
 	@cd ${WRKSRC_cm} && cmake -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
 		-DCMARK_TESTS:BOOL=OFF -DCMARK_SHARED:BOOL=OFF \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202112251448.1BPEm4H3036173>