From nobody Sun Oct 29 17:54:43 2023 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 4SJPDg3VlDz4y0KJ; Sun, 29 Oct 2023 17:54:43 +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 4SJPDg33j2z4JC7; Sun, 29 Oct 2023 17:54:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698602083; 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=4hiMwyYjhFyyfZeqtuCqyS+LKCPCRuMmmAWllNgdKhM=; b=S8brA8azw8/sA7Gq4fyd0bl8BMktrkHYN16oauClxt+7tl2jF0gYAl5fcJWUbCL3UeU/wY bdq2sR+AoxswPXCqqqWF+x69W/X572rASZMBSVwhm3UmkzjTmLBU8gdOmnLOzrjZ9h/rqu 1JnRaTXvkm0rzuA8ptWzkmtMCfjkndeT27imMP9k7BPN1uwHJn8hE5zl17X6l+SQzhIrBk AW0DArvOfTrGXFDPfWDR/SwW6+njzVK2C2un0jGITsqq+Vp2t8+nnW1vnfoaJHDjwgbFP6 cndaoyCshwIc6q5ziEjhAuJWSL4OO0CVWGK+jnlxUqAfLurvxA5lNCPYJPXMDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698602083; 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=4hiMwyYjhFyyfZeqtuCqyS+LKCPCRuMmmAWllNgdKhM=; b=kFRW9cD3DCGv2fE3ok9bqP+mowm5myg4+9nlm+Biq2djg+z7tvu821ZVMoGGMQAPhfNkA6 Z/a73loUdajHm1Gd2BIhd1pD6SRoSyrAPMumftzHdi++wUchLEcmFQcxyV8ENAefu9mvre GCKhf8Ap5nDM5EVowOGABUJh0HhgUMuFcoAZYIgGuAeNBl51Q/XSQi2nE0JjeX6hUfmL4M qQiE2o7m2mWzSXaflBO3Ky0lCYrAGx8ywPGyZiIzyqYwrUg64z+VesxJ6PlEl9otS4WULS Pd1k7r+5/g4uNd4p1iVkZruJH59bCjZ2ZHrpNcfDVEHpdonfyL7aVsYxr9dJHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698602083; a=rsa-sha256; cv=none; b=bOtAMuz/JPdbfQL4CwRg3rjc5Siq8s7X0LNFCLIhl37lx/aVXuw++FLAJ+b44H2uh6oZKV 7Bv6nauL7d7Oubsr24tejN6+H9mvQq6DkKRRO77st7U+3dwDXqTWf23o1zPMZ51chtePPq Ku5O3y/7+D2ex5J/5YGRtyvQW6FUFt3xrXlE9mO2uSmLRkLSJb918fZ1EEQYXOsNlyRrfm Ww+WOL+HdAl4lKl6HGNoCmH4GYv4wLlIf0/Lgfg656YewOWf8IyL3ew03nIEagsXOZuISM 7s0X3nJ3VTfLJI0xhg95YnZr3v9oQ5dioeMWii5CZTKYJN7U3WvVpwV46EuR0w== 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 4SJPDg26m9zp97; Sun, 29 Oct 2023 17:54:43 +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 39THsh6U028058; Sun, 29 Oct 2023 17:54:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39THshDh028055; Sun, 29 Oct 2023 17:54:43 GMT (envelope-from git) Date: Sun, 29 Oct 2023 17:54:43 GMT Message-Id: <202310291754.39THshDh028055@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jose Alonso Cardenas Marquez Subject: git: b9432b9be484 - main - Mk/Uses: Add support for lazarus-qt6-devel 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: acm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b9432b9be484a7c96696ed17ef3198ba324c6c72 Auto-Submitted: auto-generated The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=b9432b9be484a7c96696ed17ef3198ba324c6c72 commit b9432b9be484a7c96696ed17ef3198ba324c6c72 Author: Jose Alonso Cardenas Marquez AuthorDate: 2023-10-29 17:54:11 +0000 Commit: Jose Alonso Cardenas Marquez CommitDate: 2023-10-29 17:54:11 +0000 Mk/Uses: Add support for lazarus-qt6-devel --- 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