From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9CDAD1581E7 for ; Mon, 29 Apr 2024 23:51:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B6C7AE29E6; Mon, 29 Apr 2024 23:51:32 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id 8B0B7E29E6 for ; Mon, 29 Apr 2024 23:51:32 +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 563F834306D for ; Mon, 29 Apr 2024 23:51:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9857D1779 for ; Mon, 29 Apr 2024 23:51:29 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1714434649.e209990c6d94a01863c46f3285cdd18d0ec98201.sam@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-5.15.13_p20240322-ninja1.12.patch dev-qt/qtwebengine/qtwebengine-5.15.13_p20240322.ebuild X-VCS-Directories: dev-qt/qtwebengine/ dev-qt/qtwebengine/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: e209990c6d94a01863c46f3285cdd18d0ec98201 X-VCS-Branch: master Date: Mon, 29 Apr 2024 23:51:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: da0f0f14-b6f4-438e-8fe0-7d309e1c9a2d X-Archives-Hash: 22e1af69fd49fe2165d0d23ccf59260d commit: e209990c6d94a01863c46f3285cdd18d0ec98201 Author: Sam James gentoo org> AuthorDate: Mon Apr 29 23:50:28 2024 +0000 Commit: Sam James gentoo org> CommitDate: Mon Apr 29 23:50:49 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e209990c dev-qt/qtwebengine: fix build w/ ninja-1.12 for qt5 Same as Ionen's patch for qt6 but with a hunk removed. Closes: https://bugs.gentoo.org/930107 Signed-off-by: Sam James gentoo.org> .../qtwebengine-5.15.13_p20240322-ninja1.12.patch | 23 ++++++++++++++++++++++ .../qtwebengine-5.15.13_p20240322.ebuild | 5 ++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.13_p20240322-ninja1.12.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.13_p20240322-ninja1.12.patch new file mode 100644 index 000000000000..2da3dc27fab2 --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.13_p20240322-ninja1.12.patch @@ -0,0 +1,23 @@ +Quoting the description from qtwebengine-6.7.0-ninja1.12.patch: +""" +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 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 +""" + +This has a hunk removed but is otherwise the same. +--- a/src/3rdparty/chromium/content/browser/BUILD.gn ++++ b/src/3rdparty/chromium/content/browser/BUILD.gn +@@ -198,2 +198,3 @@ + "//components/services/storage/public/mojom", ++ "//components/spellcheck:buildflags", + "//components/sqlite_proto", diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.13_p20240322.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.13_p20240322.ebuild index 22bb5cdc0734..c8cd5e9574d1 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.15.13_p20240322.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.15.13_p20240322.ebuild @@ -98,7 +98,10 @@ BDEPEND="${PYTHON_DEPS} sys-devel/flex " -PATCHES=( "${WORKDIR}/${PATCHSET}" ) +PATCHES=( + "${WORKDIR}/${PATCHSET}" + "${FILESDIR}"/qtwebengine-5.15.13_p20240322-ninja1.12.patch +) qtwebengine_check-reqs() { # bug #307861