[Buildroot] [PATCH v3 4/4] package/webkitgtk: bump to version 2.42.1
Thomas Devoogdt
thomas at devoogdt.com
Fri Sep 29 08:04:56 UTC 2023
>
> Update to a new major release.
>
> Release notes:
>
> https://webkitgtk.org/2023/09/15/webkitgtk2.42.0-released.html
> https://webkitgtk.org/2023/09/27/webkitgtk2.42.1-released.html
>
> Security notes:
>
> https://webkitgtk.org/security/WSA-2023-0008.html
> __________________
>
> - USE_JPEGXL is enabled by default now [1], so add a libjxl if used.
>
> - ENABLE_GLES2 has been dropped, so drop it also here [2].
> Instead, enable USE_OPENGL_OR_ES if libgles is present. Beware that also
> libegl is needed for USE_OPENGL_OR_ES, but that one is most of the time a
> dependency for libgles, so leave it out here.
>
> - Also raise the minimal GCC version to 10.2, which is required since webkitgtk-2.42.x [3].
> Similar to commit ec1ff802df9a0f17dd2b734ba536a5e206aa5aa4,
> we do check on >= GCC 10, because we can't check on >= GCC 10.2.
>
> [1] https://github.com/WebKit/WebKit/commit/93865414f33190c57e293a80492e10edc461d7f0
> [2] https://github.com/WebKit/WebKit/commit/cfe917fec45bf72c371087ece034feee8454f1b4
> [3] https://github.com/WebKit/WebKit/commit/133498aaee8f44443d9e3b2a08be4a4b77b93fc9
- USE_JPEGXL is enabled by default now [1], so add a libjxl if used.
- ENABLE_GLES2 has been dropped, so drop it also here [2].
Instead, enable USE_OPENGL_OR_ES if libgles is present. Beware that also
libegl is needed for USE_OPENGL_OR_ES, but that one is most of the time a
dependency for libgles, so leave it out here.
- Also raise the minimal GCC version to 10.2, which is required since
webkitgtk-2.42.x [3].
Similar to commit ec1ff802df9a0f17dd2b734ba536a5e206aa5aa4,
we do check on >= GCC 10, because we can't check on >= GCC 10.2.
[1] https://github.com/WebKit/WebKit/commit/93865414f33190c57e293a80492e10edc461d7f0
[2] https://github.com/WebKit/WebKit/commit/cfe917fec45bf72c371087ece034feee8454f1b4
[3] https://github.com/WebKit/WebKit/commit/133498aaee8f44443d9e3b2a08be4a4b77b93fc9
> Signed-off-by: Thomas Devoogdt <thomas.devoogdt at barco.com>
> ---
> v2: n/a
> v3:
> - replace for package/webkitgtk: add a USE_OPENGL_OR_ES config option
> - 2.42.0 needs an extra bunch of patches, so bump to immediately to 2.42.1
> ---
> ...e-when-gstreamer-support-is-disabled.patch | 36 ---
> ...EGL-checks-when-GBM-renderer-is-used.patch | 274 ++++++++++++++++++
> ...nnection.cpp-fix-incomplete-type-Web.patch | 38 +++
> package/webkitgtk/Config.in | 6 +-
> package/webkitgtk/webkitgtk.hash | 6 +-
> package/webkitgtk/webkitgtk.mk | 16 +-
> 6 files changed, 329 insertions(+), 47 deletions(-)
> delete mode 100644 package/webkitgtk/0001-Fix-build-failure-when-gstreamer-support-is-disabled.patch
> create mode 100644 package/webkitgtk/0001-fix-USE_EGL-checks-when-GBM-renderer-is-used.patch
> create mode 100644 package/webkitgtk/0002-NetworkProcessConnection.cpp-fix-incomplete-type-Web.patch
>
> diff --git a/package/webkitgtk/0001-Fix-build-failure-when-gstreamer-support-is-disabled.patch b/package/webkitgtk/0001-Fix-build-failure-when-gstreamer-support-is-disabled.patch
> deleted file mode 100644
> index 3fa23b215b..0000000000
> --- a/package/webkitgtk/0001-Fix-build-failure-when-gstreamer-support-is-disabled.patch
> +++ /dev/null
> @@ -1,36 +0,0 @@
> -From 9b31965cdf362768e86f7e592e59e68fb3351261 Mon Sep 17 00:00:00 2001
> -From: Matt Turner <mattst88 at gmail.com>
> -Date: Tue, 8 Aug 2023 16:51:25 -0700
> -Subject: [PATCH] Fix build failure when gstreamer support is disabled
> - https://bugs.webkit.org/show_bug.cgi?id=259931 https://bugs.gentoo.org/911663
> -
> -Reviewed by Carlos Alberto Lopez Perez.
> -
> -* Source/WebCore/loader/MixedContentChecker.cpp:
> -
> -Canonical link: https://commits.webkit.org/260527.429@fix-build
> -
> -(cherry picked from commit f5ceef5bf2e3c4d7203a37b9e2d2fdd9b1bb2732)
> -
> -Upstream: https://github.com/WebKit/WebKit/commit/f5ceef5bf2e3c4d7203a37b9e2d2fdd9b1bb2732
> -Signed-off-by: Thomas Devoogdt <thomas.devoogdt at barco.com>
> ----
> - Source/WebCore/loader/MixedContentChecker.cpp | 2 ++
> - 1 file changed, 2 insertions(+)
> -
> -diff --git a/Source/WebCore/loader/MixedContentChecker.cpp b/Source/WebCore/loader/MixedContentChecker.cpp
> -index 9b4c7fe62020..ac4733bc08bc 100644
> ---- a/Source/WebCore/loader/MixedContentChecker.cpp
> -+++ b/Source/WebCore/loader/MixedContentChecker.cpp
> -@@ -33,6 +33,8 @@
> - #include "ContentSecurityPolicy.h"
> - #include "Document.h"
> - #include "Frame.h"
> -+#include "FrameLoader.h"
> -+#include "FrameLoaderClient.h"
> - #include "SecurityOrigin.h"
> -
> - namespace WebCore {
> ---
> -2.42.0
> -
> diff --git a/package/webkitgtk/0001-fix-USE_EGL-checks-when-GBM-renderer-is-used.patch b/package/webkitgtk/0001-fix-USE_EGL-checks-when-GBM-renderer-is-used.patch
> new file mode 100644
> index 0000000000..4c314db306
> --- /dev/null
> +++ b/package/webkitgtk/0001-fix-USE_EGL-checks-when-GBM-renderer-is-used.patch
> @@ -0,0 +1,274 @@
> +From 1e70a0236581bac49ef5fd47b82d62538969b294 Mon Sep 17 00:00:00 2001
> +From: Thomas Devoogdt <thomas.devoogdt at barco.com>
> +Date: Thu, 28 Sep 2023 13:26:05 +0200
> +Subject: [PATCH] fix USE_EGL checks when GBM renderer is used
> +
> +https://bugs.webkit.org/show_bug.cgi?id=262169
> +
> +Reviewed by NOBODY (OOPS!).
> +
> +Regression since commit 81c064ddb4182a34a36def401025d223ca0d31ba.
> +
> +webkitgtk-2.42.0/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.cpp:39:10: fatal error: epoxy/egl.h: No such file or directory
> + 39 | #include <epoxy/egl.h>
> + | ^~~~~~~~~~~~~
> +
> +Upstream: main & 2.42
> + - main: https://github.com/WebKit/WebKit/pull/18346
> + - 2.42: https://github.com/WebKit/WebKit/pull/18347
> +Signed-off-by: Thomas Devoogdt <thomas.devoogdt at barco.com>
> +---
> + .../WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp | 8 ++++++++
> + Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp | 4 +++-
> + Source/WebKit/UIProcess/gtk/AcceleratedBackingStore.cpp | 6 +++---
> + .../UIProcess/gtk/AcceleratedBackingStoreDMABuf.cpp | 4 ++++
> + .../WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.h | 4 ++++
> + .../gtk/AcceleratedBackingStoreDMABuf.messages.in | 2 ++
> + Source/WebKit/WebProcess/WebPage/AcceleratedSurface.cpp | 4 ++--
> + .../WebProcess/WebPage/gtk/AcceleratedSurfaceDMABuf.cpp | 4 ++++
> + .../WebProcess/WebPage/gtk/AcceleratedSurfaceDMABuf.h | 4 ++++
> + .../WebPage/gtk/AcceleratedSurfaceDMABuf.messages.in | 2 ++
> + Source/WebKit/WebProcess/glib/WebProcessGLib.cpp | 2 +-
> + 11 files changed, 37 insertions(+), 7 deletions(-)
> +
> +diff --git a/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp b/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp
> +index 8bdcf48b446a..19b46a137d5b 100644
> +--- a/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp
> ++++ b/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp
> +@@ -45,9 +45,11 @@
> + #endif
> +
> + #if PLATFORM(GTK)
> ++#if USE(EGL)
> + #include "AcceleratedBackingStoreDMABuf.h"
> + #include "DMABufRendererBufferMode.h"
> + #include <WebCore/PlatformDisplaySurfaceless.h>
> ++#endif
> + #include <gtk/gtk.h>
> +
> + #if PLATFORM(WAYLAND)
> +@@ -164,6 +166,7 @@ static String dmabufRendererWithSupportedBuffers()
> + {
> + StringBuilder buffers;
> + buffers.append("DMABuf (Supported buffers: "_s);
> ++#if USE(EGL)
> + auto mode = AcceleratedBackingStoreDMABuf::rendererBufferMode();
> + if (mode.contains(DMABufRendererBufferMode::Hardware))
> + buffers.append("Hardware"_s);
> +@@ -172,6 +175,7 @@ static String dmabufRendererWithSupportedBuffers()
> + buffers.append(", ");
> + buffers.append("Shared Memory"_s);
> + }
> ++#endif
> + buffers.append(')');
> + return buffers.toString();
> + }
> +@@ -269,7 +273,11 @@ void WebKitProtocolHandler::handleGPU(WebKitURISchemeRequest* request)
> + #if PLATFORM(GTK)
> + addTableRow(versionObject, "GTK version"_s, makeString(GTK_MAJOR_VERSION, '.', GTK_MINOR_VERSION, '.', GTK_MICRO_VERSION, " (build) "_s, gtk_get_major_version(), '.', gtk_get_minor_version(), '.', gtk_get_micro_version(), " (runtime)"_s));
> +
> ++#if USE(EGL)
> + bool usingDMABufRenderer = AcceleratedBackingStoreDMABuf::checkRequirements();
> ++#else
> ++ bool usingDMABufRenderer = false;
> ++#endif
> +
> + #if PLATFORM(WAYLAND)
> + if (PlatformDisplay::sharedDisplay().type() == PlatformDisplay::Type::Wayland && !usingDMABufRenderer) {
> +diff --git a/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp b/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp
> +index d439751cee32..151c4b854cc3 100644
> +--- a/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp
> ++++ b/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp
> +@@ -54,8 +54,10 @@
> +
> + #if PLATFORM(GTK)
> + #include "GtkSettingsManager.h"
> ++#if USE(EGL)
> + #include "AcceleratedBackingStoreDMABuf.h"
> + #endif
> ++#endif
> +
> +
> + namespace WebKit {
> +@@ -88,7 +90,7 @@ void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process
> + parameters.renderDeviceFile = WebCore::PlatformDisplay::sharedDisplay().drmRenderNodeFile();
> + #endif
> +
> +-#if PLATFORM(GTK)
> ++#if PLATFORM(GTK) && USE(EGL)
> + parameters.dmaBufRendererBufferMode = AcceleratedBackingStoreDMABuf::rendererBufferMode();
> + #endif
> +
> +diff --git a/Source/WebKit/UIProcess/gtk/AcceleratedBackingStore.cpp b/Source/WebKit/UIProcess/gtk/AcceleratedBackingStore.cpp
> +index df4cdc2ada3d..2e8a6f59513e 100644
> +--- a/Source/WebKit/UIProcess/gtk/AcceleratedBackingStore.cpp
> ++++ b/Source/WebKit/UIProcess/gtk/AcceleratedBackingStore.cpp
> +@@ -40,7 +40,7 @@
> + #include "AcceleratedBackingStoreX11.h"
> + #endif
> +
> +-#if PLATFORM(GTK)
> ++#if PLATFORM(GTK) && USE(EGL)
> + #include "AcceleratedBackingStoreDMABuf.h"
> + #endif
> +
> +@@ -72,7 +72,7 @@ static bool gtkCanUseHardwareAcceleration()
> +
> + bool AcceleratedBackingStore::checkRequirements()
> + {
> +-#if PLATFORM(GTK)
> ++#if PLATFORM(GTK) && USE(EGL)
> + if (AcceleratedBackingStoreDMABuf::checkRequirements())
> + return gtkCanUseHardwareAcceleration();
> + #endif
> +@@ -93,7 +93,7 @@ std::unique_ptr<AcceleratedBackingStore> AcceleratedBackingStore::create(WebPage
> + if (!HardwareAccelerationManager::singleton().canUseHardwareAcceleration())
> + return nullptr;
> +
> +-#if PLATFORM(GTK)
> ++#if PLATFORM(GTK) && USE(EGL)
> + if (AcceleratedBackingStoreDMABuf::checkRequirements())
> + return AcceleratedBackingStoreDMABuf::create(webPage);
> + #endif
> +diff --git a/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.cpp b/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.cpp
> +index 2a8d7127909d..64d04332a598 100644
> +--- a/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.cpp
> ++++ b/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.cpp
> +@@ -26,6 +26,8 @@
> + #include "config.h"
> + #include "AcceleratedBackingStoreDMABuf.h"
> +
> ++#if USE(EGL)
> ++
> + #include "AcceleratedBackingStoreDMABufMessages.h"
> + #include "AcceleratedSurfaceDMABufMessages.h"
> + #include "DMABufRendererBufferMode.h"
> +@@ -575,3 +577,5 @@ bool AcceleratedBackingStoreDMABuf::paint(cairo_t* cr, const WebCore::IntRect& c
> + #endif
> +
> + } // namespace WebKit
> ++
> ++#endif // USE(EGL)
> +diff --git a/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.h b/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.h
> +index 1bc769ada313..f9a6cb620e38 100644
> +--- a/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.h
> ++++ b/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.h
> +@@ -25,6 +25,8 @@
> +
> + #pragma once
> +
> ++#if USE(EGL)
> ++
> + #include "AcceleratedBackingStore.h"
> +
> + #include "MessageReceiver.h"
> +@@ -200,3 +202,5 @@ private:
> + };
> +
> + } // namespace WebKit
> ++
> ++#endif // USE(EGL)
> +diff --git a/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.messages.in b/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.messages.in
> +index 28e3fabf693a..3ba247e40220 100644
> +--- a/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.messages.in
> ++++ b/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.messages.in
> +@@ -20,8 +20,10 @@
> + # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> + # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> +
> ++#if USE(EGL)
> + messages -> AcceleratedBackingStoreDMABuf NotRefCounted {
> + Configure(UnixFileDescriptor backFD, UnixFileDescriptor frontFD, UnixFileDescriptor displayFD, WebCore::IntSize size, uint32_t format, uint32_t offset, uint32_t stride, uint64_t modifier)
> + ConfigureSHM(WebKit::ShareableBitmap::Handle backBufferHandle, WebKit::ShareableBitmap::Handle frontBufferHandle, WebKit::ShareableBitmap::Handle displayBufferHandle)
> + Frame()
> + }
> ++#endif
> +diff --git a/Source/WebKit/WebProcess/WebPage/AcceleratedSurface.cpp b/Source/WebKit/WebProcess/WebPage/AcceleratedSurface.cpp
> +index 1f64ab26c9dd..683a5350be22 100644
> +--- a/Source/WebKit/WebProcess/WebPage/AcceleratedSurface.cpp
> ++++ b/Source/WebKit/WebProcess/WebPage/AcceleratedSurface.cpp
> +@@ -37,7 +37,7 @@
> + #include "AcceleratedSurfaceLibWPE.h"
> + #endif
> +
> +-#if PLATFORM(GTK)
> ++#if PLATFORM(GTK) && USE(EGL)
> + #include "AcceleratedSurfaceDMABuf.h"
> + #endif
> +
> +@@ -46,7 +46,7 @@ using namespace WebCore;
> +
> + std::unique_ptr<AcceleratedSurface> AcceleratedSurface::create(WebPage& webPage, Client& client)
> + {
> +-#if PLATFORM(GTK)
> ++#if PLATFORM(GTK) && USE(EGL)
> + #if USE(GBM)
> + if (PlatformDisplay::sharedDisplayForCompositing().type() == PlatformDisplay::Type::GBM)
> + return AcceleratedSurfaceDMABuf::create(webPage, client);
> +diff --git a/Source/WebKit/WebProcess/WebPage/gtk/AcceleratedSurfaceDMABuf.cpp b/Source/WebKit/WebProcess/WebPage/gtk/AcceleratedSurfaceDMABuf.cpp
> +index dc2d544c9d25..d474c4ca205c 100644
> +--- a/Source/WebKit/WebProcess/WebPage/gtk/AcceleratedSurfaceDMABuf.cpp
> ++++ b/Source/WebKit/WebProcess/WebPage/gtk/AcceleratedSurfaceDMABuf.cpp
> +@@ -26,6 +26,8 @@
> + #include "config.h"
> + #include "AcceleratedSurfaceDMABuf.h"
> +
> ++#if USE(EGL)
> ++
> + #include "AcceleratedBackingStoreDMABufMessages.h"
> + #include "AcceleratedSurfaceDMABufMessages.h"
> + #include "ShareableBitmap.h"
> +@@ -490,3 +492,5 @@ void AcceleratedSurfaceDMABuf::frameDone()
> + }
> +
> + } // namespace WebKit
> ++
> ++#endif // USE(EGL)
> +diff --git a/Source/WebKit/WebProcess/WebPage/gtk/AcceleratedSurfaceDMABuf.h b/Source/WebKit/WebProcess/WebPage/gtk/AcceleratedSurfaceDMABuf.h
> +index e3985d468ad2..a230a1f02eef 100644
> +--- a/Source/WebKit/WebProcess/WebPage/gtk/AcceleratedSurfaceDMABuf.h
> ++++ b/Source/WebKit/WebProcess/WebPage/gtk/AcceleratedSurfaceDMABuf.h
> +@@ -25,6 +25,8 @@
> +
> + #pragma once
> +
> ++#if USE(EGL)
> ++
> + #include "AcceleratedSurface.h"
> +
> + #include "MessageReceiver.h"
> +@@ -156,3 +158,5 @@ private:
> + };
> +
> + } // namespace WebKit
> ++
> ++#endif // USE(EGL)
> +diff --git a/Source/WebKit/WebProcess/WebPage/gtk/AcceleratedSurfaceDMABuf.messages.in b/Source/WebKit/WebProcess/WebPage/gtk/AcceleratedSurfaceDMABuf.messages.in
> +index 0d0d2dbf9069..a481cd9bc60f 100644
> +--- a/Source/WebKit/WebProcess/WebPage/gtk/AcceleratedSurfaceDMABuf.messages.in
> ++++ b/Source/WebKit/WebProcess/WebPage/gtk/AcceleratedSurfaceDMABuf.messages.in
> +@@ -20,6 +20,8 @@
> + # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> + # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> +
> ++#if USE(EGL)
> + messages -> AcceleratedSurfaceDMABuf NotRefCounted {
> + FrameDone()
> + }
> ++#endif
> +diff --git a/Source/WebKit/WebProcess/glib/WebProcessGLib.cpp b/Source/WebKit/WebProcess/glib/WebProcessGLib.cpp
> +index 686004f4ee82..e298cf9b94a2 100644
> +--- a/Source/WebKit/WebProcess/glib/WebProcessGLib.cpp
> ++++ b/Source/WebKit/WebProcess/glib/WebProcessGLib.cpp
> +@@ -141,7 +141,7 @@ void WebProcess::platformInitializeWebProcess(WebProcessCreationParameters& para
> + WebCore::GBMDevice::singleton().initialize(parameters.renderDeviceFile);
> + #endif
> +
> +-#if PLATFORM(GTK)
> ++#if PLATFORM(GTK) && USE(EGL)
> + m_dmaBufRendererBufferMode = parameters.dmaBufRendererBufferMode;
> + if (!m_dmaBufRendererBufferMode.isEmpty()) {
> + #if USE(GBM)
> +--
> +2.42.0
> +
> diff --git a/package/webkitgtk/0002-NetworkProcessConnection.cpp-fix-incomplete-type-Web.patch b/package/webkitgtk/0002-NetworkProcessConnection.cpp-fix-incomplete-type-Web.patch
> new file mode 100644
> index 0000000000..4523996c84
> --- /dev/null
> +++ b/package/webkitgtk/0002-NetworkProcessConnection.cpp-fix-incomplete-type-Web.patch
> @@ -0,0 +1,38 @@
> +From 1816d3f4b2417d54c7adcc8ec6158c402016ac00 Mon Sep 17 00:00:00 2001
> +From: Thomas Devoogdt <thomas.devoogdt at barco.com>
> +Date: Thu, 28 Sep 2023 17:29:32 +0200
> +Subject: [PATCH] NetworkProcessConnection.cpp: fix incomplete type
> + WebCore::Page
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +Reviewed by NOBODY (OOPS!).
> +
> +webkitgtk-2.42.0/Source/WebKit/WebProcess/Network/NetworkProcessConnection.cpp:327:11: error: incomplete type ‘WebCore::Page’ used in nested name specifier
> + 327 | Page::forEachPage([&] (auto& page) {
> + | ^~~~~~~~~~~
> +
> +Upstream: main & 2.42
> + - main: https://github.com/WebKit/WebKit/pull/18356
> + - 2.42: https://github.com/WebKit/WebKit/pull/18355
> +Signed-off-by: Thomas Devoogdt <thomas.devoogdt at barco.com>
> +---
> + Source/WebKit/WebProcess/Network/NetworkProcessConnection.cpp | 1 +
> + 1 file changed, 1 insertion(+)
> +
> +diff --git a/Source/WebKit/WebProcess/Network/NetworkProcessConnection.cpp b/Source/WebKit/WebProcess/Network/NetworkProcessConnection.cpp
> +index d6f22b0b1739..7c4779c0e037 100644
> +--- a/Source/WebKit/WebProcess/Network/NetworkProcessConnection.cpp
> ++++ b/Source/WebKit/WebProcess/Network/NetworkProcessConnection.cpp
> +@@ -68,6 +68,7 @@
> + #include <WebCore/InspectorInstrumentationWebKit.h>
> + #include <WebCore/MemoryCache.h>
> + #include <WebCore/MessagePort.h>
> ++#include <WebCore/Page.h>
> + #include <WebCore/SharedBuffer.h>
> + #include <pal/SessionID.h>
> +
> +--
> +2.42.0
> +
> diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in
> index cb10784133..ace1b8739f 100644
> --- a/package/webkitgtk/Config.in
> +++ b/package/webkitgtk/Config.in
> @@ -16,12 +16,12 @@ config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS
> depends on BR2_TOOLCHAIN_HAS_SYNC_4
> depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt
>
> -comment "webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 9, host gcc >= 4.9"
> +comment "webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 10, host gcc >= 4.9"
> depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS
> depends on !BR2_BINFMT_FLAT
> depends on !BR2_PACKAGE_LIBGTK3 || !BR2_INSTALL_LIBSTDCPP || \
> !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \
> - !BR2_TOOLCHAIN_GCC_AT_LEAST_9 || \
> + !BR2_TOOLCHAIN_GCC_AT_LEAST_10 || \
> !BR2_HOST_GCC_AT_LEAST_4_9
> depends on BR2_USE_MMU
>
> @@ -32,7 +32,7 @@ config BR2_PACKAGE_WEBKITGTK
> depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu, host-ruby
> depends on BR2_INSTALL_LIBSTDCPP
> depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu, libsoup3
> - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9
> + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_10
> depends on BR2_USE_WCHAR # icu, libsoup3
> depends on BR2_PACKAGE_LIBGTK3
> depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS
> diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash
> index 7f50f1aa7b..04e247077a 100644
> --- a/package/webkitgtk/webkitgtk.hash
> +++ b/package/webkitgtk/webkitgtk.hash
> @@ -1,6 +1,6 @@
> -# From https://www.webkitgtk.org/releases/webkitgtk-2.40.5.tar.xz.sums
> -sha1 2f4d06b021115eb4106177f7d5f534f45b5d3b2e webkitgtk-2.40.5.tar.xz
> -sha256 7de051a263668621d91a61a5eb1c3771d1a7cec900043d4afef06c326c16037f webkitgtk-2.40.5.tar.xz
> +# From https://www.webkitgtk.org/releases/webkitgtk-2.42.1.tar.xz.sums
> +sha1 b9a0f964a157277d80195622316d3eea19c89d0d webkitgtk-2.42.1.tar.xz
> +sha256 6f41fac9989d3ee51c08c48de1d439cdeddecbc757e34b6180987d99b16d2499 webkitgtk-2.42.1.tar.xz
>
> # Hashes for license files:
> sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE
> diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk
> index 9c68fe73cf..035cbf15a2 100644
> --- a/package/webkitgtk/webkitgtk.mk
> +++ b/package/webkitgtk/webkitgtk.mk
> @@ -4,7 +4,7 @@
> #
> ################################################################################
>
> -WEBKITGTK_VERSION = 2.40.5
> +WEBKITGTK_VERSION = 2.42.1
> WEBKITGTK_SITE = https://www.webkitgtk.org/releases
> WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz
> WEBKITGTK_INSTALL_STAGING = YES
> @@ -73,6 +73,13 @@ else
> WEBKITGTK_CONF_OPTS += -DENABLE_INTROSPECTION=OFF
> endif
>
> +ifeq ($(BR2_PACKAGE_LIBJXL),y)
> +WEBKITGTK_CONF_OPTS += -DUSE_JPEGXL=ON
> +WEBKITGTK_DEPENDENCIES += libjxl
> +else
> +WEBKITGTK_CONF_OPTS += -DUSE_JPEGXL=OFF
> +endif
> +
> ifeq ($(BR2_PACKAGE_LIBMANETTE),y)
> WEBKITGTK_CONF_OPTS += -DENABLE_GAMEPAD=ON
> WEBKITGTK_DEPENDENCIES += libmanette
> @@ -80,12 +87,11 @@ else
> WEBKITGTK_CONF_OPTS += -DENABLE_GAMEPAD=OFF
> endif
>
> -# Use GLES if available and desktop GL is not.
> -ifeq ($(BR2_PACKAGE_HAS_LIBGL):$(BR2_PACKAGE_HAS_LIBGLES),:y)
> -WEBKITGTK_CONF_OPTS += -DENABLE_GLES2=ON
> +ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y)
> +WEBKITGTK_CONF_OPTS += -DUSE_OPENGL_OR_ES=ON
> WEBKITGTK_DEPENDENCIES += libgles
> else
> -WEBKITGTK_CONF_OPTS += -DENABLE_GLES2=OFF
> +WEBKITGTK_CONF_OPTS += -DUSE_OPENGL_OR_ES=OFF
> endif
>
> ifeq ($(BR2_PACKAGE_HAS_LIBGBM),y)
> --
> 2.42.0
>
More information about the buildroot
mailing list