Update to webkitgtk{41,60}-2.52.2.

This commit is contained in:
ajacoutot
2026-04-14 11:26:22 +00:00
parent 51c3d04d4b
commit 1a533427d2
8 changed files with 13 additions and 101 deletions
+1 -1
View File
@@ -11,7 +11,7 @@ PORTROACH = limitw:1,even
COMMENT = GTK+ port of the WebKit (${API}) rendering engine
V = 2.52.1
V = 2.52.2
DISTNAME = webkitgtk-${V}
PKGNAME = webkitgtk${API:S/.//}-${V}
FULLPKGNAME = ${PKGNAME}
+2 -2
View File
@@ -1,2 +1,2 @@
SHA256 (webkitgtk-2.52.1.tar.xz) = I459UyBbFABK3X7rQpPJTW+/cJez7+987lUZ5cEhqQQ=
SIZE (webkitgtk-2.52.1.tar.xz) = 65036140
SHA256 (webkitgtk-2.52.2.tar.xz) = Bd4rRIdLotraV1X4mM+1N4PDFz+RtGNo+i3MxYSXKrs=
SIZE (webkitgtk-2.52.2.tar.xz) = 65056988
@@ -1,40 +1,12 @@
From 3c54d2278eba24fe75ff2c04b74807e118ed7562 Mon Sep 17 00:00:00 2001
From: Pablo Saavedra <psaavedra@igalia.com>
Date: Thu, 10 Oct 2024 15:11:47 +0200
Subject: [PATCH] [JSC] Fix build failure on musl: Add fallback for roundeven
and roundevenf https://bugs.webkit.org/show_bug.cgi?id=281216
Modified to remove OS(LINUX) from #if
Index: Source/JavaScriptCore/runtime/MathCommon.cpp
--- Source/JavaScriptCore/runtime/MathCommon.cpp.orig
+++ Source/JavaScriptCore/runtime/MathCommon.cpp
@@ -626,6 +626,28 @@ static inline double roundeven(double operand)
@@ -604,7 +604,7 @@ JSC_DEFINE_NOEXCEPT_JIT_OPERATION(f64_nearest, double,
return std::nearbyint(operand);
}
#endif
+#if !defined(__GLIBC__)
+static inline float roundevenf(float operand)
+{
+ float rounded = roundf(operand);
+ if (fabsf(operand - rounded) == 0.5f) {
+ if (fmod(rounded, 2.0f) != 0.0f)
+ return rounded - copysignf(1.0f, operand);
+ }
+ return rounded;
+}
+
+static inline double roundeven(double operand)
+{
+ double rounded = round(operand);
+ if (fabs(operand - rounded) == 0.5) {
+ if (fmod(rounded, 2.0) != 0.0)
+ return rounded - copysign(1.0, operand);
+ }
+ return rounded;
+}
+#endif
+
JSC_DEFINE_NOEXCEPT_JIT_OPERATION(f32_roundeven, float, (float operand)) { return roundevenf(operand); }
JSC_DEFINE_NOEXCEPT_JIT_OPERATION(f64_roundeven, double, (double operand)) { return roundeven(operand); }
JSC_DEFINE_NOEXCEPT_JIT_OPERATION(f32_trunc, float, (float operand)) { return std::trunc(operand); }
-#if (OS(LINUX) && !defined(__GLIBC__)) || OS(HAIKU)
+#if (OS(LINUX) && !defined(__GLIBC__)) || OS(HAIKU) || OS(OPENBSD)
static inline float roundevenf(float operand)
{
float rounded = roundf(operand);
@@ -6,7 +6,7 @@ Index: Source/WebCore/CMakeLists.txt
+++ Source/WebCore/CMakeLists.txt
@@ -2134,6 +2134,7 @@ set(WebCore_LIBRARIES
LibXml2::LibXml2
SQLite::SQLite3
SQLite3::SQLite3
ZLIB::ZLIB
+ "epoll-shim"
)
@@ -1,43 +0,0 @@
From 40c315ca7b3ad6ae5c98d72a6927b3a75b43cb46 Mon Sep 17 00:00:00 2001
From: Claudio Saavedra <csaavedra@igalia.com>
Date: Fri, 27 Mar 2026 22:09:02 +0200
Subject: [PATCH] [GTK3] Fix the dom bindings build https://bugs.webkit.org/show_bug.cgi?id=310915
Index: Source/WebCore/page/UserMessageHandler.cpp
--- Source/WebCore/page/UserMessageHandler.cpp.orig
+++ Source/WebCore/page/UserMessageHandler.cpp
@@ -63,16 +63,20 @@ static bool passesSameOriginCheck(JSC::JSGlobalObject&
return securityOrigin->isSameOriginAs(frameSecurityOrigin);
}
-void UserMessageHandler::postMessage(JSC::JSGlobalObject& globalObject, JSC::JSValue value, Ref<DeferredPromise>&& promise)
+ExceptionOr<void> UserMessageHandler::postMessage(JSC::JSGlobalObject& globalObject, JSC::JSValue value, Ref<DeferredPromise>&& promise)
{
// Check to see if the descriptor has been removed. This can happen if the host application has
// removed the named message handler at the WebKit2 API level.
RefPtr descriptor = m_descriptor;
- if (!descriptor)
- return promise->reject(Exception { ExceptionCode::InvalidAccessError });
+ if (!descriptor) {
+ promise->reject(Exception { ExceptionCode::InvalidAccessError });
+ return Exception { ExceptionCode::InvalidAccessError };
+ }
- if (!passesSameOriginCheck(globalObject, m_frame.get()))
- return promise->reject(Exception { ExceptionCode::InvalidAccessError, "Failed same-origin check."_s });
+ if (!passesSameOriginCheck(globalObject, m_frame.get())) {
+ promise->reject(Exception { ExceptionCode::InvalidAccessError, "Failed same-origin check."_s });
+ return Exception { ExceptionCode::InvalidAccessError };
+ }
descriptor->didPostMessage(*this, globalObject, value, [promise = WTF::move(promise)](JSC::JSValue result, const String& errorMessage) {
if (errorMessage.isNull())
@@ -84,6 +88,8 @@ void UserMessageHandler::postMessage(JSC::JSGlobalObje
JSC::JSLockHolder lock(globalObject);
promise->reject<IDLAny>(JSC::createError(globalObject, errorMessage));
});
+
+ return { };
}
ExceptionOr<JSC::JSValue> UserMessageHandler::postLegacySynchronousMessage(JSC::JSGlobalObject& globalObject, JSC::JSValue value)
@@ -1,17 +0,0 @@
From 40c315ca7b3ad6ae5c98d72a6927b3a75b43cb46 Mon Sep 17 00:00:00 2001
From: Claudio Saavedra <csaavedra@igalia.com>
Date: Fri, 27 Mar 2026 22:09:02 +0200
Subject: [PATCH] [GTK3] Fix the dom bindings build https://bugs.webkit.org/show_bug.cgi?id=310915
Index: Source/WebCore/page/UserMessageHandler.h
--- Source/WebCore/page/UserMessageHandler.h.orig
+++ Source/WebCore/page/UserMessageHandler.h
@@ -52,7 +52,7 @@ class UserMessageHandler : public RefCounted<UserMessa
void ref() const final { RefCounted::ref(); }
void deref() const final { RefCounted::deref(); }
- void postMessage(JSC::JSGlobalObject&, JSC::JSValue, Ref<DeferredPromise>&&);
+ ExceptionOr<void> postMessage(JSC::JSGlobalObject&, JSC::JSValue, Ref<DeferredPromise>&&);
ExceptionOr<JSC::JSValue> postLegacySynchronousMessage(JSC::JSGlobalObject&, JSC::JSValue);
const UserMessageHandlerDescriptor* descriptor() const { return m_descriptor.get(); }
@@ -4,7 +4,7 @@ build with an older webkitgtk4 package installed.
Index: Source/cmake/OptionsCommon.cmake
--- Source/cmake/OptionsCommon.cmake.orig
+++ Source/cmake/OptionsCommon.cmake
@@ -288,6 +288,9 @@ elseif (NOT ENABLE_ASSERTS)
@@ -292,6 +292,9 @@ elseif (NOT ENABLE_ASSERTS)
WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-DASSERT_ENABLED=0)
endif ()
@@ -16,7 +16,7 @@ Index: Source/cmake/WebKitFeatures.cmake
else ()
set(ENABLE_JIT_DEFAULT OFF)
set(ENABLE_FTL_DEFAULT OFF)
@@ -455,7 +449,7 @@ macro(GET_WEBKIT_CONFIG_VARIABLES _var_name)
@@ -457,7 +451,7 @@ macro(GET_WEBKIT_CONFIG_VARIABLES _var_name)
endmacro()
macro(WEBKIT_CHECK_HAVE_INCLUDE _variable _header)