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 2456015808B for ; Fri, 4 Mar 2022 09:51:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 56603E0B50; Fri, 4 Mar 2022 09:51:10 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3F712E0B50 for ; Fri, 4 Mar 2022 09:51:10 +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 C382D342B24 for ; Fri, 4 Mar 2022 09:51:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4719C330 for ; Fri, 4 Mar 2022 09:51:05 +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: <1646387370.4ce41369c608d6489a6d38fc409da7869e4c24e6.asturm@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qt5-build.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 4ce41369c608d6489a6d38fc409da7869e4c24e6 X-VCS-Branch: master Date: Fri, 4 Mar 2022 09:51:05 +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: c56512a9-3b8d-4f92-bcfc-e8b279ca6016 X-Archives-Hash: 73e712dc1c4a9945a431b5a48c771dc2 commit: 4ce41369c608d6489a6d38fc409da7869e4c24e6 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Mar 4 09:49:30 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Mar 4 09:49:30 2022 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=4ce41369 qt5-build.eclass: Update comment regarding MODULE_VERSION downpatching Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/qt5-build.eclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index a2a72bde..757afa85 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -129,13 +129,13 @@ qt5-build_src_prepare() { qt5_prepare_env 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. 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 + # Ensure our ${QT5_PV} is not contradicted by any upstream (Qt) commit + # bumping version in 5.15 branch after release (probably can be dropped + # after 5.15.2_p* are gone) sed -e "/^MODULE_VERSION/s/5\.15\.[3456789]/${QT5_PV}/" -i .qmake.conf || die fi