commit: 71e925a3cc39458ac21caf651460744649d88b20 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Wed May 8 17:26:45 2024 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Wed May 8 18:42:56 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71e925a3
dev-util/qbs: prevent auto-selecting Qt version DISABLE_FIND behaves badly here between being either unused or preventing the fallback. It normally tries Qt6 first, but given #931596 somehow picked it despite qtbase:6 being installed and seemingly not broken (given it built other Qt6 packages), let's make sure. May not necessarily fix #931596 but if whatever happened happens again, there should be a more interesting output. Doesn't hurt to ensure it won't ever pick Qt5 either way to ensure it doesn't successfully build if Qt6 had issues. Closes: https://bugs.gentoo.org/931596 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> dev-util/qbs/files/qbs-2.3.1-qtver.patch | 9 +++++++++ dev-util/qbs/qbs-2.3.1.ebuild | 5 +++++ 2 files changed, 14 insertions(+) diff --git a/dev-util/qbs/files/qbs-2.3.1-qtver.patch b/dev-util/qbs/files/qbs-2.3.1-qtver.patch new file mode 100644 index 000000000000..3117c432c544 --- /dev/null +++ b/dev-util/qbs/files/qbs-2.3.1-qtver.patch @@ -0,0 +1,9 @@ +https://bugs.gentoo.org/931596 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -29,3 +29,5 @@ + ++if (NOT DEFINED QT_VERSION_MAJOR) + find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED) ++endif() + diff --git a/dev-util/qbs/qbs-2.3.1.ebuild b/dev-util/qbs/qbs-2.3.1.ebuild index c00fae7ed834..ed014f09332d 100644 --- a/dev-util/qbs/qbs-2.3.1.ebuild +++ b/dev-util/qbs/qbs-2.3.1.ebuild @@ -43,6 +43,10 @@ CMAKE_SKIP_TESTS=( tst_language ) +PATCHES=( + "${FILESDIR}"/${PN}-2.3.1-qtver.patch +) + python_check_deps() { # _find_python_module in cmake/QbsDocumentation.cmake python_has_version "dev-python/beautifulsoup4[${PYTHON_USEDEP}]" && @@ -64,6 +68,7 @@ src_configure() { -DQBS_INSTALL_MAN_PAGE=yes -DQBS_INSTALL_QCH_DOCS=$(usex doc) -DQBS_LIB_INSTALL_DIR="$(get_libdir)" + -DQT_VERSION_MAJOR=6 #931596 -DWITH_TESTS=$(usex test) -DWITH_UNIT_TESTS=$(usex test) )
