commit: 8a3d629983330ad7148cbfc5b7b79083362124f4 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Mar 30 18:13:29 2022 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Mar 30 18:56:24 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a3d6299
dev-qt/qtdeclarative: Fix patchset, drop riscv patch Previous patchset mistakenly did not contain full Qt5PatchCollection already on top of 5.15.2-r15. A proper riscv patch is now part of qtcore-5.15.3. Closes: https://bugs.gentoo.org/790689 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> dev-qt/qtdeclarative/Manifest | 1 + .../qtdeclarative/qtdeclarative-5.15.3-r1.ebuild | 66 ++++++++++++++++++++++ 2 files changed, 67 insertions(+) diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest index 756b849a281e..cbaabc484516 100644 --- a/dev-qt/qtdeclarative/Manifest +++ b/dev-qt/qtdeclarative/Manifest @@ -1,3 +1,4 @@ DIST qtdeclarative-5.15.2-29ee9a0e.tar.gz 24346706 BLAKE2B 5bd518a61aaa24672164fad41599ca6cc4ed7e8ab3eac56d8a38d9b0d892f92ddc3e4f7a6a66c16043d1eb29578602a91824413283fdcf971bbfaf95e0a59af0 SHA512 7964cf301f8cceb01cc4eaa7b3a5bc1e882633f61abcd250fee6dc27110baa4e32622d0b24e2cdc3874b0518c79f6f42fa1ac434535270af3b35081e663d8cd4 DIST qtdeclarative-5.15.3-gentoo-kde-1.tar.xz 7612 BLAKE2B e4385c43a05a152e5d4071ee72142bec617b9707ffd4e60afd66b124bf0c272a236eaf9bb984e49769687ac680550c9aeb61a773a0b820fc00500f0faec85d09 SHA512 9e25e42c5616f4e3487f6c012e63c245e68a807407dd9c54d6b8d4efc23ba98a6f7fe67cf87017161676a0335cf4d12e494d1956dbf8efeedaa9504dff3ade4a +DIST qtdeclarative-5.15.3-gentoo-kde-2.tar.xz 17340 BLAKE2B 5f5efae23cf6c1c3abf8d0d0594ac66ae3bf116e744626f7218d0a66e5f5598861a25e8b2d8aaec7c3dd444fa4e91de313b67b53ec624965f08472587fee460d SHA512 76d5bd8aa9f2b2e766ad4dd63a3c03b2e52da90b91cf11c777f3efd6fb3110100b358f05562639b60031bb49622fd1f4b135b6903a53493664bcbf1a0b6d69d7 DIST qtdeclarative-everywhere-opensource-src-5.15.3.tar.xz 21567896 BLAKE2B 897aa6959f34bc6e5a3be04d9f56d13315e6681daadb935f0e2422f551865c8c6d49b0c15c5358439155d3215c1c139fe60acf0b4a7e766e8e1ff4ce85a0449e SHA512 c0f8dba5ba9e211071d64ec9de7395925d97424be899292a83fe961091c6695bfe68395fed4b34a746a69293765122a5ee53c119053f01b5fc511f0dbf577597 diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.3-r1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.3-r1.ebuild new file mode 100644 index 000000000000..4820d17976ce --- /dev/null +++ b/dev-qt/qtdeclarative/qtdeclarative-5.15.3-r1.ebuild @@ -0,0 +1,66 @@ +# Copyright 2009-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +QT5_KDEPATCHSET_REV=2 +PYTHON_COMPAT=( python3_{8..10} ) +inherit python-any-r1 qt5-build + +DESCRIPTION="The QML and Quick modules for the Qt5 framework" + +if [[ ${QT5_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +IUSE="gles2-only +jit localstorage vulkan +widgets" + +# qtgui[gles2-only=] is needed because of bug 504322 +DEPEND=" + =dev-qt/qtcore-${QT5_PV}* + =dev-qt/qtgui-${QT5_PV}*:5=[gles2-only=,vulkan=] + =dev-qt/qtnetwork-${QT5_PV}* + =dev-qt/qttest-${QT5_PV}* + media-libs/libglvnd + localstorage? ( =dev-qt/qtsql-${QT5_PV}* ) + widgets? ( =dev-qt/qtwidgets-${QT5_PV}*[gles2-only=] ) +" +RDEPEND="${DEPEND}" +BDEPEND="${PYTHON_DEPS}" + +PATCHES=( + "${FILESDIR}/${PN}-5.14.2-QQuickItemView-fix-maxXY-extent.patch" # QTBUG-83890 +) + +src_prepare() { + qt_use_disable_mod localstorage sql \ + src/imports/imports.pro + + qt_use_disable_mod widgets widgets \ + src/src.pro \ + src/qmltest/qmltest.pro \ + tests/auto/auto.pro \ + tools/tools.pro \ + tools/qmlscene/qmlscene.pro \ + tools/qml/qml.pro + + qt5-build_src_prepare +} + +src_configure() { + local myqmakeargs=( + -- + -qml-debug + $(qt_use jit feature-qml-jit) + ) + qt5-build_src_configure +} + +src_install() { + qt5-build_src_install + qt5_symlink_binary_to_path qml 5 + qt5_symlink_binary_to_path qmleasing 5 + qt5_symlink_binary_to_path qmljs 5 + qt5_symlink_binary_to_path qmlpreview 5 + qt5_symlink_binary_to_path qmlscene 5 +}
