diff --git a/network/misc/webkit2gtk/files/gentoo/2.28.2-non-jumbo-fix.patch b/network/misc/webkit2gtk/files/gentoo/2.28.2-non-jumbo-fix.patch new file mode 100644 index 0000000000..da9f1d3f56 --- /dev/null +++ b/network/misc/webkit2gtk/files/gentoo/2.28.2-non-jumbo-fix.patch @@ -0,0 +1,34 @@ +From d553de92ed238278f51b93a2c90af7d3ff7a2da2 Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp +Date: Tue, 12 May 2020 15:28:45 +0300 +Subject: [PATCH] Try to fix an apparent non-unified build error +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Source/WebKit/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp: In member function ‘WTF::RefPtr +WebKit::InjectedBundleHitTestResult::urlElementHandle() const’: +Source/WebKit/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp:57:78: error: no matching function for call to +‘WebKit::InjectedBundleNodeHandle::getOrCreate(WebCore::Element*)’ + 57 | return InjectedBundleNodeHandle::getOrCreate(m_hitTestResult.URLElement()); + | ^ +In file included from Source/WebKit/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp:29 +--- + .../WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Source/WebKit/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp b/Source/WebKit/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp +index df8e55df1f0..26f045bd3fc 100644 +--- a/Source/WebKit/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp ++++ b/Source/WebKit/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp +@@ -32,6 +32,7 @@ + #include "WebImage.h" + #include + #include ++#include + #include + #include + #include +-- +2.20.1 + diff --git a/network/misc/webkit2gtk/files/gentoo/2.28.2-opengl-without-X-fixes.patch b/network/misc/webkit2gtk/files/gentoo/2.28.2-opengl-without-X-fixes.patch new file mode 100644 index 0000000000..6976c3ce4d --- /dev/null +++ b/network/misc/webkit2gtk/files/gentoo/2.28.2-opengl-without-X-fixes.patch @@ -0,0 +1,53 @@ +From c67efa2bbe2094b40b4e104bb26497c2aff5ce68 Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp +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 | 5 ++++- + Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp | 5 ++++- + 2 files changed, 8 insertions(+), 2 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 + +@@ -57,7 +60,7 @@ inline ThreadGlobalGLContext* currentContext() + + static bool initializeOpenGLShimsIfNeeded() + { +-#if USE(OPENGL_ES) || USE(LIBEPOXY) ++#if USE(OPENGL_ES) || USE(LIBEPOXY) || USE(ANGLE) + return true; + #else + static bool initialized = false; +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 +-#include ++#endif ++ ++#if !USE(OPENGL_ES) && !USE(LIBEPOXY) && !USE(ANGLE) ++#include "WebCore/OpenGLShims.h" + #endif + + #if USE(GSTREAMER) +-- +2.20.1 + diff --git a/network/misc/webkit2gtk/files/gentoo/2.28.4-non-jumbo-fix2.patch b/network/misc/webkit2gtk/files/gentoo/2.28.4-non-jumbo-fix2.patch new file mode 100644 index 0000000000..d7bc379d2b --- /dev/null +++ b/network/misc/webkit2gtk/files/gentoo/2.28.4-non-jumbo-fix2.patch @@ -0,0 +1,31 @@ +From f6b0ae5334eb9de1858b5f3b0edc2f7245087cab Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp +Date: Sat, 11 Jul 2020 15:28:05 +0300 +Subject: [PATCH] Try to fix another apparent non-unified build error +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Source/WebCore/rendering/svg/RenderSVGResourceClipper.h:70:42: required from here +/usr/lib/gcc/x86_64-pc-linux-gnu/9.2.0/include/g++-v9/bits/unique_ptr.h:79:16: error: invalid application of ‘sizeof’ to incomplete type ‘WebCore::ImageBuffer’ + 79 | static_assert(sizeof(_Tp)>0, + | ^~~~~~~~~~~ +--- + Source/WebCore/rendering/svg/RenderSVGResourceClipper.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h b/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h +index 55d9e34df61..12a7a83cc61 100644 +--- a/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h ++++ b/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h +@@ -19,6 +19,7 @@ + + #pragma once + ++#include "ImageBuffer.h" + #include "RenderSVGResourceContainer.h" + #include "SVGClipPathElement.h" + #include "SVGUnitTypes.h" +-- +2.20.1 + diff --git a/network/misc/webkit2gtk/files/gentoo/2.30.3-fix-noGL-build.patch b/network/misc/webkit2gtk/files/gentoo/2.30.3-fix-noGL-build.patch new file mode 100644 index 0000000000..5e9f426773 --- /dev/null +++ b/network/misc/webkit2gtk/files/gentoo/2.30.3-fix-noGL-build.patch @@ -0,0 +1,27 @@ +From 25cf4db5575192fd306b7a74d496d1e10d8cfd3e Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp +Date: Fri, 27 Nov 2020 22:47:30 +0200 +Subject: [PATCH] [X11] Fix build with disabled OpenGL + +The added PlatformDisplayX11::visual() method requires symbols from +X11/Xutil.h, which wasn't added as an explicit include with only +EGL headers indirectly pulled it in with standard build options. +--- + Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp b/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp +index 8fe3d3e92c88..2b2805446aad 100644 +--- a/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp ++++ b/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp +@@ -30,6 +30,7 @@ + + #if PLATFORM(X11) + #include ++#include + #include + #if PLATFORM(GTK) + #include +-- +2.20.1 + diff --git a/network/misc/webkit2gtk/files/gentoo/webkit-gtk-2.24.4-eglmesaext-include.patch b/network/misc/webkit2gtk/files/gentoo/webkit-gtk-2.24.4-eglmesaext-include.patch new file mode 100644 index 0000000000..9c277e719d --- /dev/null +++ b/network/misc/webkit2gtk/files/gentoo/webkit-gtk-2.24.4-eglmesaext-include.patch @@ -0,0 +1,10 @@ +--- webkitgtk-2.24.4.orig/Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp 2019-08-26 17:55:46.000000000 +0300 ++++ webkitgtk-2.24.4.orig/Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp 2019-11-04 23:33:44.146933810 +0300 +@@ -31,6 +31,7 @@ + #include "WebKitWaylandServerProtocol.h" + #include + #include ++#include + #include + #include + #include diff --git a/network/misc/webkit2gtk/pspec.xml b/network/misc/webkit2gtk/pspec.xml index abc9fb1cb2..91825a48b5 100644 --- a/network/misc/webkit2gtk/pspec.xml +++ b/network/misc/webkit2gtk/pspec.xml @@ -54,7 +54,11 @@ wpebackend-fdo-devel - + gentoo/webkit-gtk-2.24.4-eglmesaext-include.patch + gentoo/2.28.2-opengl-without-X-fixes.patch + gentoo/2.28.2-non-jumbo-fix.patch + gentoo/2.28.4-non-jumbo-fix2.patch + gentoo/2.30.3-fix-noGL-build.patch