commit: 3b90ac97f969979abb2928ea954d83b29dc03c63
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 7 05:55:33 2025 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Aug 8 01:14:02 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b90ac97
dev-qt/qtwebengine: update live
Minor changes from testing 6.9.9999 a bit in prepration for
6.9.2, haven't tested 6.10 again yet so required changes may
be incomplete there.
- gperf patch is upstreamed in 6.9.9999 too now
- workaround some new broken user_facing .txt, only tested
6.9.9999 but assuming 6.10/11 have the same problem right now
- tentatively drop the race condition workaround, a new
"DEPENDS WebEngineCore_sync_headers" has appeared in 6.9.9999 and
that may or may not be enough to make that obsolete but I have no
real way to test for sure, will re-add if we get reports
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.10.9999.ebuild | 9 +++++----
dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild | 10 +++++-----
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 9 +++++----
3 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.10.9999.ebuild
b/dev-qt/qtwebengine/qtwebengine-6.10.9999.ebuild
index 6b980211170e..c4ff9a77cac1 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.10.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.10.9999.ebuild
@@ -268,11 +268,12 @@ src_configure() {
}
src_compile() {
- # tentatively work around a possible (rare) race condition (bug
#921680),
- # has good chances to be obsolete but keep for now as a safety
- cmake_build WebEngineCore_sync_all_public_headers
-
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() {
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild
b/dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild
index ed3ad36a0177..a86467c536e3 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild
@@ -109,7 +109,6 @@ PATCHES=( "${WORKDIR}"/patches/${PN} )
PATCHES+=(
# add extras as needed here, may merge in set if carries across versions
- "${FILESDIR}"/${PN}-6.8.3-gperf3.2.patch
)
python_check_deps() {
@@ -269,11 +268,12 @@ src_configure() {
}
src_compile() {
- # tentatively work around a possible (rare) race condition (bug
#921680),
- # has good chances to be obsolete but keep for now as a safety
- cmake_build WebEngineCore_sync_all_public_headers
-
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() {
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index 6b980211170e..c4ff9a77cac1 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -268,11 +268,12 @@ src_configure() {
}
src_compile() {
- # tentatively work around a possible (rare) race condition (bug
#921680),
- # has good chances to be obsolete but keep for now as a safety
- cmake_build WebEngineCore_sync_all_public_headers
-
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() {
