From 865b42c15b520af89040fd4a6e6e6c4cd54125c2 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Wed, 17 Apr 2024 05:47:57 -0400 Subject: dev-qt/qtwebengine: add one more race fix for ninja-1.12 (Qt6) Bug: https://bugs.gentoo.org/930107 Signed-off-by: Ionen Wolkens --- dev-qt/qtwebengine/files/qtwebengine-6.7.0-ninja1.12.patch | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.7.0-ninja1.12.patch b/dev-qt/qtwebengine/files/qtwebengine-6.7.0-ninja1.12.patch index cd6f6a3cc89d..2d12daccd224 100644 --- a/dev-qt/qtwebengine/files/qtwebengine-6.7.0-ninja1.12.patch +++ b/dev-qt/qtwebengine/files/qtwebengine-6.7.0-ninja1.12.patch @@ -3,15 +3,13 @@ Patch status: pending being looked at upstream Issue[1][2][3] also exist in chromium itself[4], and unclear why this started happening only with ninja-1.12.0 at the moment. -Just a quickfix, likely not correct and seems there may be -further unresolved race issues[5]. Arguably better to not -use ninja-1.12.0 for this yet (1.11.1 or samurai are fine). +Just a quickfix, likely not fully correct and seems there may +be further unresolved race issues. [1] https://bugs.gentoo.org/930107 [2] https://bugreports.qt.io/browse/QTBUG-124375 [3] https://github.com/ninja-build/ninja/issues/2417 [4] https://bugs.gentoo.org/930112 -[5] https://bugs.gentoo.org/930107#c17 --- a/src/3rdparty/chromium/content/browser/BUILD.gn +++ b/src/3rdparty/chromium/content/browser/BUILD.gn @@ -198,2 +198,3 @@ @@ -24,3 +22,9 @@ use ninja-1.12.0 for this yet (1.11.1 or samurai are fine). "//content/public/browser", + "//components/web_cache/public/mojom", "//extensions/common", +--- a/src/core/configure/BUILD.root.gn.in ++++ b/src/core/configure/BUILD.root.gn.in +@@ -235,2 +235,3 @@ + deps = [ ++ "//chrome/app:generated_resources", + "//components/zoom", -- cgit v1.2.3-65-gdbad