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 87909158089 for ; Mon, 11 Sep 2023 21:20:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 65B3F2BC18A; Mon, 11 Sep 2023 21:20:50 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4695E2BC184 for ; Mon, 11 Sep 2023 21:20:50 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6D955335D4D for ; Mon, 11 Sep 2023 21:20:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D3440117A for ; Mon, 11 Sep 2023 21:20:47 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1694466346.c44376c0b7aab810ab1e9e1d27063f422f4bd5ab.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/qt6-build.eclass X-VCS-Directories: eclass/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: c44376c0b7aab810ab1e9e1d27063f422f4bd5ab X-VCS-Branch: master Date: Mon, 11 Sep 2023 21:20:47 +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: fb5144cd-aaf8-4f63-9eba-a2b9a41de8fe X-Archives-Hash: cdfdd47b92844f79a3c22207cec2dcdb commit: c44376c0b7aab810ab1e9e1d27063f422f4bd5ab Author: Ionen Wolkens gentoo org> AuthorDate: Mon Sep 11 11:02:28 2023 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Mon Sep 11 21:05:46 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c44376c0 qt6-build.eclass: include patch version in subslot for >=6.5.3 This matches Qt5 which had been doing the same. While working on qt-creator bump, noticed that it broke with qtquick3d-6.5.9999, which turned out because of changes in private APIs that will land in 6.5.3. In other words, it is going to need a rebuild when that lands but current SLOT=0/6.5 do not allow this. This could be a one-off issue but let's stay safer when private APIs are abused. This also keeps the 9999 in live subslot, so switching between live and releases will trigger rebuilds too. Signed-off-by: Ionen Wolkens gentoo.org> eclass/qt6-build.eclass | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/eclass/qt6-build.eclass b/eclass/qt6-build.eclass index c96bc0c1c3c3..2990b41a9e95 100644 --- a/eclass/qt6-build.eclass +++ b/eclass/qt6-build.eclass @@ -66,7 +66,11 @@ readonly QT6_BUILD_TYPE HOMEPAGE="https://www.qt.io/" LICENSE="|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3" -SLOT=6/${PV%.*} +if ver_test ${PV} -ge 6.5.3; then + SLOT=6/${PV%%_*} +else + SLOT=6/${PV%.*} # TODO: remove this after <6.5.3 is gone +fi if [[ ${PN} != qttranslations ]]; then IUSE="test"