| 1 |
commit: 4695bb5e5677e5590e5322204034c71f2ff89c63 |
| 2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jan 2 21:30:13 2022 +0000 |
| 4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jan 2 22:44:13 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4695bb5e |
| 7 |
|
| 8 |
net-libs/webkit-gtk: fix USE=-opengl build patch |
| 9 |
|
| 10 |
When adapting the patch to 2.34 series I saw that the latter hunk was |
| 11 |
included upstream now, and assumed all is fine or didn't notice I'm |
| 12 |
deleting multiple hunks - but the first hunk for header includes is |
| 13 |
still necessary. |
| 14 |
|
| 15 |
Thanks-to: Alex Xu (Hello71) <alex_y_xu <AT> yahoo.ca> |
| 16 |
Closes: https://bugs.gentoo.org/819384 |
| 17 |
Package-Manager: Portage-3.0.20, Repoman-3.0.2 |
| 18 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
| 19 |
|
| 20 |
.../files/2.34.3-opengl-without-X-fixes.patch | 46 ++++++++++++++++++++++ |
| 21 |
net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild | 2 +- |
| 22 |
2 files changed, 47 insertions(+), 1 deletion(-) |
| 23 |
|
| 24 |
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 |
| 25 |
new file mode 100644 |
| 26 |
index 000000000000..5608500376ff |
| 27 |
--- /dev/null |
| 28 |
+++ b/net-libs/webkit-gtk/files/2.34.3-opengl-without-X-fixes.patch |
| 29 |
@@ -0,0 +1,46 @@ |
| 30 |
+https://bugs.webkit.org/show_bug.cgi?id=208907 |
| 31 |
+ |
| 32 |
+From c67efa2bbe2094b40b4e104bb26497c2aff5ce68 Mon Sep 17 00:00:00 2001 |
| 33 |
+From: Mart Raudsepp <leio@g.o> |
| 34 |
+Date: Sat, 9 May 2020 23:11:52 +0300 |
| 35 |
+Subject: [PATCH] Clean up OpenGLShims.h conditionals in a few places to fix |
| 36 |
+ some build configurations |
| 37 |
+ |
| 38 |
+--- |
| 39 |
+ Source/WebCore/platform/graphics/GLContext.cpp | 3 +++ |
| 40 |
+ Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp | 5 ++++- |
| 41 |
+ 2 files changed, 7 insertions(+), 1 deletions(-) |
| 42 |
+ |
| 43 |
+diff --git a/Source/WebCore/platform/graphics/GLContext.cpp b/Source/WebCore/platform/graphics/GLContext.cpp |
| 44 |
+index b217988b990..1ba0eb8a482 100644 |
| 45 |
+--- a/Source/WebCore/platform/graphics/GLContext.cpp |
| 46 |
++++ b/Source/WebCore/platform/graphics/GLContext.cpp |
| 47 |
+@@ -28,6 +28,9 @@ |
| 48 |
+ |
| 49 |
+ #if USE(GLX) |
| 50 |
+ #include "GLContextGLX.h" |
| 51 |
++#endif |
| 52 |
++ |
| 53 |
++#if !USE(OPENGL_ES) && !USE(LIBEPOXY) && !USE(ANGLE) |
| 54 |
+ #include "OpenGLShims.h" |
| 55 |
+ #endif |
| 56 |
+ |
| 57 |
+diff --git a/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp b/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp |
| 58 |
+index 3515be452b2..82cce70f14b 100644 |
| 59 |
+--- a/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp |
| 60 |
++++ b/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp |
| 61 |
+@@ -64,7 +64,10 @@ |
| 62 |
+ |
| 63 |
+ #if USE(GLX) |
| 64 |
+ #include <GL/glx.h> |
| 65 |
+-#include <WebCore/OpenGLShims.h> |
| 66 |
++#endif |
| 67 |
++ |
| 68 |
++#if !USE(OPENGL_ES) && !USE(LIBEPOXY) && !USE(ANGLE) |
| 69 |
++#include "WebCore/OpenGLShims.h" |
| 70 |
+ #endif |
| 71 |
+ |
| 72 |
+ #if USE(GSTREAMER) |
| 73 |
+-- |
| 74 |
+2.20.1 |
| 75 |
+ |
| 76 |
|
| 77 |
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild |
| 78 |
index f6b51ffd2814..ff06c0b8a9ef 100644 |
| 79 |
--- a/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild |
| 80 |
+++ b/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild |
| 81 |
@@ -171,7 +171,7 @@ pkg_setup() { |
| 82 |
} |
| 83 |
|
| 84 |
src_prepare() { |
| 85 |
- eapply "${FILESDIR}"/2.34.1-opengl-without-X-fixes.patch |
| 86 |
+ eapply "${FILESDIR}"/2.34.3-opengl-without-X-fixes.patch |
| 87 |
cmake_src_prepare |
| 88 |
gnome2_src_prepare |
| 89 |
} |
Archives