Skip to content

Commit

Permalink
qt5-build.eclass: Add _QT5_GENTOOPATCHSET_REV qtbase patchset logic
Browse files Browse the repository at this point in the history
Usage may be extended to other QT5_MODULEs in the future.

Signed-off-by: Andreas Sturmlechner <[email protected]>
  • Loading branch information
a17r committed Jun 19, 2022
1 parent ed007e4 commit bd3918f
Showing 1 changed file with 14 additions and 0 deletions.
14 changes: 14 additions & 0 deletions eclass/qt5-build.eclass
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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}"
Expand Down

0 comments on commit bd3918f

Please sign in to comment.