diff options
| author |   Ionen Wolkens <ionen@gentoo.org> | 2024-04-16 11:26:02 -0400 |
|---|---|---|
| committer | Ionen Wolkens <ionen@gentoo.org> | 2024-04-16 20:15:23 -0400 |
| commit | 289d48f871d477edab5f750d307b6cb5eb632331 (patch) | |
| tree | 3c30995a1ad3c5e156e7b4af6a33b420bdbdb9fd /dev-qt | |
| parent | dev-qt/qtwebengine: "improve" build with ninja-1.12 (Qt6) (diff) | |
| download | gentoo-289d48f871d477edab5f750d307b6cb5eb632331.tar.gz gentoo-289d48f871d477edab5f750d307b6cb5eb632331.tar.bz2 gentoo-289d48f871d477edab5f750d307b6cb5eb632331.zip | |
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@gentoo.org>
Diffstat (limited to 'dev-qt')
| -rw-r--r-- | dev-qt/qtwebengine/files/qtwebengine-6.7.0-displaykey-header.patch | 12 | ||||
| -rw-r--r-- | dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild | 1 | ||||
| -rw-r--r-- | dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild | 1 |
3 files changed, 14 insertions, 0 deletions
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() { |