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 A87C9158043 for ; Wed, 17 Apr 2024 00:16:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EA74EE29EF; Wed, 17 Apr 2024 00:16:02 +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 CE1CBE29EF for ; Wed, 17 Apr 2024 00:16:02 +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 A264D34343F for ; Wed, 17 Apr 2024 00:16:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E1E1016F8 for ; Wed, 17 Apr 2024 00:15:59 +0000 (UTC) From: "Ionen Wolkens" 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" Message-ID: <1713312923.289d48f871d477edab5f750d307b6cb5eb632331.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qtwebengine/files/qtwebengine-6.7.0-displaykey-header.patch dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild X-VCS-Directories: dev-qt/qtwebengine/ dev-qt/qtwebengine/files/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 289d48f871d477edab5f750d307b6cb5eb632331 X-VCS-Branch: master Date: Wed, 17 Apr 2024 00:15:59 +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: 54302bda-b114-4c76-91d2-9af1ee56761a X-Archives-Hash: 55d6bee8da987e50934f337a0b9f5991 commit: 289d48f871d477edab5f750d307b6cb5eb632331 Author: Ionen Wolkens gentoo org> AuthorDate: Tue Apr 16 15:26:02 2024 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Wed Apr 17 00:15:23 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=289d48f8 dev-qt/qtwebengine: fix webdriver build under some configurations Unknown what is causing this to fail exactly, 6.7.0's USE=webdriver did build fine with all USE enabled last time tested so it could be related to disabling something while relying on transitive headers. Bug: https://bugs.gentoo.org/930107 Signed-off-by: Ionen Wolkens gentoo.org> .../files/qtwebengine-6.7.0-displaykey-header.patch | 12 ++++++++++++ dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild | 1 + dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild | 1 + 3 files changed, 14 insertions(+) diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.7.0-displaykey-header.patch b/dev-qt/qtwebengine/files/qtwebengine-6.7.0-displaykey-header.patch new file mode 100644 index 000000000000..84dce821f80f --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-6.7.0-displaykey-header.patch @@ -0,0 +1,12 @@ +TODO: merge with glx-headers patch in patchset, similar +issues that seem to stem from Qt's GLX restoration. + +https://bugs.gentoo.org/930107#c8 +--- a/src/3rdparty/chromium/ui/gl/gl_display.h ++++ b/src/3rdparty/chromium/ui/gl/gl_display.h +@@ -12,4 +12,5 @@ + + #include "ui/gl/gl_export.h" ++#include "ui/gl/gpu_preference.h" + + #if defined(USE_EGL) diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild index 1035ff458cd5..997dbaf4ec5f 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild @@ -109,6 +109,7 @@ PATCHES+=( # add extras as needed here, may merge in set if carries across versions "${FILESDIR}"/${PN}-6.7.0-clang18.patch "${FILESDIR}"/${PN}-6.7.0-ninja1.12.patch + "${FILESDIR}"/${PN}-6.7.0-displaykey-header.patch ) python_check_deps() { diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild index aae8a8cfa848..f9dd54161654 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild @@ -109,6 +109,7 @@ PATCHES+=( # add extras as needed here, may merge in set if carries across versions "${FILESDIR}"/${PN}-6.7.0-clang18.patch "${FILESDIR}"/${PN}-6.7.0-ninja1.12.patch + "${FILESDIR}"/${PN}-6.7.0-displaykey-header.patch ) python_check_deps() {