summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2021-12-06 05:19:35 +0000
committerV3n3RiX <venerix@koprulu.sector>2021-12-06 05:19:35 +0000
commita38733e119f167a3dc01f1379ad6114629fe3e64 (patch)
tree572fb0f0de9916355403bc3f6435702eb34e1f80
parent49303c0ce9d5e8cc30843163b5db10ef1c30f3ae (diff)
net-libs/webkit-gtk : add patches
-rw-r--r--net-libs/webkit-gtk/files/2.28.2-non-jumbo-fix.patch34
-rw-r--r--net-libs/webkit-gtk/files/2.28.2-opengl-without-X-fixes.patch2
-rw-r--r--net-libs/webkit-gtk/files/2.28.4-non-jumbo-fix2.patch31
-rw-r--r--net-libs/webkit-gtk/files/2.30.3-fix-noGL-build.patch27
-rw-r--r--net-libs/webkit-gtk/files/2.30.3-icu68.patch179
-rw-r--r--net-libs/webkit-gtk/files/2.34.1-opengl-without-X-fixes.patch31
-rw-r--r--net-libs/webkit-gtk/files/webkit-gtk-2.24.4-eglmesaext-include.patch10
7 files changed, 33 insertions, 281 deletions
diff --git a/net-libs/webkit-gtk/files/2.28.2-non-jumbo-fix.patch b/net-libs/webkit-gtk/files/2.28.2-non-jumbo-fix.patch
deleted file mode 100644
index da9f1d3f..00000000
--- a/net-libs/webkit-gtk/files/2.28.2-non-jumbo-fix.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From d553de92ed238278f51b93a2c90af7d3ff7a2da2 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-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::InjectedBundleNodeHandle>
-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 <WebCore/BitmapImage.h>
- #include <WebCore/Document.h>
-+#include <WebCore/Element.h>
- #include <WebCore/Frame.h>
- #include <WebCore/FrameLoader.h>
- #include <WebCore/FrameView.h>
---
-2.20.1
-
diff --git a/net-libs/webkit-gtk/files/2.28.2-opengl-without-X-fixes.patch b/net-libs/webkit-gtk/files/2.28.2-opengl-without-X-fixes.patch
index 6976c3ce..7feb2fac 100644
--- a/net-libs/webkit-gtk/files/2.28.2-opengl-without-X-fixes.patch
+++ b/net-libs/webkit-gtk/files/2.28.2-opengl-without-X-fixes.patch
@@ -1,3 +1,5 @@
+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
diff --git a/net-libs/webkit-gtk/files/2.28.4-non-jumbo-fix2.patch b/net-libs/webkit-gtk/files/2.28.4-non-jumbo-fix2.patch
deleted file mode 100644
index d7bc379d..00000000
--- a/net-libs/webkit-gtk/files/2.28.4-non-jumbo-fix2.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From f6b0ae5334eb9de1858b5f3b0edc2f7245087cab Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-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/net-libs/webkit-gtk/files/2.30.3-fix-noGL-build.patch b/net-libs/webkit-gtk/files/2.30.3-fix-noGL-build.patch
deleted file mode 100644
index 5e9f4267..00000000
--- a/net-libs/webkit-gtk/files/2.30.3-fix-noGL-build.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 25cf4db5575192fd306b7a74d496d1e10d8cfd3e Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-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 <X11/Xlib.h>
-+#include <X11/Xutil.h>
- #include <X11/extensions/Xcomposite.h>
- #if PLATFORM(GTK)
- #include <X11/extensions/Xdamage.h>
---
-2.20.1
-
diff --git a/net-libs/webkit-gtk/files/2.30.3-icu68.patch b/net-libs/webkit-gtk/files/2.30.3-icu68.patch
deleted file mode 100644
index 33116fee..00000000
--- a/net-libs/webkit-gtk/files/2.30.3-icu68.patch
+++ /dev/null
@@ -1,179 +0,0 @@
-From a5f1691b5b885dd228018740803075e7b6059e4b Mon Sep 17 00:00:00 2001
-From: "stephan.szabo@sony.com"
- <stephan.szabo@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
-Date: Tue, 3 Nov 2020 20:06:15 +0000
-Subject: [PATCH] [WinCairo/PlayStation] ICU 68.1 no longer exposes FALSE and
- TRUE macros by default https://bugs.webkit.org/show_bug.cgi?id=218522
-
-Reviewed by Don Olmstead.
-
-Source/WebCore:
-
-* platform/text/TextCodecICU.cpp: Replace use of TRUE with true
-
-Source/WebKit:
-
-* UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp: Replace FALSE with false
-
-Source/WTF:
-
-Replace uses of FALSE and TRUE with false and true.
-
-* wtf/text/icu/UTextProvider.h:
-* wtf/text/icu/UTextProviderLatin1.cpp:
-* wtf/text/icu/UTextProviderUTF16.cpp:
-
-
-git-svn-id: https://svn.webkit.org/repository/webkit/trunk@269325 268f45cc-cd09-0410-ab3c-d52691b4dbfc
----
- Source/WTF/wtf/text/icu/UTextProvider.h | 8 ++++----
- Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp | 14 +++++++-------
- Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp | 4 ++--
- Source/WebCore/platform/text/TextCodecICU.cpp | 2 +-
- .../DrawingAreaProxyCoordinatedGraphics.cpp | 2 +-
- 6 files changed, 15 insertions(+), 15 deletions(-)
-
-diff --git a/Source/WTF/wtf/text/icu/UTextProvider.h b/Source/WTF/wtf/text/icu/UTextProvider.h
-index c8f28d6ed3da..3c6fbeab6a5c 100644
---- a/Source/WTF/wtf/text/icu/UTextProvider.h
-+++ b/Source/WTF/wtf/text/icu/UTextProvider.h
-@@ -79,12 +79,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text, int64_t nativeIndex, int
- // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
- ASSERT(offset < std::numeric_limits<int32_t>::max());
- text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
-- isAccessible = TRUE;
-+ isAccessible = true;
- return true;
- }
- if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) {
- text->chunkOffset = text->chunkLength;
-- isAccessible = FALSE;
-+ isAccessible = false;
- return true;
- }
- } else {
-@@ -93,12 +93,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text, int64_t nativeIndex, int
- // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
- ASSERT(offset < std::numeric_limits<int32_t>::max());
- text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
-- isAccessible = TRUE;
-+ isAccessible = true;
- return true;
- }
- if (nativeIndex <= 0 && !text->chunkNativeStart) {
- text->chunkOffset = 0;
-- isAccessible = FALSE;
-+ isAccessible = false;
- return true;
- }
- }
-diff --git a/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp b/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp
-index 0a646b7f390d..49980f95ba79 100644
---- a/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp
-+++ b/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp
-@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t index, UBool forward)
- if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) {
- // Already inside the buffer. Set the new offset.
- uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
-- return TRUE;
-+ return true;
- }
- if (index >= length && uText->chunkNativeLimit == length) {
- // Off the end of the buffer, but we can't get it.
- uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
-- return FALSE;
-+ return false;
- }
- } else {
- if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) {
- // Already inside the buffer. Set the new offset.
- uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
-- return TRUE;
-+ return true;
- }
- if (!index && !uText->chunkNativeStart) {
- // Already at the beginning; can't go any farther.
- uText->chunkOffset = 0;
-- return FALSE;
-+ return false;
- }
- }
-
-@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t index, UBool forward)
-
- uText->nativeIndexingLimit = uText->chunkLength;
-
-- return TRUE;
-+ return true;
- }
-
- static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status)
-@@ -337,7 +337,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UText* text)
- static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
- {
- if (!text->context)
-- return FALSE;
-+ return false;
- int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text);
- UBool isAccessible;
- if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
-@@ -357,7 +357,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBo
- ASSERT(newContext == UTextProviderContext::PriorContext);
- textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
- }
-- return TRUE;
-+ return true;
- }
-
- static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
-diff --git a/Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp b/Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp
-index 69c8d091bd62..9c3fa709200a 100644
---- a/Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp
-+++ b/Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp
-@@ -126,7 +126,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLength(UText* text)
- static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
- {
- if (!text->context)
-- return FALSE;
-+ return false;
- int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text);
- UBool isAccessible;
- if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
-@@ -146,7 +146,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBoo
- ASSERT(newContext == UTextProviderContext::PriorContext);
- textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
- }
-- return TRUE;
-+ return true;
- }
-
- static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
-diff --git a/Source/WebCore/platform/text/TextCodecICU.cpp b/Source/WebCore/platform/text/TextCodecICU.cpp
-index 19b41eb7125f..2f7d1930b8d7 100644
---- a/Source/WebCore/platform/text/TextCodecICU.cpp
-+++ b/Source/WebCore/platform/text/TextCodecICU.cpp
-@@ -194,7 +194,7 @@ void TextCodecICU::createICUConverter() const
- UErrorCode error = U_ZERO_ERROR;
- m_converter = ICUConverterPtr { ucnv_open(m_canonicalConverterName, &error), ucnv_close };
- if (m_converter)
-- ucnv_setFallback(m_converter.get(), TRUE);
-+ ucnv_setFallback(m_converter.get(), true);
- }
-
- int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& error)
-diff --git a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp
-index 61e3f6050d7f..5a51b9ec1d68 100644
---- a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp
-+++ b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp
-@@ -402,7 +402,7 @@ DrawingAreaProxyCoordinatedGraphics::DrawingMonitor::~DrawingMonitor()
- int DrawingAreaProxyCoordinatedGraphics::DrawingMonitor::webViewDrawCallback(DrawingAreaProxyCoordinatedGraphics::DrawingMonitor* monitor)
- {
- monitor->didDraw();
-- return FALSE;
-+ return false;
- }
-
- void DrawingAreaProxyCoordinatedGraphics::DrawingMonitor::start(WTF::Function<void(CallbackBase::Error)>&& callback)
---
-2.20.1
-
diff --git a/net-libs/webkit-gtk/files/2.34.1-opengl-without-X-fixes.patch b/net-libs/webkit-gtk/files/2.34.1-opengl-without-X-fixes.patch
new file mode 100644
index 00000000..a4cf86f3
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.34.1-opengl-without-X-fixes.patch
@@ -0,0 +1,31 @@
+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/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletions(-)
+
+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
+
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.24.4-eglmesaext-include.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.24.4-eglmesaext-include.patch
deleted file mode 100644
index 9c277e71..00000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.24.4-eglmesaext-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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 <EGL/egl.h>
- #include <EGL/eglext.h>
-+#include <EGL/eglmesaext.h>
- #include <WebCore/GLContext.h>
- #include <WebCore/PlatformDisplayWayland.h>
- #include <WebCore/Region.h>