From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E01D615802C for ; Sun, 15 Dec 2024 20:18:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B3422E0AD3; Sun, 15 Dec 2024 20:18:51 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8F3A1E0ACA for ; Sun, 15 Dec 2024 20:18:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 53EA6342FB5 for ; Sun, 15 Dec 2024 20:18:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C5FF52215 for ; Sun, 15 Dec 2024 20:18:46 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1734293854.02fa7f196abd378af6f97c8d0044ecd9c8ef3a2f.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qttools/qttools-6.9.9999.ebuild X-VCS-Directories: dev-qt/qttools/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 02fa7f196abd378af6f97c8d0044ecd9c8ef3a2f X-VCS-Branch: master Date: Sun, 15 Dec 2024 20:18:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8306d4eb-ea49-4c98-b552-506c87e191f8 X-Archives-Hash: f296f5183929987d6c94babe6f263c85 commit: 02fa7f196abd378af6f97c8d0044ecd9c8ef3a2f Author: Ionen Wolkens gentoo org> AuthorDate: Sun Dec 15 06:43:18 2024 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Sun Dec 15 20:17:34 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02fa7f19 dev-qt/qttools: add 6.9.9999 Signed-off-by: Ionen Wolkens gentoo.org> dev-qt/qttools/qttools-6.9.9999.ebuild | 159 +++++++++++++++++++++++++++++++++ 1 file changed, 159 insertions(+) diff --git a/dev-qt/qttools/qttools-6.9.9999.ebuild b/dev-qt/qttools/qttools-6.9.9999.ebuild new file mode 100644 index 000000000000..3944f485aac8 --- /dev/null +++ b/dev-qt/qttools/qttools-6.9.9999.ebuild @@ -0,0 +1,159 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LLVM_COMPAT=( {17..19} ) # 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-r1 optfeature qt6-build + +DESCRIPTION="Qt Tools Collection" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~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[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 ) + ) +" + +pkg_setup() { + use clang && llvm-r1_pkg_setup +} + +src_configure() { + 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 + + 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 +}