| 1 |
commit: 62ba24237fdbbb0585de46780bc15c4bfe6fc920 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Sep 8 09:34:47 2022 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Nov 29 19:19:12 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=62ba2423 |
| 7 |
|
| 8 |
qt5-build.eclass: Set _QT5_GENTOOPATCHSET_REV=2 for >=Qt5Base-5.15.7 |
| 9 |
|
| 10 |
Apply gentoo-patchset before running sed over configure. |
| 11 |
|
| 12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 13 |
|
| 14 |
eclass/qt5-build.eclass | 13 ++++++++++--- |
| 15 |
1 file changed, 10 insertions(+), 3 deletions(-) |
| 16 |
|
| 17 |
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass |
| 18 |
index 0825d311..d4b1d0f7 100644 |
| 19 |
--- a/eclass/qt5-build.eclass |
| 20 |
+++ b/eclass/qt5-build.eclass |
| 21 |
@@ -123,7 +123,14 @@ if [[ ${PN} != qtwebengine ]]; then |
| 22 |
fi |
| 23 |
|
| 24 |
if [[ ${QT5_MODULE} == qtbase ]]; then |
| 25 |
- _QT5_GENTOOPATCHSET_REV=1 |
| 26 |
+ case ${PV} in |
| 27 |
+ 5.15.5) |
| 28 |
+ _QT5_GENTOOPATCHSET_REV=1 |
| 29 |
+ ;; |
| 30 |
+ *) |
| 31 |
+ _QT5_GENTOOPATCHSET_REV=2 |
| 32 |
+ ;; |
| 33 |
+ esac |
| 34 |
SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-${_QT5_GENTOOPATCHSET_REV}.tar.xz" |
| 35 |
fi |
| 36 |
|
| 37 |
@@ -182,6 +189,8 @@ qt5-build_src_prepare() { |
| 38 |
if [[ ${QT5_MODULE} == qtbase ]]; then |
| 39 |
qt5_symlink_tools_to_build_dir |
| 40 |
|
| 41 |
+ [[ -n ${_QT5_GENTOOPATCHSET_REV} ]] && eapply "${WORKDIR}/qtbase-5.15-gentoo-patchset-${_QT5_GENTOOPATCHSET_REV}" |
| 42 |
+ |
| 43 |
# Avoid unnecessary qmake recompilations |
| 44 |
sed -i -e "/Creating qmake/i if [ '!' -e \"\$outpath/bin/qmake\" ]; then" \ |
| 45 |
-e '/echo "Done."/a fi' configure || die "sed failed (skip qmake bootstrap)" |
| 46 |
@@ -201,8 +210,6 @@ qt5-build_src_prepare() { |
| 47 |
|
| 48 |
# Respect build variables in configure tests (bug #639494) |
| 49 |
sed -i -e "s|\"\$outpath/bin/qmake\" \"\$relpathMangled\" -- \"\$@\"|& $(qt5_qmake_args) |" configure || die |
| 50 |
- |
| 51 |
- [[ -n ${_QT5_GENTOOPATCHSET_REV} ]] && eapply "${WORKDIR}/qtbase-5.15-gentoo-patchset-${_QT5_GENTOOPATCHSET_REV}" |
| 52 |
fi |
| 53 |
|
| 54 |
[[ -n ${QT5_KDEPATCHSET_REV} ]] && eapply "${WORKDIR}/${QT5_MODULE}-${PV}-gentoo-kde-${QT5_KDEPATCHSET_REV}" |
Archives