gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 17:09:10 -07:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
- Apply gentoo-patchset before running sed over configure
- _QT5_GENTOOPATCHSET_REV shall always be applied

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
2022-08-03 11:09:03 +02:00
parent 98f5475d46
commit bef668bbe7
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
eclass/qt5-build.eclass
View File

@@ -112,10 +112,6 @@ if [[ ${PN} != qtwebengine ]]; then
_QT5_P=${QT5_MODULE}-everywhere-opensource-src-${PV}
HOMEPAGE="https://www.qt.io/"
SRC_URI="https://download.qt.io/official_releases/qt/${PV%.*}/${PV}/submodules/${_QT5_P}.tar.xz"
if [[ ${QT5_MODULE} == qtbase ]]; then
_QT5_GENTOOPATCHSET_REV=1
SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-${_QT5_GENTOOPATCHSET_REV}.tar.xz"
fi
# KDE Qt5PatchCollection on top of tag v${PV}-lts-lgpl
if [[ -n ${QT5_KDEPATCHSET_REV} ]]; then
HOMEPAGE+=" https://invent.kde.org/qt/qt/${QT5_MODULE} https://community.kde.org/Qt5PatchCollection"
@@ -126,6 +122,18 @@ if [[ ${PN} != qtwebengine ]]; then
esac
fi
if [[ ${QT5_MODULE} == qtbase ]]; then
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
# @ECLASS_VARIABLE: QT5_BUILD_DIR
# @OUTPUT_VARIABLE
# @DESCRIPTION:
@@ -181,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)"
@@ -200,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}"