pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
webkit-gtk: some progress
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By: wiz
Date: Thu Apr 2 12:29:33 2026 +0200
Changeset: c2598f4d1a45bcaafb04d6ccf0f0ce4bb00ef92a
Modified Files:
webkit-gtk/TODO
webkit-gtk/distinfo
webkit-gtk/patches/patch-Source_WTF_wtf_glib_FileSystemGlib.cpp
Added Files:
webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_JSCJSValue.h
Log Message:
webkit-gtk: some progress
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c2598f4d1a45bcaafb04d6ccf0f0ce4bb00ef92a
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
webkit-gtk/TODO | 98 +++++++++++++++++-----
webkit-gtk/distinfo | 3 +-
...atch-Source_JavaScriptCore_runtime_JSCJSValue.h | 21 +++++
.../patch-Source_WTF_wtf_glib_FileSystemGlib.cpp | 6 +-
4 files changed, 104 insertions(+), 24 deletions(-)
diffs:
diff --git a/webkit-gtk/TODO b/webkit-gtk/TODO
index 8364d3e247..8885b5e094 100644
--- a/webkit-gtk/TODO
+++ b/webkit-gtk/TODO
@@ -1,25 +1,83 @@
NEW in 2.52.1:
-[183/8757] Building CXX object Source/WTF/wtf/CMakeFiles/WTF.dir/glib/FileSystemGlib.cpp.o
-FAILED: [code=1] Source/WTF/wtf/CMakeFiles/WTF.dir/glib/FileSystemGlib.cpp.o
-/tmp/wip/webkit-gtk/work/.cwrapper/bin/c++ -DBUILDING_GTK__=1 -DBUILDING_WEBKIT=1 -DBUILDING_WITH_CMAKE=1 -DBUILDING_WTF -DGETTEXT_PACKAGE=\"WebKitGTK-4.1\" -DHAVE_CONFIG_H=1 -DJSC_GLIB_API_ENABLED -DPAS_BMALLOC=1 -DUSER_AGENT_BRANDING="\"Linux x86_64\"" -D_GLIBCXX_ASSERTIONS=1 -I/tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/cmake-pkgsrc-build -I/tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/cmake-pkgsrc-build/WTF/DerivedSources -I/tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/Source/WTF -I/tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/Source/WTF/wtf -I/tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/Source/WTF/wtf/dtoa -I/tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/Source/WTF/wtf/fast_float -I/tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/Source/WTF/wtf/persistence -I/tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/Source/WTF/wtf/simdutf -I/tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/Source/WTF/wtf/text -I/tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/Source/WTF/wtf/text/icu -I/tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/Sou
rce/WTF/wtf/threads -I/tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/Source/WTF/wtf/unicode -isystem /usr/pkg/include -isystem /usr/pkg/include/glib-2.0 -isystem /usr/pkg/lib/glib-2.0/include -fdiagnostics-color=always -Wextra -Wall -pipe -fmax-errors=20 -Wno-odr -Wno-stringop-overread -Wno-stringop-overflow -Wno-nonnull -Wno-array-bounds -Wno-expansion-to-defined -Wno-noexcept-type -Wno-subobject-linkage -Wno-psabi -Wno-misleading-indentation -Wno-maybe-uninitialized -Wundef -Wpointer-arith -Wmissing-format-attribute -Wformat-security -Wcast-align -Wno-tautological-compare -fasynchronous-unwind-tables -O2 -Wno-unused-parameter -Wno-undef -gdwarf64 -fstack-clash-protection -I/usr/include -I/usr/pkg/include/python3.14 -I/usr/pkg/include -I/usr/pkg/include/glib-2.0 -I/usr/pkg/include/gio-unix-2.0 -I/usr/pkg/lib/glib-2.0/include -I/usr/pkg/include/freetype2 -I/usr/pkg/include/harfbuzz -I/usr/pkg/include/gstreamer-1.0 -I/usr/pkg/include/libxml2 -I/usr/pkg/include/libdrm -I/usr/pkg/include/gst
reamer-1.0 -Wno-unused-parameter -Wno-undef -gdwarf64 -DFIXED_EXECUTABLE_MEMORY_POOL_SIZE_IN_MB=512 -DSTRUCTURE_HEAP_ADDRESS_SIZE_IN_MB=256 -fno-strict-aliasing -fno-exceptions -fno-rtti -fcoroutines -ffunction-sections -fdata-sections -DNDEBUG -std=c++23 -fPIC -fvisibility=hidden -I/usr/pkg/include -pthread -I/usr/pkg/include/glib-2.0 -I/usr/pkg/lib/glib-2.0/include -I/usr/include -MD -MT Source/WTF/wtf/CMakeFiles/WTF.dir/glib/FileSystemGlib.cpp.o -MF Source/WTF/wtf/CMakeFiles/WTF.dir/glib/FileSystemGlib.cpp.o.d -o Source/WTF/wtf/CMakeFiles/WTF.dir/glib/FileSystemGlib.cpp.o -c /tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/Source/WTF/wtf/glib/FileSystemGlib.cpp
-/tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/Source/WTF/wtf/glib/FileSystemGlib.cpp: In function 'WTF::CString WTF::FileSystemImpl::currentExecutablePath()':
-/tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/Source/WTF/wtf/glib/FileSystemGlib.cpp:99:44: error: call of overloaded 'CString(<brace-enclosed initializer list>)' is ambiguous
- 99 | return CString({readLinkBuffer, result});
- | ^
-In file included from /tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/Source/WTF/wtf/text/StringView.h:33,
- from /tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/Source/WTF/wtf/text/StringConcatenate.h:34,
- from /tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/Source/WTF/wtf/text/AtomString.h:349,
- from /tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/Source/WTF/wtf/text/WTFString.h:605,
- from /tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/Source/WTF/wtf/FileSystem.h:43,
- from /tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/Source/WTF/wtf/glib/FileSystemGlib.cpp:24:
-/tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/Source/WTF/wtf/text/CString.h:136:8: note: candidate: 'WTF::CString::CString(const std::string&)'
- 136 | inline CString::CString(const std::string& value)
- | ^~~~~~~
-/tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/Source/WTF/wtf/text/CString.h:75:24: note: candidate: 'WTF::CString::CString(std::span<const char>)'
- 75 | WTF_EXPORT_PRIVATE CString(std::span<const char>); // Any encoding
- | ^~~~~~~
-[198/8757] Building CXX object Source/WTF/wtf/CMakeFiles/WTF.dir/generic/MemoryPressureHandlerGeneric.cpp.o
+In file included from /usr/pkg/include/X11/Xlib.h:44,
+ from /usr/pkg/include/EGL/eglplatform.h:134,
+ from /usr/pkg/include/epoxy/egl_generated.h:11,
+ from /usr/pkg/include/epoxy/egl.h:46,
+ from /tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/Source/WebCore/platform/graphics/skia/PlatformDisplaySkia.cpp:42,
+ from /tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/cmake-pkgsrc-build/WebCore/DerivedSources/unified-sources/UnifiedSource-3c72abbe-66.cpp:4:
+/tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/cmake-pkgsrc-build/WebCore/PrivateHeaders/WebCore/SharedMemory.h:57:27: error: expected identifier before numeric constant
+ 57 | enum class MemoryLedger { None, Default, Network, Media, Graphics, Neural };
+ | ^~~~
+/tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/cmake-pkgsrc-build/WebCore/PrivateHeaders/WebCore/SharedMemory.h:57:27: error: expected '}' before numeric constant
+In file included from /tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/Source/WebCore/platform/graphics/ShareableBitmap.h:33,
+ from /tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/Source/WebCore/platform/graphics/skia/ShareableBitmapSkia.cpp:27,
+ from /tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/cmake-pkgsrc-build/WebCore/DerivedSources/unified-sources/UnifiedSource-3c72abbe-66.cpp:5:
+/tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/cmake-pkgsrc-build/WebCore/PrivateHeaders/WebCore/SharedMemory.h:57:25: note: to match this '{'
+ 57 | enum class MemoryLedger { None, Default, Network, Media, Graphics, Neural };
+ | ^
+/tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/cmake-pkgsrc-build/WebCore/PrivateHeaders/WebCore/SharedMemory.h:57:27: error: expected unqualified-id before numeric constant
+ 57 | enum class MemoryLedger { None, Default, Network, Media, Graphics, Neural };
+ | ^~~~
+/tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/cmake-pkgsrc-build/WebCore/PrivateHeaders/WebCore/SharedMemory.h:96:47: error: 'MemoryLedger' has not been declared
+ 96 | WEBCORE_EXPORT void takeOwnershipOfMemory(MemoryLedger) const;
+ | ^~~~~~~~~~~~
+/tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/cmake-pkgsrc-build/WebCore/PrivateHeaders/WebCore/SharedMemory.h:98:79: error: 'MemoryLedger' has not been declared
+ 98 | WEBCORE_EXPORT void setOwnershipOfMemory(const WebCore::ProcessIdentity&, MemoryLedger) const;
+ | ^~~~~~~~~~~~
+/tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/cmake-pkgsrc-build/WebCore/PrivateHeaders/WebCore/SharedMemory.h:169:1: error: expected declaration before '}' token
+ 169 | } // namespace WebCore
+ | ^
+/tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/Source/WebCore/platform/graphics/ShareableBitmap.h:61:139: error: expected unqualified-id before numeric constant
+ 61 | WEBCORE_EXPORT ShareableBitmapConfiguration(const IntSize&, std::optional<DestinationColorSpace> = std::nullopt, Headroom = Headroom::None, bool isOpaque = false);
+ | ^~~~
+/tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/Source/WebCore/platform/graphics/ShareableBitmap.h:105:37: error: expected unqualified-id before numeric constant
+ 105 | Headroom m_headroom { Headroom::None };
+ | ^~~~
+/tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/Source/WebCore/platform/graphics/ShareableBitmap.h:105:37: error: expected '}' before numeric constant
+/tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/Source/WebCore/platform/graphics/ShareableBitmap.h:105:25: note: to match this '{'
+ 105 | Headroom m_headroom { Headroom::None };
+ | ^
+/tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/Source/WebCore/platform/graphics/ShareableBitmap.h:105:37: error: could not convert '{<expression error>}' from '<brace-enclosed initializer list>' to 'WebCore::Headroom'
+ 105 | Headroom m_headroom { Headroom::None };
+ | ^~~~
+ | |
+ | <brace-enclosed initializer list>
+/tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/Source/WebCore/platform/graphics/ShareableBitmap.h:105:37: error: expected ';' before numeric constant
+/tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/cmake-pkgsrc-build/WebCore/PrivateHeaders/WebCore/ImageFrame.h:99:39: error: expected unqualified-id before numeric constant
+ 99 | Headroom headroom { Headroom::None };
+ | ^~~~
+/tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/cmake-pkgsrc-build/WebCore/PrivateHeaders/WebCore/ImageFrame.h:99:39: error: expected '}' before numeric constant
+In file included from /tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/cmake-pkgsrc-build/WebCore/PrivateHeaders/WebCore/ImageSource.h:28,
+ from /tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/Source/WebCore/platform/graphics/BitmapImage.h:31,
+ from /tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/Source/WebCore/platform/graphics/skia/ShareableBitmapSkia.cpp:29:
+/tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/cmake-pkgsrc-build/WebCore/PrivateHeaders/WebCore/ImageFrame.h:99:27: note: to match this '{'
+ 99 | Headroom headroom { Headroom::None };
+ | ^
+/tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/cmake-pkgsrc-build/WebCore/PrivateHeaders/WebCore/ImageFrame.h:99:39: error: could not convert '{<expression error>}' from '<brace-enclosed initializer list>' to 'WebCore::Headroom'
+ 99 | Headroom headroom { Headroom::None };
+ | ^~~~
+ | |
+ | <brace-enclosed initializer list>
+/tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/cmake-pkgsrc-build/WebCore/PrivateHeaders/WebCore/ImageFrame.h:99:39: error: expected ';' before numeric constant
+/tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/cmake-pkgsrc-build/WebCore/PrivateHeaders/WebCore/ImageFrame.h:151:69: error: expected unqualified-id before numeric constant
+ 151 | ImageOrientation m_orientation { ImageOrientation::Orientation::None };
+ | ^~~~
+/tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/cmake-pkgsrc-build/WebCore/PrivateHeaders/WebCore/ImageFrame.h:151:69: error: expected '}' before numeric constant
+/tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/cmake-pkgsrc-build/WebCore/PrivateHeaders/WebCore/ImageFrame.h:151:36: note: to match this '{'
+ 151 | ImageOrientation m_orientation { ImageOrientation::Orientation::None };
+ | ^
+/tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/cmake-pkgsrc-build/WebCore/PrivateHeaders/WebCore/ImageFrame.h:151:69: error: could not convert '{<expression error>}' from '<brace-enclosed initializer list>' to 'WebCore::ImageOrientation'
+ 151 | ImageOrientation m_orientation { ImageOrientation::Orientation::None };
+ | ^~~~
+ | |
+ | <brace-enclosed initializer list>
+/tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/cmake-pkgsrc-build/WebCore/PrivateHeaders/WebCore/ImageFrame.h:151:69: error: expected ';' before numeric constant
+/tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/cmake-pkgsrc-build/WebCore/PrivateHeaders/WebCore/ImageFrame.h: In member function 'void WebCore::ImageFrame::Source::clear()':
+/tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/cmake-pkgsrc-build/WebCore/PrivateHeaders/WebCore/ImageFrame.h:118:38: error: expected unqualified-id before numeric constant
+ 118 | headroom = Headroom::None;
+ | ^~~~
+compilation terminated due to -fmax-errors=20.
diff --git a/webkit-gtk/distinfo b/webkit-gtk/distinfo
index fc0abebfff..a737b55666 100644
--- a/webkit-gtk/distinfo
+++ b/webkit-gtk/distinfo
@@ -5,6 +5,7 @@ SHA512 (webkitgtk-2.52.1.tar.xz) = 2798e2d94bcdde954e5cacfbae68219918dc2f9fae357
Size (webkitgtk-2.52.1.tar.xz) = 65036140 bytes
SHA1 (patch-Source_JavaScriptCore_assembler_ARM64Assembler.h) = 20d09e1c226cfff707659ffa35a2c2c3f1cdb617
SHA1 (patch-Source_JavaScriptCore_runtime_JSCBytecodeCacheVersion.cpp) = 946356c2c8e74a245b4fdd06f6a9a44cfa8af8f0
+SHA1 (patch-Source_JavaScriptCore_runtime_JSCJSValue.h) = 68dba3d91e5945b4e4f42034ac73bd709320d0fa
SHA1 (patch-Source_JavaScriptCore_runtime_MathCommon.cpp) = 4535d1aed5e92da2d459097516ee01d9faddfd0d
SHA1 (patch-Source_ThirdParty_ANGLE_src_common_SimpleMutex.h) = 6cd83b9ec476ed39adecec6b30e898bda8e5b76d
SHA1 (patch-Source_ThirdParty_ANGLE_src_common_platform.h) = 2fda057edc3dde3356f0663ec5aa52cb61fb1229
@@ -14,7 +15,7 @@ SHA1 (patch-Source_ThirdParty_skia_src_gpu_ganesh_GrAutoLocaleSetter.h) = 6a854b
SHA1 (patch-Source_ThirdParty_skia_src_ports_SkMemory__malloc.cpp) = e277d988eeaacb7ec8b7f051342b77c5e8ac06a7
SHA1 (patch-Source_WTF_wtf_InlineASM.h) = 35afdd5143f4a2df8a5554a0b0b35141a8784c6c
SHA1 (patch-Source_WTF_wtf_PlatformEnable.h) = 905b2b4bf4b8c90cf91eb8ecf1d414013cc3bcbb
-SHA1 (patch-Source_WTF_wtf_glib_FileSystemGlib.cpp) = a46ae871e2c0919da94bcb14a2b94d0e5a911922
+SHA1 (patch-Source_WTF_wtf_glib_FileSystemGlib.cpp) = fd9cca287e053953616e7e1a2d13f8731247ed19
SHA1 (patch-Source_WebCore_page_NavigatorBase.cpp) = 40a1c832e0df382e39cecb6c57527731e7c63c52
SHA1 (patch-Source_WebCore_platform_graphics_gbm_MemoryMappedGPUBuffer.cpp) = 3e95b73709a3a39cd130dcaf4bf440e9c0195fa5
SHA1 (patch-Source_WebCore_rendering_RenderBox.h) = 88bcb40bef0331b7d3c095ec9d0daab0dcaac6c4
diff --git a/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_JSCJSValue.h b/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_JSCJSValue.h
new file mode 100644
index 0000000000..0d35945964
--- /dev/null
+++ b/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_JSCJSValue.h
@@ -0,0 +1,21 @@
+$NetBSD$
+
+/tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/cmake-pkgsrc-build/JavaScriptCore/PrivateHeaders/JavaScriptCore/JSCJSValue.h: In member function 'double JSC::JSValue::toIntegerOrInfinity(JSC::JSGlobalObject*) cons\
+t':
+/tmp/wip/webkit-gtk/work/webkitgtk-2.52.1/cmake-pkgsrc-build/JavaScriptCore/PrivateHeaders/JavaScriptCore/JSCJSValue.h:1130:12: error: 'isnan' was not declared in this scope; did you mean 'std::isnan'?
+ 1130 | return isnan(d) ? 0.0 : trunc(d) + 0.0;
+ | ^~~~~
+ | std::isnan
+
+
+--- Source/JavaScriptCore/runtime/JSCJSValue.h.orig 2026-04-02 09:43:05.398552050 +0000
++++ Source/JavaScriptCore/runtime/JSCJSValue.h
+@@ -1127,7 +1127,7 @@ inline double JSValue::toIntegerOrInfinity(JSGlobalObj
+ if (isInt32())
+ return asInt32();
+ double d = toNumber(globalObject);
+- return isnan(d) ? 0.0 : trunc(d) + 0.0;
++ return std::isnan(d) ? 0.0 : trunc(d) + 0.0;
+ }
+
+ inline bool JSValue::isUInt32() const
diff --git a/webkit-gtk/patches/patch-Source_WTF_wtf_glib_FileSystemGlib.cpp b/webkit-gtk/patches/patch-Source_WTF_wtf_glib_FileSystemGlib.cpp
index 74c62ad784..a118de1dff 100644
--- a/webkit-gtk/patches/patch-Source_WTF_wtf_glib_FileSystemGlib.cpp
+++ b/webkit-gtk/patches/patch-Source_WTF_wtf_glib_FileSystemGlib.cpp
@@ -8,14 +8,14 @@ webkitgtk-2.46.3/Source/WTF/wtf/glib/FileSystemGlib.cpp:83:42: error: no matchin
| ^
---- Source/WTF/wtf/glib/FileSystemGlib.cpp.orig 2024-08-19 06:28:38.571296700 +0000
+--- Source/WTF/wtf/glib/FileSystemGlib.cpp.orig 2026-02-23 14:40:54.578305500 +0000
+++ Source/WTF/wtf/glib/FileSystemGlib.cpp
-@@ -80,7 +80,7 @@ CString currentExecutablePath()
+@@ -96,7 +96,7 @@ CString currentExecutablePath()
ssize_t result = readlink("/proc/curproc/file", readLinkBuffer, PATH_MAX);
if (result == -1)
return { };
- return CString(readLinkBuffer, result);
-+ return CString({readLinkBuffer, result});
++ return CString(unsafeMakeSpan(readLinkBuffer, static_cast<size_t>(result)));
}
#elif OS(WINDOWS)
CString currentExecutablePath()
Home |
Main Index |
Thread Index |
Old Index