pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
webkit-gtk60: start update to 2.52.3
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By: wiz
Date: Fri Apr 17 11:27:00 2026 +0200
Changeset: 5419d2800e52cd82776abcdc00c4afbbd5e08482
Modified Files:
webkit-gtk60/Makefile
webkit-gtk60/distinfo
Added Files:
webkit-gtk60/patches/patch-Source_JavaScriptCore_runtime_DefinePropertyAttributes.h
webkit-gtk60/patches/patch-Source_WebCore_css_values_CSSValueAggregates.h
webkit-gtk60/patches/patch-Source_WebCore_loader_cache_CachedResource.h
webkit-gtk60/patches/patch-Source_WebCore_style_values_non-standard_StyleWebKitBoxReflect.h
Removed Files:
webkit-gtk60/patches/patch-Source_JavaScriptCore_bytecode_InlineCacheCompiler.h
Log Message:
webkit-gtk60: start update to 2.52.3
still needs more patches
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5419d2800e52cd82776abcdc00c4afbbd5e08482
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
webkit-gtk60/Makefile | 2 +-
webkit-gtk60/distinfo | 10 ++++---
...e_JavaScriptCore_bytecode_InlineCacheCompiler.h | 25 ----------------
...vaScriptCore_runtime_DefinePropertyAttributes.h | 34 ++++++++++++++++++++++
...-Source_WebCore_css_values_CSSValueAggregates.h | 25 ++++++++++++++++
...ch-Source_WebCore_loader_cache_CachedResource.h | 24 +++++++++++++++
...yle_values_non-standard_StyleWebKitBoxReflect.h | 26 +++++++++++++++++
7 files changed, 116 insertions(+), 30 deletions(-)
diffs:
diff --git a/webkit-gtk60/Makefile b/webkit-gtk60/Makefile
index aa8c75538f..90d326e0e5 100644
--- a/webkit-gtk60/Makefile
+++ b/webkit-gtk60/Makefile
@@ -3,7 +3,7 @@
# Some environment variables that can help debugging this:
# https://trac.webkit.org/wiki/EnvironmentVariables
-DISTNAME= webkitgtk-2.52.2
+DISTNAME= webkitgtk-2.52.3
PKGNAME= ${DISTNAME:S/webkitgtk/webkit-gtk60/}
CATEGORIES= www
MASTER_SITES= https://www.webkitgtk.org/releases/
diff --git a/webkit-gtk60/distinfo b/webkit-gtk60/distinfo
index 6a0927d4df..ae59cc85d1 100644
--- a/webkit-gtk60/distinfo
+++ b/webkit-gtk60/distinfo
@@ -1,10 +1,10 @@
$NetBSD$
-BLAKE2s (webkitgtk-2.52.2.tar.xz) = 20724024679b0f049c772157a27d74828ae31d493a9f73867feea292862923b0
-SHA512 (webkitgtk-2.52.2.tar.xz) = bdbcc0e928c9b0f4047ba0c2f4690d42176d78a75954984c73215c091d1407488ab8392d7acf1686a7e7acf3fe27621b3c1e5e84239753f5990c39962c73b273
-Size (webkitgtk-2.52.2.tar.xz) = 65056988 bytes
+BLAKE2s (webkitgtk-2.52.3.tar.xz) = 85736abab7a2f7f35e41afe72a91aab865822407bd85d67e7bc4858930bc0953
+SHA512 (webkitgtk-2.52.3.tar.xz) = 8007688e4eb5b465a6f50e05e89858f970f7bbaed45844b8f97175de1fb24e41e6d88f4f6b6299d5ae2ad4e19483da371ac16257d787626da29de7551fbd2a3c
+Size (webkitgtk-2.52.3.tar.xz) = 65052268 bytes
SHA1 (patch-Source_JavaScriptCore_assembler_ARM64Assembler.h) = 20d09e1c226cfff707659ffa35a2c2c3f1cdb617
-SHA1 (patch-Source_JavaScriptCore_bytecode_InlineCacheCompiler.h) = e80bdf4401eee80923c5dce347adefe788260865
+SHA1 (patch-Source_JavaScriptCore_runtime_DefinePropertyAttributes.h) = 47d75f1204d7cde49e5fe56de856d585f1181343
SHA1 (patch-Source_JavaScriptCore_runtime_JSCBytecodeCacheVersion.cpp) = 946356c2c8e74a245b4fdd06f6a9a44cfa8af8f0
SHA1 (patch-Source_JavaScriptCore_runtime_MathCommon.cpp) = 4535d1aed5e92da2d459097516ee01d9faddfd0d
SHA1 (patch-Source_ThirdParty_ANGLE_src_common_SimpleMutex.h) = 6cd83b9ec476ed39adecec6b30e898bda8e5b76d
@@ -15,8 +15,10 @@ 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_WebCore_css_values_CSSValueAggregates.h) = 708e2f7a48ff31c4a8ef50f87680452532a2f66c
SHA1 (patch-Source_WebCore_editing_FontAttributes.h) = 7a768d0e467a4e36122beaa612e65f806452d011
SHA1 (patch-Source_WebCore_editing_FrameSelection.h) = f23da5ffb29e900bd1dd517a6ba765d68edac273
+SHA1 (patch-Source_WebCore_loader_cache_CachedResource.h) = 404b807d386e545f2893274745d8dfaba567289a
SHA1 (patch-Source_WebCore_page_NavigatorBase.cpp) = 40a1c832e0df382e39cecb6c57527731e7c63c52
SHA1 (patch-Source_WebCore_platform_SharedMemory.h) = 5c96105b99f6fd9cd94342b9cf0fa727d3664893
SHA1 (patch-Source_WebCore_platform_graphics_gbm_MemoryMappedGPUBuffer.cpp) = 3e95b73709a3a39cd130dcaf4bf440e9c0195fa5
diff --git a/webkit-gtk60/patches/patch-Source_JavaScriptCore_bytecode_InlineCacheCompiler.h b/webkit-gtk60/patches/patch-Source_JavaScriptCore_bytecode_InlineCacheCompiler.h
deleted file mode 100644
index 9a3043a0b9..0000000000
--- a/webkit-gtk60/patches/patch-Source_JavaScriptCore_bytecode_InlineCacheCompiler.h
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD$
-
-Post-2.52.2 release patch.
-https://github.com/WebKit/WebKit/commit/346454388ab
-
---- Source/JavaScriptCore/bytecode/InlineCacheCompiler.h.orig 2026-04-10 11:57:50.844550600 +0000
-+++ Source/JavaScriptCore/bytecode/InlineCacheCompiler.h
-@@ -528,13 +528,13 @@ static constexpr size_t prologueSizeInBytesDataIC = 1;
- #if CPU(X86_64)
- static constexpr size_t prologueSizeInBytesDataIC = 1;
- #elif CPU(ARM64E)
--static constexpr size_t prologueSizeInBytesDataIC = 4;
-+static constexpr size_t prologueSizeInBytesDataIC = 8;
- #elif CPU(ARM64)
--static constexpr size_t prologueSizeInBytesDataIC = 0;
-+static constexpr size_t prologueSizeInBytesDataIC = 4;
- #elif CPU(ARM_THUMB2)
--static constexpr size_t prologueSizeInBytesDataIC = 0;
-+static constexpr size_t prologueSizeInBytesDataIC = 6;
- #elif CPU(RISCV64)
--static constexpr size_t prologueSizeInBytesDataIC = 0;
-+static constexpr size_t prologueSizeInBytesDataIC = 12;
- #else
- #error "unsupported architecture"
- #endif
diff --git a/webkit-gtk60/patches/patch-Source_JavaScriptCore_runtime_DefinePropertyAttributes.h b/webkit-gtk60/patches/patch-Source_JavaScriptCore_runtime_DefinePropertyAttributes.h
new file mode 100644
index 0000000000..9c064d02c8
--- /dev/null
+++ b/webkit-gtk60/patches/patch-Source_JavaScriptCore_runtime_DefinePropertyAttributes.h
@@ -0,0 +1,34 @@
+$NetBSD$
+
+In file included 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-gtk60/work/webkitgtk-2.52.3/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/ThreadedCompositor.cpp:50,
+ from /tmp/wip/webkit-gtk60/work/webkitgtk-2.52.3/cmake-pkgsrc-build/DerivedSources/WebKit/unified-sources/UnifiedSource-54928a2b-33.cpp:1:
+/tmp/wip/webkit-gtk60/work/webkitgtk-2.52.3/cmake-pkgsrc-build/JavaScriptCore/PrivateHeaders/JavaScriptCore/DefinePropertyAttributes.h:35:51: error: expected unqualified-id before numeric constant
+ 35 | static_assert(!static_cast<uint8_t>(TriState::False), "TriState::False is 0.");
+ | ^~~~~
+...
+/tmp/wip/webkit-gtk60/work/webkitgtk-2.52.3/cmake-pkgsrc-build/JavaScriptCore/PrivateHeaders/JavaScriptCore/DefinePropertyAttributes.h: In member function 'std::optional<bool> JSC::DefinePropertyAttributes::writable() const':
+/tmp/wip/webkit-gtk60/work/webkitgtk-2.52.3/cmake-pkgsrc-build/JavaScriptCore/PrivateHeaders/JavaScriptCore/DefinePropertyAttributes.h:106:60: error: expected unqualified-id before numeric constant
+ 106 | return extractTriState(WritableShift) == TriState::True;
+ | ^~~~
+
+
+--- Source/JavaScriptCore/runtime/DefinePropertyAttributes.h.orig 2026-04-17 08:09:15.234936601 +0000
++++ Source/JavaScriptCore/runtime/DefinePropertyAttributes.h
+@@ -28,6 +28,14 @@
+ #include <optional>
+ #include <wtf/TriState.h>
+
++#ifdef False
++#undef False
++#endif
++
++#ifdef True
++#undef True
++#endif
++
+ namespace JSC {
+
+ class DefinePropertyAttributes {
diff --git a/webkit-gtk60/patches/patch-Source_WebCore_css_values_CSSValueAggregates.h b/webkit-gtk60/patches/patch-Source_WebCore_css_values_CSSValueAggregates.h
new file mode 100644
index 0000000000..002fd85be3
--- /dev/null
+++ b/webkit-gtk60/patches/patch-Source_WebCore_css_values_CSSValueAggregates.h
@@ -0,0 +1,25 @@
+$NetBSD$
+
+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-gtk60/work/webkitgtk-2.52.3/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/ThreadedCompositor.cpp:50,
+ from /tmp/wip/webkit-gtk60/work/webkitgtk-2.52.3/cmake-pkgsrc-build/DerivedSources/WebKit/unified-sources/UnifiedSource-54928a2b-33.cpp:1:
+/tmp/wip/webkit-gtk60/work/webkitgtk-2.52.3/cmake-pkgsrc-build/WebCore/PrivateHeaders/WebCore/CSSValueAggregates.h:47:51: error: expected identifier before numeric constant
+ 47 | enum class SerializationSeparatorType : uint8_t { None, Space, Comma, Slash };
+ | ^~~~
+
+--- Source/WebCore/css/values/CSSValueAggregates.h.orig 2026-04-17 07:47:59.331171195 +0000
++++ Source/WebCore/css/values/CSSValueAggregates.h
+@@ -42,6 +42,10 @@
+ #include <wtf/text/AtomString.h>
+ #include <wtf/text/TextStream.h>
+
++#ifdef None
++#undef None
++#endif
++
+ namespace WebCore {
+
+ enum class SerializationSeparatorType : uint8_t { None, Space, Comma, Slash };
diff --git a/webkit-gtk60/patches/patch-Source_WebCore_loader_cache_CachedResource.h b/webkit-gtk60/patches/patch-Source_WebCore_loader_cache_CachedResource.h
new file mode 100644
index 0000000000..8233c75992
--- /dev/null
+++ b/webkit-gtk60/patches/patch-Source_WebCore_loader_cache_CachedResource.h
@@ -0,0 +1,24 @@
+$NetBSD$
+
+In file included 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-gtk60/work/webkitgtk-2.52.3/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/ThreadedCompositor.cpp:50,
+ from /tmp/wip/webkit-gtk60/work/webkitgtk-2.52.3/cmake-pkgsrc-build/DerivedSources/WebKit/unified-sources/UnifiedSource-54928a2b-33.cpp:1:
+/tmp/wip/webkit-gtk60/work/webkitgtk-2.52.3/cmake-pkgsrc-build/WebCore/PrivateHeaders/WebCore/CachedResource.h:120:10: error: expected identifier before 'int'
+ 120 | enum Status : uint8_t {
+ | ^~~~~~
+
+--- Source/WebCore/loader/cache/CachedResource.h.orig 2026-04-17 08:44:48.754804603 +0000
++++ Source/WebCore/loader/cache/CachedResource.h
+@@ -45,6 +45,10 @@
+ #include <wtf/WeakHashMap.h>
+ #include <wtf/text/WTFString.h>
+
++#ifdef Status
++#undef Status
++#endif
++
+ namespace WebCore {
+ class CachedResource;
+ class CachedResourceCallback;
diff --git a/webkit-gtk60/patches/patch-Source_WebCore_style_values_non-standard_StyleWebKitBoxReflect.h b/webkit-gtk60/patches/patch-Source_WebCore_style_values_non-standard_StyleWebKitBoxReflect.h
new file mode 100644
index 0000000000..6f264aa4c6
--- /dev/null
+++ b/webkit-gtk60/patches/patch-Source_WebCore_style_values_non-standard_StyleWebKitBoxReflect.h
@@ -0,0 +1,26 @@
+$NetBSD$
+
+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-gtk60/work/webkitgtk-2.52.3/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/ThreadedCompositor.cpp:50,
+ from /tmp/wip/webkit-gtk60/work/webkitgtk-2.52.3/cmake-pkgsrc-build/DerivedSources/WebKit/unified-sources/UnifiedSource-54928a2b-33.cpp:1:
+/tmp/wip/webkit-gtk60/work/webkitgtk-2.52.3/cmake-pkgsrc-build/WebCore/PrivateHeaders/WebCore/StyleWebKitBoxReflect.h:40:58: error: expected unqualified-id before numeric constant
+ 40 | ReflectionDirection direction { ReflectionDirection::Below };
+ | ^~~~~
+
+
+--- Source/WebCore/style/values/non-standard/StyleWebKitBoxReflect.h.orig 2026-04-17 09:12:46.751122658 +0000
++++ Source/WebCore/style/values/non-standard/StyleWebKitBoxReflect.h
+@@ -29,6 +29,10 @@
+ #include <WebCore/StyleLengthWrapper.h>
+ #include <WebCore/StyleMaskBorder.h>
+
++#ifdef Below
++#undef Below
++#endif
++
+ namespace WebCore {
+ namespace Style {
+
Home |
Main Index |
Thread Index |
Old Index