commit: 96614b933fb14a6f1adc1dcca3c3a1e06511e78e Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Thu Jul 10 14:02:28 2025 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Thu Jul 10 14:33:34 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96614b93
dev-qt/qtbase: drop 6.8.3-r1 Bug: https://bugs.gentoo.org/957084 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> dev-qt/qtbase/Manifest | 1 - .../files/qtbase-6.8.0-qcontiguouscache.patch | 14 - .../qtbase/files/qtbase-6.8.3-CVE-2025-3512.patch | 163 --------- dev-qt/qtbase/qtbase-6.8.3-r1.ebuild | 381 --------------------- 4 files changed, 559 deletions(-) diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest index bbbf58f7b9d6..e011d8e86d22 100644 --- a/dev-qt/qtbase/Manifest +++ b/dev-qt/qtbase/Manifest @@ -1,2 +1 @@ -DIST qtbase-everywhere-src-6.8.3.tar.xz 48426536 BLAKE2B 3133a0e50c1f6d185e8b587934d04cc79dd06f7c86bc092e8b678690464878f14f346cb0f2f4d8b33a1a6c67cdda31bd33ccaa97d04dfdcb53f3c0c1649a3c2f SHA512 ef364f939f23b622f67d21833c2dbf1fb74531d9a1e25b6d2e94ea5d747a40f20c6c3a24abef1e9710287366b7cb54dd090350d315601317779235c20743cc81 DIST qtbase-everywhere-src-6.9.1.tar.xz 49755912 BLAKE2B 557c894eaa6933152c0c12e187bbac26d8166b4657af0259e65c87915c2b58a371ad5a080fe2cf8720757fdd5f61b3c82507163a236b65edd274b6c6d00068d7 SHA512 f0fdf4e2c10db73d8036e4b1324f04f48eced78feeed450b0ffa1fac5574daa4173996a4d25da761f5eeaa6037eab02418a88a59fd760d96a08d813c9b8136ed diff --git a/dev-qt/qtbase/files/qtbase-6.8.0-qcontiguouscache.patch b/dev-qt/qtbase/files/qtbase-6.8.0-qcontiguouscache.patch deleted file mode 100644 index e5f14e0a1c73..000000000000 --- a/dev-qt/qtbase/files/qtbase-6.8.0-qcontiguouscache.patch +++ /dev/null @@ -1,14 +0,0 @@ -https://bugs.gentoo.org/938475 -https://codereview.qt-project.org/c/qt/qtbase/+/585668 -From: Sam James <[email protected]> -Date: Sun, 25 Aug 2024 17:34:22 +0100 -Subject: [PATCH] QContiguousCache: fix include for qMin - -Include `<QtCore/qminmax.h>` for `qMin`. This came up downstream -in Gentoo at https://bugs.gentoo.org/938475. ---- a/src/corelib/tools/qcontiguouscache.h -+++ b/src/corelib/tools/qcontiguouscache.h -@@ -10,2 +10,3 @@ - #include <QtCore/qtcoreexports.h> -+#include <QtCore/qminmax.h> - #include <QtCore/qttypetraits.h> diff --git a/dev-qt/qtbase/files/qtbase-6.8.3-CVE-2025-3512.patch b/dev-qt/qtbase/files/qtbase-6.8.3-CVE-2025-3512.patch deleted file mode 100644 index b6bf7e4e5e05..000000000000 --- a/dev-qt/qtbase/files/qtbase-6.8.3-CVE-2025-3512.patch +++ /dev/null @@ -1,163 +0,0 @@ -https://www.qt.io/blog/security-advisory-qtextmarkdownimporter-hbo -https://codereview.qt-project.org/c/qt/qtbase/+/635699 ---- a/src/gui/text/qtextmarkdownimporter.cpp -+++ b/src/gui/text/qtextmarkdownimporter.cpp -@@ -28,5 +28,6 @@ - static const QChar qtmi_Space = u' '; - --static constexpr auto markerString() noexcept { return "---"_L1; } -+static constexpr auto lfMarkerString() noexcept { return "---\n"_L1; } -+static constexpr auto crlfMarkerString() noexcept { return "---r\n"_L1; } - - // TODO maybe eliminate the margins after all views recognize BlockQuoteLevel, CSS can format it, etc. -@@ -120,4 +121,45 @@ - } - -+/*! \internal -+ Split any Front Matter from the Markdown document \a md. -+ Returns a pair of QStringViews: if \a md begins with qualifying Front Matter -+ (according to the specification at https://jekyllrb.com/docs/front-matter/ ), -+ put it into the \c frontMatter view, omitting both markers; and put the remaining -+ Markdown into \c rest. If no Front Matter is found, return all of \a md in \c rest. -+*/ -+static auto splitFrontMatter(QStringView md) -+{ -+ struct R { -+ QStringView frontMatter, rest; -+ explicit operator bool() const noexcept { return !frontMatter.isEmpty(); } -+ }; -+ -+ const auto NotFound = R{{}, md}; -+ -+ /* Front Matter must start with '---\n' or '---\r\n' on the very first line, -+ and Front Matter must end with another such line. -+ If that is not the case, we return NotFound: then the whole document is -+ to be passed on to the Markdown parser, in which '---\n' is interpreted -+ as a "thematic break" (like <hr/> in HTML). */ -+ QLatin1StringView marker; -+ if (md.startsWith(lfMarkerString())) -+ marker = lfMarkerString(); -+ else if (md.startsWith(crlfMarkerString())) -+ marker = crlfMarkerString(); -+ else -+ return NotFound; -+ -+ const auto frontMatterStart = marker.size(); -+ const auto endMarkerPos = md.indexOf(marker, frontMatterStart); -+ -+ if (endMarkerPos < 0 || md[endMarkerPos - 1] != QChar::LineFeed) -+ return NotFound; -+ -+ Q_ASSERT(frontMatterStart < md.size()); -+ Q_ASSERT(endMarkerPos < md.size()); -+ const auto frontMatter = md.sliced(frontMatterStart, endMarkerPos - frontMatterStart); -+ return R{frontMatter, md.sliced(endMarkerPos + marker.size())}; -+} -+ - void QTextMarkdownImporter::import(const QString &markdown) - { -@@ -144,19 +186,12 @@ - QStringView md = markdown; - -- if (m_features.testFlag(QTextMarkdownImporter::FeatureFrontMatter) && md.startsWith(markerString())) { -- qsizetype endMarkerPos = md.indexOf(markerString(), markerString().size() + 1); -- if (endMarkerPos > 4) { -- qsizetype firstLinePos = 4; // first line of yaml -- while (md.at(firstLinePos) == '\n'_L1 || md.at(firstLinePos) == '\r'_L1) -- ++firstLinePos; -- auto frontMatter = md.sliced(firstLinePos, endMarkerPos - firstLinePos); -- firstLinePos = endMarkerPos + 4; // first line of markdown after yaml -- while (md.size() > firstLinePos && (md.at(firstLinePos) == '\n'_L1 || md.at(firstLinePos) == '\r'_L1)) -- ++firstLinePos; -- md = md.sliced(firstLinePos); -- doc->setMetaInformation(QTextDocument::FrontMatter, frontMatter.toString()); -- qCDebug(lcMD) << "extracted FrontMatter: size" << frontMatter.size(); -+ if (m_features.testFlag(QTextMarkdownImporter::FeatureFrontMatter)) { -+ if (const auto split = splitFrontMatter(md)) { -+ doc->setMetaInformation(QTextDocument::FrontMatter, split.frontMatter.toString()); -+ qCDebug(lcMD) << "extracted FrontMatter: size" << split.frontMatter.size(); -+ md = split.rest; - } - } -+ - const auto mdUtf8 = md.toUtf8(); - m_cursor.beginEditBlock(); ---- a/tests/auto/gui/text/qtextmarkdownimporter/data/front-marker-malformed1.md -+++ b/tests/auto/gui/text/qtextmarkdownimporter/data/front-marker-malformed1.md -@@ -0,0 +1,3 @@ -+--- -+name: "Pluto"--- -+Pluto may not be a planet. And this document does not contain Front Matter. ---- a/tests/auto/gui/text/qtextmarkdownimporter/data/front-marker-malformed2.md -+++ b/tests/auto/gui/text/qtextmarkdownimporter/data/front-marker-malformed2.md -@@ -0,0 +1,5 @@ -+--- -+name: "Sloppy" -+--- -+This document has trailing whitespace after its second Front Matter marker. -+Therefore the marker does not qualify, and the document does not have Front Matter. ---- a/tests/auto/gui/text/qtextmarkdownimporter/data/front-marker-malformed3.md -+++ b/tests/auto/gui/text/qtextmarkdownimporter/data/front-marker-malformed3.md -@@ -0,0 +1,4 @@ -+--- -+name: "Aborted YAML" -+description: "The ending marker does not end with a newline, so it's invalid." -+--- -\ No newline at end of file ---- a/tests/auto/gui/text/qtextmarkdownimporter/data/oss-fuzz-42533775.md -+++ b/tests/auto/gui/text/qtextmarkdownimporter/data/oss-fuzz-42533775.md -@@ -0,0 +1 @@ -+--- --- -\ No newline at end of file ---- a/tests/auto/gui/text/qtextmarkdownimporter/data/yaml-crlf.md -+++ b/tests/auto/gui/text/qtextmarkdownimporter/data/yaml-crlf.md -@@ -0,0 +1,10 @@ -+--- -+name: "Venus" -+discoverer: "Galileo Galilei" -+title: "A description of the planet Venus" -+keywords: -+ - planets -+ - solar system -+ - astronomy -+--- -+*Venus* is the second planet from the Sun, orbiting it every 224.7 Earth days. ---- a/tests/auto/gui/text/qtextmarkdownimporter/tst_qtextmarkdownimporter.cpp -+++ b/tests/auto/gui/text/qtextmarkdownimporter/tst_qtextmarkdownimporter.cpp -@@ -549,4 +549,5 @@ - QTest::newRow("fuzz20450") << "attempted to insert into a list that no longer exists"; - QTest::newRow("fuzz20580") << ""; -+ QTest::newRow("oss-fuzz-42533775") << ""; // caused a heap-buffer-overflow - } - -@@ -645,8 +646,13 @@ - { - QTest::addColumn<QString>("inputFile"); -+ QTest::addColumn<int>("expectedFrontMatterSize"); - QTest::addColumn<int>("expectedBlockCount"); - -- QTest::newRow("yaml + markdown") << QFINDTESTDATA("data/yaml.md") << 1; -- QTest::newRow("yaml only") << QFINDTESTDATA("data/yaml-only.md") << 0; -+ QTest::newRow("yaml + markdown") << QFINDTESTDATA("data/yaml.md") << 140 << 1; -+ QTest::newRow("yaml + markdown with CRLFs") << QFINDTESTDATA("data/yaml-crlf.md") << 140 << 1; -+ QTest::newRow("yaml only") << QFINDTESTDATA("data/yaml-only.md") << 59 << 0; -+ QTest::newRow("malformed 1") << QFINDTESTDATA("data/front-marker-malformed1.md") << 0 << 1; -+ QTest::newRow("malformed 2") << QFINDTESTDATA("data/front-marker-malformed2.md") << 0 << 2; -+ QTest::newRow("malformed 3") << QFINDTESTDATA("data/front-marker-malformed3.md") << 0 << 1; - } - -@@ -654,4 +660,5 @@ - { - QFETCH(QString, inputFile); -+ QFETCH(int, expectedFrontMatterSize); - QFETCH(int, expectedBlockCount); - -@@ -673,5 +680,7 @@ - } - QCOMPARE(blockCount, expectedBlockCount); // yaml is not part of the markdown text -- QCOMPARE(doc.metaInformation(QTextDocument::FrontMatter), yaml); // without fences -+ if (expectedFrontMatterSize) -+ QCOMPARE(doc.metaInformation(QTextDocument::FrontMatter), yaml); // without fences -+ QCOMPARE(doc.metaInformation(QTextDocument::FrontMatter).size(), expectedFrontMatterSize); - } - diff --git a/dev-qt/qtbase/qtbase-6.8.3-r1.ebuild b/dev-qt/qtbase/qtbase-6.8.3-r1.ebuild deleted file mode 100644 index eb81835dea42..000000000000 --- a/dev-qt/qtbase/qtbase-6.8.3-r1.ebuild +++ /dev/null @@ -1,381 +0,0 @@ -# Copyright 2021-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic qt6-build toolchain-funcs - -DESCRIPTION="Cross-platform application development framework" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86" -fi - -declare -A QT6_IUSE=( - [global]="+ssl +udev zstd" - [core]="icu journald syslog" - [modules]="+concurrent +dbus +gui +network +sql +xml" - - [gui]=" - +X accessibility eglfs evdev gles2-only +libinput - opengl renderdoc tslib vulkan wayland +widgets - " - [network]="brotli gssapi libproxy sctp" - [sql]="mysql oci8 odbc postgres +sqlite" - [widgets]="cups gtk" - - [optfeature]="nls" #810802 -) -IUSE="${QT6_IUSE[*]}" -REQUIRED_USE=" - ?? ( journald syslog ) - $( - printf '%s? ( gui ) ' ${QT6_IUSE[gui]//+/} - printf '%s? ( network ) ' ${QT6_IUSE[network]//+/} - printf '%s? ( sql ) ' ${QT6_IUSE[sql]//+/} - printf '%s? ( gui widgets ) ' ${QT6_IUSE[widgets]//+/} - ) - accessibility? ( dbus ) - eglfs? ( opengl ) - gles2-only? ( opengl ) - gui? ( || ( X eglfs wayland ) ) - libinput? ( udev ) - sql? ( || ( ${QT6_IUSE[sql]//+/} ) ) - test? ( icu sql? ( sqlite ) ) -" - -# groups: -# - global (configure.cmake) -# - qtcore (src/corelib/configure.cmake) -# - qtgui (src/gui/configure.cmake) -# - qtnetwork (src/network/configure.cmake) -# - qtprintsupport (src/printsupport/configure.cmake) [gui+widgets] -# - qtsql (src/plugins/sqldrivers/configure.cmake) -# nolink: renderdoc, systemd -COMMON_DEPEND=" - sys-libs/zlib:= - ssl? ( dev-libs/openssl:= ) - udev? ( virtual/libudev:= ) - zstd? ( app-arch/zstd:= ) - - app-crypt/libb2 - dev-libs/double-conversion:= - dev-libs/glib:2 - dev-libs/libpcre2:=[pcre16,unicode(+)] - icu? ( dev-libs/icu:= ) - journald? ( sys-apps/systemd ) - - dbus? ( sys-apps/dbus ) - gui? ( - media-libs/fontconfig - >=media-libs/freetype-2.13.1:2 - media-libs/harfbuzz:= - media-libs/libjpeg-turbo:= - media-libs/libpng:= - x11-libs/libdrm - x11-libs/libxkbcommon[X?] - X? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libxcb:= - x11-libs/xcb-util-cursor - x11-libs/xcb-util-image - x11-libs/xcb-util-keysyms - x11-libs/xcb-util-renderutil - x11-libs/xcb-util-wm - ) - accessibility? ( app-accessibility/at-spi2-core:2 ) - eglfs? ( media-libs/mesa[gbm(+)] ) - evdev? ( sys-libs/mtdev ) - libinput? ( dev-libs/libinput:= ) - opengl? ( - gles2-only? ( media-libs/libglvnd ) - !gles2-only? ( media-libs/libglvnd[X?] ) - ) - renderdoc? ( media-gfx/renderdoc ) - tslib? ( x11-libs/tslib ) - widgets? ( - cups? ( net-print/cups ) - gtk? ( - x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-3.24.41-r1:3[X?,wayland?] - x11-libs/pango - ) - ) - ) - network? ( - brotli? ( app-arch/brotli:= ) - gssapi? ( virtual/krb5 ) - libproxy? ( net-libs/libproxy ) - ) - sql? ( - mysql? ( dev-db/mysql-connector-c:= ) - oci8? ( dev-db/oracle-instantclient:=[sdk] ) - odbc? ( dev-db/unixODBC ) - postgres? ( dev-db/postgresql:* ) - sqlite? ( dev-db/sqlite:3 ) - ) -" -RDEPEND=" - ${COMMON_DEPEND} - syslog? ( virtual/logger ) -" -DEPEND=" - ${COMMON_DEPEND} - X? ( x11-base/xorg-proto ) - gui? ( - vulkan? ( dev-util/vulkan-headers ) - ) - network? ( - sctp? ( net-misc/lksctp-tools ) - ) - test? ( - elibc_musl? ( sys-libs/timezone-data ) - ) -" -BDEPEND="zstd? ( app-arch/libarchive[zstd] )" #910392 -PDEPEND=" - nls? ( ~dev-qt/qttranslations-${PV}:6 ) - wayland? ( ~dev-qt/qtwayland-${PV}:6 ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-6.5.2-hppa-forkfd-grow-stack.patch - "${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch - "${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch - "${FILESDIR}"/${PN}-6.6.3-gcc14-avx512fp16.patch - "${FILESDIR}"/${PN}-6.8.0-qcontiguouscache.patch - "${FILESDIR}"/${PN}-6.8.2-cross.patch - "${FILESDIR}"/${PN}-6.8.3-CVE-2025-3512.patch -) - -src_prepare() { - qt6-build_src_prepare - - if use test; then - # test itself has -Werror=strict-aliasing issues, drop for simplicity - sed -e '/add_subdirectory(qsharedpointer)/d' \ - -i tests/auto/corelib/tools/CMakeLists.txt || die - - # workaround for __extendhfxf2 being used for tst_qfloat16.cpp - # which is unavailable with compiler-rt (assume used if clang) - if tc-is-clang; then - sed -e '/add_subdirectory(qfloat16)/d' \ - -i tests/auto/corelib/global/CMakeLists.txt || die - fi - fi -} - -src_configure() { - if use gtk; then - # defang automagic dependencies (bug #624960) - use X || append-cxxflags -DGENTOO_GTK_HIDE_X11 - use wayland || append-cxxflags -DGENTOO_GTK_HIDE_WAYLAND - fi - - local mycmakeargs=( - -DBUILD_WITH_PCH=OFF - - -DINSTALL_ARCHDATADIR="${QT6_ARCHDATADIR}" - -DINSTALL_BINDIR="${QT6_BINDIR}" - -DINSTALL_DATADIR="${QT6_DATADIR}" - -DINSTALL_DOCDIR="${QT6_DOCDIR}" - -DINSTALL_EXAMPLESDIR="${QT6_EXAMPLESDIR}" - -DINSTALL_INCLUDEDIR="${QT6_HEADERDIR}" - -DINSTALL_LIBDIR="${QT6_LIBDIR}" - -DINSTALL_LIBEXECDIR="${QT6_LIBEXECDIR}" - -DINSTALL_MKSPECSDIR="${QT6_MKSPECSDIR}" - -DINSTALL_PLUGINSDIR="${QT6_PLUGINDIR}" - -DINSTALL_QMLDIR="${QT6_QMLDIR}" - -DINSTALL_SYSCONFDIR="${QT6_SYSCONFDIR}" - -DINSTALL_TRANSLATIONSDIR="${QT6_TRANSLATIONDIR}" - - -DQT_UNITY_BUILD=ON # ~30% faster build, affects other dev-qt/* too - - -DQT_FEATURE_relocatable=OFF #927691 - $(qt_feature ssl openssl) - $(qt_feature ssl openssl_linked) - $(qt_feature udev libudev) - $(qt_feature zstd) - - # qtcore - $(qt_feature icu) - $(qt_feature journald) - $(qt_feature syslog) - - # tools - -DQT_FEATURE_androiddeployqt=OFF - - # modules - $(qt_feature concurrent) - $(qt_feature dbus) - $(qt_feature gui) - $(qt_feature network) - $(qt_feature sql) - # trivial, and is often needed (sometimes even when not building tests) - -DQT_FEATURE_testlib=ON - $(qt_feature xml) - - # let gentoo's defaults and/or users control security *FLAGS - -DQT_FEATURE_glibc_fortify_source=OFF - -DQT_FEATURE_intelcet=OFF - -DQT_FEATURE_libcpp_hardening=OFF - -DQT_FEATURE_libstdcpp_assertions=OFF - -DQT_FEATURE_relro_now_linker=OFF - -DQT_FEATURE_stack_clash_protection=OFF - -DQT_FEATURE_stack_protector=OFF - -DQT_FEATURE_trivial_auto_var_init_pattern=OFF - - -DQT_INTERNAL_AVOID_OVERRIDING_SYNCQT_CONFIG=ON # would force -O3 - ) - - use gui && mycmakeargs+=( - $(qt_feature X xcb) - $(qt_feature X system_xcb_xinput) - $(qt_feature X xkbcommon_x11) - $(cmake_use_find_package X X11) # needed for truly no automagic - $(qt_feature accessibility accessibility_atspi_bridge) - $(qt_feature eglfs) - $(qt_feature evdev) - $(qt_feature evdev mtdev) - $(qt_feature libinput) - $(qt_feature renderdoc graphicsframecapture) - $(qt_feature tslib) - $(qt_feature vulkan) - $(qt_feature wayland) - $(qt_feature widgets) - -DINPUT_opengl=$(usex opengl $(usex gles2-only es2 desktop) no) - -DQT_FEATURE_system_textmarkdownreader=OFF # TODO?: package md4c - ) && use widgets && mycmakeargs+=( - # note: qtprintsupport is enabled w/ gui+widgets regardless of USE=cups - $(qt_feature cups) - $(qt_feature gtk gtk3) - ) - - use network && mycmakeargs+=( - $(qt_feature brotli) - $(qt_feature gssapi) - $(qt_feature libproxy) - $(qt_feature sctp) - $(usev test -DQT_SKIP_DOCKER_COMPOSE=ON) - ) - - use sql && mycmakeargs+=( - -DQT_FEATURE_sql_db2=OFF # unpackaged - -DQT_FEATURE_sql_ibase=OFF # unpackaged - -DQT_FEATURE_sql_mimer=OFF # unpackaged - $(qt_feature mysql sql_mysql) - $(qt_feature oci8 sql_oci) - $(usev oci8 -DOracle_ROOT="${ESYSROOT}"/usr/$(get_libdir)/oracle/client) - $(qt_feature odbc sql_odbc) - $(qt_feature postgres sql_psql) - $(qt_feature sqlite sql_sqlite) - $(qt_feature sqlite system_sqlite) - ) - - tc-is-cross-compiler && mycmakeargs+=( - -DQT_HOST_PATH="${BROOT}"/usr - -DQT_FORCE_BUILD_TOOLS=ON - -DQT_NO_GENERATE_QMAKE_WRAPPER_FOR_TARGET=ON - ) - - qt6-build_src_configure -} - -src_test() { - local -x TZ=UTC - local -x LC_TIME=C - - local CMAKE_SKIP_TESTS=( - # broken with out-of-source + if qtbase is not already installed - tst_moc - tst_qmake - # similarly broken when relocatable=OFF (bug #927691) - tst_qapplication - tst_qt_cmake_create - tst_uic - # needs x11/opengl, we *could* run these but tend to be flaky - # when opengl rendering is involved (even if software-only) - tst_qopengl{,config,widget,window} - tst_qgraphicsview - tst_qx11info - # fails with network sandbox - tst_qdnslookup - # fails with sandbox - tst_qsharedmemory - # typical to lack SCTP support on non-generic kernels - tst_qsctpsocket - # randomly fails without -j1, and not worth it over this (bug #916181) - tst_qfiledialog{,2} - # may randomly hang+timeout, perhaps related to -j as well - tst_qprocess #936484 - tst_qtimer - # haystacksWithMoreThan4GiBWork can easily OOM (16GB ram not enough) - tst_qlatin1stringmatcher - # these can be flaky depending on the environment/toolchain - tst_qlogging # backtrace log test can easily vary - tst_q{,raw}font # affected by available fonts / settings (bug #914737) - tst_qprinter # checks system's printers (bug #916216) - tst_qhighdpi # may detect users' settings and fail (bug #935364) - tst_qstorageinfo # checks mounted filesystems - # flaky due to using different test framework and fails with USE=-gui - tst_selftests - # known failing when using clang+glibc+stdc++, needs looking into - tst_qthread - # partially failing on x86 chroots and seemingly(?) harmless (dev-qt - # revdeps tests pass), skip globally to avoid keywording flakiness - tst_json - tst_qcolorspace - tst_qdoublevalidator - tst_qglobal - tst_qglyphrun - tst_qvectornd - tst_rcc - # similarly, but on armv7 and potentially others (bug #914028) - tst_qlineedit - tst_qpainter - # likewise, known failing on BE arches (bug #914033,914371,918878) - tst_qimagereader - tst_qimagewriter - tst_qpluginloader - tst_quuid # >=6.6.2 had related fixes, needs retesting - # partially broken on llvm-musl, needs looking into but skip to have - # a baseline for regressions (rest of dev-qt still passes with musl) - $(usev elibc_musl ' - tst_qicoimageformat - tst_qimagereader - tst_qimage - ') - # fails due to hppa's NaN handling, needs looking into (bug #914371) - $(usev hppa ' - tst_qcborvalue - tst_qnumeric - ') - # note: for linux, upstream only really runs+maintains tests for amd64 - # https://doc.qt.io/qt-6/supported-platforms.html - ) - - qt6-build_src_test -} - -src_install() { - qt6-build_src_install - - if use test; then - local delete_bins=( # need a better way to handle this - clientserver copier crashingServer desktopsettingsaware_helper - echo fileWriterProcess modal_helper nospace 'one space' - paster qcommandlineparser_test_helper qfileopeneventexternal - socketprocess syslocaleapp tst_qhashseed_helper 'two space s' - write-read-write - ) - local delete=( # sigh - "${D}${QT6_BINDIR}"/test* - "${D}${QT6_LIBDIR}/objects-${CMAKE_BUILD_TYPE}"/*test* - "${delete_bins[@]/#/${D}${QT6_BINDIR}/}" - ) - # using -f given not tracking which tests may be skipped or not - rm -rf -- "${delete[@]}" || die - fi -}
