diff options
Diffstat (limited to 'dev-qt/qtwebengine/qtwebengine-6.9999.ebuild')
| -rw-r--r-- | dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild index 9e610ffe9709..b6cde9827b18 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild @@ -229,9 +229,6 @@ src_configure() { # TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON # (see also BUILD_ONLY_GN option added in 6.8+ for the latter) -DINSTALL_GN=OFF - - # TODO: drop this if no longer errors out early during cmake generation - -DQT_GENERATE_SBOM=OFF ) local mygnargs=( @@ -276,15 +273,6 @@ src_configure() { qt6-build_src_configure } -src_compile() { - cmake_src_compile - - # exact cause unknown, but >=qtwebengine-6.9.2 started to act as if - # QtWebEngineProcess is marked USER_FACING despite not set anywhere - # and this creates a user_facing_tool_links.txt with a broken symlink - :> "${BUILD_DIR}"/user_facing_tool_links.txt || die -} - src_test() { if [[ ${EUID} == 0 ]]; then # almost every tests fail, so skip entirely @@ -331,6 +319,18 @@ src_install() { [[ -e ${D}${QT6_LIBDIR}/libQt6WebEngineCore.so ]] || #601472 die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/" + # exact cause unknown, but >=qtwebengine-6.9.2 started to act as if + # QtWebEngineProcess is marked USER_FACING despite not set anywhere + # and this creates a user_facing_tool_links.txt with a broken symlink + if [[ -L ${ED}/usr/bin/QtWebEngineProcess6 ]] && + [[ ! -e ${ED}/usr/bin/QtWebEngineProcess6 ]] + then + rm -- "${ED}"/usr/bin/QtWebEngineProcess6 || die + else + # eqawarn rather than die to avoid failing a long build over this + eqawarn "QA Notice: symlink workaround may be obsolete" + fi + if use test; then local delete=( # sigh "${D}${QT6_ARCHDATADIR}"/metatypes/*testmockdelegates* |