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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A2CB0158041 for ; Wed, 8 Sep 2021 16:55:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 59CFBE09B1; Wed, 8 Sep 2021 16:55:48 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3EF3EE09B1 for ; Wed, 8 Sep 2021 16:55:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3924933BE2E for ; Wed, 8 Sep 2021 16:55:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5CAF6B0 for ; Wed, 8 Sep 2021 16:55:44 +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: <1631120073.88b4c5dcd6b8cd0cda9462f154e71a312f6a5fb3.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/qt5-build.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 88b4c5dcd6b8cd0cda9462f154e71a312f6a5fb3 X-VCS-Branch: master Date: Wed, 8 Sep 2021 16:55:44 +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: 4525839a-2379-438d-b75a-a8b7f6f17fac X-Archives-Hash: b941ee871aca783a347596ef3bedef4c commit: 88b4c5dcd6b8cd0cda9462f154e71a312f6a5fb3 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Sep 5 21:52:30 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Sep 8 16:54:33 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88b4c5dc qt5-build.eclass: Downpatch version of live to 5.15.2 too Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/qt5-build.eclass | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 0cc45c596b3..a0895e27abd 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -128,13 +128,15 @@ EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install src_test pkg_ qt5-build_src_prepare() { qt5_prepare_env - if [[ -n ${KDE_ORG_COMMIT} ]]; then + if [[ ${QT5_BUILD_TYPE} == live ]] || [[ -n ${KDE_ORG_COMMIT} ]]; then # Upstream bumped version in 5.15 branch after 5.15.2 release but their # 5.15.3 release is closed and this will never be more than a Qt 5.15.2 # with patches on top. - einfo "Preparing KDE Qt5PatchCollection snapshot at ${KDE_ORG_COMMIT}" + if [[ -n ${KDE_ORG_COMMIT} ]]; then + einfo "Preparing KDE Qt5PatchCollection snapshot at ${KDE_ORG_COMMIT}" + mkdir -p .git || die # need to fake a git repository for configure + fi sed -e "/^MODULE_VERSION/s/5\.15\.[3456789]/${QT5_PV}/" -i .qmake.conf || die - mkdir -p .git || die # need to fake a git repository for configure fi if [[ ${QT5_MODULE} == qtbase ]]; then