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

webkit_gtk: update build to llvm18, openssl3, icu74

Browse Source 
Also add patch to fix build with current libxml2
This commit is contained in:
PulkoMandy
2024-08-13 21:03:44 +02:00
parent 0ed6157257
commit cc5e1ccc05
2 changed files with 62 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
net-libs/webkit-gtk/patches/webkit_gtk-2.40.0.patchset
View File

@@ -1,4 +1,4 @@
From a0f880ec4ae79f12d4ed1358f34338d861aad32b Mon Sep 17 00:00:00 2001
From 47f09efb7d7ee1b1f369938c2b27afbfb64d2dd6 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
@@ -481,7 +481,7 @@ index e5cac15..5dabd58 100644
prctl(PR_SET_NAME, normalizeThreadName(threadName));
#else
diff --git a/Source/WebCore/Modules/mediastream/gstreamer/GStreamerWebRTCUtils.cpp b/Source/WebCore/Modules/mediastream/gstreamer/GStreamerWebRTCUtils.cpp
index fb4b3eb..9371e52 100644
index a468d15..dc07bad 100644
--- a/Source/WebCore/Modules/mediastream/gstreamer/GStreamerWebRTCUtils.cpp
+++ b/Source/WebCore/Modules/mediastream/gstreamer/GStreamerWebRTCUtils.cpp
@@ -22,13 +22,14 @@
@@ -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 364c699..bb23fc8 100644
index 0ff9f86..af90bc3 100644
--- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
+++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
@@ -2243,6 +2243,8 @@ void MediaPlayerPrivateGStreamer::configureDownloadBuffer(GstElement* element)
@@ -2231,6 +2231,8 @@ void MediaPlayerPrivateGStreamer::configureDownloadBuffer(GstElement* element)
GUniquePtr<char> defaultValue(g_build_filename(G_DIR_SEPARATOR_S, "var", "tmp", nullptr));
mediaDiskCachePath.swap(defaultValue);
}
@@ -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 d96a09e..581e04e 100644
index abb9dea..eca0e0d 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)
@@ -956,10 +956,10 @@ index a5b7915..69c67a7 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 bca4cd1..a4c44fa 100644
index f2b231c..4fb3e56 100644
--- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp
+++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp
@@ -149,7 +149,7 @@ void LayerTreeHost::layerFlushTimerFired()
@@ -150,7 +150,7 @@ void LayerTreeHost::layerFlushTimerFired()
m_coordinator.forceFrameSync();
OptionSet<FinalizeRenderingUpdateFlags> flags;
@@ -968,7 +968,7 @@ index bca4cd1..a4c44fa 100644
if (!m_transientZoom)
flags.add(FinalizeRenderingUpdateFlags::ApplyScrollingTreeLayerPositions);
#else
@@ -158,7 +158,7 @@ void LayerTreeHost::layerFlushTimerFired()
@@ -159,7 +159,7 @@ void LayerTreeHost::layerFlushTimerFired()
bool didSync = m_coordinator.flushPendingLayerChanges(flags);
@@ -977,7 +977,7 @@ index bca4cd1..a4c44fa 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)
@@ -206,7 +206,7 @@ void LayerTreeHost::forceRepaint()
@@ -207,7 +207,7 @@ void LayerTreeHost::forceRepaint()
if (!m_isWaitingForRenderer) {
OptionSet<FinalizeRenderingUpdateFlags> flags;
@@ -986,7 +986,7 @@ index bca4cd1..a4c44fa 100644
if (!m_transientZoom)
flags.add(FinalizeRenderingUpdateFlags::ApplyScrollingTreeLayerPositions);
#else
@@ -478,7 +478,7 @@ void LayerTreeHost::renderNextFrame(bool forceRepaint)
@@ -472,7 +472,7 @@ void LayerTreeHost::renderNextFrame(bool forceRepaint)
}
}
@@ -1075,7 +1075,7 @@ index c89de56..c342e71 100644
long pages = sysconf(_SC_PHYS_PAGES);
long pageSize = sysconf(_SC_PAGE_SIZE);
diff --git a/Source/bmalloc/bmalloc/BPlatform.h b/Source/bmalloc/bmalloc/BPlatform.h
index 00633b6..a243177 100644
index 071b691..b443200 100644
--- a/Source/bmalloc/bmalloc/BPlatform.h
+++ b/Source/bmalloc/bmalloc/BPlatform.h
@@ -48,6 +48,10 @@
@@ -1192,10 +1192,10 @@ index cc96551..74b0dff 100644
# -----------------------------------------------------------------------------
# Install JavaScript shell
--
2.37.3
2.45.2
From 785393e38d10de96f9d5ffd96086aa2a767d975c Mon Sep 17 00:00:00 2001
From 07ea6126e7481578552e93dc4c63bd9ee344a187 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
@@ -1223,5 +1223,41 @@ index d1a5e8b..4e0efd5 100644
}
--
2.37.3
2.45.2
From 2b1b321ef13c231bf5d6b2fd21da4dab09243c04 Mon Sep 17 00:00:00 2001
From: PulkoMandy <pulkomandy@pulkomandy.tk>
Date: Tue, 13 Aug 2024 21:00:16 +0200
Subject: Fix build with current versions of libmxl2 and llvm
diff --git a/Source/WebCore/xml/XSLTProcessor.h b/Source/WebCore/xml/XSLTProcessor.h
index 80813f4..7aeb88b 100644
--- a/Source/WebCore/xml/XSLTProcessor.h
+++ b/Source/WebCore/xml/XSLTProcessor.h
@@ -61,7 +61,7 @@ public:
void reset();
- static void parseErrorFunc(void* userData, xmlError*);
+ static void parseErrorFunc(void* userData, const xmlError*);
static void genericErrorFunc(void* userData, const char* msg, ...);
// Only for libXSLT callbacks
diff --git a/Source/WebCore/xml/XSLTProcessorLibxslt.cpp b/Source/WebCore/xml/XSLTProcessorLibxslt.cpp
index c4da911..4db3652 100644
--- a/Source/WebCore/xml/XSLTProcessorLibxslt.cpp
+++ b/Source/WebCore/xml/XSLTProcessorLibxslt.cpp
@@ -62,7 +62,7 @@ void XSLTProcessor::genericErrorFunc(void*, const char*, ...)
// It would be nice to do something with this error message.
}
-void XSLTProcessor::parseErrorFunc(void* userData, xmlError* error)
+void XSLTProcessor::parseErrorFunc(void* userData, const xmlError* error)
{
PageConsoleClient* console = static_cast<PageConsoleClient*>(userData);
if (!console)
--
2.45.2

20
net-libs/webkit-gtk/webkit_gtk-2.40.0.recipe
View File

@@ -12,7 +12,7 @@ COPYRIGHT="2009‒2023 The WebKitGTK Team"
LICENSE="GNU LGPL v2
BSD (2-clause)
"
REVISION="1"
REVISION="2"
SOURCE_URI="https://www.webkitgtk.org/releases/webkitgtk-$portVersion.tar.xz"
CHECKSUM_SHA256="a4607ea1bf89669e89b1cb2c63faaec513f93de09b6ae60cc71d6a8aab7ab393"
SOURCE_DIR="webkitgtk-$portVersion"
@@ -130,7 +130,7 @@ BUILD_REQUIRES="
harfbuzz${secondaryArchSuffix}_glib
devel:libavif$secondaryArchSuffix
devel:libbrotlidec$secondaryArchSuffix
devel:libcrypto$secondaryArchSuffix
devel:libcrypto$secondaryArchSuffix >= 3
devel:libenchant_2$secondaryArchSuffix
devel:libepoxy$secondaryArchSuffix
devel:libevent_2.1$secondaryArchSuffix
@@ -158,11 +158,10 @@ BUILD_REQUIRES="
devel:libharfbuzz$secondaryArchSuffix
devel:libharfbuzz_gobject$secondaryArchSuffix
devel:libhyphen$secondaryArchSuffix
devel:libicuuc$secondaryArchSuffix
devel:libicuuc$secondaryArchSuffix >= 74
devel:libintl$secondaryArchSuffix
devel:libjpeg$secondaryArchSuffix
devel:libjxl$secondaryArchSuffix
devel:libLLVM_12$secondaryArchSuffix
devel:libnghttp2$secondaryArchSuffix
devel:libopenjp2$secondaryArchSuffix
devel:libopus$secondaryArchSuffix
@@ -172,7 +171,7 @@ BUILD_REQUIRES="
devel:libsecret_1$secondaryArchSuffix
devel:libsoup_3.0$secondaryArchSuffix
devel:libsqlite3$secondaryArchSuffix
devel:libssl$secondaryArchSuffix
devel:libssl$secondaryArchSuffix >= 3
devel:libtasn1$secondaryArchSuffix
devel:libvpx$secondaryArchSuffix
devel:libwayland_client$secondaryArchSuffix
@@ -184,12 +183,16 @@ BUILD_REQUIRES="
devel:libz$secondaryArchSuffix
wayland_protocols
"
# Note: llvm_ar is the command needed from llvm, not llvm_config, but only the llvm_config command
# has a version constraint in current llvm packages.
BUILD_PREREQUIRES="
cmd:cmake
cmd:clang >= 12
cmd:clang++ >= 12
cmd:clang >= 18
cmd:clang++ >= 18
cmd:gcc$secondaryArchSuffix
cmd:gperf
cmd:llvm_config >= 18
cmd:make
cmd:ninja
cmd:orcc$secondaryArchSuffix
@@ -198,8 +201,9 @@ BUILD_PREREQUIRES="
cmd:python3
cmd:ruby
cmd:sed
cmd:xargs
cmd:unifdef
cmd:xargs
cmd:xgettext
"
PATCH()