haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 11:40:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

webkit_gtk: bump version

Browse Source
This commit is contained in:
Gerasim Troeglazov
2023-02-24 18:44:00 +10:00
parent 52de4ef189
commit 08de181eea
2 changed files with 77 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
net-libs/webkit-gtk/patches/webkit_gtk-2.39.7.patchset → net-libs/webkit-gtk/patches/webkit_gtk-2.39.90.patchset
View File

@@ -1,4 +1,4 @@
From 84bad6fbfa498e0c85ff90da0439aa4b63ebecbc Mon Sep 17 00:00:00 2001
From a0f880ec4ae79f12d4ed1358f34338d861aad32b Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 13 Feb 2023 19:37:32 +1000
Subject: Fix build for Haiku
@@ -54,7 +54,7 @@ index e52143c..4ac504c 100644
+ )
+endif ()
diff --git a/Source/JavaScriptCore/runtime/Options.cpp b/Source/JavaScriptCore/runtime/Options.cpp
index 0d75566..5c00287 100644
index c94723d..eb09ee1 100644
--- a/Source/JavaScriptCore/runtime/Options.cpp
+++ b/Source/JavaScriptCore/runtime/Options.cpp
@@ -92,7 +92,7 @@ std::optional<OptionsStorage::Unsigned> parse(const char* string)
@@ -76,10 +76,10 @@ index 0d75566..5c00287 100644
template<>
std::optional<OptionsStorage::Double> parse(const char* string)
diff --git a/Source/JavaScriptCore/wasm/js/WebAssemblyFunction.cpp b/Source/JavaScriptCore/wasm/js/WebAssemblyFunction.cpp
index 9dd2c0d..503f267 100644
index 0674973..7f6c924 100644
--- a/Source/JavaScriptCore/wasm/js/WebAssemblyFunction.cpp
+++ b/Source/JavaScriptCore/wasm/js/WebAssemblyFunction.cpp
@@ -359,7 +359,11 @@ CodePtr<JSEntryPtrTag> WebAssemblyFunction::jsCallEntrypointSlow()
@@ -360,7 +360,11 @@ CodePtr<JSEntryPtrTag> WebAssemblyFunction::jsCallEntrypointSlow()
#if !CPU(ARM) // ARM has no pinned registers for Wasm Memory, so no need to set them up
if (!!instance()->instance().module().moduleInformation().memory) {
auto mode = instance()->memoryMode();
@@ -109,7 +109,7 @@ index 952f09e..c1e524f 100644
std::string fullPath = directory + libraryName;
return OpenPosixLibrary(fullPath, extraFlags, errorOut);
diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Context.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Context.cpp
index 86e0b53..53df5d9 100644
index 0b8387e..3e11f12 100644
--- a/Source/ThirdParty/ANGLE/src/libANGLE/Context.cpp
+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Context.cpp
@@ -443,7 +443,7 @@ void SetCurrentValidContextTLS(Context *context)
@@ -218,7 +218,7 @@ index 48b0c31..6ed66c8 100644
ForbidMallocUseForCurrentThreadScope::ForbidMallocUseForCurrentThreadScope()
{
diff --git a/Source/WTF/wtf/FileSystem.cpp b/Source/WTF/wtf/FileSystem.cpp
index 6f2971e..9bc1922 100644
index bcce638..f89c0ab 100644
--- a/Source/WTF/wtf/FileSystem.cpp
+++ b/Source/WTF/wtf/FileSystem.cpp
@@ -41,6 +41,10 @@
@@ -232,7 +232,7 @@ index 6f2971e..9bc1922 100644
#if USE(GLIB)
#include <gio/gfiledescriptorbased.h>
#include <gio/gio.h>
@@ -727,9 +731,13 @@ bool createSymbolicLink(const String& targetPath, const String& symbolicLinkPath
@@ -724,9 +728,13 @@ bool createSymbolicLink(const String& targetPath, const String& symbolicLinkPath
bool hardLink(const String& targetPath, const String& linkPath)
{
@@ -313,10 +313,10 @@ index 274b963..6a28e74 100644
// bits of any virtual address, bits 48 through 63, must be
// copies of bit 47 (in a manner akin to sign extension).
diff --git a/Source/WTF/wtf/PlatformEnable.h b/Source/WTF/wtf/PlatformEnable.h
index 4cb5cdf..4a63485 100644
index e30a3d8..f2af1cf 100644
--- a/Source/WTF/wtf/PlatformEnable.h
+++ b/Source/WTF/wtf/PlatformEnable.h
@@ -661,7 +661,7 @@
@@ -664,7 +664,7 @@
#if !defined(ENABLE_DFG_JIT) && ENABLE(JIT)
/* Enable the DFG JIT on X86 and X86_64. */
@@ -326,7 +326,7 @@ index 4cb5cdf..4a63485 100644
#endif
diff --git a/Source/WTF/wtf/PlatformHave.h b/Source/WTF/wtf/PlatformHave.h
index 120a1c8..ca3bc8b 100644
index 949977f..8f56f56 100644
--- a/Source/WTF/wtf/PlatformHave.h
+++ b/Source/WTF/wtf/PlatformHave.h
@@ -389,7 +389,7 @@
@@ -736,10 +736,10 @@ index f8627d2..1244edb 100644
if (s_currentContext == this)
return true;
diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
index 5cdbb96..9869012 100644
index 364c699..bb23fc8 100644
--- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
+++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
@@ -2161,6 +2161,8 @@ void MediaPlayerPrivateGStreamer::configureDownloadBuffer(GstElement* element)
@@ -2243,6 +2243,8 @@ void MediaPlayerPrivateGStreamer::configureDownloadBuffer(GstElement* element)
GUniquePtr<char> defaultValue(g_build_filename(G_DIR_SEPARATOR_S, "var", "tmp", nullptr));
mediaDiskCachePath.swap(defaultValue);
}
@@ -749,10 +749,10 @@ index 5cdbb96..9869012 100644
GUniquePtr<char> mediaDiskCachePath(g_build_filename(G_DIR_SEPARATOR_S, "var", "tmp", nullptr));
#endif
diff --git a/Source/WebKit/CMakeLists.txt b/Source/WebKit/CMakeLists.txt
index 5e26805..efd0fe7 100644
index 8c0b085..c634c4c 100644
--- a/Source/WebKit/CMakeLists.txt
+++ b/Source/WebKit/CMakeLists.txt
@@ -413,6 +413,10 @@ if (UNIX)
@@ -411,6 +411,10 @@ if (UNIX)
endif ()
endif ()
@@ -877,7 +877,7 @@ index f5a986d..bc0b9fc 100644
{
m_connection->invalidate();
diff --git a/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp b/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp
index 14c048a..2797c38 100644
index d96a09e..581e04e 100644
--- a/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp
+++ b/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp
@@ -122,6 +122,8 @@ static const char* hardwareAccelerationPolicy(WebKitURISchemeRequest* request)
@@ -889,7 +889,7 @@ index 14c048a..2797c38 100644
#elif PLATFORM(GTK)
auto* webView = webkit_uri_scheme_request_get_web_view(request);
ASSERT(webView);
@@ -153,6 +155,8 @@ static const char* openGLAPI(bool isEGL)
@@ -155,6 +157,8 @@ static const char* openGLAPI(bool isEGL)
if (epoxy_is_desktop_gl())
return "OpenGL (libepoxy)";
return "OpenGL ES 2 (libepoxy)";
@@ -899,7 +899,7 @@ index 14c048a..2797c38 100644
#if USE(EGL)
if (isEGL) {
diff --git a/Source/WebKit/WebProcess/WebCoreSupport/WebWorkerClient.cpp b/Source/WebKit/WebProcess/WebCoreSupport/WebWorkerClient.cpp
index d4e178c..ed62d76 100644
index 58eb170..ccd190b 100644
--- a/Source/WebKit/WebProcess/WebCoreSupport/WebWorkerClient.cpp
+++ b/Source/WebKit/WebProcess/WebCoreSupport/WebWorkerClient.cpp
@@ -40,6 +40,8 @@
@@ -912,10 +912,10 @@ index d4e178c..ed62d76 100644
using namespace WebCore;
diff --git a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp
index b672817..5b7ddb7 100644
index c50d982..0e5c6f1 100644
--- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp
+++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp
@@ -487,7 +487,7 @@ void DrawingAreaCoordinatedGraphics::displayDidRefresh()
@@ -504,7 +504,7 @@ void DrawingAreaCoordinatedGraphics::displayDidRefresh()
displayTimerFired();
}
@@ -924,7 +924,7 @@ index b672817..5b7ddb7 100644
void DrawingAreaCoordinatedGraphics::adjustTransientZoom(double scale, FloatPoint origin)
{
if (!m_transientZoom) {
@@ -620,7 +620,7 @@ void DrawingAreaCoordinatedGraphics::resumePainting()
@@ -637,7 +637,7 @@ void DrawingAreaCoordinatedGraphics::resumePainting()
void DrawingAreaCoordinatedGraphics::enterAcceleratedCompositingMode(GraphicsLayer* graphicsLayer)
{
@@ -934,10 +934,10 @@ index b672817..5b7ddb7 100644
m_webPage.corePage()->settings().setForceCompositingMode(true);
m_alwaysUseCompositing = true;
diff --git a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.h b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.h
index e1e34f0..5abaf9f 100644
index a5b7915..69c67a7 100644
--- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.h
+++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.h
@@ -85,7 +85,7 @@ private:
@@ -87,7 +87,7 @@ private:
void targetRefreshRateDidChange(unsigned rate) override;
void displayDidRefresh() override;
@@ -946,7 +946,7 @@ index e1e34f0..5abaf9f 100644
void adjustTransientZoom(double scale, WebCore::FloatPoint origin) override;
void commitTransientZoom(double scale, WebCore::FloatPoint origin) override;
#endif
@@ -157,7 +157,7 @@ private:
@@ -159,7 +159,7 @@ private:
RunLoop::Timer m_displayTimer;
@@ -956,10 +956,10 @@ index e1e34f0..5abaf9f 100644
WebCore::FloatPoint m_transientZoomInitialOrigin;
#endif
diff --git a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp
index 6a21081..65ab6c3 100644
index bca4cd1..a4c44fa 100644
--- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp
+++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp
@@ -148,7 +148,7 @@ void LayerTreeHost::layerFlushTimerFired()
@@ -149,7 +149,7 @@ void LayerTreeHost::layerFlushTimerFired()
m_coordinator.forceFrameSync();
OptionSet<FinalizeRenderingUpdateFlags> flags;
@@ -968,7 +968,7 @@ index 6a21081..65ab6c3 100644
if (!m_transientZoom)
flags.add(FinalizeRenderingUpdateFlags::ApplyScrollingTreeLayerPositions);
#else
@@ -157,7 +157,7 @@ void LayerTreeHost::layerFlushTimerFired()
@@ -158,7 +158,7 @@ void LayerTreeHost::layerFlushTimerFired()
bool didSync = m_coordinator.flushPendingLayerChanges(flags);
@@ -977,7 +977,7 @@ index 6a21081..65ab6c3 100644
// If we have an active transient zoom, we want the zoom to win over any changes
// that WebCore makes to the relevant layers, so re-apply our changes after flushing.
if (m_transientZoom)
@@ -205,7 +205,7 @@ void LayerTreeHost::forceRepaint()
@@ -206,7 +206,7 @@ void LayerTreeHost::forceRepaint()
if (!m_isWaitingForRenderer) {
OptionSet<FinalizeRenderingUpdateFlags> flags;
@@ -986,7 +986,7 @@ index 6a21081..65ab6c3 100644
if (!m_transientZoom)
flags.add(FinalizeRenderingUpdateFlags::ApplyScrollingTreeLayerPositions);
#else
@@ -476,7 +476,7 @@ void LayerTreeHost::renderNextFrame(bool forceRepaint)
@@ -478,7 +478,7 @@ void LayerTreeHost::renderNextFrame(bool forceRepaint)
}
}
@@ -1036,10 +1036,10 @@ index 45e4bbd..d3b5d2d 100644
inline void LayerTreeHost::commitTransientZoom(double, WebCore::FloatPoint) { }
#endif
diff --git a/Source/WebKit/WebProcess/WebProcess.cpp b/Source/WebKit/WebProcess/WebProcess.cpp
index f1bfb2b..c169514 100644
index 54e333b..b1784ed 100644
--- a/Source/WebKit/WebProcess/WebProcess.cpp
+++ b/Source/WebKit/WebProcess/WebProcess.cpp
@@ -398,7 +398,7 @@ void WebProcess::initializeConnection(IPC::Connection* connection)
@@ -395,7 +395,7 @@ void WebProcess::initializeConnection(IPC::Connection* connection)
#endif
connection->setDidCloseOnConnectionWorkQueueCallback(callExitCallback);
@@ -1177,10 +1177,10 @@ index ba8423e..f8e72e1 100644
endif ()
else ()
diff --git a/Source/cmake/WebKitCommon.cmake b/Source/cmake/WebKitCommon.cmake
index 2889a90..5955496 100644
index cc96551..74b0dff 100644
--- a/Source/cmake/WebKitCommon.cmake
+++ b/Source/cmake/WebKitCommon.cmake
@@ -159,7 +159,9 @@ if (NOT HAS_RUN_WEBKIT_COMMON)
@@ -158,7 +158,9 @@ if (NOT HAS_RUN_WEBKIT_COMMON)
set(WebKit_LIBRARY_TYPE SHARED)
set(WebCoreTestSupport_LIBRARY_TYPE STATIC)
@@ -1194,3 +1194,34 @@ index 2889a90..5955496 100644
--
2.37.3
From 785393e38d10de96f9d5ffd96086aa2a767d975c Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 24 Feb 2023 18:36:15 +1000
Subject: Fix build without MACHINE_CONTEXT
diff --git a/Source/JavaScriptCore/wasm/WasmFaultSignalHandler.cpp b/Source/JavaScriptCore/wasm/WasmFaultSignalHandler.cpp
index d1a5e8b..4e0efd5 100644
--- a/Source/JavaScriptCore/wasm/WasmFaultSignalHandler.cpp
+++ b/Source/JavaScriptCore/wasm/WasmFaultSignalHandler.cpp
@@ -53,7 +53,7 @@ static constexpr bool verbose = false;
static SignalAction trapHandler(Signal signal, SigInfo& sigInfo, PlatformRegisters& context)
{
RELEASE_ASSERT(signal == Signal::AccessFault);
-
+#if HAVE(MACHINE_CONTEXT)
auto instructionPointer = MachineContext::instructionPointer(context);
if (!instructionPointer)
return SignalAction::NotHandled;
@@ -97,6 +97,7 @@ static SignalAction trapHandler(Signal signal, SigInfo& sigInfo, PlatformRegiste
}
}
}
+#endif
return SignalAction::NotHandled;
}
--
2.37.3

22
net-libs/webkit-gtk/webkit_gtk-2.39.7.recipe → net-libs/webkit-gtk/webkit_gtk-2.39.90.recipe
View File

@@ -14,7 +14,7 @@ LICENSE="GNU LGPL v2
"
REVISION="1"
SOURCE_URI="https://www.webkitgtk.org/releases/webkitgtk-$portVersion.tar.xz"
CHECKSUM_SHA256="bb7da0346388d349f560ef0f2c666880d068e77c195cbcf644a0ae69230244b2"
CHECKSUM_SHA256="8275866c3529a715c23cae38dbf2edd310d8188546a47c5a2f709d193f7a5fc0"
SOURCE_DIR="webkitgtk-$portVersion"
PATCHES="webkit_gtk-$portVersion.patchset"
ADDITIONAL_FILES="
@@ -27,8 +27,9 @@ SECONDARY_ARCHITECTURES="x86"
PROVIDES="
webkit_gtk$secondaryArchSuffix = $portVersion
lib:libwebkit2gtk_4.1$secondaryArchSuffix = 0.6.3 compat >= 0
lib:libjavascriptcoregtk_4.1$secondaryArchSuffix = 0.3.6 compat >= 0
lib:libwebkit2gtk_4.1$secondaryArchSuffix = 0.7.0 compat >= 0
lib:libjavascriptcoregtk_4.1$secondaryArchSuffix = 0.3.7 compat >= 0
cmd:WebKitWebDriver$secondaryArchSuffix = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix
@@ -56,9 +57,11 @@ REQUIRES="
lib:libgstapp_1.0$secondaryArchSuffix
lib:libgstaudio_1.0$secondaryArchSuffix
lib:libgstbase_1.0$secondaryArchSuffix
lib:libgstmpegts_1.0$secondaryArchSuffix
lib:libgstpbutils_1.0$secondaryArchSuffix
lib:libgstreamer_1.0$secondaryArchSuffix
lib:libgsttag_1.0$secondaryArchSuffix
lib:libgsttranscoder_1.0$secondaryArchSuffix
lib:libgstvideo_1.0$secondaryArchSuffix
lib:libgstfft_1.0$secondaryArchSuffix
lib:libgstwebrtc_1.0$secondaryArchSuffix
@@ -93,8 +96,8 @@ REQUIRES="
PROVIDES_devel="
webkit_gtk${secondaryArchSuffix}_devel = $portVersion
devel:libwebkit2gtk_4.1$secondaryArchSuffix = 0.6.3 compat >= 0
devel:libjavascriptcoregtk_4.1$secondaryArchSuffix = 0.3.6 compat >= 0
devel:libwebkit2gtk_4.1$secondaryArchSuffix = 0.7.0 compat >= 0
devel:libjavascriptcoregtk_4.1$secondaryArchSuffix = 0.3.7 compat >= 0
"
REQUIRES_devel="
webkit_gtk$secondaryArchSuffix == $portVersion base
@@ -145,8 +148,10 @@ BUILD_REQUIRES="
devel:libgstaudio_1.0$secondaryArchSuffix
devel:libgstbadaudio_1.0$secondaryArchSuffix
devel:libgstbase_1.0$secondaryArchSuffix
devel:libgstmpegts_1.0$secondaryArchSuffix
devel:libgstpbutils_1.0$secondaryArchSuffix
devel:libgstreamer_1.0$secondaryArchSuffix
devel:libgsttranscoder_1.0$secondaryArchSuffix
devel:libgstvideo_1.0$secondaryArchSuffix
devel:libgstwebrtc_1.0$secondaryArchSuffix
devel:libgtk_3$secondaryArchSuffix
@@ -247,9 +252,9 @@ BUILD()
-DENABLE_VARIATION_FONTS=ON \
-DENABLE_VIDEO=ON \
-DENABLE_WEB_AUDIO=ON \
-DENABLE_WEBDRIVER=OFF \
-DENABLE_WEBDRIVER=ON \
-DENABLE_WEBGL=ON \
-DENABLE_WEBGL2=OFF \
-DENABLE_WEBGL2=ON \
-DENABLE_WEB_RTC=ON \
-DENABLE_WAYLAND_TARGET=OFF \
-DENABLE_X11_TARGET=OFF \
@@ -257,8 +262,9 @@ BUILD()
-DUSE_AVIF=ON \
-DUSE_GBM=OFF \
-DUSE_GSTREAMER_GL=OFF \
-DUSE_GSTREAMER_MPEGTS=ON \
-DUSE_GSTREAMER_TRANSCODER=ON \
-DUSE_GSTREAMER_WEBRTC=ON \
-DUSE_GSTREAMER_TRANSCODER=OFF \
-DUSE_GTK4=OFF \
-DUSE_JPEGXL=ON \
-DUSE_LCMS=OFF \