From nobody Fri Nov 10 20:17:25 2023 X-Original-To: dev-commits-ports-branches@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 4SRqqp27Ypz50F1b; Fri, 10 Nov 2023 20:17:26 +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 4SRqqp1h9rz4ZpC; Fri, 10 Nov 2023 20:17:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699647446; 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=HSplXaKhrpkM0G/zanvtH0HQsSm4v5p1dpWtP6u5+/g=; b=eHg/k7M/Nm3+FDpV3Kvo2k1C3X7E/Yy5bkUniwkG1qwd3Mpl1J7r+xS2hg+GDbm1544NuH g90D/vjvDhBWxhoa9eg3AZDXE+e+vM+HQC0RueQjB8kezo6jvYasfxsQh+naU4LlsYin73 NuyGC8ZXC3uSan+WEhSKVuCz5z4Lj4gMAljdZftB1CA1rImoPIVs1NXb7Abej6fnFE6sXp tqXvsRFQ6NVI0FqpUk1GaKAT1+H1k7XBb16OPSh3M70yFJPwjjnsiBE3OGoQ6Kv/aSf8Go 8nrH6F71HpgTyxk64mh2b8dGhCba/aGj/RGow02IERBgDj1BByW/eISEkJfjwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699647446; 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=HSplXaKhrpkM0G/zanvtH0HQsSm4v5p1dpWtP6u5+/g=; b=VxOtl3xRoLDY9J4G3GHtyyTSv+T0hJW7H1zDuVLiIU2IefzFaIgv1btQpzk0DchMf+l/wQ 1QoMsQl3BWZGrHz2SbRqcJTnsSO2HH4RHu2bAiizyglXa4G+U7kS1oOXIhijvSobmnG736 8WMFQF9vZXcLEIKQUmq5UP9ZcqW3wtL5qUlh7qHSMUHdsBV/Znb/08qBPAa90Gav6Hh2eb bHyOC3dNyBH6fH7epjm/Y+VQWie2JtBGjHPRKnBOIIoH+nRr1MlaNfelggGZGORkRlAYx9 38tgmRUXjHI5FhcSp6Sgfw6ddvadLwDIY2LNTJo+G/T+ktIwFIuGmk7j8yCDiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699647446; a=rsa-sha256; cv=none; b=p4Fy3z+NwXZX+SI7yUv2TwZ7XBZYXudwxKwBzNWdxoRBu1m5MNhKhV3exA8fCmSyqwpVsD Kaq5EMR916TgpqsB3jYzOYMGATqeBv0GDKZ3gFGthi1djcVvEnNI/o8kmbybvll1OxwcCR ML4nVVdJ9WfYt8OiIyy97oxpA+zbC92RbqZ1nFoZJGYBS9ZthdI8oV0rxmXBXzRA9LpuQW XET9v70ubg49nhG25O+/q1rJDI1NC7AK40rd0TXEzVygumqQzaTMdw0HNxjf/4BPbhWji0 dUcJ9Bw0/JVGsLZa5OymFgF25u2NDF0deRs2Z8bRZChNI9oOnPPYcoo8Z/9L6g== 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 4SRqqp0SNFz1BBD; Fri, 10 Nov 2023 20:17:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AAKHPjb036354; Fri, 10 Nov 2023 20:17:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AAKHPwF036351; Fri, 10 Nov 2023 20:17:25 GMT (envelope-from git) Date: Fri, 10 Nov 2023 20:17:25 GMT Message-Id: <202311102017.3AAKHPwF036351@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jose Alonso Cardenas Marquez Subject: git: b85c2f097ce4 - 2023Q4 - Mk/Uses: Add support for lazarus-qt6-devel List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: acm X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q4 X-Git-Reftype: branch X-Git-Commit: b85c2f097ce48b28f4ee2df5187021a0a79459f2 Auto-Submitted: auto-generated The branch 2023Q4 has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=b85c2f097ce48b28f4ee2df5187021a0a79459f2 commit b85c2f097ce48b28f4ee2df5187021a0a79459f2 Author: Jose Alonso Cardenas Marquez AuthorDate: 2023-10-29 17:54:11 +0000 Commit: Jose Alonso Cardenas Marquez CommitDate: 2023-11-10 20:17:18 +0000 Mk/Uses: Add support for lazarus-qt6-devel (cherry picked from commit b9432b9be484a7c96696ed17ef3198ba324c6c72) --- Mk/Uses/lazarus.mk | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/Mk/Uses/lazarus.mk b/Mk/Uses/lazarus.mk index ce2ce2c3c4e3..0f7cc934562e 100644 --- a/Mk/Uses/lazarus.mk +++ b/Mk/Uses/lazarus.mk @@ -9,7 +9,9 @@ # gtk2 - This automatically build lazarus-app with gtk2 interface # # qt5 - This automatically build lazarus-app with qt5 interface -# +# +# qt6 - This automatically build lazarus-app with qt6 interface +# # flavors - This automatically build lazarus-app with flavors feature # # If the port not requires compile lazarus project files automatically, you can @@ -46,13 +48,17 @@ _INCLUDE_USES_LAZARUS_MK= yes WARNING+= "DEFAULT_LAZARUS_VER is defined, consider using DEFAULT_VERSIONS=lazarus=${DEFAULT_LAZARUS_VER} instead" . endif -. if ${lazarus_ARGS:Ngtk2:Nqt5:Nflavors} -IGNORE= Unknown argument for USES=lazarus: ${lazarus_ARGS:Ngtk2:Nqt5:Nflavors} +. if ${lazarus_ARGS:Mqt6} && !defined(WANT_LAZARUS_DEVEL) +IGNORE= "DEFAULT_LAZARUS_VER not support qt6 flavor, consider using: gtk2 or qt5 instead" +. endif + +. if ${lazarus_ARGS:Ngtk2:Nqt5:Nqt6:Nflavors} +IGNORE= Unknown argument for USES=lazarus: ${lazarus_ARGS:Ngtk2:Nqt5:Nqt6:Nflavors} . endif . if !empty(LAZARUS_NO_FLAVORS) -. if ${LAZARUS_NO_FLAVORS:Ngtk2:Nqt5} -IGNORE= Unknown argument for LAZARUS_NO_FLAVORS: ${LAZARUS_NO_FLAVORS:Ngtk2:Nqt5} +. if ${LAZARUS_NO_FLAVORS:Ngtk2:Nqt5:Nqt6} +IGNORE= Unknown argument for LAZARUS_NO_FLAVORS: ${LAZARUS_NO_FLAVORS:Ngtk2:Nqt5:Nqt6} . endif . endif @@ -78,6 +84,10 @@ MKINSTDIR= ${LOCALBASE}/lib/fpc/${FPC_VER}/fpmkinst/${BUILDNAME} LAZARUS_FLAVORS= gtk2 qt5 +. if defined(WANT_LAZARUS_DEVEL) +LAZARUS_FLAVORS+= qt6 +. endif + . if ${lazarus_ARGS:Mflavors} . if defined(LAZARUS_NO_FLAVORS) . for flavor in ${LAZARUS_NO_FLAVORS} @@ -117,6 +127,12 @@ LCL_PLATFORM= qt5 BUILD_DEPENDS+= ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-qt5${LAZARUS_DEVELSUFFIX} . endif +. if ${lazarus_ARGS:Mqt6} || ${FLAVOR} == qt6 +LIB_DEPENDS+= libQt6Pas.so:x11-toolkits/qt6pas +LCL_PLATFORM= qt6 +BUILD_DEPENDS+= ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-qt6${LAZARUS_DEVELSUFFIX} +. endif + LAZBUILD_CMD= ${LOCALBASE}/bin/lazbuild LAZBUILD_ARGS?= # empty