diff options
| author |   Mart Raudsepp <leio@gentoo.org> | 2022-01-02 23:30:13 +0200 |
|---|---|---|
| committer | Mart Raudsepp <leio@gentoo.org> | 2022-01-03 00:44:13 +0200 |
| commit | 4695bb5e5677e5590e5322204034c71f2ff89c63 (patch) | |
| tree | fbf57ad02223dcce09fefad000aa23b2800c4f67 /net-libs/webkit-gtk/files | |
| parent | net-libs/webkit-gtk: security bump to 2.34.3 (diff) | |
| download | gentoo-4695bb5e5677e5590e5322204034c71f2ff89c63.tar.gz gentoo-4695bb5e5677e5590e5322204034c71f2ff89c63.tar.bz2 gentoo-4695bb5e5677e5590e5322204034c71f2ff89c63.zip | |
net-libs/webkit-gtk: fix USE=-opengl build patch
When adapting the patch to 2.34 series I saw that the latter hunk was
included upstream now, and assumed all is fine or didn't notice I'm
deleting multiple hunks - but the first hunk for header includes is
still necessary.
Thanks-to: Alex Xu (Hello71) <alex_y_xu@yahoo.ca>
Closes: https://bugs.gentoo.org/819384
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Mart Raudsepp <leio@gentoo.org>
Diffstat (limited to 'net-libs/webkit-gtk/files')
| -rw-r--r-- | net-libs/webkit-gtk/files/2.34.3-opengl-without-X-fixes.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/net-libs/webkit-gtk/files/2.34.3-opengl-without-X-fixes.patch b/net-libs/webkit-gtk/files/2.34.3-opengl-without-X-fixes.patch new file mode 100644 index 000000000000..5608500376ff --- /dev/null +++ b/net-libs/webkit-gtk/files/2.34.3-opengl-without-X-fixes.patch @@ -0,0 +1,46 @@ +https://bugs.webkit.org/show_bug.cgi?id=208907 + +From c67efa2bbe2094b40b4e104bb26497c2aff5ce68 Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp <leio@gentoo.org> +Date: Sat, 9 May 2020 23:11:52 +0300 +Subject: [PATCH] Clean up OpenGLShims.h conditionals in a few places to fix + some build configurations + +--- + Source/WebCore/platform/graphics/GLContext.cpp | 3 +++ + Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp | 5 ++++- + 2 files changed, 7 insertions(+), 1 deletions(-) + +diff --git a/Source/WebCore/platform/graphics/GLContext.cpp b/Source/WebCore/platform/graphics/GLContext.cpp +index b217988b990..1ba0eb8a482 100644 +--- a/Source/WebCore/platform/graphics/GLContext.cpp ++++ b/Source/WebCore/platform/graphics/GLContext.cpp +@@ -28,6 +28,9 @@ + + #if USE(GLX) + #include "GLContextGLX.h" ++#endif ++ ++#if !USE(OPENGL_ES) && !USE(LIBEPOXY) && !USE(ANGLE) + #include "OpenGLShims.h" + #endif + +diff --git a/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp b/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp +index 3515be452b2..82cce70f14b 100644 +--- a/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp ++++ b/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp +@@ -64,7 +64,10 @@ + + #if USE(GLX) + #include <GL/glx.h> +-#include <WebCore/OpenGLShims.h> ++#endif ++ ++#if !USE(OPENGL_ES) && !USE(LIBEPOXY) && !USE(ANGLE) ++#include "WebCore/OpenGLShims.h" + #endif + + #if USE(GSTREAMER) +-- +2.20.1 + |