[gentoo-commits] proj/qt:master commit in: eclass/

[Andreas Sturmlechner]

commit:     62ba24237fdbbb0585de46780bc15c4bfe6fc920
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  8 09:34:47 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Nov 29 19:19:12 2022 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=62ba2423

qt5-build.eclass: Set _QT5_GENTOOPATCHSET_REV=2 for >=Qt5Base-5.15.7

Apply gentoo-patchset before running sed over configure.

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/qt5-build.eclass | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 0825d311..d4b1d0f7 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -123,7 +123,14 @@ if [[ ${PN} != qtwebengine ]]; then
 fi
 
 if [[ ${QT5_MODULE} == qtbase ]]; then
-       _QT5_GENTOOPATCHSET_REV=1
+       case ${PV} in
+               5.15.5)
+                       _QT5_GENTOOPATCHSET_REV=1
+                       ;;
+               *)
+                       _QT5_GENTOOPATCHSET_REV=2
+                       ;;
+       esac
        SRC_URI+=" 
https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-${_QT5_GENTOOPATCHSET_REV}.tar.xz";
 fi
 
@@ -182,6 +189,8 @@ qt5-build_src_prepare() {
        if [[ ${QT5_MODULE} == qtbase ]]; then
                qt5_symlink_tools_to_build_dir
 
+               [[ -n ${_QT5_GENTOOPATCHSET_REV} ]] && eapply 
"${WORKDIR}/qtbase-5.15-gentoo-patchset-${_QT5_GENTOOPATCHSET_REV}"
+
                # Avoid unnecessary qmake recompilations
                sed -i -e "/Creating qmake/i if [ '!' -e 
\"\$outpath/bin/qmake\" ]; then" \
                        -e '/echo "Done."/a fi' configure || die "sed failed 
(skip qmake bootstrap)"
@@ -201,8 +210,6 @@ qt5-build_src_prepare() {
 
                # Respect build variables in configure tests (bug #639494)
                sed -i -e "s|\"\$outpath/bin/qmake\" \"\$relpathMangled\" -- 
\"\$@\"|& $(qt5_qmake_args) |" configure || die
-
-               [[ -n ${_QT5_GENTOOPATCHSET_REV} ]] && eapply 
"${WORKDIR}/qtbase-5.15-gentoo-patchset-${_QT5_GENTOOPATCHSET_REV}"
        fi
 
        [[ -n ${QT5_KDEPATCHSET_REV} ]] && eapply 
"${WORKDIR}/${QT5_MODULE}-${PV}-gentoo-kde-${QT5_KDEPATCHSET_REV}"