diff options
author | Ionen Wolkens <ionen@gentoo.org> | 2024-11-15 09:24:59 -0500 |
---|---|---|
committer | Ionen Wolkens <ionen@gentoo.org> | 2024-11-15 09:43:11 -0500 |
commit | 5234ec1826825db9964b365f21d3952484f08846 (patch) | |
tree | 0ae41e1139b2ad2ef54a3f24b2b1d375562c1280 /dev-qt/qtdeclarative/qtdeclarative-6.8.0-r7.ebuild | |
parent | dev-db/postgresql: drop 12.20, 13.16, 14.13, 15.8, 16.4, 17.0-r1 (diff) | |
download | gentoo-5234ec1826825db9964b365f21d3952484f08846.tar.gz gentoo-5234ec1826825db9964b365f21d3952484f08846.tar.bz2 gentoo-5234ec1826825db9964b365f21d3952484f08846.zip |
dev-qt/qtdeclarative: backport 6.8 branch fix for QTBUG-130767
Currently fix seems to be only in 6.8.2 so we may need this for
6.8.1 as well.
Leaving it out of the live ebuild given that is currently
building 6.8.2
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Diffstat (limited to 'dev-qt/qtdeclarative/qtdeclarative-6.8.0-r7.ebuild')
-rw-r--r-- | dev-qt/qtdeclarative/qtdeclarative-6.8.0-r7.ebuild | 70 |
1 files changed, 70 insertions, 0 deletions
diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.8.0-r7.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.8.0-r7.ebuild new file mode 100644 index 000000000000..21baad2c9b84 --- /dev/null +++ b/dev-qt/qtdeclarative/qtdeclarative-6.8.0-r7.ebuild @@ -0,0 +1,70 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) + +# behaves very badly when qtdeclarative is not already installed, also +# other more minor issues (installs junk, sandbox/offscreen issues) +QT6_RESTRICT_TESTS=1 + +inherit python-any-r1 qt6-build + +DESCRIPTION="Qt Declarative (Quick 2)" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +IUSE="accessibility +jit +network opengl qmlls +sql +ssl svg vulkan +widgets" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[accessibility=,gui,network=,opengl=,sql?,ssl?,vulkan=,widgets=] + >=dev-qt/qtbase-${PV}-r1 + qmlls? ( ~dev-qt/qtlanguageserver-${PV}:6 ) + svg? ( ~dev-qt/qtsvg-${PV}:6 ) +" +DEPEND=" + ${RDEPEND} + vulkan? ( dev-util/vulkan-headers ) +" +BDEPEND=" + ${PYTHON_DEPS} + ~dev-qt/qtshadertools-${PV}:6 +" + +PATCHES=( + "${FILESDIR}"/${PN}-6.7.3-QTBUG-129622.patch + "${FILESDIR}"/${PN}-6.8.0-QTBUG-125053.patch + "${FILESDIR}"/${PN}-6.8.0-QTBUG-129797.patch + "${FILESDIR}"/${PN}-6.8.0-QTBUG-129500.patch + "${FILESDIR}"/${PN}-6.8.0-QTBUG-130767.patch +) + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package qmlls Qt6LanguageServerPrivate) + $(cmake_use_find_package sql Qt6Sql) + $(cmake_use_find_package svg Qt6Svg) + $(qt_feature jit qml_jit) + $(qt_feature network qml_network) + $(qt_feature ssl qml_ssl) + ) + + qt6-build_src_configure +} + +src_install() { + qt6-build_src_install + + if [[ ! -e ${D}${QT6_LIBDIR}/libQt6QuickControls2.so.6 ]]; then #940675 + eerror "${CATEGORY}/${PF} seems to have been improperly built and" + eerror "install was aborted to protect the system. Possibly(?) due" + eerror "to a rare portage ordering bug. If using portage, try:" + eerror " emerge -1 qtshadertools:6 qtdeclarative:6" + eerror "If that did not resolve the issue, please provide build.log" + eerror "on https://bugs.gentoo.org/940675" + die "aborting due to incomplete/broken build (see above)" + fi +} |