commit: 289d48f871d477edab5f750d307b6cb5eb632331 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Tue Apr 16 15:26:02 2024 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> 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 <ionen <AT> 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() {
