diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2022-07-17 16:55:24 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2022-07-23 13:20:57 +0200 |
| commit | d21301407411b6f248131fe691d858476f70a2bb (patch) | |
| tree | 1ce6f39f2d99c110d30060028d4e2f7bc1f5dda7 /eclass | |
| parent | dev-games/aseprite: unkeyword 1.2.35 for ~x86 (diff) | |
| download | gentoo-d21301407411b6f248131fe691d858476f70a2bb.tar.gz gentoo-d21301407411b6f248131fe691d858476f70a2bb.tar.bz2 gentoo-d21301407411b6f248131fe691d858476f70a2bb.zip | |
qt5-build.eclass: Merge _QT5_GENTOOPATCHSET_REV handling into main block
Dropping pre-5.15.5 SRC_URI support.
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/qt5-build.eclass | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 86082a07f4bc..872357ec3896 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -107,11 +107,15 @@ if [[ ${PN} != qtwebengine ]]; then *9999 ) inherit kde.org # kde/5.15 branch ;; - 5.15.[3-9]* | 5.15.??* ) + 5.15.[5-9]* | 5.15.??* ) # official stable release _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" @@ -122,11 +126,6 @@ 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: |