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

[Andreas Sturmlechner]

commit:     56064249c35a88e07c8ef642d61e767877e0ee98
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  3 09:09:03 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug  3 09:12:27 2022 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=56064249

qt5-build.eclass: _QT5_GENTOOPATCHSET_REV shall always be applied

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

 eclass/qt5-build.eclass | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index c6cb5dd3..0825d311 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -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,11 @@ if [[ ${PN} != qtwebengine ]]; then
 	esac
 fi
 
+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
+
 # @ECLASS_VARIABLE: QT5_BUILD_DIR
 # @OUTPUT_VARIABLE
 # @DESCRIPTION: