diff options
author | Ionen Wolkens <ionen@gentoo.org> | 2024-03-29 18:45:06 -0400 |
---|---|---|
committer | Ionen Wolkens <ionen@gentoo.org> | 2024-03-29 20:27:56 -0400 |
commit | 251cc7ce2b61a625ab88087d0599baefb55ba91e (patch) | |
tree | 756a509ac8b44478aa21576b3453b1615985ead6 /dev-qt/qtdeclarative | |
parent | dev-qt/qtmultimedia: avoid installing extra USE=test junk in 6.7+ (diff) | |
download | gentoo-251cc7ce2b61a625ab88087d0599baefb55ba91e.tar.gz gentoo-251cc7ce2b61a625ab88087d0599baefb55ba91e.tar.bz2 gentoo-251cc7ce2b61a625ab88087d0599baefb55ba91e.zip |
dev-qt/qtdeclarative: fix qtsvg automagic in 6.7+
Qt6Svg been checked by the build system for a long time but
was only used for unused examples and (manual) tests and so
was ignored.
...but 6.7 adds a svgtoqml tool which actually links with it
and is otherwise skipped without qtsvg.
Doesn't seem very interesting, so left off-by-default for now.
Could change if something needs it, albeit USE=svg is default
on desktop profiles either way.
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Diffstat (limited to 'dev-qt/qtdeclarative')
-rw-r--r-- | dev-qt/qtdeclarative/qtdeclarative-6.7.9999.ebuild | 8 | ||||
-rw-r--r-- | dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.7.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.7.9999.ebuild index 235c4f16520f..b87689b35832 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6.7.9999.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6.7.9999.ebuild @@ -12,13 +12,16 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" fi -IUSE="accessibility +network opengl +sql +ssl vulkan +widgets" +IUSE="accessibility +network opengl +sql +ssl svg vulkan +widgets" # behaves very badly when qtdeclarative is not already installed, also # other more minor issues (installs junk, sandbox/offscreen issues) RESTRICT="test" -RDEPEND="~dev-qt/qtbase-${PV}:6[accessibility=,gui,network=,opengl=,sql?,ssl?,vulkan=,widgets=]" +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[accessibility=,gui,network=,opengl=,sql?,ssl?,vulkan=,widgets=] + svg? ( ~dev-qt/qtsvg-${PV}:6 ) +" DEPEND=" ${RDEPEND} vulkan? ( dev-util/vulkan-headers ) @@ -31,6 +34,7 @@ BDEPEND=" src_configure() { local mycmakeargs=( $(cmake_use_find_package sql Qt6Sql) + $(cmake_use_find_package svg Qt6Svg) $(qt_feature network qml_network) $(qt_feature ssl qml_ssl) ) diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild index 235c4f16520f..b87689b35832 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild @@ -12,13 +12,16 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" fi -IUSE="accessibility +network opengl +sql +ssl vulkan +widgets" +IUSE="accessibility +network opengl +sql +ssl svg vulkan +widgets" # behaves very badly when qtdeclarative is not already installed, also # other more minor issues (installs junk, sandbox/offscreen issues) RESTRICT="test" -RDEPEND="~dev-qt/qtbase-${PV}:6[accessibility=,gui,network=,opengl=,sql?,ssl?,vulkan=,widgets=]" +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[accessibility=,gui,network=,opengl=,sql?,ssl?,vulkan=,widgets=] + svg? ( ~dev-qt/qtsvg-${PV}:6 ) +" DEPEND=" ${RDEPEND} vulkan? ( dev-util/vulkan-headers ) @@ -31,6 +34,7 @@ BDEPEND=" src_configure() { local mycmakeargs=( $(cmake_use_find_package sql Qt6Sql) + $(cmake_use_find_package svg Qt6Svg) $(qt_feature network qml_network) $(qt_feature ssl qml_ssl) ) |