diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2021-09-05 23:52:30 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2021-09-08 18:54:33 +0200 |
| commit | 88b4c5dcd6b8cd0cda9462f154e71a312f6a5fb3 (patch) | |
| tree | 80058c358c0c09252c49e8a3517f3bb9eaac382d /eclass | |
| parent | qt5-build.eclass: Introduce QT5_PV for intra-dev-qt deps (diff) | |
| download | gentoo-88b4c5dcd6b8cd0cda9462f154e71a312f6a5fb3.tar.gz gentoo-88b4c5dcd6b8cd0cda9462f154e71a312f6a5fb3.tar.bz2 gentoo-88b4c5dcd6b8cd0cda9462f154e71a312f6a5fb3.zip | |
qt5-build.eclass: Downpatch version of live to 5.15.2 too
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/qt5-build.eclass | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 0cc45c596b3b..a0895e27abd9 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 |