diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2022-06-14 13:39:45 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2022-06-19 14:24:33 +0200 |
| commit | bd3918f9a5337f05587a5cc73053651e963267d0 (patch) | |
| tree | 61751bd08aaaf9878d176f074c44e8438c9b38db | |
| parent | qt5-build.eclass: Support future double-digit Qt-5.15 patch releases (diff) | |
| download | gentoo-bd3918f9a5337f05587a5cc73053651e963267d0.tar.gz gentoo-bd3918f9a5337f05587a5cc73053651e963267d0.tar.bz2 gentoo-bd3918f9a5337f05587a5cc73053651e963267d0.zip | |
qt5-build.eclass: Add _QT5_GENTOOPATCHSET_REV qtbase patchset logic
Usage may be extended to other QT5_MODULEs in the future.
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
| -rw-r--r-- | eclass/qt5-build.eclass | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 2272e2e293be..86082a07f4bc 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -63,6 +63,13 @@ readonly QT5_PV # The upstream package name of the module this package belongs to. # Used for SRC_URI and S. +# @ECLASS_VARIABLE: _QT5_GENTOOPATCHSET_REV +# @DEFAULT_UNSET +# @INTERNAL +# @DESCRIPTION: +# Gentoo downstream patchset version applied over qtbase. Used for SRC_URI and +# applied in src_prepare. + # @ECLASS_VARIABLE: QT5_TARGET_SUBDIRS # @DEFAULT_UNSET # @DESCRIPTION: @@ -115,6 +122,11 @@ if [[ ${PN} != qtwebengine ]]; then esac fi +if [[ ${QT5_MODULE} == qtbase ]] && [[ ${PV} == 5.15.[5-9]* ]]; then + _QT5_GENTOOPATCHSET_REV=1 + SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-${_QT5_GENTOOPATCHSET_REV}.tar.xz" +fi + # @ECLASS_VARIABLE: QT5_BUILD_DIR # @OUTPUT_VARIABLE # @DESCRIPTION: @@ -189,6 +201,8 @@ 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}" |