pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
webkit-gtk60: reduce x11 header pollution bugfix patchset
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By: wiz
Date: Tue May 12 09:37:48 2026 +0200
Changeset: a965cbe06d8fba839890822ce7103bc6d757b255
Modified Files:
webkit-gtk60/distinfo
webkit-gtk60/patches/patch-Source_JavaScriptCore_runtime_DefinePropertyAttributes.h
Added Files:
webkit-gtk60/patches/patch-Source_WebCore_platform_graphics_skia_PlatformDisplaySkia.cpp
webkit-gtk60/patches/patch-Source_WebCore_platform_graphics_x11_XErrorTrapper.h
webkit-gtk60/patches/patch-Source_WebKit_UIProcess_gtk_DisplayX11.cpp
webkit-gtk60/patches/patch-Source_WebKit_WebProcess_WebPage_CoordinatedGraphics_ThreadedCompositor.cpp
Removed Files:
webkit-gtk60/patches/patch-Source_WebCore_css_values_CSSValueAggregates.h
webkit-gtk60/patches/patch-Source_WebCore_editing_FontAttributes.h
webkit-gtk60/patches/patch-Source_WebCore_editing_FrameSelection.h
webkit-gtk60/patches/patch-Source_WebCore_platform_SharedMemory.h
webkit-gtk60/patches/patch-Source_WebCore_rendering_style_RenderStyleConstants.h
webkit-gtk60/patches/patch-Source_WebCore_style_values_non-standard_StyleWebKitBoxReflect.h
webkit-gtk60/patches/patch-Source_WebKit_WebProcess_WebPage_glib_WebPageGLib.cpp
webkit-gtk60/patches/patch-Source_bmalloc_bmalloc_EligibilityResult.h
webkit-gtk60/patches/patch-Source_bmalloc_bmalloc_EligibilityResultInlines.h
webkit-gtk60/patches/patch-Source_bmalloc_bmalloc_IsoAllocatorInlines.h
Log Message:
webkit-gtk60: reduce x11 header pollution bugfix patchset
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a965cbe06d8fba839890822ce7103bc6d757b255
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
webkit-gtk60/distinfo | 16 +++-------
...vaScriptCore_runtime_DefinePropertyAttributes.h | 14 ++-------
...-Source_WebCore_css_values_CSSValueAggregates.h | 25 ---------------
.../patch-Source_WebCore_editing_FontAttributes.h | 25 ---------------
.../patch-Source_WebCore_editing_FrameSelection.h | 25 ---------------
.../patch-Source_WebCore_platform_SharedMemory.h | 26 ----------------
..._platform_graphics_skia_PlatformDisplaySkia.cpp | 15 +++++++++
...e_WebCore_platform_graphics_x11_XErrorTrapper.h | 36 ++++++++++++++++++++++
..._WebCore_rendering_style_RenderStyleConstants.h | 20 ------------
...yle_values_non-standard_StyleWebKitBoxReflect.h | 22 -------------
...atch-Source_WebKit_UIProcess_gtk_DisplayX11.cpp | 15 +++++++++
...Page_CoordinatedGraphics_ThreadedCompositor.cpp | 24 +++++++++++++++
..._WebKit_WebProcess_WebPage_glib_WebPageGLib.cpp | 25 ---------------
...atch-Source_bmalloc_bmalloc_EligibilityResult.h | 24 ---------------
...urce_bmalloc_bmalloc_EligibilityResultInlines.h | 16 ----------
...ch-Source_bmalloc_bmalloc_IsoAllocatorInlines.h | 15 ---------
16 files changed, 97 insertions(+), 246 deletions(-)
diffs:
diff --git a/webkit-gtk60/distinfo b/webkit-gtk60/distinfo
index 92485a6ca0..b956cb687c 100644
--- a/webkit-gtk60/distinfo
+++ b/webkit-gtk60/distinfo
@@ -6,7 +6,7 @@ Size (webkitgtk-2.52.3.tar.xz) = 65052268 bytes
SHA1 (patch-CMakeLists.txt) = 63a133cb37da466c684958988dd63c354585f5d3
SHA1 (patch-Source_JavaScriptCore_assembler_ARM64Assembler.h) = 20d09e1c226cfff707659ffa35a2c2c3f1cdb617
SHA1 (patch-Source_JavaScriptCore_parser_VariableEnvironment.h) = fc574ed61f7913b24a936003ec9b4461e24dee92
-SHA1 (patch-Source_JavaScriptCore_runtime_DefinePropertyAttributes.h) = 47d75f1204d7cde49e5fe56de856d585f1181343
+SHA1 (patch-Source_JavaScriptCore_runtime_DefinePropertyAttributes.h) = 1069f6cb3a49374beb0d54937b9c70dca4015438
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
@@ -18,27 +18,21 @@ SHA1 (patch-Source_ThirdParty_skia_src_ports_SkMemory__malloc.cpp) = e277d988eea
SHA1 (patch-Source_WTF_wtf_InlineASM.h) = 35afdd5143f4a2df8a5554a0b0b35141a8784c6c
SHA1 (patch-Source_WTF_wtf_PlatformEnable.h) = 905b2b4bf4b8c90cf91eb8ecf1d414013cc3bcbb
SHA1 (patch-Source_WTF_wtf_glib_FileSystemGlib.cpp) = b404226996b90bf01e7d275204a6c7a4d2f73bae
-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
+SHA1 (patch-Source_WebCore_platform_graphics_skia_PlatformDisplaySkia.cpp) = d5ff7192189a214f2ffe615e147eb87434172b9f
+SHA1 (patch-Source_WebCore_platform_graphics_x11_XErrorTrapper.h) = d9dc2cbc1a56bf624c7b5b0e099a7fc1bab13f1c
SHA1 (patch-Source_WebCore_rendering_RenderBox.h) = 88bcb40bef0331b7d3c095ec9d0daab0dcaac6c4
SHA1 (patch-Source_WebCore_rendering_shapes_ShapeOutsideInfo.cpp) = ad3370c031b58778b069685a6bbdd038bc09b424
-SHA1 (patch-Source_WebCore_rendering_style_RenderStyleConstants.h) = bef4c247a86a6aff327fa2e039afbc4022b3e7cc
-SHA1 (patch-Source_WebCore_style_values_non-standard_StyleWebKitBoxReflect.h) = 0abd97b23abe0a70275a699d5fc4f458731dab76
SHA1 (patch-Source_WebKit_Platform_IPC_unix_ConnectionUnix.cpp) = 365873c1dc93cf77d9b5eb28800d2b63f4e9da57
SHA1 (patch-Source_WebKit_UIProcess_Launcher_glib_ProcessLauncherGLib.cpp) = 45a215a2b7a913b6fba16ff91276e2c9779e06be
SHA1 (patch-Source_WebKit_UIProcess_gtk_AcceleratedBackingStore.cpp) = e2022bdff272135ceb9894c7df52b62dba12879a
-SHA1 (patch-Source_WebKit_WebProcess_WebPage_glib_WebPageGLib.cpp) = 852122d75654c9a7a7b2613915d3ce443ae2322d
+SHA1 (patch-Source_WebKit_UIProcess_gtk_DisplayX11.cpp) = fa57fa9a7b985cdca05f1358a08f08a5da800160
+SHA1 (patch-Source_WebKit_WebProcess_WebPage_CoordinatedGraphics_ThreadedCompositor.cpp) = cc02381e30bd46f4280f518352c97f7ebfb4a0bd
SHA1 (patch-Source_bmalloc_bmalloc_AvailableMemory.cpp) = 814ba3dc4f941ea13811f6c8d3d7a8ed47844c16
SHA1 (patch-Source_bmalloc_bmalloc_AvailableMemory.h) = a1eace5da1fa5058067ed2b035e9d685906ce0e4
SHA1 (patch-Source_bmalloc_bmalloc_BPlatform.h) = 7259775cfae2a2219c5bd1d45671be69e8d2d987
-SHA1 (patch-Source_bmalloc_bmalloc_EligibilityResult.h) = 80358a6fd8ddf87271811f9af5b884332e59da22
-SHA1 (patch-Source_bmalloc_bmalloc_EligibilityResultInlines.h) = fbf027e2b2897e24cea2dd47cc60ff6d9d763e0e
-SHA1 (patch-Source_bmalloc_bmalloc_IsoAllocatorInlines.h) = 9fecc4321ea0e46b09a704ce1f817d0386a0fe36
SHA1 (patch-Source_bmalloc_bmalloc_bmalloc.h) = 272b35e7a63d7082780917689119f5fe1bd8b000
SHA1 (patch-Source_bmalloc_libpas_src_libpas_pas__committed__pages__vector.h) = c72f85e263e32a9ea6e20a3d88fb56ace9bcd05f
SHA1 (patch-Source_bmalloc_libpas_src_libpas_pas__monotonic__time.c) = f4307a22f280e233066673e31f8bd29ca32bca9d
diff --git a/webkit-gtk60/patches/patch-Source_JavaScriptCore_runtime_DefinePropertyAttributes.h b/webkit-gtk60/patches/patch-Source_JavaScriptCore_runtime_DefinePropertyAttributes.h
index 9c064d02c8..2a788581dc 100644
--- a/webkit-gtk60/patches/patch-Source_JavaScriptCore_runtime_DefinePropertyAttributes.h
+++ b/webkit-gtk60/patches/patch-Source_JavaScriptCore_runtime_DefinePropertyAttributes.h
@@ -8,26 +8,16 @@ In file included from /usr/pkg/include/EGL/eglplatform.h:134,
/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.orig 2026-05-11 22:44:47.752626610 +0000
+++ Source/JavaScriptCore/runtime/DefinePropertyAttributes.h
-@@ -28,6 +28,14 @@
+@@ -28,6 +28,10 @@
#include <optional>
#include <wtf/TriState.h>
+#ifdef False
+#undef False
+#endif
-+
-+#ifdef True
-+#undef True
-+#endif
+
namespace JSC {
diff --git a/webkit-gtk60/patches/patch-Source_WebCore_css_values_CSSValueAggregates.h b/webkit-gtk60/patches/patch-Source_WebCore_css_values_CSSValueAggregates.h
deleted file mode 100644
index 002fd85be3..0000000000
--- a/webkit-gtk60/patches/patch-Source_WebCore_css_values_CSSValueAggregates.h
+++ /dev/null
@@ -1,25 +0,0 @@
-$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_editing_FontAttributes.h b/webkit-gtk60/patches/patch-Source_WebCore_editing_FontAttributes.h
deleted file mode 100644
index dcf1db9074..0000000000
--- a/webkit-gtk60/patches/patch-Source_WebCore_editing_FontAttributes.h
+++ /dev/null
@@ -1,25 +0,0 @@
-$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-gtk/work/webkitgtk-2.52.2/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/ThreadedCompositor.cpp:50,
- from /tmp/wip/webkit-gtk/work/webkitgtk-2.52.2/cmake-pkgsrc-build/DerivedSources/WebKit/unified-sources/UnifiedSource-54928a2b-46.cpp:4:
-/tmp/wip/webkit-gtk/work/webkitgtk-2.52.2/cmake-pkgsrc-build/WebCore/PrivateHeaders/WebCore/FontAttributes.h:42:52: error: expected unqualified-id before numeric constant
- 42 | Style::ListStyleType styleType { CSS::Keyword::None { } };
- | ^~~~
-
---- Source/WebCore/editing/FontAttributes.h.orig 2026-04-14 14:43:02.330262736 +0000
-+++ Source/WebCore/editing/FontAttributes.h
-@@ -36,6 +36,10 @@ OBJC_CLASS NSTextList;
- OBJC_CLASS NSDictionary;
- OBJC_CLASS NSTextList;
-
-+#ifdef None
-+#undef None
-+#endif
-+
- namespace WebCore {
-
- struct TextList {
diff --git a/webkit-gtk60/patches/patch-Source_WebCore_editing_FrameSelection.h b/webkit-gtk60/patches/patch-Source_WebCore_editing_FrameSelection.h
deleted file mode 100644
index 34fe52fd9d..0000000000
--- a/webkit-gtk60/patches/patch-Source_WebCore_editing_FrameSelection.h
+++ /dev/null
@@ -1,25 +0,0 @@
-$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-gtk/work/webkitgtk-2.52.2/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/ThreadedCompositor.cpp:50,
- from /tmp/wip/webkit-gtk/work/webkitgtk-2.52.2/cmake-pkgsrc-build/DerivedSources/WebKit/unified-sources/UnifiedSource-54928a2b-46.cpp:4:
-/tmp/wip/webkit-gtk/work/webkitgtk-2.52.2/cmake-pkgsrc-build/WebCore/PrivateHeaders/WebCore/FrameSelection.h:138:55: error: expected identifier before numeric constant
- 138 | enum class CursorAlignOnScroll : bool { IfNeeded, Always };
- | ^~~~~~
-
---- Source/WebCore/editing/FrameSelection.h.orig 2026-04-14 16:14:56.876999207 +0000
-+++ Source/WebCore/editing/FrameSelection.h
-@@ -39,6 +39,10 @@
- #include <wtf/Platform.h>
- #include <wtf/TZoneMalloc.h>
-
-+#ifdef Always
-+#undef Always
-+#endif
-+
- namespace WebCore {
-
- class CharacterData;
diff --git a/webkit-gtk60/patches/patch-Source_WebCore_platform_SharedMemory.h b/webkit-gtk60/patches/patch-Source_WebCore_platform_SharedMemory.h
deleted file mode 100644
index bcf6ef09d4..0000000000
--- a/webkit-gtk60/patches/patch-Source_WebCore_platform_SharedMemory.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$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-gtk/work/webkitgtk-2.52.2/Source/WebCore/platform/graphics/skia/PlatformDisplaySkia.cpp:42,
- from /tmp/wip/webkit-gtk/work/webkitgtk-2.52.2/cmake-pkgsrc-build/WebCore/DerivedSources/unified-sources/UnifiedSource-3c72abbe-66.cpp:5:
-/tmp/wip/webkit-gtk/work/webkitgtk-2.52.2/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 };
- | ^~~~
-
-
---- Source/WebCore/platform/SharedMemory.h.orig 2026-04-14 14:21:20.585631982 +0000
-+++ Source/WebCore/platform/SharedMemory.h
-@@ -54,6 +54,10 @@ class SharedBuffer;
- class ProcessIdentity;
- class SharedBuffer;
-
-+#ifdef None
-+#undef None
-+#endif
-+
- enum class MemoryLedger { None, Default, Network, Media, Graphics, Neural };
- enum class SharedMemoryProtection : bool { ReadOnly, ReadWrite };
-
diff --git a/webkit-gtk60/patches/patch-Source_WebCore_platform_graphics_skia_PlatformDisplaySkia.cpp b/webkit-gtk60/patches/patch-Source_WebCore_platform_graphics_skia_PlatformDisplaySkia.cpp
new file mode 100644
index 0000000000..8caf09c907
--- /dev/null
+++ b/webkit-gtk60/patches/patch-Source_WebCore_platform_graphics_skia_PlatformDisplaySkia.cpp
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- Source/WebCore/platform/graphics/skia/PlatformDisplaySkia.cpp.orig 2026-05-11 22:05:44.502856896 +0000
++++ Source/WebCore/platform/graphics/skia/PlatformDisplaySkia.cpp
+@@ -59,6 +59,10 @@ WTF_IGNORE_WARNINGS_IN_THIRD_PARTY_CODE_BEGIN
+ #include <xf86drm.h>
+ #endif
+
++#ifdef None
++#undef None
++#endif
++
+ namespace WebCore {
+
+ #if PLATFORM(GTK) || PLATFORM(WPE)
diff --git a/webkit-gtk60/patches/patch-Source_WebCore_platform_graphics_x11_XErrorTrapper.h b/webkit-gtk60/patches/patch-Source_WebCore_platform_graphics_x11_XErrorTrapper.h
new file mode 100644
index 0000000000..5ac90f6037
--- /dev/null
+++ b/webkit-gtk60/patches/patch-Source_WebCore_platform_graphics_x11_XErrorTrapper.h
@@ -0,0 +1,36 @@
+$NetBSD$
+
+[Swift GTK] Undefined Success
+https://bugs.webkit.org/show_bug.cgi?id=314395
+
+Reviewed by Adrian Perez de Castro.
+
+The X11 header defines Success. This causes difficulty when this header is
+transitively included in some Swift/C++ import scenarios, since the definition
+of Success causes problems interpreting the 'Success' case of other enums
+across the codebase. Undefine Success since we don't currently need it.
+
+--- Source/WebCore/platform/graphics/x11/XErrorTrapper.h.orig 2026-05-11 20:03:47.552553397 +0000
++++ Source/WebCore/platform/graphics/x11/XErrorTrapper.h
+@@ -27,6 +27,21 @@
+
+ #if PLATFORM(X11)
+ #include <X11/Xlib.h>
++#ifdef Above
++#undef Above
++#endif
++#ifdef Always
++#undef Always
++#endif
++#ifdef Below
++#undef Below
++#endif
++#ifdef Success
++#undef Success
++#endif
++#ifdef True
++#undef True
++#endif
+ #include <wtf/Vector.h>
+
+ namespace WebCore {
diff --git a/webkit-gtk60/patches/patch-Source_WebCore_rendering_style_RenderStyleConstants.h b/webkit-gtk60/patches/patch-Source_WebCore_rendering_style_RenderStyleConstants.h
deleted file mode 100644
index 8402f69c01..0000000000
--- a/webkit-gtk60/patches/patch-Source_WebCore_rendering_style_RenderStyleConstants.h
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD$
-
-Undefine X11 macros that conflict with enum values.
-X11/X.h defines Below=1 and Above=0, which breaks ReflectionDirection enum.
-
---- Source/WebCore/rendering/style/RenderStyleConstants.h.orig 2026-04-19 05:54:19.072594406 +0000
-+++ Source/WebCore/rendering/style/RenderStyleConstants.h
-@@ -33,6 +33,12 @@
- #include <wtf/EnumSet.h>
- #include <wtf/EnumTraits.h>
-
-+// X11/X.h defines these as numeric constants, conflicting with our enum values
-+#ifdef Below
-+#undef Below
-+#undef Above
-+#endif
-+
- namespace WTF {
- class TextStream;
- }
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
deleted file mode 100644
index d4fa90b4bb..0000000000
--- a/webkit-gtk60/patches/patch-Source_WebCore_style_values_non-standard_StyleWebKitBoxReflect.h
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
-Undefine X11 macros that conflict with enum values.
-X11/X.h defines Below=1 and Above=0, which breaks ReflectionDirection enum.
-Must be in this file directly due to #pragma once preventing re-inclusion
-of RenderStyleConstants.h after X11 headers are included.
-
---- Source/WebCore/style/values/non-standard/StyleWebKitBoxReflect.h.orig 2026-02-23 14:40:55.954298000 +0000
-+++ Source/WebCore/style/values/non-standard/StyleWebKitBoxReflect.h
-@@ -29,6 +29,12 @@
- #include <WebCore/StyleLengthWrapper.h>
- #include <WebCore/StyleMaskBorder.h>
-
-+// X11/X.h defines Below=1 and Above=0, conflicting with ReflectionDirection enum
-+#ifdef Below
-+#undef Below
-+#undef Above
-+#endif
-+
- namespace WebCore {
- namespace Style {
-
diff --git a/webkit-gtk60/patches/patch-Source_WebKit_UIProcess_gtk_DisplayX11.cpp b/webkit-gtk60/patches/patch-Source_WebKit_UIProcess_gtk_DisplayX11.cpp
new file mode 100644
index 0000000000..90c77edb42
--- /dev/null
+++ b/webkit-gtk60/patches/patch-Source_WebKit_UIProcess_gtk_DisplayX11.cpp
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- Source/WebKit/UIProcess/gtk/DisplayX11.cpp.orig 2026-05-11 22:39:33.571425983 +0000
++++ Source/WebKit/UIProcess/gtk/DisplayX11.cpp
+@@ -41,6 +41,10 @@
+ #include <gdk/gdkx.h>
+ #endif
+
++#ifdef Status
++#undef Status
++#endif
++
+ namespace WebKit {
+ using namespace WebCore;
+
diff --git a/webkit-gtk60/patches/patch-Source_WebKit_WebProcess_WebPage_CoordinatedGraphics_ThreadedCompositor.cpp b/webkit-gtk60/patches/patch-Source_WebKit_WebProcess_WebPage_CoordinatedGraphics_ThreadedCompositor.cpp
new file mode 100644
index 0000000000..0483365c2c
--- /dev/null
+++ b/webkit-gtk60/patches/patch-Source_WebKit_WebProcess_WebPage_CoordinatedGraphics_ThreadedCompositor.cpp
@@ -0,0 +1,24 @@
+$NetBSD$
+
+--- Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/ThreadedCompositor.cpp.orig 2026-05-11 22:43:24.758132262 +0000
++++ Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/ThreadedCompositor.cpp
+@@ -53,6 +53,19 @@
+ #include <GLES2/gl2.h>
+ #endif
+
++#ifdef Always
++#undef Always
++#endif
++#ifdef Below
++#undef Below
++#endif
++#ifdef None
++#undef None
++#endif
++#ifdef True
++#undef True
++#endif
++
+ namespace WebKit {
+ using namespace WebCore;
+
diff --git a/webkit-gtk60/patches/patch-Source_WebKit_WebProcess_WebPage_glib_WebPageGLib.cpp b/webkit-gtk60/patches/patch-Source_WebKit_WebProcess_WebPage_glib_WebPageGLib.cpp
deleted file mode 100644
index a9ba61dc21..0000000000
--- a/webkit-gtk60/patches/patch-Source_WebKit_WebProcess_WebPage_glib_WebPageGLib.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-$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-gtk/work/webkitgtk-2.52.2/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/ThreadedCompositor.cpp:50,
- from /tmp/wip/webkit-gtk/work/webkitgtk-2.52.2/cmake-pkgsrc-build/DerivedSources/WebKit/unified-sources/UnifiedSource-54928a2b-46.cpp:4:
-/tmp/wip/webkit-gtk/work/webkitgtk-2.52.2/Source/WebKit/WebProcess/WebPage/glib/WebPageGLib.cpp: In member function 'void WebKit::WebPage::getPlatformEditorState(WebCore::LocalFrame&, WebKit::EditorState&) const':
-/tmp/wip/webkit-gtk/work/webkitgtk-2.52.2/Source/WebKit/WebProcess/WebPage/glib/WebPageGLib.cpp:139:84: error: expected unqualified-id before numeric constant
- 139 | if (editor.selectionHasStyle(CSSPropertyFontWeight, "bold"_s) == TriState::True)
- | ^~~~
-
---- Source/WebKit/WebProcess/WebPage/glib/WebPageGLib.cpp.orig 2026-04-14 16:52:45.150237443 +0000
-+++ Source/WebKit/WebProcess/WebPage/glib/WebPageGLib.cpp
-@@ -66,6 +66,10 @@
- #include <xf86drm.h>
- #endif
-
-+#ifdef True
-+#undef True
-+#endif
-+
- namespace WebKit {
- using namespace WebCore;
-
diff --git a/webkit-gtk60/patches/patch-Source_bmalloc_bmalloc_EligibilityResult.h b/webkit-gtk60/patches/patch-Source_bmalloc_bmalloc_EligibilityResult.h
deleted file mode 100644
index f13877edb4..0000000000
--- a/webkit-gtk60/patches/patch-Source_bmalloc_bmalloc_EligibilityResult.h
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
-error: expected identifier Success
-
---- Source/bmalloc/bmalloc/EligibilityResult.h.orig 2025-05-17 12:08:50.761060597 +0000
-+++ Source/bmalloc/bmalloc/EligibilityResult.h
-@@ -39,7 +39,7 @@
- namespace bmalloc {
-
- enum class EligibilityKind {
-- Success,
-+ BmSuccess,
- Full,
- OutOfMemory
- };
-@@ -51,7 +51,7 @@ struct EligibilityResult {
- EligibilityResult(EligibilityKind);
- EligibilityResult(IsoPage<Config>*);
-
-- EligibilityKind kind { EligibilityKind::Success };
-+ EligibilityKind kind { EligibilityKind::BmSuccess };
- IsoPage<Config>* page { nullptr };
- };
-
diff --git a/webkit-gtk60/patches/patch-Source_bmalloc_bmalloc_EligibilityResultInlines.h b/webkit-gtk60/patches/patch-Source_bmalloc_bmalloc_EligibilityResultInlines.h
deleted file mode 100644
index 5a6ebad6eb..0000000000
--- a/webkit-gtk60/patches/patch-Source_bmalloc_bmalloc_EligibilityResultInlines.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-error: expected identifier before numeric constant Success,
-
-
---- Source/bmalloc/bmalloc/EligibilityResultInlines.h.orig 2025-05-16 15:56:41.704679027 +0000
-+++ Source/bmalloc/bmalloc/EligibilityResultInlines.h
-@@ -41,7 +41,7 @@ EligibilityResult<Config>::EligibilityRe
-
- template<typename Config>
- EligibilityResult<Config>::EligibilityResult(IsoPage<Config>* page)
-- : kind(EligibilityKind::Success)
-+ : kind(EligibilityKind::BmSuccess)
- , page(page)
- {
- }
diff --git a/webkit-gtk60/patches/patch-Source_bmalloc_bmalloc_IsoAllocatorInlines.h b/webkit-gtk60/patches/patch-Source_bmalloc_bmalloc_IsoAllocatorInlines.h
deleted file mode 100644
index e0e9e8e237..0000000000
--- a/webkit-gtk60/patches/patch-Source_bmalloc_bmalloc_IsoAllocatorInlines.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-error: expected identifier Success
-
---- Source/bmalloc/bmalloc/IsoAllocatorInlines.h.orig 2025-05-16 16:04:09.842306255 +0000
-+++ Source/bmalloc/bmalloc/IsoAllocatorInlines.h
-@@ -78,7 +78,7 @@ BNO_INLINE void* IsoAllocator<Config>::a
- BASSERT(allocationMode == AllocationMode::Fast);
-
- EligibilityResult<Config> result = heap.takeFirstEligible(locker);
-- if (result.kind != EligibilityKind::Success) {
-+ if (result.kind != EligibilityKind::BmSuccess) {
- RELEASE_BASSERT(result.kind == EligibilityKind::OutOfMemory);
- RELEASE_BASSERT(!abortOnFailure);
- return nullptr;
Home |
Main Index |
Thread Index |
Old Index