| 1 |
commit: edbc3c52339c596ada3226f2c008b0743208cdb7 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Sep 5 21:52:30 2021 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Sep 7 15:43:38 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=edbc3c52 |
| 7 |
|
| 8 |
qt5-build.eclass: Downpatch version of live to 5.15.2 too |
| 9 |
|
| 10 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 11 |
|
| 12 |
eclass/qt5-build.eclass | 8 +++++--- |
| 13 |
1 file changed, 5 insertions(+), 3 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass |
| 16 |
index a320a78d..8756d6e5 100644 |
| 17 |
--- a/eclass/qt5-build.eclass |
| 18 |
+++ b/eclass/qt5-build.eclass |
| 19 |
@@ -128,13 +128,15 @@ EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install src_test pkg_ |
| 20 |
qt5-build_src_prepare() { |
| 21 |
qt5_prepare_env |
| 22 |
|
| 23 |
- if [[ -n ${KDE_ORG_COMMIT} ]]; then |
| 24 |
+ if [[ ${QT5_BUILD_TYPE} == live ]] || [[ -n ${KDE_ORG_COMMIT} ]]; then |
| 25 |
# Upstream bumped version in 5.15 branch after 5.15.2 release but their |
| 26 |
# 5.15.3 release is closed and this will never be more than a Qt 5.15.2 |
| 27 |
# with patches on top. |
| 28 |
- einfo "Preparing KDE Qt5PatchCollection snapshot at ${KDE_ORG_COMMIT}" |
| 29 |
+ if [[ -n ${KDE_ORG_COMMIT} ]]; then |
| 30 |
+ einfo "Preparing KDE Qt5PatchCollection snapshot at ${KDE_ORG_COMMIT}" |
| 31 |
+ mkdir -p .git || die # need to fake a git repository for configure |
| 32 |
+ fi |
| 33 |
sed -e "/^MODULE_VERSION/s/5\.15\.[3456789]/${QT5_PV}/" -i .qmake.conf || die |
| 34 |
- mkdir -p .git || die # need to fake a git repository for configure |
| 35 |
fi |
| 36 |
|
| 37 |
if [[ ${QT5_MODULE} == qtbase ]]; then |
Archives