From nobody Sat Dec 25 14:48:04 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 5948118FABA9; Sat, 25 Dec 2021 14:48:05 +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 4JLmxx0gzdz3rWB; Sat, 25 Dec 2021 14:48:05 +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 EB930191AF; Sat, 25 Dec 2021 14:48:04 +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 1BPEm4UG036174; Sat, 25 Dec 2021 14:48:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BPEm4H3036173; Sat, 25 Dec 2021 14:48:04 GMT (envelope-from git) Date: Sat, 25 Dec 2021 14:48:04 GMT Message-Id: <202112251448.1BPEm4H3036173@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: dc123a0b00ae - main - deskutils/mindforger: fix build on non-aarch64 non-x86 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: dc123a0b00ae563e1fcdbca99934d8a7398bc0b5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640443685; 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=m5OpExRv6mK6pKSA3EXMsFHbDgzx1NH8EqRupNdsUSE=; b=fDbI9/D9fU9R8wLOBzHMMxv15y+Tz0x2VfebYJKY1qIn6wDOMF1MZxhSxbmyq0txt8wqok Yhn3zHZCgW3KUg9nbbauGdQY73ftmVsNlIcNDNTsUYuD0S4kPUejrgwJdAJtTDGeRLl/FR 0gBmcGvS88vNqTHUIsCv9KiRezVNqLAH5czE7Qya7ibkuCodOUgF8V7au6y01mLVuewvFo r38oTVT3tSU9Bb1zs42svVqwCjlaj1gOqxLGkqxoRk5krYaMA4ThrR0ycmjjAejli33lG0 b6Y+wca5cbmg9LN3oHBf+FYaE60ATbcrHeVcrAUK1zp7kg4/T7p/YIyP+Kv8cw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640443685; a=rsa-sha256; cv=none; b=uD1RoQZRTYIEZ1XIPpV9XZ7Mos+lF84T0RYLMhrNr6AhyrB/++S35uHfcj94r5dknXIt6S g9n1lebdIUac1Tk77wvz8oswCZ/CGNZ2F4UkViSAdFzTyxq6soRZFGD6wEyxOHiK71FHYz M+qWvIXQyO7FLHcr8ZAWc+966/pfJqPM5s6qHT8rAmnm4ruKbzrj72gunDCm08gfTtbJ3x maIwgtdc9IgseoMwuCXfy2n79sGGZTjKxk0AZxntKmGOtFKo0bGLjHY7iMJVRfMEn4NISg g8fZv1aJoLfagAADdAXkAfTFH2N6iDwETVCS3yJ/B27IkebblWdWUlPSg9fBag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=dc123a0b00ae563e1fcdbca99934d8a7398bc0b5 commit dc123a0b00ae563e1fcdbca99934d8a7398bc0b5 Author: Piotr Kubaj AuthorDate: 2021-12-25 14:41:49 +0000 Commit: Piotr Kubaj 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 + +.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 \