From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1691028-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id AF5F01581D8
for <garchives@archives.gentoo.org>; Mon, 18 Nov 2024 09:06:19 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id DA435E0B67;
Mon, 18 Nov 2024 09:06:17 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id C0FE8E0B67
for <gentoo-commits@lists.gentoo.org>; Mon, 18 Nov 2024 09:06:17 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 04FC333FECD
for <gentoo-commits@lists.gentoo.org>; Mon, 18 Nov 2024 09:06:17 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 64F9A1E74
for <gentoo-commits@lists.gentoo.org>; Mon, 18 Nov 2024 09:06:15 +0000 (UTC)
From: "Ionen Wolkens" <ionen@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" <ionen@gentoo.org>
Message-ID: <1731920554.956d6a85d63efd962759c9388ddcb86bb0282dcb.ionen@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-qt/qtwebengine/files/qtwebengine-6.7.3-missing-gn-deps-blink.patch dev-qt/qtwebengine/files/qtwebengine-6.7.3-missing-gn-deps.patch dev-qt/qtwebengine/qtwebengine-6.7.3.ebuild dev-qt/qtwebengine/qtwebengine-6.8.0.ebuild dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
X-VCS-Directories: dev-qt/qtwebengine/files/ dev-qt/qtwebengine/
X-VCS-Committer: ionen
X-VCS-Committer-Name: Ionen Wolkens
X-VCS-Revision: 956d6a85d63efd962759c9388ddcb86bb0282dcb
X-VCS-Branch: master
Date: Mon, 18 Nov 2024 09:06:15 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: dcf864f7-cac0-4d13-8204-07f4fea5f370
X-Archives-Hash: 70510aabaa25e78252e7d89c82887b60
commit: 956d6a85d63efd962759c9388ddcb86bb0282dcb
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 26 02:03:15 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Nov 18 09:02:34 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=956d6a85
dev-qt/qtwebengine: quick fix for build race conditions (qt6)
Done as two separate patches given one is a chromium backport
(fixed in 6.8), and the others are qtwebengine-side issues.
Thanks to Matt Whitlock for testing.
Quite possible there are more issues, but there is no harm in
fixing the ones we know about so far.
Closes: https://bugs.gentoo.org/942142
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
.../qtwebengine-6.7.3-missing-gn-deps-blink.patch | 38 ++++++++++++++++++++++
.../files/qtwebengine-6.7.3-missing-gn-deps.patch | 33 +++++++++++++++++++
dev-qt/qtwebengine/qtwebengine-6.7.3.ebuild | 2 ++
dev-qt/qtwebengine/qtwebengine-6.8.0.ebuild | 1 +
dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild | 1 +
5 files changed, 75 insertions(+)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.7.3-missing-gn-deps-blink.patch b/dev-qt/qtwebengine/files/qtwebengine-6.7.3-missing-gn-deps-blink.patch
new file mode 100644
index 000000000000..87f19dcceef4
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.7.3-missing-gn-deps-blink.patch
@@ -0,0 +1,38 @@
+Patch status: fixed in >=chromium-120.0.6088.0 / Qt6.8.0
+
+Backport from [1] for [2] to fix a race condition.
+
+[1] https://crrev.com/ac2ad9c9f01bf255fd123785bd37d3b0ec44e410
+[2] https://bugs.gentoo.org/942142
+--- a/src/3rdparty/chromium/third_party/blink/public/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/blink/public/BUILD.gn
+@@ -437,4 +437,5 @@
+ "//third_party/blink/public/common",
+ "//third_party/blink/public/common:headers",
++ "//third_party/blink/renderer/platform:make_platform_generated",
+ "//ui/accessibility:ax_base",
+ "//ui/base/dragdrop/mojom:mojom_shared",
+--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/BUILD.gn
+@@ -142,5 +142,8 @@
+ group("make_platform_generated") {
+ visibility = [] # Allow re-assignment of list.
+- visibility = [ "//third_party/blink/renderer/*" ]
++ visibility = [
++ "//third_party/blink/public:blink_headers",
++ "//third_party/blink/renderer/*",
++ ]
+ public_deps = [
+ ":bindings_buildflags",
+@@ -151,4 +154,5 @@
+ ":runtime_feature_state_override_context",
+ "//third_party/blink/public/common:buildflags",
++ "//third_party/blink/renderer/platform/heap:blink_heap_buildflags",
+ "//third_party/blink/renderer/platform/network:make_generated",
+ ]
+@@ -197,5 +201,4 @@
+ "//third_party/blink/public/mojom:mojom_platform_blink",
+ "//third_party/blink/public/mojom:web_bluetooth_mojo_bindings_blink",
+- "//third_party/blink/renderer/platform/heap:blink_heap_buildflags",
+ "//third_party/blink/renderer/platform/network:make_generated",
+ "//third_party/blink/renderer/platform/wtf",
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.7.3-missing-gn-deps.patch b/dev-qt/qtwebengine/files/qtwebengine-6.7.3-missing-gn-deps.patch
new file mode 100644
index 000000000000..b9723a59d859
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.7.3-missing-gn-deps.patch
@@ -0,0 +1,33 @@
+Patch status: needs upstreaming
+
+Add missing dependencies for rare race conditions, these are all
+related to Qt-specific changes as far as I can see.
+
+https://bugs.gentoo.org/942142
+--- a/src/3rdparty/chromium/components/history/core/browser/BUILD.gn
++++ b/src/3rdparty/chromium/components/history/core/browser/BUILD.gn
+@@ -184,4 +184,8 @@
+ "//components/sync",
+ ]
++
++ deps += [
++ "//components/signin/public/base:signin_buildflags",
++ ]
+ }
+
+--- a/src/3rdparty/chromium/qtwebengine/browser/extensions/api/BUILD.gn
++++ b/src/3rdparty/chromium/qtwebengine/browser/extensions/api/BUILD.gn
+@@ -46,4 +46,5 @@
+ deps = [
+ "//content/public/browser",
++ "//qtwebengine/common/extensions/api:api",
+ ]
+ }
+--- a/src/core/ozone/BUILD.gn
++++ b/src/core/ozone/BUILD.gn
+@@ -22,4 +22,5 @@
+ deps = [
+ "//base",
++ "//media/gpu:buildflags",
+ "//ui/base:buildflags",
+ "//ui/ozone:ozone_base",
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.3.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.3.ebuild
index 5d685e365f2a..d9b580efb949 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.3.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.3.ebuild
@@ -110,6 +110,8 @@ PATCHES=( "${WORKDIR}"/patches/${PN} )
PATCHES+=(
# add extras as needed here, may merge in set if carries across versions
+ "${FILESDIR}"/${PN}-6.7.3-missing-gn-deps.patch
+ "${FILESDIR}"/${PN}-6.7.3-missing-gn-deps-blink.patch
)
python_check_deps() {
diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.0.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.0.ebuild
index 6b40caa515b0..4bf68d74e0a3 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.8.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.8.0.ebuild
@@ -108,6 +108,7 @@ PATCHES=( "${WORKDIR}"/patches/${PN} )
PATCHES+=(
# add extras as needed here, may merge in set if carries across versions
+ "${FILESDIR}"/${PN}-6.7.3-missing-gn-deps.patch
)
python_check_deps() {
diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
index baac705a7f5d..9e3a5cd53a3d 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
@@ -108,6 +108,7 @@ PATCHES=( "${WORKDIR}"/patches/${PN} )
PATCHES+=(
# add extras as needed here, may merge in set if carries across versions
+ "${FILESDIR}"/${PN}-6.7.3-missing-gn-deps.patch
)
python_check_deps() {