From 3d05d0025c6d74a6b677a172283a0b25c4cf4012 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 27 Mar 2025 00:31:42 +0000 Subject: gentoo auto-resync : 27:03:2025 - 00:31:42 --- dev-qt/qttools/Manifest | 3 +- dev-qt/qttools/qttools-6.8.3.ebuild | 167 +++++++++++++++++++++++++++++++++ dev-qt/qttools/qttools-6.8.9999.ebuild | 167 --------------------------------- 3 files changed, 169 insertions(+), 168 deletions(-) create mode 100644 dev-qt/qttools/qttools-6.8.3.ebuild delete mode 100644 dev-qt/qttools/qttools-6.8.9999.ebuild (limited to 'dev-qt/qttools') diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest index 2afcc4d3aa14..62cac08bd835 100644 --- a/dev-qt/qttools/Manifest +++ b/dev-qt/qttools/Manifest @@ -1,7 +1,8 @@ DIST qttools-everywhere-src-6.8.2.tar.xz 10297596 BLAKE2B b8dc80718246e5bc72ef5c76c176f0b4bf264d387d22c49c03695a218ce295a946fd2cf84bf45d6a11752875a681d9bde27a33f7f5cb148e9a3c53f167996de0 SHA512 ad448af0656640a712eefe81fc4291209dec27fe10d42dfb68c7c31e65003653fb3821996f44c50d8ab4371853a18cfc0b4032f7876ce6c75d0fb9b4fe91ca27 +DIST qttools-everywhere-src-6.8.3.tar.xz 10301984 BLAKE2B fb07a574d5b7f0dbc964819d217973d8e3a15974c510fa053a4a23bf548e8bb2bf9d8965dcd058eb6c53da7598f68ceccefa181c7f93cfb4506805df8937fda4 SHA512 77141b310f63932678f28682c490ccc75776493994d96582d546545c17937605efac312c008c75fda991b78c369320d0a2c4b543b568a459cc90051d1ed2b9da DIST qttools-everywhere-src-6.9.0-rc.tar.xz 10327268 BLAKE2B 2f5cbfe29dbae60bc9f7e09b7416c7d2103094b933188b250c6bde84f2683e2351acd1f31c6dbab1bda0b61f7ad9e09870995dc9c5556a3244cdfd07ced1cfa1 SHA512 2f3ada6863160de32fbdca7d0315dc82976cc3f2c8fde3581fc580107c301201959a00c52a1d06f4b909a91ffd3f49cc94798c5d3260a8750a3046d65ab40b3e EBUILD qttools-6.8.2.ebuild 4899 BLAKE2B 2cdcf2d5bfa1d9093e769095727bdbd090348be6f5e51bf7fb40866c4fa886e02067505e43f8bd30b6374605a79e00148b4e9adf9d1791861f2001facbfeef2a SHA512 cbd76693eeeb69a515d671bfb0a7ed4fa7e27046959381652801919d42524a411bbb7b1da785ea9e033a35ac6f4f003b9a93200370c9e920e82a855bbaa824e2 -EBUILD qttools-6.8.9999.ebuild 5311 BLAKE2B f56fd0bb40894a959dec4dc140f60b0ecacf29c164270fd34ec02dfa2d2f0eebed1da5bee4ad73105ecb4b2dd7113311e723b18b3028cb90e80da159a130381d SHA512 2aba580f8e5010bf1d098263d7fa5075a5e02e8c467ad3a0aca9523306590af5edab1e7dbb4ffadf246eb3182c3df707755ee46713febc94f2d2effbf1e683ec +EBUILD qttools-6.8.3.ebuild 5311 BLAKE2B f56fd0bb40894a959dec4dc140f60b0ecacf29c164270fd34ec02dfa2d2f0eebed1da5bee4ad73105ecb4b2dd7113311e723b18b3028cb90e80da159a130381d SHA512 2aba580f8e5010bf1d098263d7fa5075a5e02e8c467ad3a0aca9523306590af5edab1e7dbb4ffadf246eb3182c3df707755ee46713febc94f2d2effbf1e683ec EBUILD qttools-6.9.0_rc.ebuild 5086 BLAKE2B f2defaa213e19dc0af73d6f89fdfc3bb8f4166fde413337e882cfacb3feefa1609cdd0f195ddf7c2de7faaae2dd6cf4d80744f50d8f57afe70a40aa9404568a6 SHA512 6cb06278c182020b6ede72d2d85e101ad3ecd4a7570418c65b9eb9bcb320afce7b64c52d1c8e8bf78ab5af0655c827e28361193dfb6025010b1170888f7485aa EBUILD qttools-6.9.9999.ebuild 5311 BLAKE2B f56fd0bb40894a959dec4dc140f60b0ecacf29c164270fd34ec02dfa2d2f0eebed1da5bee4ad73105ecb4b2dd7113311e723b18b3028cb90e80da159a130381d SHA512 2aba580f8e5010bf1d098263d7fa5075a5e02e8c467ad3a0aca9523306590af5edab1e7dbb4ffadf246eb3182c3df707755ee46713febc94f2d2effbf1e683ec EBUILD qttools-6.9999.ebuild 5311 BLAKE2B f56fd0bb40894a959dec4dc140f60b0ecacf29c164270fd34ec02dfa2d2f0eebed1da5bee4ad73105ecb4b2dd7113311e723b18b3028cb90e80da159a130381d SHA512 2aba580f8e5010bf1d098263d7fa5075a5e02e8c467ad3a0aca9523306590af5edab1e7dbb4ffadf246eb3182c3df707755ee46713febc94f2d2effbf1e683ec diff --git a/dev-qt/qttools/qttools-6.8.3.ebuild b/dev-qt/qttools/qttools-6.8.3.ebuild new file mode 100644 index 000000000000..52750e2eb0d8 --- /dev/null +++ b/dev-qt/qttools/qttools-6.8.3.ebuild @@ -0,0 +1,167 @@ +# Copyright 2021-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LLVM_COMPAT=( {17..20} ) # see .cmake.conf for minimum +LLVM_OPTIONAL=1 + +# behaves very badly when qttools is not already installed, also +# other issues to handle (clang tests flaky depending on version, +# and 3rdparty/ tries to FetchContent gtest) +QT6_RESTRICT_TESTS=1 + +inherit desktop llvm-r2 optfeature qt6-build + +DESCRIPTION="Qt Tools Collection" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" +fi + +IUSE=" + +assistant clang designer distancefieldgenerator gles2-only +linguist + opengl pixeltool +qdbus qdoc qml qmlls qtattributionsscanner qtdiag + qtplugininfo vulkan +widgets zstd +" +# note that some tools do not *require* widgets but will skip a sub-tool +# if not enabled (e.g. linguist gives lrelease but not the GUI linguist6) +REQUIRED_USE=" + assistant? ( widgets ) + clang? ( ${LLVM_REQUIRED_USE} ) + designer? ( qml widgets ) + distancefieldgenerator? ( qml widgets ) + pixeltool? ( widgets ) + qdoc? ( clang qml ) + qmlls? ( assistant qml ) +" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[widgets?] + assistant? ( ~dev-qt/qtbase-${PV}:6[concurrent,network,sql,sqlite] ) + clang? ( + $(llvm_gen_dep ' + llvm-core/clang:${LLVM_SLOT}= + llvm-core/llvm:${LLVM_SLOT}= + ') + ) + designer? ( + ~dev-qt/qtbase-${PV}:6[network,xml,zstd=] + zstd? ( app-arch/zstd:= ) + ) + qdbus? ( ~dev-qt/qtbase-${PV}:6[dbus,xml] ) + qml? ( ~dev-qt/qtdeclarative-${PV}:6[widgets?] ) + qmlls? ( ~dev-qt/qtdeclarative-${PV}:6[qmlls] ) + qtdiag? ( ~dev-qt/qtbase-${PV}:6[network,gles2-only=,vulkan=] ) + widgets? ( ~dev-qt/qtbase-${PV}:6[opengl=] ) +" +DEPEND=" + ${RDEPEND} + qtdiag? ( + vulkan? ( dev-util/vulkan-headers ) + ) +" + +src_prepare() { + qt6-build_src_prepare + + # qttools is picky about clang versions and ignores LLVM_SLOT + sed -i '/find_package/s/${VERSION}//' cmake/FindWrapLibClang.cmake || die +} + +src_configure() { + use clang && llvm_chost_setup + + local mycmakeargs=( + # prevent the clang test as it can abort due to bug #916098 + $(cmake_use_find_package clang WrapLibClang) + $(cmake_use_find_package qml Qt6Qml) + $(cmake_use_find_package widgets Qt6Widgets) + $(qt_feature assistant) + $(qt_feature clang) + $(qt_feature designer) + $(qt_feature distancefieldgenerator) + $(qt_feature linguist) + $(qt_feature pixeltool) + $(qt_feature qdbus) + $(qt_feature qdoc) + $(qt_feature qtattributionsscanner) + $(qt_feature qtdiag) + $(qt_feature qtplugininfo) + + # TODO?: package litehtml, but support for latest releases seem + # to lag behind and bundled may work out better for now + # https://github.com/litehtml/litehtml/issues/266 + $(usev assistant -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=ON) + + # USE=qmlls' help plugin may be temporary, upstream has plans to split + # QtHelp into another package so that qtdeclarative can depend on it + # without a circular dependency with qttools + $(cmake_use_find_package qmlls Qt6QmlLSPrivate) + ) + + qt6-build_src_configure +} + +src_install() { + qt6-build_src_install + + # *could* consider a USE=gui to guard GUI applications and their .desktop + # files when only want the libraries (Help/UiTools), but cmake logic makes + # it difficult to get only these and we'd be just rm'ing small'ish files + if use widgets; then #914766 + use designer || use distancefieldgenerator || use pixeltool && + newicon src/designer/src/designer/images/designer.png designer6.png + + if use assistant; then + make_desktop_entry assistant6 'Qt 6 Assistant' assistant6 \ + 'Qt;Development;Documentation' \ + 'Comment=Tool for viewing online documentation in Qt help file format' + newicon src/assistant/assistant/images/assistant-128.png assistant6.png + fi + + if use designer; then + make_desktop_entry designer6 'Qt 6 Designer' designer6 \ + 'Qt;Development;GUIDesigner' \ + 'Comment=WYSIWYG tool for designing and building graphical user interfaces with QtWidgets' + fi + + if use distancefieldgenerator; then + # no icon, sharing with designer which fits letter-wise + make_desktop_entry qdistancefieldgenerator6 'Qt 6 Distance Field Generator' designer6 \ + 'Qt;Development' \ + 'Comment=Tool for pregenerating the font cache of Qt applications' + fi + + if use linguist; then + make_desktop_entry linguist6 'Qt 6 Linguist' linguist6 \ + 'Qt;Development;Translation' \ + 'Comment=Tool for translating Qt applications' + newicon src/linguist/linguist/images/icons/linguist-128-32.png linguist6.png + fi + + if use pixeltool; then + # no icon, not fitting but share with designer for now + make_desktop_entry pixeltool6 'Qt 6 Pixel Tool' designer6 \ + 'Qt;Development' \ + 'Comment=Tool for zooming in the desktop area pointed by the cursor' + fi + + if use qdbus; then + make_desktop_entry qdbusviewer6 'Qt 6 QDBusViewer' qdbusviewer6 \ + 'Qt;Development' \ + 'Comment=Tool that lets introspect D-Bus objects and messages' + newicon src/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer6.png + fi + + # hack: make_destop_entry does not support overriding DESCRIPTION + find "${ED}" -type f -name "*.desktop" \ + -exec sed -i "/^Comment=${DESCRIPTION}/d" -- {} + || die + fi +} + +pkg_postinst() { + use assistant && + optfeature "Qt documentation viewable in assistant" \ + 'dev-qt/qt-docs:6[qch]' #602296 +} diff --git a/dev-qt/qttools/qttools-6.8.9999.ebuild b/dev-qt/qttools/qttools-6.8.9999.ebuild deleted file mode 100644 index 52750e2eb0d8..000000000000 --- a/dev-qt/qttools/qttools-6.8.9999.ebuild +++ /dev/null @@ -1,167 +0,0 @@ -# Copyright 2021-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LLVM_COMPAT=( {17..20} ) # see .cmake.conf for minimum -LLVM_OPTIONAL=1 - -# behaves very badly when qttools is not already installed, also -# other issues to handle (clang tests flaky depending on version, -# and 3rdparty/ tries to FetchContent gtest) -QT6_RESTRICT_TESTS=1 - -inherit desktop llvm-r2 optfeature qt6-build - -DESCRIPTION="Qt Tools Collection" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" -fi - -IUSE=" - +assistant clang designer distancefieldgenerator gles2-only +linguist - opengl pixeltool +qdbus qdoc qml qmlls qtattributionsscanner qtdiag - qtplugininfo vulkan +widgets zstd -" -# note that some tools do not *require* widgets but will skip a sub-tool -# if not enabled (e.g. linguist gives lrelease but not the GUI linguist6) -REQUIRED_USE=" - assistant? ( widgets ) - clang? ( ${LLVM_REQUIRED_USE} ) - designer? ( qml widgets ) - distancefieldgenerator? ( qml widgets ) - pixeltool? ( widgets ) - qdoc? ( clang qml ) - qmlls? ( assistant qml ) -" - -RDEPEND=" - ~dev-qt/qtbase-${PV}:6[widgets?] - assistant? ( ~dev-qt/qtbase-${PV}:6[concurrent,network,sql,sqlite] ) - clang? ( - $(llvm_gen_dep ' - llvm-core/clang:${LLVM_SLOT}= - llvm-core/llvm:${LLVM_SLOT}= - ') - ) - designer? ( - ~dev-qt/qtbase-${PV}:6[network,xml,zstd=] - zstd? ( app-arch/zstd:= ) - ) - qdbus? ( ~dev-qt/qtbase-${PV}:6[dbus,xml] ) - qml? ( ~dev-qt/qtdeclarative-${PV}:6[widgets?] ) - qmlls? ( ~dev-qt/qtdeclarative-${PV}:6[qmlls] ) - qtdiag? ( ~dev-qt/qtbase-${PV}:6[network,gles2-only=,vulkan=] ) - widgets? ( ~dev-qt/qtbase-${PV}:6[opengl=] ) -" -DEPEND=" - ${RDEPEND} - qtdiag? ( - vulkan? ( dev-util/vulkan-headers ) - ) -" - -src_prepare() { - qt6-build_src_prepare - - # qttools is picky about clang versions and ignores LLVM_SLOT - sed -i '/find_package/s/${VERSION}//' cmake/FindWrapLibClang.cmake || die -} - -src_configure() { - use clang && llvm_chost_setup - - local mycmakeargs=( - # prevent the clang test as it can abort due to bug #916098 - $(cmake_use_find_package clang WrapLibClang) - $(cmake_use_find_package qml Qt6Qml) - $(cmake_use_find_package widgets Qt6Widgets) - $(qt_feature assistant) - $(qt_feature clang) - $(qt_feature designer) - $(qt_feature distancefieldgenerator) - $(qt_feature linguist) - $(qt_feature pixeltool) - $(qt_feature qdbus) - $(qt_feature qdoc) - $(qt_feature qtattributionsscanner) - $(qt_feature qtdiag) - $(qt_feature qtplugininfo) - - # TODO?: package litehtml, but support for latest releases seem - # to lag behind and bundled may work out better for now - # https://github.com/litehtml/litehtml/issues/266 - $(usev assistant -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=ON) - - # USE=qmlls' help plugin may be temporary, upstream has plans to split - # QtHelp into another package so that qtdeclarative can depend on it - # without a circular dependency with qttools - $(cmake_use_find_package qmlls Qt6QmlLSPrivate) - ) - - qt6-build_src_configure -} - -src_install() { - qt6-build_src_install - - # *could* consider a USE=gui to guard GUI applications and their .desktop - # files when only want the libraries (Help/UiTools), but cmake logic makes - # it difficult to get only these and we'd be just rm'ing small'ish files - if use widgets; then #914766 - use designer || use distancefieldgenerator || use pixeltool && - newicon src/designer/src/designer/images/designer.png designer6.png - - if use assistant; then - make_desktop_entry assistant6 'Qt 6 Assistant' assistant6 \ - 'Qt;Development;Documentation' \ - 'Comment=Tool for viewing online documentation in Qt help file format' - newicon src/assistant/assistant/images/assistant-128.png assistant6.png - fi - - if use designer; then - make_desktop_entry designer6 'Qt 6 Designer' designer6 \ - 'Qt;Development;GUIDesigner' \ - 'Comment=WYSIWYG tool for designing and building graphical user interfaces with QtWidgets' - fi - - if use distancefieldgenerator; then - # no icon, sharing with designer which fits letter-wise - make_desktop_entry qdistancefieldgenerator6 'Qt 6 Distance Field Generator' designer6 \ - 'Qt;Development' \ - 'Comment=Tool for pregenerating the font cache of Qt applications' - fi - - if use linguist; then - make_desktop_entry linguist6 'Qt 6 Linguist' linguist6 \ - 'Qt;Development;Translation' \ - 'Comment=Tool for translating Qt applications' - newicon src/linguist/linguist/images/icons/linguist-128-32.png linguist6.png - fi - - if use pixeltool; then - # no icon, not fitting but share with designer for now - make_desktop_entry pixeltool6 'Qt 6 Pixel Tool' designer6 \ - 'Qt;Development' \ - 'Comment=Tool for zooming in the desktop area pointed by the cursor' - fi - - if use qdbus; then - make_desktop_entry qdbusviewer6 'Qt 6 QDBusViewer' qdbusviewer6 \ - 'Qt;Development' \ - 'Comment=Tool that lets introspect D-Bus objects and messages' - newicon src/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer6.png - fi - - # hack: make_destop_entry does not support overriding DESCRIPTION - find "${ED}" -type f -name "*.desktop" \ - -exec sed -i "/^Comment=${DESCRIPTION}/d" -- {} + || die - fi -} - -pkg_postinst() { - use assistant && - optfeature "Qt documentation viewable in assistant" \ - 'dev-qt/qt-docs:6[qch]' #602296 -} -- cgit v1.2.3