diff options
Diffstat (limited to 'dev-qt')
25 files changed, 668 insertions, 26 deletions
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz Binary files differindex e06009d843eb..af392de9c922 100644 --- a/dev-qt/Manifest.gz +++ b/dev-qt/Manifest.gz diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest index 91d82048bbc2..429f04d5acf1 100644 --- a/dev-qt/qt-creator/Manifest +++ b/dev-qt/qt-creator/Manifest @@ -1,3 +1,9 @@ +AUX qt-creator-11.0.2-musl-no-execinfo.patch 1305 BLAKE2B 14fba3e72188403cf457de46c50960bb69336023e74173a2a67c0e3101cbf8367cc0d0a31118efdaf715a184e558b6f2277fe8025035de482f6913e139660792 SHA512 707d09268cff8981d1baf7fa08c48a2c02edf044a7a76594d545a2a020616090c8b61851dff8d8a8350c024b39be932c9f7bc266e01b87680c7982759b1d96c4 +AUX qt-creator-11.0.2-musl-no-malloc-trim.patch 400 BLAKE2B 6933d466e1c93cb71a97dade2f5cc1a1d9aecc4b376a4ccfe5b16bd7b7485f4d8230b00d93b21c8420e74094369f47d84dcb655c22f1327ba69a2b313aeff5b8 SHA512 c0a31f61723964fabdbd3e4256689a6712de5c0dc12a4e0989f1867588fd18a4f6535f30290949f3d3f982b9bb0b454d0b9b81781e3900d859fc40ac5bec1068 +AUX qt-creator-11.0.2-qt653.patch 960 BLAKE2B 5b8e9b5c52df8c9f49af7d627a0af1d01cd41f67aac4ca59a29bda4708893544bc16c15579ef331d4f53859b65d1e50a5b8ef956b0a2de87961d6990a5aa1fe9 SHA512 8cfb2b96373b94c4eff8b83f18b8964d3c2a41b44620a0c694db978ed6042e0b521706c889f59e885bb737e56d1a9be068f5b17bc5267b8ec66cf14fab1c06a0 +DIST qt-creator-opensource-src-11.0.2.tar.xz 49828532 BLAKE2B 6028b71e1a7bf5ab953caa6223a2694e625449ab9e0eaa6e0dd8b34c0d64a9a5cea7b06d4aa98015d91defad04bc945db8528f87f5bddc70ba185ca32bb7ee8b SHA512 db123274e0652982f33db60b8f81610f0787357cdc7318ea2bbe105343ff905462c38e29a68f864c48bda51fee6f17859074c172f77dd2379ecc2e7028f5fcd5 DIST qt-creator-opensource-src-8.0.2.tar.xz 48874868 BLAKE2B 53f491441ba28f9420c76cd4adfdcb7c7ef432d756fc5bf64a507c2cd1022b35700418a7b35b7119d97f9947b5dac2a8acc56b600c3e75001f80565f1619c072 SHA512 59ff62e6592fd33ff74aeab13dd33f3817ba132fb98f8a87ea818e1e52b4af0dc292e362085733665f0867d67ff867794755b2f02067897a9fb1c14023c6fb23 +EBUILD qt-creator-11.0.2.ebuild 7082 BLAKE2B c6bf7423f2a13749e1226126daaee9953147c96be56c866c14d722968f7100e9c577080e7d9910abce37f0f7332602865d7b6725c4b572dfd40298de95d21355 SHA512 c922b5cf2601b4cc20c0aa4637891bf1704480b73a470ff27ace4a5cb9aad287b3d19f7a5543a48ecb959535937090bb621d8e421076147b219f99825924fe64 EBUILD qt-creator-8.0.2.ebuild 13562 BLAKE2B ed5898ff39becb8496538fcd0017e54e6fd7c0559351705a664250fefd399cefd622e27cca2e91b43cefa48819d543d809721ee3985466aa1327cd1644ee846f SHA512 4a2727479f76fa872ab6fe66ca629d72c613697ee2e2ad305d489b720e1c2a29675ca9f4a72fed3a02830dbc18f575aa480a1c540ca0eee9c63cfe1fb48386e4 -MISC metadata.xml 3889 BLAKE2B fe54d506e96703f88697dcb61747b6ce358644a98c83e8449f65d8a2bcacedf11a39066b40de85309b4739cbd7856b1af4d5a2aa7827ad376021f97998976db2 SHA512 cc5bdbd7eb15a65803873296866805c8eaec9f8cc2bb003eda49d7493928cbf9edbe1a281bb421d696928d30c3c0060bf6c6e174ea27d7c51a7dfecf66433b6f +EBUILD qt-creator-9999.ebuild 6736 BLAKE2B 0c826cded161cada3d906cfbc442e7dedb2fdc7e85c46c2a5fad29f694f49a5f06a90180f0648a74026d7b5a5f0e889df79167becafdfae77ad07ed700067654 SHA512 1d4db42565ff957c9f10385fdc3d51c3313e442afc89b3710838c55f819c3fd4e5f96a409170d7d57ac3fcb7218968a00e71464409ef541fe1067286d720fa8f +MISC metadata.xml 4229 BLAKE2B 4e71551f13819064fc008037070a36bba83a153e13ee602265ca86f4b7df5d6a53889c91072818ef741196053191c4cfc83abb3d877f49f2ccdfeff82f0dbe92 SHA512 1ddefd8379001e7e5cbac83b900ab7cf25d710e938e610ef715457d251a921b27ba6583f6f19fdb3af5c67c0ecbc334b19a3bb75e2ed46a4a6c582ec7cd09876 diff --git a/dev-qt/qt-creator/files/qt-creator-11.0.2-musl-no-execinfo.patch b/dev-qt/qt-creator/files/qt-creator-11.0.2-musl-no-execinfo.patch new file mode 100644 index 000000000000..b36cfef2d4e7 --- /dev/null +++ b/dev-qt/qt-creator/files/qt-creator-11.0.2-musl-no-execinfo.patch @@ -0,0 +1,47 @@ +execinfo is unavailable with musl (unless opted to package+use libexecinfo) +--- a/src/libs/utils/qtcassert.cpp ++++ b/src/libs/utils/qtcassert.cpp +@@ -9,5 +9,5 @@ + #include <QTime> + +-#if defined(Q_OS_UNIX) ++#if defined(Q_OS_UNIX) && defined(__GLIBC__) + #include <stdio.h> + #include <signal.h> +@@ -30,5 +30,5 @@ + if (maxdepth < 0 || maxdepth > ArraySize) + maxdepth = ArraySize; +-#if defined(Q_OS_UNIX) ++#if defined(Q_OS_UNIX) && defined(__GLIBC__) + void *bt[ArraySize] = {nullptr}; + int size = backtrace(bt, maxdepth); +--- a/src/plugins/qmldesigner/designercore/exceptions/exception.cpp ++++ b/src/plugins/qmldesigner/designercore/exceptions/exception.cpp +@@ -4,5 +4,5 @@ + #include "exception.h" + +-#ifdef Q_OS_LINUX ++#if defined(Q_OS_LINUX) && defined(__GLIBC__) + #include <execinfo.h> + #include <cxxabi.h> +@@ -31,5 +31,5 @@ + namespace QmlDesigner { + +-#ifdef Q_OS_LINUX ++#if defined(Q_OS_LINUX) && defined(__GLIBC__) + const char* demangle(const char* name) + { +@@ -76,5 +76,5 @@ + } + +-#ifdef Q_OS_LINUX ++#if defined(Q_OS_LINUX) && defined(__GLIBC__) + static QString getBackTrace() + { +@@ -114,5 +114,5 @@ + , m_file(QString::fromUtf8(file)) + , m_description(description) +- #ifdef Q_OS_LINUX ++ #if defined(Q_OS_LINUX) && defined(__GLIBC__) + , m_backTrace(getBackTrace()) + #endif diff --git a/dev-qt/qt-creator/files/qt-creator-11.0.2-musl-no-malloc-trim.patch b/dev-qt/qt-creator/files/qt-creator-11.0.2-musl-no-malloc-trim.patch new file mode 100644 index 000000000000..d4936882d4d2 --- /dev/null +++ b/dev-qt/qt-creator/files/qt-creator-11.0.2-musl-no-malloc-trim.patch @@ -0,0 +1,10 @@ +malloc_trim() is unavailable with musl +--- a/src/plugins/coreplugin/mainwindow.cpp ++++ b/src/plugins/coreplugin/mainwindow.cpp +@@ -222,5 +222,5 @@ + m_trimTimer.setInterval(60000); + // glibc may not actually free memory in free(). +-#ifdef Q_OS_LINUX ++#if defined(Q_OS_LINUX) && defined(__GLIBC__) + connect(&m_trimTimer, &QTimer::timeout, this, [] { malloc_trim(0); }); + #endif diff --git a/dev-qt/qt-creator/files/qt-creator-11.0.2-qt653.patch b/dev-qt/qt-creator/files/qt-creator-11.0.2-qt653.patch new file mode 100644 index 000000000000..1ad23a207d9b --- /dev/null +++ b/dev-qt/qt-creator/files/qt-creator-11.0.2-qt653.patch @@ -0,0 +1,26 @@ +Uses private parts of the QtQuick3D api which added a namespace in: +https://github.com/qt/qtquick3d/commit/2b139225745a94ab4fa7e30f28cd0207469ee68e +--- a/src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.cpp ++++ b/src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.cpp +@@ -803,5 +803,9 @@ + const QMatrix4x4 sceneTransform = parent->sceneTransform() * localTransform; + ++#if (QT_VERSION >= QT_VERSION_CHECK(6, 5, 3)) ++ return QSSGUtils::mat44::getPosition(sceneTransform); ++#else + return mat44::getPosition(sceneTransform); ++#endif + } + +--- a/src/tools/qml2puppet/qml2puppet/editor3d/mousearea3d.cpp ++++ b/src/tools/qml2puppet/qml2puppet/editor3d/mousearea3d.cpp +@@ -738,5 +738,9 @@ + const QMatrix4x4 sceneTransform = parent->sceneTransform() * localTransform; + ++#if (QT_VERSION >= QT_VERSION_CHECK(6, 5, 3)) ++ return QSSGUtils::mat44::getPosition(sceneTransform); ++#else + return mat44::getPosition(sceneTransform); ++#endif + } + diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml index dc11e329b879..8a364df28048 100644 --- a/dev-qt/qt-creator/metadata.xml +++ b/dev-qt/qt-creator/metadata.xml @@ -27,7 +27,7 @@ <flag name="designer">Enable designer for QtWidgets-based UIs</flag> <flag name="docker">Build plugin for Docker support</flag> <flag name="glsl">Build the GLSL editor plugin</flag> - <flag name="help">Enable the integrated documentation viewer</flag> + <flag name="help">Enable the integrated <pkg>dev-qt/qt-docs</pkg> viewer (also needed for examples)</flag> <flag name="imageviewer">Build plugin to open and view image files</flag> <flag name="incredibuild">Enable integration with Incredibuild</flag> <flag name="lsp">Add support for the Language Server Protocol (LSP)</flag> @@ -49,12 +49,15 @@ <flag name="serialterminal">Build the serial terminal plugin</flag> <flag name="silversearcher">Enable integration with <pkg>sys-apps/the_silver_searcher</pkg></flag> <flag name="systemd">Add support for retrieving application output from journald</flag> + <flag name="qmldesigner">Build QmlDesigner and related plugins (Insight, StudioWelcome)</flag> + <flag name="tracing">Build plugins requiring tracing capabilities (CtfVisualizer, PerfProfiler, QmlProfiler)</flag> <flag name="valgrind">Enable integration with <pkg>dev-util/valgrind</pkg></flag> <flag name="webassembly">Build WebAssembly plugin</flag> - <flag name="webengine">Use <pkg>dev-qt/qtwebengine</pkg> to view documentation</flag> + <flag name="webengine">Use <pkg>dev-qt/qtwebengine</pkg> with the help USE rather than bundled litehtml</flag> </use> <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> <doc>https://doc.qt.io/qtcreator/</doc> + <remote-id type="github">qt-creator/qt-creator</remote-id> </upstream> </pkgmetadata> diff --git a/dev-qt/qt-creator/qt-creator-11.0.2.ebuild b/dev-qt/qt-creator/qt-creator-11.0.2.ebuild new file mode 100644 index 000000000000..2d43880f115f --- /dev/null +++ b/dev-qt/qt-creator/qt-creator-11.0.2.ebuild @@ -0,0 +1,260 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +inherit cmake flag-o-matic llvm python-any-r1 readme.gentoo-r1 xdg + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI=( + "https://code.qt.io/qt-creator/qt-creator.git" + "https://github.com/qt-creator/qt-creator.git" + ) + EGIT_SUBMODULES=( + perfparser + src/libs/qlitehtml + src/libs/qlitehtml/src/3rdparty/litehtml + ) +else + QTC_PV=${PV/_/-} + QTC_P=${PN}-opensource-src-${QTC_PV} + [[ ${QTC_PV} == ${PV} ]] && QTC_REL=official || QTC_REL=development + SRC_URI="https://download.qt.io/${QTC_REL}_releases/qtcreator/$(ver_cut 1-2)/${PV/_/-}/${QTC_P}.tar.xz" + S=${WORKDIR}/${QTC_P} + KEYWORDS="~amd64" +fi + +DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt" +HOMEPAGE="https://www.qt.io/product/development-tools" + +LICENSE="GPL-3" +SLOT="0" +IUSE=" + +clang +designer doc +help qmldesigner serialterminal + +svg test +tracing webengine +" +RESTRICT="!test? ( test )" + +# 17+ may be usable, but there are many fixes for 17 in next version +LLVM_MAX_SLOT=16 +QT_PV=6.2.0:6 # IDE_QT_VERSION_MIN + +# := is used where Qt's private APIs are used for safety +COMMON_DEPEND=" + >=dev-qt/qt5compat-${QT_PV} + >=dev-qt/qtbase-${QT_PV}=[concurrent,gui,network,widgets,xml] + >=dev-qt/qtdeclarative-${QT_PV}= + clang? ( + dev-cpp/yaml-cpp:= + <sys-devel/clang-$((LLVM_MAX_SLOT+1)):= + ) + designer? ( >=dev-qt/qttools-${QT_PV}[designer] ) + help? ( + >=dev-qt/qttools-${QT_PV}[assistant] + webengine? ( >=dev-qt/qtwebengine-${QT_PV} ) + ) + qmldesigner? ( + >=dev-qt/qtquick3d-${QT_PV}= + >=dev-qt/qtsvg-${QT_PV} + ) + serialterminal? ( >=dev-qt/qtserialport-${QT_PV} ) + svg? ( >=dev-qt/qtsvg-${QT_PV} ) + tracing? ( + app-arch/zstd:= + dev-libs/elfutils + >=dev-qt/qtshadertools-${QT_PV} + ) +" +# qtimageformats for .webp in examples, semi-optfeature but useful in general +RDEPEND=" + ${COMMON_DEPEND} + help? ( >=dev-qt/qtimageformats-${QT_PV} ) + qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} ) +" +DEPEND="${COMMON_DEPEND}" +BDEPEND=" + ${PYTHON_DEPS} + >=dev-qt/qttools-${QT_PV}[linguist] + doc? ( >=dev-qt/qttools-${QT_PV}[qdoc] ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch + "${FILESDIR}"/${PN}-11.0.2-musl-no-malloc-trim.patch + "${FILESDIR}"/${PN}-11.0.2-qt653.patch +) + +pkg_setup() { + python-any-r1_pkg_setup + use clang && llvm_pkg_setup +} + +src_prepare() { + cmake_src_prepare + + # needed for finding docs at runtime in PF + sed -e "/_IDE_DOC_PATH/s/qtcreator/${PF}/" \ + -i cmake/QtCreatorAPIInternal.cmake || die +} + +src_configure() { + # -Werror=lto-type-mismatch issues, needs looking into + filter-lto + + # temporary workaround for musl-1.2.4 (bug #903611), this ideally + # needs fixing in qtbase as *64 usage comes from its headers' macros + use elibc_musl && append-lfs-flags + + local mycmakeargs=( + -DBUILD_WITH_PCH=no + -DWITH_DOCS=$(usex doc) + -DBUILD_DEVELOPER_DOCS=$(usex doc) + -DWITH_TESTS=$(usex test) + + # TODO?: try to unbundle with =no when syntax-highlighting:6 exists + -DBUILD_LIBRARY_KSYNTAXHIGHLIGHTING=yes + + # Much can be optional, but do not want to flood users (or maintainers) + # with too many flags. Not to mention that many plugins are merely + # wrappers around still optional tools (e.g. cvs) and any unwanted + # plugins can be disabled at runtime. So optional flags are limited + # to plugins with additional build-time dependencies. + -DBUILD_LIBRARY_TRACING=$(usex tracing) # qml+perfprofiler,ctfvisual + -DBUILD_EXECUTABLE_PERFPARSER=$(usex tracing) + + -DBUILD_PLUGIN_CLANGCODEMODEL=$(usex clang) + -DBUILD_PLUGIN_CLANGFORMAT=$(usex clang) + -DBUILD_PLUGIN_CLANGTOOLS=$(usex clang) + -DCLANGTOOLING_LINK_CLANG_DYLIB=yes + + -DBUILD_PLUGIN_DESIGNER=$(usex designer) + + -DBUILD_PLUGIN_HELP=$(usex help) + -DBUILD_HELPVIEWERBACKEND_QTWEBENGINE=$(usex webengine) + -DBUILD_LIBRARY_QLITEHTML=$(usex help $(usex !webengine)) + # TODO?: package litehtml, but support for latest releases seem + # to lag behind and bundled may work out better for now + # https://bugreports.qt.io/browse/QTCREATORBUG-29169 + $(use help && usev !webengine ' + -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=yes + -DEXTERNAL_XXD=no + ') + + -DBUILD_PLUGIN_SERIALTERMINAL=$(usex serialterminal) + + -DENABLE_SVG_SUPPORT=$(usex svg) + + -DWITH_QMLDESIGNER=$(usex qmldesigner) + + -Djournald=no # not really useful unless match qtbase (needs systemd) + + # not packaged, but allow using if found + #-DCMAKE_DISABLE_FIND_PACKAGE_LibDDemangle=yes + #-DCMAKE_DISABLE_FIND_PACKAGE_LibRustcDemangle=yes + ) + + cmake_src_configure +} + +src_test() { + local -x QT_QPA_PLATFORM=offscreen + + local CMAKE_SKIP_TESTS=( + # unknown why these fails, but seems fixed in live + tst_tracing_timelineitemsrenderpass + tst_tracing_timelinenotesrenderpass + tst_tracing_timelineselectionrenderpass + # fails when built with clang, but also seems fixed in live + tst_process + # skipping same tests+label as upstream's CI by default + # `grep ctest .github/workflows/build_cmake.yml` + tst_perfdata + ) + + cmake_src_test --label-exclude exclude_from_precheck +} + +src_compile() { + cmake_src_compile + + use doc && cmake_build {qch,html}_docs +} + +src_install() { + cmake_src_install + + if use doc; then + dodoc -r "${BUILD_DIR}"/doc/html + dodoc "${BUILD_DIR}"/share/doc/${PF}/qtcreator{,-dev}.qch + docompress -x /usr/share/doc/${PF}/qtcreator{,-dev}.qch + fi + + local DISABLE_AUTOFORMATTING=yes + local DOC_CONTENTS="\ +Some plugins (if used) may need optional extra dependencies/USE. + +This list provides associations with Gentoo's packages (if exists) +ordered as in Qt Creator's Help -> About Plugins (not exhaustive). + +dev-qt/qt-docs:6 with USE=\"examples qch\" is notably recommended, or +else the example tab will be empty alongside missing documentation. + +Build Systems: +- CMakeProjectManager (dev-util/cmake) +- MesonProjectManager (dev-util/meson) +- QbsProjectManager (dev-util/qbs) + +C++: +- Beautifier (dev-util/astyle and/or dev-util/uncrustify) +- ClangCodeModel (USE=clang, dev-util/clazy to understand Qt semantics) +- ClangFormat (USE=clang) + +Code Analyzer: +- ClangTools (USE=clang) +- Cppcheck (dev-util/cppcheck) +- CtfVisualizer (USE=tracing) +- PerfProfiler (USE=tracing) +- Valgrind (dev-util/valgrind) + +Core: +- Help (USE=help + dev-qt/qt-docs:6 with USE=\"examples qch\") + +Device Support: +- Android (dev-util/android-sdk-update-manager) + +Other Languages: +- Nim (dev-lang/nim) +- Python (dev-lang/python) + +Qt Creator: +- Designer (USE=designer) + +Qt Quick: +- Insight (USE=qmldesigner) +- QmlDesigner (USE=qmldesigner) +- QmlProfiler (USE=tracing) + +Utilities: +- Autotest (dev-cpp/catch, dev-cpp/gtest, or dev-libs/boost if used) +- Conan (dev-util/conan) +- Docker (app-containers/docker) +- Haskell (dev-lang/ghc) +- SerialTerminal (USE=serialterminal) +- SilverSearcher (sys-apps/the_silver_searcher) +- StudioWelcome (USE=qmldesigner) + +Version Control: +- CVS (dev-vcs/cvs) +- Fossil (dev-vcs/fossil) +- Git (dev-vcs/git) +- Mercurial (dev-vcs/mercurial) +- Subversion (dev-vcs/subversion)" + readme.gentoo_create_doc +} + +pkg_postinst() { + xdg_pkg_postinst + readme.gentoo_print_elog +} diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild new file mode 100644 index 000000000000..e3eb16aa2c02 --- /dev/null +++ b/dev-qt/qt-creator/qt-creator-9999.ebuild @@ -0,0 +1,250 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +inherit cmake flag-o-matic llvm python-any-r1 readme.gentoo-r1 xdg + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI=( + "https://code.qt.io/qt-creator/qt-creator.git" + "https://github.com/qt-creator/qt-creator.git" + ) + EGIT_SUBMODULES=( + perfparser + src/libs/qlitehtml + src/libs/qlitehtml/src/3rdparty/litehtml + ) +else + QTC_PV=${PV/_/-} + QTC_P=${PN}-opensource-src-${QTC_PV} + [[ ${QTC_PV} == ${PV} ]] && QTC_REL=official || QTC_REL=development + SRC_URI="https://download.qt.io/${QTC_REL}_releases/qtcreator/$(ver_cut 1-2)/${PV/_/-}/${QTC_P}.tar.xz" + S=${WORKDIR}/${QTC_P} + KEYWORDS="~amd64" +fi + +DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt" +HOMEPAGE="https://www.qt.io/product/development-tools" + +LICENSE="GPL-3" +SLOT="0" +IUSE=" + +clang +designer doc +help qmldesigner serialterminal + +svg test +tracing webengine +" +RESTRICT="!test? ( test )" + +LLVM_MAX_SLOT=17 +QT_PV=6.2.0:6 # IDE_QT_VERSION_MIN + +# := is used where Qt's private APIs are used for safety +COMMON_DEPEND=" + >=dev-qt/qt5compat-${QT_PV} + >=dev-qt/qtbase-${QT_PV}=[concurrent,gui,network,widgets,xml] + >=dev-qt/qtdeclarative-${QT_PV}= + clang? ( + dev-cpp/yaml-cpp:= + <sys-devel/clang-$((LLVM_MAX_SLOT+1)):= + ) + designer? ( >=dev-qt/qttools-${QT_PV}[designer] ) + help? ( + >=dev-qt/qttools-${QT_PV}[assistant] + webengine? ( >=dev-qt/qtwebengine-${QT_PV} ) + ) + qmldesigner? ( + >=dev-qt/qtquick3d-${QT_PV}= + >=dev-qt/qtsvg-${QT_PV} + ) + serialterminal? ( >=dev-qt/qtserialport-${QT_PV} ) + svg? ( >=dev-qt/qtsvg-${QT_PV} ) + tracing? ( + app-arch/zstd:= + dev-libs/elfutils + >=dev-qt/qtshadertools-${QT_PV} + ) +" +# qtimageformats for .webp in examples, semi-optfeature but useful in general +RDEPEND=" + ${COMMON_DEPEND} + help? ( >=dev-qt/qtimageformats-${QT_PV} ) + qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} ) +" +DEPEND="${COMMON_DEPEND}" +BDEPEND=" + ${PYTHON_DEPS} + >=dev-qt/qttools-${QT_PV}[linguist] + doc? ( >=dev-qt/qttools-${QT_PV}[qdoc] ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch + "${FILESDIR}"/${PN}-11.0.2-musl-no-malloc-trim.patch + "${FILESDIR}"/${PN}-11.0.2-qt653.patch +) + +pkg_setup() { + python-any-r1_pkg_setup + use clang && llvm_pkg_setup +} + +src_prepare() { + cmake_src_prepare + + # needed for finding docs at runtime in PF + sed -e "/_IDE_DOC_PATH/s/qtcreator/${PF}/" \ + -i cmake/QtCreatorAPIInternal.cmake || die +} + +src_configure() { + # -Werror=lto-type-mismatch issues, needs looking into + filter-lto + + # temporary workaround for musl-1.2.4 (bug #903611), this ideally + # needs fixing in qtbase as *64 usage comes from its headers' macros + use elibc_musl && append-lfs-flags + + local mycmakeargs=( + -DBUILD_WITH_PCH=no + -DWITH_DOCS=$(usex doc) + -DBUILD_DEVELOPER_DOCS=$(usex doc) + -DWITH_TESTS=$(usex test) + + # TODO?: try to unbundle with =no when syntax-highlighting:6 exists + -DBUILD_LIBRARY_KSYNTAXHIGHLIGHTING=yes + + # Much can be optional, but do not want to flood users (or maintainers) + # with too many flags. Not to mention that many plugins are merely + # wrappers around still optional tools (e.g. cvs) and any unwanted + # plugins can be disabled at runtime. So optional flags are limited + # to plugins with additional build-time dependencies. + -DBUILD_LIBRARY_TRACING=$(usex tracing) # qml+perfprofiler,ctfvisual + -DBUILD_EXECUTABLE_PERFPARSER=$(usex tracing) + + -DBUILD_PLUGIN_CLANGCODEMODEL=$(usex clang) + -DBUILD_PLUGIN_CLANGFORMAT=$(usex clang) + -DBUILD_PLUGIN_CLANGTOOLS=$(usex clang) + -DCLANGTOOLING_LINK_CLANG_DYLIB=yes + + -DBUILD_PLUGIN_DESIGNER=$(usex designer) + + -DBUILD_PLUGIN_HELP=$(usex help) + -DBUILD_HELPVIEWERBACKEND_QTWEBENGINE=$(usex webengine) + -DBUILD_LIBRARY_QLITEHTML=$(usex help $(usex !webengine)) + # TODO?: package litehtml, but support for latest releases seem + # to lag behind and bundled may work out better for now + # https://bugreports.qt.io/browse/QTCREATORBUG-29169 + $(use help && usev !webengine -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=yes) + + -DBUILD_PLUGIN_SERIALTERMINAL=$(usex serialterminal) + + -DENABLE_SVG_SUPPORT=$(usex svg) + + -DWITH_QMLDESIGNER=$(usex qmldesigner) + + -Djournald=no # not really useful unless match qtbase (needs systemd) + + # not packaged, but allow using if found + #-DCMAKE_DISABLE_FIND_PACKAGE_LibDDemangle=yes + #-DCMAKE_DISABLE_FIND_PACKAGE_LibRustcDemangle=yes + ) + + cmake_src_configure +} + +src_test() { + local -x QT_QPA_PLATFORM=offscreen + + local CMAKE_SKIP_TESTS=( + # skipping same tests+label as upstream's CI by default + # `grep ctest .github/workflows/build_cmake.yml` + tst_perfdata + ) + + cmake_src_test --label-exclude exclude_from_precheck +} + +src_compile() { + cmake_src_compile + + use doc && cmake_build {qch,html}_docs +} + +src_install() { + cmake_src_install + + if use doc; then + dodoc -r "${BUILD_DIR}"/doc/html + dodoc "${BUILD_DIR}"/share/doc/${PF}/qtcreator{,-dev}.qch + docompress -x /usr/share/doc/${PF}/qtcreator{,-dev}.qch + fi + + local DISABLE_AUTOFORMATTING=yes + local DOC_CONTENTS="\ +Some plugins (if used) may need optional extra dependencies/USE. + +This list provides associations with Gentoo's packages (if exists) +ordered as in Qt Creator's Help -> About Plugins (not exhaustive). + +dev-qt/qt-docs:6 with USE=\"examples qch\" is notably recommended, or +else the example tab will be empty alongside missing documentation. + +Build Systems: +- CMakeProjectManager (dev-util/cmake) +- MesonProjectManager (dev-util/meson) +- QbsProjectManager (dev-util/qbs) + +C++: +- Beautifier (dev-util/astyle and/or dev-util/uncrustify) +- ClangCodeModel (USE=clang, dev-util/clazy to understand Qt semantics) +- ClangFormat (USE=clang) + +Code Analyzer: +- ClangTools (USE=clang) +- Cppcheck (dev-util/cppcheck) +- CtfVisualizer (USE=tracing) +- PerfProfiler (USE=tracing) +- Valgrind (dev-util/valgrind) + +Core: +- Help (USE=help + dev-qt/qt-docs:6 with USE=\"examples qch\") + +Device Support: +- Android (dev-util/android-sdk-update-manager) + +Other Languages: +- Nim (dev-lang/nim) +- Python (dev-lang/python) + +Qt Creator: +- Designer (USE=designer) + +Qt Quick: +- Insight (USE=qmldesigner) +- QmlDesigner (USE=qmldesigner) +- QmlProfiler (USE=tracing) + +Utilities: +- Autotest (dev-cpp/catch, dev-cpp/gtest, or dev-libs/boost if used) +- Conan (dev-util/conan) +- Docker (app-containers/docker) +- Haskell (dev-lang/ghc) +- SerialTerminal (USE=serialterminal) +- SilverSearcher (sys-apps/the_silver_searcher) +- StudioWelcome (USE=qmldesigner) + +Version Control: +- CVS (dev-vcs/cvs) +- Fossil (dev-vcs/fossil) +- Git (dev-vcs/git) +- Mercurial (dev-vcs/mercurial) +- Subversion (dev-vcs/subversion)" + readme.gentoo_create_doc +} + +pkg_postinst() { + xdg_pkg_postinst + readme.gentoo_print_elog +} diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest index 4dae3ff59790..2fc8195175a3 100644 --- a/dev-qt/qtbase/Manifest +++ b/dev-qt/qtbase/Manifest @@ -1,7 +1,7 @@ AUX qtbase-6.5.2-CVE-2023-38197.patch 14691 BLAKE2B 68de2edb047871de9608a0a570773c9987474f9977f1dad9a849b8ed18dad6ef966997c0293adaee92fd2fcdb24a79a6bd05a71874c548722bfca64d960f12e3 SHA512 0ee7d66a0894879816454fdfd4c9feb958d82e87f4287935704216330e74135709b23cba7a5c084a6b2617b16c54a96eb6eff785d85f0d79b15ef6ccd9da51c6 AUX qtbase-6.5.2-tests-gcc13.patch 1491 BLAKE2B 72417e910bb35df59c10d18e093bf4d17952d0a39ead552a342020004bbf7c9e0f903140c014509ab806915ff380ad3732e3cd119b9b1ce3bec550b9c247a077 SHA512 10e05e135e4997cc71c0d2f1a0b40131babe88801d87bb11f69aa1ae93cdcdef9e1e510dbfe337b5bd101e4831a401a63a5e49d84f9f865d6db986e3e60277ba DIST qtbase-everywhere-src-6.5.2.tar.xz 48410716 BLAKE2B 578c69ede6f45a8b21cba0a24674d5d8801722503d13ab9578b06b2446ce15e6a84bcdbd0c5d2c9aa868ec70862f0845406c959ed79b695f82bb398ecf299c63 SHA512 8d97029aae5b73a3e03624c9a8495dbf2fe54a4f5e992071c06f3d93935e64c80f2121b33eeb60a92d96ceb288cb25d74906a5bf47b45bb018d859d4a2d13f20 -EBUILD qtbase-6.5.2-r2.ebuild 8934 BLAKE2B c11e3181a9f8d8200a59a31008a5a49026a5cba3ee4487274e24c6a2f0a2fc42173bc9306a9a8cad106e1dd1bb6ae8511ed58539b3a9000a1d920763cb943217 SHA512 2db33bd77917eb230a4fdfa5c2e65ba0f3fa79f6838c8eddacfd22045a04cf65934bfee28857f27acfe2670e992577db96f549267ee214aa35635a8ae04b939d -EBUILD qtbase-6.5.9999.ebuild 8842 BLAKE2B d8090a9bc7c360df38967d6d2d19ac7ef06a9cc1d03a13005662a578f6d4ac3261ceefe91b8919e1b2264c8433a58164ccff6884c45b058257453e9e2fe74aa7 SHA512 d7cecdbbc81e4330a429411cd3e6449528a12b820575820e665984938a13f94d8b7a87536c1a295ab570e0c8e4c487962fff969ca8153e4bd7f5204246ed736b -EBUILD qtbase-6.9999.ebuild 8842 BLAKE2B d8090a9bc7c360df38967d6d2d19ac7ef06a9cc1d03a13005662a578f6d4ac3261ceefe91b8919e1b2264c8433a58164ccff6884c45b058257453e9e2fe74aa7 SHA512 d7cecdbbc81e4330a429411cd3e6449528a12b820575820e665984938a13f94d8b7a87536c1a295ab570e0c8e4c487962fff969ca8153e4bd7f5204246ed736b +EBUILD qtbase-6.5.2-r2.ebuild 9024 BLAKE2B 5581865d62e3d8dbf5f035b1d5b44472c45654b67164a93eb9b87d54a23a3aa2f18c6b4836c2b4d3bc05947161702748d2042fb5d137360d374d967bb1671054 SHA512 89821953e975542e0d9789c18f19036f1535f2fc65a00c3207a524226861b43bbd3485e733756208bc6de2fd3aaa7225b8adde7aa9551c046ddd73e2d96956d3 +EBUILD qtbase-6.5.9999.ebuild 8915 BLAKE2B d64974c22182b760ea36d4bd6aeed33cad14b584abb0e3969d03e7b96d8a894bcab524432b8be7cf257d4dc7763ca71085b9f33b02ed90aeb2cf7a7f32811a9b SHA512 d0c4b844f62ec26a748928c52c45859935aef4905e28d48813e57904f1851dea16beb0334f25a6e799e6e653c8d1b7a1b63c30ae6104957fa91347dea6157617 +EBUILD qtbase-6.9999.ebuild 8915 BLAKE2B d64974c22182b760ea36d4bd6aeed33cad14b584abb0e3969d03e7b96d8a894bcab524432b8be7cf257d4dc7763ca71085b9f33b02ed90aeb2cf7a7f32811a9b SHA512 d0c4b844f62ec26a748928c52c45859935aef4905e28d48813e57904f1851dea16beb0334f25a6e799e6e653c8d1b7a1b63c30ae6104957fa91347dea6157617 MISC metadata.xml 1606 BLAKE2B f6e00b051825268bd8976eea76bd297ab52f8821810ec71388ea7ff4e52e7b0fb1ae22313fe29d3fc123eba70efe9dff9f0934d00b07d3a4b055e9f9344b2feb SHA512 4321e0c195abc2d9459fab1706eeb24563382ff47f37a51a318888370565702c9394cc88e45b20c5f5ebc43114693cfe9c783db1389b8c5fae765ce839677555 diff --git a/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild index ba0ce93ec259..0555e1ac9271 100644 --- a/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild +++ b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild @@ -8,7 +8,7 @@ inherit flag-o-matic qt6-build toolchain-funcs DESCRIPTION="Cross-platform application development framework" if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi declare -A QT6_IUSE=( @@ -295,6 +295,9 @@ src_test() { tst_qglyphrun tst_qvectornd tst_rcc + # similarly, but on armv7 (bug #914028) + tst_qlineedit + tst_qpainter # partially broken on llvm-musl, needs looking into but skip to have # a baseline for regressions (like above, rest of dev-qt is fine) $(usev elibc_musl ' diff --git a/dev-qt/qtbase/qtbase-6.5.9999.ebuild b/dev-qt/qtbase/qtbase-6.5.9999.ebuild index 8a845eb86893..f3ee319901e2 100644 --- a/dev-qt/qtbase/qtbase-6.5.9999.ebuild +++ b/dev-qt/qtbase/qtbase-6.5.9999.ebuild @@ -290,6 +290,9 @@ src_test() { tst_qglyphrun tst_qvectornd tst_rcc + # similarly, but on armv7 (bug #914028) + tst_qlineedit + tst_qpainter # partially broken on llvm-musl, needs looking into but skip to have # a baseline for regressions (like above, rest of dev-qt is fine) $(usev elibc_musl ' diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild index 8a845eb86893..f3ee319901e2 100644 --- a/dev-qt/qtbase/qtbase-6.9999.ebuild +++ b/dev-qt/qtbase/qtbase-6.9999.ebuild @@ -290,6 +290,9 @@ src_test() { tst_qglyphrun tst_qvectornd tst_rcc + # similarly, but on armv7 (bug #914028) + tst_qlineedit + tst_qpainter # partially broken on llvm-musl, needs looking into but skip to have # a baseline for regressions (like above, rest of dev-qt is fine) $(usev elibc_musl ' diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest index 91d0e4857b3e..cd1e337e2fe8 100644 --- a/dev-qt/qtdeclarative/Manifest +++ b/dev-qt/qtdeclarative/Manifest @@ -3,7 +3,7 @@ DIST qtdeclarative-5.15.10-gentoo-kde-3.tar.xz 26396 BLAKE2B 07ad0b115316e8eeaa1 DIST qtdeclarative-everywhere-opensource-src-5.15.10.tar.xz 21596352 BLAKE2B 4259b55b1406694cf10d5ff1c4bc2501b47a7a7ea4a09eeb77c08fa1417d5f8d028df1a0753af0d1ef52d7aa1331343c56b6c72adf462a6d1a1d5097c288ad8f SHA512 378fc41a31edb52d85fd5e37fe6c086e35b5d5d759ceacc49cf7981a8a38d25ae5f2ca27d99547bd1db381f32128e7947800e2a01a857177707cc2a9980373a8 DIST qtdeclarative-everywhere-src-6.5.2.tar.xz 35552840 BLAKE2B 048da9ab9433034ede21b51458cd3c7bd09d5364c8e2e65a02905bdc107d456ba0cbf2f9ea459324462c455fb33ef5f9b7bbbbe79e669100c82274476c10b34c SHA512 e6fd9dddbab72ee2e323d8ae0f4ac438b935477ad50b3e069a307993e94b289648d29ee265ac535e1396e4c1ba4bdf7e16b0cdf89a17df8d0a43bbe94f7316ef EBUILD qtdeclarative-5.15.10-r2.ebuild 1537 BLAKE2B ea417da488314eed547e9637796d153a358c8cec1645242338f6fa67605b45a886b9f91de62db4483f1a69b704ce852879948c097c66cdeb4f6e777a81c264f6 SHA512 a34ae5b04825f751715975dc927824b6ba4726564647e50d84f27bc1dc1d8c8a6dde27b02e568b01ee21f6a8476ac27d9db9b72fd3b3a4175be7043e89d7435c -EBUILD qtdeclarative-6.5.2-r1.ebuild 701 BLAKE2B 4430d15f8361f70d6207f04903285e05b634ea2fa1e25a0431514a4e941cf4c4726417462d6716dc59a86d34c02584535ce528ac7fd6510a66a126f18cf39cd3 SHA512 96f79b461851f32831a1e9f4dfb1fc02f08041b8b64cb2259015fa0e2be48622e506a0f918737ecee0490bd6ab7e2f159ad51d518cd454ce149c8c26aeb57124 +EBUILD qtdeclarative-6.5.2-r1.ebuild 718 BLAKE2B 528000a8f7e267c34f1077e3910e74f61f83bb13d5a53a8cb4d21b499307722a98b839e27c908d3acf6b329e26f900fd1d481524afbcd66cebef696a91a99efd SHA512 96c4befb851b638b94f2b7727d38645dc2b17e192ea273ed4129f73a4f040e00f976001bb4f57a86e3fc1b5cd6c02f13734051e61e99e04d1f717ab3b32c0306 EBUILD qtdeclarative-6.5.9999.ebuild 701 BLAKE2B 4430d15f8361f70d6207f04903285e05b634ea2fa1e25a0431514a4e941cf4c4726417462d6716dc59a86d34c02584535ce528ac7fd6510a66a126f18cf39cd3 SHA512 96f79b461851f32831a1e9f4dfb1fc02f08041b8b64cb2259015fa0e2be48622e506a0f918737ecee0490bd6ab7e2f159ad51d518cd454ce149c8c26aeb57124 EBUILD qtdeclarative-6.9999.ebuild 701 BLAKE2B 4430d15f8361f70d6207f04903285e05b634ea2fa1e25a0431514a4e941cf4c4726417462d6716dc59a86d34c02584535ce528ac7fd6510a66a126f18cf39cd3 SHA512 96f79b461851f32831a1e9f4dfb1fc02f08041b8b64cb2259015fa0e2be48622e506a0f918737ecee0490bd6ab7e2f159ad51d518cd454ce149c8c26aeb57124 MISC metadata.xml 800 BLAKE2B ac64df7acf6a3fff34fe396b981c4babb145590b2e8d8d656ea6287d2a251c799866748f184a4b1876fe3195120a6192fe9ea7d787f49978a3c8d47159c01031 SHA512 30e9c9c8c3719791e927574a08a0a5667c327ca3d6c614df1b372ae1390074ae5ba16d0363cc81c625fa9ce585f93cb4bcba78ad9f0b36470d63c614c195c5c2 diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.5.2-r1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.5.2-r1.ebuild index 90ce21a2e8ec..eb266e39c599 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6.5.2-r1.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6.5.2-r1.ebuild @@ -8,7 +8,7 @@ inherit qt6-build DESCRIPTION="Qt Declarative (Quick 2)" if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi IUSE="opengl +sql vulkan +widgets" diff --git a/dev-qt/qtshadertools/Manifest b/dev-qt/qtshadertools/Manifest index 8e81b62094ec..a98e88d0b5a2 100644 --- a/dev-qt/qtshadertools/Manifest +++ b/dev-qt/qtshadertools/Manifest @@ -1,5 +1,5 @@ DIST qtshadertools-everywhere-src-6.5.2.tar.xz 1061812 BLAKE2B 33b997f121ae408f9cbbba53c08d015f55709b3558e8ef1f0ec41c2313f1d4e51051c4bd540e25b1fa91c1bd9d7dbba381e363ee6fae1df6d728ad95727dc829 SHA512 95a697de1e0b415b700edc86c452847f37478951c547fad42c8373c592a1f474b824df7c2d1ae3b26fb9401df3c523431633e0293f5e472732964cb527def6be -EBUILD qtshadertools-6.5.2.ebuild 316 BLAKE2B af77183f14888dcd6060254987f681ad19285921233b4bc983f332a5b1ea3d002b69ae725c177c62eaf646a8d05180cab07786ac618ab9b839d3ea1ed8e39894 SHA512 c6763f935d73641aaa5ba093a63f664df57458c3650a0de501341b1ed313f814a0632dbfc2602b588e063bb60fee9dcc65545f22043234126ceb0c0ef742ee0c +EBUILD qtshadertools-6.5.2.ebuild 333 BLAKE2B b9aab8dd741788daf5d7775dd273a93be96372f5894f7810c77c6a2b5c78d183653e2f32391a5b392bf1552c68f36c58972765ec900461f36d7cb73f3e3b99b6 SHA512 8e0d6afc5dd6ee0842cc7e7983d3f8779bb1c4e2a2f246bb1b55b0066850e292870165fec84f664ec85feffe13736ce0970691c0ff86190f5907b41ab67d8338 EBUILD qtshadertools-6.5.9999.ebuild 316 BLAKE2B af77183f14888dcd6060254987f681ad19285921233b4bc983f332a5b1ea3d002b69ae725c177c62eaf646a8d05180cab07786ac618ab9b839d3ea1ed8e39894 SHA512 c6763f935d73641aaa5ba093a63f664df57458c3650a0de501341b1ed313f814a0632dbfc2602b588e063bb60fee9dcc65545f22043234126ceb0c0ef742ee0c EBUILD qtshadertools-6.9999.ebuild 316 BLAKE2B af77183f14888dcd6060254987f681ad19285921233b4bc983f332a5b1ea3d002b69ae725c177c62eaf646a8d05180cab07786ac618ab9b839d3ea1ed8e39894 SHA512 c6763f935d73641aaa5ba093a63f664df57458c3650a0de501341b1ed313f814a0632dbfc2602b588e063bb60fee9dcc65545f22043234126ceb0c0ef742ee0c MISC metadata.xml 538 BLAKE2B 59f8b1a838f1fadf78bc2d9f1c65fde2c7fdc306730671b16297ff19308186907744bcbd0924074001e1cdb43c1dde29486368bb0d2533b3cb12f7befa53d2dc SHA512 dfe1c793f5525ce4d4353d9131749247163021ec3d995d2cc95df53d214d2e0b24468a026df0dd6403cad41990ab5e8c5e801efa346a06a2d962f29990b16ddf diff --git a/dev-qt/qtshadertools/qtshadertools-6.5.2.ebuild b/dev-qt/qtshadertools/qtshadertools-6.5.2.ebuild index 7655c47db240..174c66ce198a 100644 --- a/dev-qt/qtshadertools/qtshadertools-6.5.2.ebuild +++ b/dev-qt/qtshadertools/qtshadertools-6.5.2.ebuild @@ -8,7 +8,7 @@ inherit qt6-build DESCRIPTION="Qt APIs and Tools for Graphics Pipelines" if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi RDEPEND=" diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest index b9f192d27f06..fa6ac4108641 100644 --- a/dev-qt/qttools/Manifest +++ b/dev-qt/qttools/Manifest @@ -1,5 +1,5 @@ DIST qttools-everywhere-src-6.5.2.tar.xz 8591336 BLAKE2B 37adbaec83938d4dae096b1ab4e49d1693ab2a926b3b61f5b40f45c8f89ba71ae847abf6eab4db26206dfc9896e5a880de489cfe17c942e66383dcf9b6fc7397 SHA512 d5b858b5307b2abfda2786331034a2957afbaba6299955bc3a2489f15bc8c2613b613b0f6f1fdf2aabfa9929a44eeeae3faeb26e0ab176d347e8ddd47f0e8011 -EBUILD qttools-6.5.2-r1.ebuild 1984 BLAKE2B e6fc67479afb2dbb72e1abe6d581b1860a9c4facc924358f6a41c7ff77ccde0904511386f0cf57600ed762a5559105806cc31b322a2edc9ba093f7254b75d1ac SHA512 adf3771742d0295cf846804e6d4f8c4995508be2a787d37b9ecbda4b218fdc2b5ddb497799d43cdc2fa4ffd1e1c0e723f1a554f27693c9e31879a7f042e61f21 -EBUILD qttools-6.5.9999.ebuild 1984 BLAKE2B e6fc67479afb2dbb72e1abe6d581b1860a9c4facc924358f6a41c7ff77ccde0904511386f0cf57600ed762a5559105806cc31b322a2edc9ba093f7254b75d1ac SHA512 adf3771742d0295cf846804e6d4f8c4995508be2a787d37b9ecbda4b218fdc2b5ddb497799d43cdc2fa4ffd1e1c0e723f1a554f27693c9e31879a7f042e61f21 -EBUILD qttools-6.9999.ebuild 1984 BLAKE2B e6fc67479afb2dbb72e1abe6d581b1860a9c4facc924358f6a41c7ff77ccde0904511386f0cf57600ed762a5559105806cc31b322a2edc9ba093f7254b75d1ac SHA512 adf3771742d0295cf846804e6d4f8c4995508be2a787d37b9ecbda4b218fdc2b5ddb497799d43cdc2fa4ffd1e1c0e723f1a554f27693c9e31879a7f042e61f21 +EBUILD qttools-6.5.2-r1.ebuild 2301 BLAKE2B 3f48fd4c9e7347d81b5111407e7658892041a6223a30671deb015ba69d8c3063ad91d7d205d8e6cade0b5b45069ce9232a394f0434bcfe331013ef83f27a6503 SHA512 b91f1afccf27246c02eb73cf708f415445fd901430d333334e01aeb0fd37c63d29df6557d9c5e31ba7482cb54676d24fed9a692a0dfcd466e44dc678e327fe95 +EBUILD qttools-6.5.9999.ebuild 2284 BLAKE2B b33b383177131409da792ab93f263764862203e579b6208b97b3c0e58907ecf2a369e48355f524bf3640fc1db09a137ddac3cbb62379b29cf72411fa050e9783 SHA512 fda4172784d089eb1bfaeb9fcb2e25e1bb2617c9b430630fb71d6414e41158c6a575f2426a8b2e294cb5f141e2b337ab9e80c9859da1abfeeca6974642b9c7bc +EBUILD qttools-6.9999.ebuild 2284 BLAKE2B b33b383177131409da792ab93f263764862203e579b6208b97b3c0e58907ecf2a369e48355f524bf3640fc1db09a137ddac3cbb62379b29cf72411fa050e9783 SHA512 fda4172784d089eb1bfaeb9fcb2e25e1bb2617c9b430630fb71d6414e41158c6a575f2426a8b2e294cb5f141e2b337ab9e80c9859da1abfeeca6974642b9c7bc MISC metadata.xml 1393 BLAKE2B ffe27b97fb8e5d072b2228ded8dfb59c4f0d5837cb1656ebdf4893818d3dbb3b7e359e273d8fdc356d21d3af5f5a841254b7ab26e348584e896b94151181a6c3 SHA512 3dad0d030fb1d92fb5719a1405199c4e9a2b445a5f6d3d3ac609c74a0cc6c6b5bcd414c556db8cb09e54549158b23b57175a04fdf21ae29f331827872db69a04 diff --git a/dev-qt/qttools/qttools-6.5.2-r1.ebuild b/dev-qt/qttools/qttools-6.5.2-r1.ebuild index 243633446599..9120759d00ad 100644 --- a/dev-qt/qttools/qttools-6.5.2-r1.ebuild +++ b/dev-qt/qttools/qttools-6.5.2-r1.ebuild @@ -8,7 +8,7 @@ inherit llvm optfeature qt6-build DESCRIPTION="Qt Tools Collection" if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi IUSE=" @@ -42,7 +42,12 @@ RDEPEND=" qtdiag? ( ~dev-qt/qtbase-${PV}:6[gles2-only=,vulkan=] ) widgets? ( ~dev-qt/qtbase-${PV}:6[opengl=] ) " -DEPEND="${RDEPEND}" +DEPEND=" + ${RDEPEND} + qtdiag? ( + vulkan? ( dev-util/vulkan-headers ) + ) +" pkg_setup() { use clang && llvm_pkg_setup @@ -63,6 +68,11 @@ src_configure() { $(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) ) qt6-build_src_configure @@ -71,5 +81,5 @@ src_configure() { pkg_postinst() { use assistant && optfeature "Qt documentation viewable in assistant" \ - dev-qt/qt-docs:6 #602296 + 'dev-qt/qt-docs:6[qch]' #602296 } diff --git a/dev-qt/qttools/qttools-6.5.9999.ebuild b/dev-qt/qttools/qttools-6.5.9999.ebuild index 243633446599..295a69f8fd39 100644 --- a/dev-qt/qttools/qttools-6.5.9999.ebuild +++ b/dev-qt/qttools/qttools-6.5.9999.ebuild @@ -42,7 +42,12 @@ RDEPEND=" qtdiag? ( ~dev-qt/qtbase-${PV}:6[gles2-only=,vulkan=] ) widgets? ( ~dev-qt/qtbase-${PV}:6[opengl=] ) " -DEPEND="${RDEPEND}" +DEPEND=" + ${RDEPEND} + qtdiag? ( + vulkan? ( dev-util/vulkan-headers ) + ) +" pkg_setup() { use clang && llvm_pkg_setup @@ -63,6 +68,11 @@ src_configure() { $(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) ) qt6-build_src_configure @@ -71,5 +81,5 @@ src_configure() { pkg_postinst() { use assistant && optfeature "Qt documentation viewable in assistant" \ - dev-qt/qt-docs:6 #602296 + 'dev-qt/qt-docs:6[qch]' #602296 } diff --git a/dev-qt/qttools/qttools-6.9999.ebuild b/dev-qt/qttools/qttools-6.9999.ebuild index 243633446599..295a69f8fd39 100644 --- a/dev-qt/qttools/qttools-6.9999.ebuild +++ b/dev-qt/qttools/qttools-6.9999.ebuild @@ -42,7 +42,12 @@ RDEPEND=" qtdiag? ( ~dev-qt/qtbase-${PV}:6[gles2-only=,vulkan=] ) widgets? ( ~dev-qt/qtbase-${PV}:6[opengl=] ) " -DEPEND="${RDEPEND}" +DEPEND=" + ${RDEPEND} + qtdiag? ( + vulkan? ( dev-util/vulkan-headers ) + ) +" pkg_setup() { use clang && llvm_pkg_setup @@ -63,6 +68,11 @@ src_configure() { $(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) ) qt6-build_src_configure @@ -71,5 +81,5 @@ src_configure() { pkg_postinst() { use assistant && optfeature "Qt documentation viewable in assistant" \ - dev-qt/qt-docs:6 #602296 + 'dev-qt/qt-docs:6[qch]' #602296 } diff --git a/dev-qt/qttranslations/Manifest b/dev-qt/qttranslations/Manifest index c9f9522c1775..1a161ba064de 100644 --- a/dev-qt/qttranslations/Manifest +++ b/dev-qt/qttranslations/Manifest @@ -1,7 +1,7 @@ DIST qttranslations-everywhere-opensource-src-5.15.10.tar.xz 1635736 BLAKE2B c21f5fed04502622377bc1eaa11dab2d4e693ca7a882ced21920926fac74fc75b92d16a26c35133f1437cef51d1effbcaa292ef2a768e085f54b10774d47f8fd SHA512 94f22857cf9f14f13f774ee5632bfd0fc367ca5fb745cbfb3997fee8651961d9547f0a629afc54c35b2e4493244da9b94214777e20340c2b203c538bc1c84a22 DIST qttranslations-everywhere-src-6.5.2.tar.xz 1468624 BLAKE2B 4201ecaf6fedb920ff49fafed7579af2a676a9f34e33bda886f3898a111c49a716cf4c161a51724298f4b477320610ffdc03b00555b5d7e4486d729afcd4b162 SHA512 2930153207a6ba7bb6720171f2be1c845e84edef87abd5ec6a4464c4386fb58fbdd59740c210727eb6b058ceffcaaf0aaea99e968215b68b121eb35d6e4f05c2 EBUILD qttranslations-5.15.10.ebuild 379 BLAKE2B f7a1f63d58d4a09bdf92cf91f2ec0c546a8626cddc7bcc9d55c70eab8db038d3ae6912e0909f660099af7d4998e99353d0eda9d98da253f7021b8008c1d30b41 SHA512 bf741516c6b8ad79fac401a29befc1004926ce203460b0c5f261744c70db5bcc0047b9af8f36153668b1680fefcbd80f50840623d5379be43ce059e1373c4506 -EBUILD qttranslations-6.5.2.ebuild 330 BLAKE2B abc4eeef9e79487bd946e40db1c094b8556161d4422914f1ef2ca777944c554462525cae5b122411f432816da4196d22637c2af4daa521bf73b3ab40efa73c8e SHA512 377621adf3eb0c8dc733dae23910550eb78699dbb2913863b829ee5bace6971c6f1559b4c6c0f203eb73bca4d44567040546d5d64c98c104258de222aa4e77c8 +EBUILD qttranslations-6.5.2.ebuild 347 BLAKE2B 9c1202755938b419e2da4122db1f72db89a0bc33e0cab8b11a6e90744cec7f931e758d3b66842700cb8ee0eb42a3eefefa6642da509f5c504ee4a1c3bbd51da7 SHA512 47915df9e5c7087c827030b9bf2c628620b6d865aeb1c2d1fe35303b7abd6479dbe33c655a7359a2514bff89a566d1b6a10a1bf0077346b85b5ce498cd172988 EBUILD qttranslations-6.5.9999.ebuild 330 BLAKE2B abc4eeef9e79487bd946e40db1c094b8556161d4422914f1ef2ca777944c554462525cae5b122411f432816da4196d22637c2af4daa521bf73b3ab40efa73c8e SHA512 377621adf3eb0c8dc733dae23910550eb78699dbb2913863b829ee5bace6971c6f1559b4c6c0f203eb73bca4d44567040546d5d64c98c104258de222aa4e77c8 EBUILD qttranslations-6.9999.ebuild 330 BLAKE2B abc4eeef9e79487bd946e40db1c094b8556161d4422914f1ef2ca777944c554462525cae5b122411f432816da4196d22637c2af4daa521bf73b3ab40efa73c8e SHA512 377621adf3eb0c8dc733dae23910550eb78699dbb2913863b829ee5bace6971c6f1559b4c6c0f203eb73bca4d44567040546d5d64c98c104258de222aa4e77c8 -MISC metadata.xml 539 BLAKE2B 3fb53d125b7a1b83a71369a1a5787cc3ba243738c3ccd32f42e20723c671ec1a09076ba27a96e89609749a2529924c8735ceb1b37e16b4dc2ccb1d11cdefa801 SHA512 b61515e069c87057569a1d77a14fc6b1be7c4491307ca1b3e1b47f47d545f6e84c51f7824c320ed5f973569a25b0d8f4bb4645fba3a3ec2865b489bdd4fc819b +MISC metadata.xml 563 BLAKE2B 11869c4f597d5fabbf64d850fe11460e1e91c09170dadfb660a5035cc5fbc1589d5c616459f2426ce0c2480762dc40d5822beedb963da9855e580a4aa2e4df0e SHA512 e228dd2161cdf78f156ce10da18aadc938f58c3455c1226fbebda35acd371201ae09779e531847d4707054c837f063f2d213341f17111a2cf2665707db024116 diff --git a/dev-qt/qttranslations/metadata.xml b/dev-qt/qttranslations/metadata.xml index 230e148cf03e..62cfd452bccc 100644 --- a/dev-qt/qttranslations/metadata.xml +++ b/dev-qt/qttranslations/metadata.xml @@ -5,6 +5,7 @@ <email>qt@gentoo.org</email> <name>Gentoo Qt Project</name> </maintainer> + <stabilize-allarches/> <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> <doc>https://doc.qt.io/</doc> diff --git a/dev-qt/qttranslations/qttranslations-6.5.2.ebuild b/dev-qt/qttranslations/qttranslations-6.5.2.ebuild index 2f5770cc8b83..d481584b1cc7 100644 --- a/dev-qt/qttranslations/qttranslations-6.5.2.ebuild +++ b/dev-qt/qttranslations/qttranslations-6.5.2.ebuild @@ -8,7 +8,7 @@ inherit qt6-build DESCRIPTION="Translation files for the Qt6 framework" if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi DEPEND="~dev-qt/qtbase-${PV}:6" diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest index 9b2a0f21ae95..9782ac0f101a 100644 --- a/dev-qt/qtwayland/Manifest +++ b/dev-qt/qtwayland/Manifest @@ -5,7 +5,7 @@ DIST qtwayland-5.15.10-gentoo-kde-2.tar.xz 43076 BLAKE2B 735ac875c0957de47f90d08 DIST qtwayland-everywhere-opensource-src-5.15.10.tar.xz 568552 BLAKE2B c5cd4ed5ff78befb5bb49f9eb809562c418b2469aa0fa23728a1de46d57f42788bba3f87a54c8dda2ee0900c76b84213d1111fd86159dc5e6707f7b67ed386de SHA512 214b1fec7dfd815d148a7485f7811e623b06d172e58e4ee3167264a4e4b8f4aeec11474e574f91652a0bd3a48476a6747cad468f1e5035c49a55a96fc1400899 DIST qtwayland-everywhere-src-6.5.2.tar.xz 1059356 BLAKE2B 4708b78ff5c8e413edaa4d4400317f58dd068273a5eef7caf1500abf8afbe4e9ac405b6854691ef93265a7eeb0cfb7406024826a0b7c7ba3f8149218af67fd48 SHA512 520d109402f1d629481029a3b1eaab740e66135db4069c34651172bb2ad821b22de60e9956a96331d2f32a4522fc52c6a4ba99b474092d755760cad08c776477 EBUILD qtwayland-5.15.10-r4.ebuild 1353 BLAKE2B 3cab556185c182f4cd8ed280737e1434c51ec1c52719688a2ca5372d81baa5edca8675b22a7c0f9601f7dacec65f54e7e361fd851a2f226dcefaac38180bd9b5 SHA512 0ac3e896cc8c6c717e44dc3119b1c5cf3cc4cc6d22538f837699528c61e29e11a3969538b0518d21c7d7b1362ac81910e9508197076481a51b4bece379f7dca2 -EBUILD qtwayland-6.5.2-r3.ebuild 1008 BLAKE2B 82fde088be3934181ad2a9f1f767f93c12b61c3fb7f2b68fff8b1fe8219a22337fd51f3a7b9ce83418949415d759baa4373a86e6e86fbd84fa87a9928e649101 SHA512 956c882e53b9a09050c4d2e554e44e11813cbed5f177d9e73f393d8d21564ea393b28f0c392742e2d3190fff37493bf48221b7834a2cc464199784a5c02c8784 +EBUILD qtwayland-6.5.2-r3.ebuild 1025 BLAKE2B 6bd629f6b5a04d34615489934d1013d0be49c5c59d720ab8d3712a1d34adf01695301eff88256496760f34ae2cb22ef76e1ea695894d73ba50df6dd3c1d76b74 SHA512 c1f1ce94de2650218ffa30a93af3c04a77e8cae8ed172e469fa3608c146212105bdf7f7e327b2cff371e920e9a5e0bad8940461d96110815671a0e605ca11e5c EBUILD qtwayland-6.5.9999.ebuild 943 BLAKE2B 1527a7fe4f074ab0d22e1144aa46ccb2356d040777c8d43fb38400c05fd5c4c5b48f90ca06bcd78171ae23cb9bfe65e2764a4c1c32fddc6fcebbba318d0cb83d SHA512 b678155903b89df2e6171ea1a38ae2aca9260f99779935b7af89cca59a14445fbcec71cf49671f3aaf467ab069fbac1c61df4fbb19766229d281786905a5f0d6 EBUILD qtwayland-6.9999.ebuild 943 BLAKE2B 1527a7fe4f074ab0d22e1144aa46ccb2356d040777c8d43fb38400c05fd5c4c5b48f90ca06bcd78171ae23cb9bfe65e2764a4c1c32fddc6fcebbba318d0cb83d SHA512 b678155903b89df2e6171ea1a38ae2aca9260f99779935b7af89cca59a14445fbcec71cf49671f3aaf467ab069fbac1c61df4fbb19766229d281786905a5f0d6 MISC metadata.xml 790 BLAKE2B 61ed17b888bc084b787b06d504b86aaf7a55c87f332115d007340cc5e158d6b02f08b247140d4311f37cfe92c474a07faeef5470bbd109dbbe7f600faccb9724 SHA512 61e0b8812f02c9d51a31c0e1e05cfdf512c5dd0336c95f00db237f5e3419555cea90be0aaa02894c5a9e50ded43ccbcd1fd3a38d2fd93651a27dc0d85fccccc9 diff --git a/dev-qt/qtwayland/qtwayland-6.5.2-r3.ebuild b/dev-qt/qtwayland/qtwayland-6.5.2-r3.ebuild index 9cd6abd6eecf..cbda1d2edbac 100644 --- a/dev-qt/qtwayland/qtwayland-6.5.2-r3.ebuild +++ b/dev-qt/qtwayland/qtwayland-6.5.2-r3.ebuild @@ -8,7 +8,7 @@ inherit qt6-build DESCRIPTION="Wayland platform plugin for Qt" if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi IUSE="compositor qml vulkan" |