summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2022-03-04 10:49:30 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2022-03-21 12:03:15 +0100
commit74c286a8a6cc795d017d6cd92651aeceada724ca (patch)
treedf94f023529939485c75d6f607b1d96b53519c19 /eclass/qt5-build.eclass
parentdev-qt/qtchooser: Drop tools colliding with Qt 5.15.3 links (diff)
downloadgentoo-74c286a8a6cc795d017d6cd92651aeceada724ca.tar.gz
gentoo-74c286a8a6cc795d017d6cd92651aeceada724ca.tar.bz2
gentoo-74c286a8a6cc795d017d6cd92651aeceada724ca.zip
qt5-build.eclass: Update comment regarding MODULE_VERSION downpatching
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'eclass/qt5-build.eclass')
-rw-r--r--eclass/qt5-build.eclass6
1 files changed, 3 insertions, 3 deletions
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index a2a72bde46cd..757afa850e52 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