From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4A0F61580D3 for ; Sat, 25 Nov 2023 23:34:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9286A2BC037; Sat, 25 Nov 2023 23:34:57 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 529592BC037 for ; Sat, 25 Nov 2023 23:34:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5306233FD3F for ; Sat, 25 Nov 2023 23:34:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D8C0413B3 for ; Sat, 25 Nov 2023 23:34:54 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1700954747.306d1be4b48b586196f00210f5f46f0c496eeae9.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/ecm.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 306d1be4b48b586196f00210f5f46f0c496eeae9 X-VCS-Branch: master Date: Sat, 25 Nov 2023 23:34:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: dc3ad2b8-a507-4f65-8f4c-aa871d0711cf X-Archives-Hash: 2bf2d3934c2fd97ee89616333677a9f6 commit: 306d1be4b48b586196f00210f5f46f0c496eeae9 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Nov 18 22:56:55 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Nov 25 23:25:47 2023 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=306d1be4 ecm.eclass: Enforce QT_MAJOR_VERSION=6 for packages w/ KFMIN >= 5.240 Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/ecm.eclass | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass index 39780f422f..6b870688a1 100644 --- a/eclass/ecm.eclass +++ b/eclass/ecm.eclass @@ -148,7 +148,8 @@ fi # @DESCRIPTION: # Minimum version of Frameworks to require. Default value for kde-frameworks # is ${PV} and 5.106.0 baseline for everything else. -# If set to >=5.240, KF6/Qt6 will be assumed thus SLOT=6 dependencies added. +# If set to >=5.240, KF6/Qt6 is assumed thus SLOT=6 dependencies added and +# -DQT_MAJOR_VERSION=6 added to cmake args. if [[ ${CATEGORY} = kde-frameworks ]]; then : "${KFMIN:=$(ver_cut 1-2)}" fi @@ -542,6 +543,10 @@ ecm_src_configure() { local cmakeargs + if [[ ${_KFSLOT} == 6 ]]; then + cmakeargs+=( -DQT_MAJOR_VERSION=6 ) + fi + if in_iuse test && ! use test ; then cmakeargs+=( -DBUILD_TESTING=OFF )