pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
(www/webkit-gtk) Candidate for 2.45.3, but configure error now
Module Name: pkgsrc-wip
Committed By: Makoto Fujiwara <makoto%if.t.u-tokyo.ac.jp@localhost>
Pushed By: mef
Date: Sat Jun 22 22:41:02 2024 +0900
Changeset: 73f8322ad22739baffb972b7c48f7c77bea9e0f3
Modified Files:
webkit-gtk/Makefile
webkit-gtk/PLIST
webkit-gtk/TODO
webkit-gtk/buildlink3.mk
webkit-gtk/distinfo
webkit-gtk/options.mk
webkit-gtk/patches/patch-Source_JavaScriptCore_Scripts_generate-unified-sources.sh
webkit-gtk/patches/patch-Source_WebCore_Scripts_generate-unified-sources.sh
webkit-gtk/patches/patch-Source_WebKit_Scripts_generate-unified-sources.sh
webkit-gtk/patches/patch-aj
Added Files:
webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_MachineContext.h
webkit-gtk/patches/patch-Source_cmake_OptionsGTK.cmake
Removed Files:
webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h
webkit-gtk/patches/patch-Source_ThirdParty_ANGLE_src_common_third__party_smhasher_src_PMurHash.cpp
webkit-gtk/patches/patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h
webkit-gtk/patches/patch-Source_WTF_wtf_PlatformOS.h
webkit-gtk/patches/patch-Source_WebCore_crypto_algorithms_CryptoAlgorithmAES__GCM.cpp
webkit-gtk/patches/patch-Source_WebCore_css_calc_CSSCalcOperationNode.cpp
webkit-gtk/patches/patch-Source_WebCore_css_calc_CSSCalcOperationNode.h
webkit-gtk/patches/patch-Source_WebCore_css_calc_CSSCalcValue.cpp
webkit-gtk/patches/patch-Source_WebCore_platform_graphics_filters_FEMorphology.cpp
webkit-gtk/patches/patch-Source_WebCore_rendering_RenderLayerBacking.h
webkit-gtk/patches/patch-Source_WebCore_rendering_shapes_ShapeOutsideInfo.cpp
webkit-gtk/patches/patch-Source_WebKit_CMakeLists.txt
webkit-gtk/patches/patch-Source_WebKit_PlatformGTK.cmake
webkit-gtk/patches/patch-Source_WebKit_Platform_IPC_unix_ConnectionUnix.cpp
webkit-gtk/patches/patch-Source_cmake_WebKitCommon.cmake
Log Message:
(www/webkit-gtk) Candidate for 2.45.3, but configure error now
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=73f8322ad22739baffb972b7c48f7c77bea9e0f3
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
webkit-gtk/Makefile | 28 ++--
webkit-gtk/PLIST | 4 +-
webkit-gtk/TODO | 176 +++++++++++++++------
webkit-gtk/buildlink3.mk | 4 +-
webkit-gtk/distinfo | 33 ++--
webkit-gtk/options.mk | 3 +-
...aScriptCore_Scripts_generate-unified-sources.sh | 8 +-
...ource_JavaScriptCore_assembler_ARM64Assembler.h | 17 --
...-Source_JavaScriptCore_runtime_MachineContext.h | 123 ++++++++++++++
...c_common_third__party_smhasher_src_PMurHash.cpp | 16 --
...Party_gtest_include_gtest_internal_gtest-port.h | 20 ---
.../patches/patch-Source_WTF_wtf_PlatformOS.h | 26 ---
...rce_WebCore_Scripts_generate-unified-sources.sh | 10 +-
...e_crypto_algorithms_CryptoAlgorithmAES__GCM.cpp | 17 --
...ource_WebCore_css_calc_CSSCalcOperationNode.cpp | 54 -------
...-Source_WebCore_css_calc_CSSCalcOperationNode.h | 15 --
.../patch-Source_WebCore_css_calc_CSSCalcValue.cpp | 15 --
...Core_platform_graphics_filters_FEMorphology.cpp | 15 --
...h-Source_WebCore_rendering_RenderLayerBacking.h | 17 --
...e_WebCore_rendering_shapes_ShapeOutsideInfo.cpp | 15 --
.../patches/patch-Source_WebKit_CMakeLists.txt | 17 --
.../patches/patch-Source_WebKit_PlatformGTK.cmake | 15 --
...rce_WebKit_Platform_IPC_unix_ConnectionUnix.cpp | 35 ----
...urce_WebKit_Scripts_generate-unified-sources.sh | 8 +-
.../patches/patch-Source_cmake_OptionsGTK.cmake | 32 ++++
.../patches/patch-Source_cmake_WebKitCommon.cmake | 28 ----
webkit-gtk/patches/patch-aj | 15 +-
27 files changed, 333 insertions(+), 433 deletions(-)
diffs:
diff --git a/webkit-gtk/Makefile b/webkit-gtk/Makefile
index ec93a430b3..24f93c094d 100644
--- a/webkit-gtk/Makefile
+++ b/webkit-gtk/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.240 2022/11/23 16:19:06 adam Exp $
+# $NetBSD: Makefile,v 1.260 2024/05/29 16:34:57 adam Exp $
-DISTNAME= webkitgtk-2.38.5
+DISTNAME= webkitgtk-2.45.3
PKGNAME= ${DISTNAME:S/webkitgtk/webkit-gtk/}
CATEGORIES= www
MASTER_SITES= https://www.webkitgtk.org/releases/
@@ -16,22 +16,14 @@ NOT_FOR_PLATFORM= NetBSD-[1-6].*-*
TOOL_DEPENDS+= gettext-tools>=0.18:../../devel/gettext-tools
-USE_CMAKE= yes
USE_LANGUAGES= c c++17
USE_TOOLS+= automake bash bison flex gdbus-codegen gmake perl pkg-config msgfmt
# Enabling -gdwarf-2 hits GNU ar limits on file size.
CTF_SUPPORTED= no
-# GCC >= 8 is required, it no longer builds with lower versions.
-GCC_REQD+= 8
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 099915
-USE_PKGSRC_GCC= yes
-USE_PKGSRC_GCC_RUNTIME= yes
-.endif
+# GCC >= 10 10 10 10 10 10 10 10 10 10 is required, it no longer builds with lower versions.
+GCC_REQD+= 10
PKGCONFIG_OVERRIDE+= Source/JavaScriptCore/javascriptcoregtk.pc.in
PKGCONFIG_OVERRIDE+= Source/WebKit/gtk/webkit2gtk-web-extension.pc.in
@@ -46,13 +38,14 @@ CMAKE_ARGS+= -DENABLE_GEOLOCATION=OFF
CMAKE_ARGS+= -DENABLE_INTROSPECTION=ON
CMAKE_ARGS+= -DENABLE_JOURNALD_LOG=OFF
CMAKE_ARGS+= -DENABLE_BUBBLEWRAP_SANDBOX=OFF
-CMAKE_ARGS+= -DENABLE_DOCUMENTATION=OFF
CMAKE_ARGS+= -DUSE_GSTREAMER_GL=OFF
CMAKE_ARGS+= -DUSE_LIBHYPHEN=OFF
CMAKE_ARGS+= -DUSE_OPENJPEG=OFF
CMAKE_ARGS+= -DUSE_SOUP2=ON
+CMAKE_ARGS+= -DUSE_GSTREAMER_TRANSCODER=OFF
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64*)
+.include "../../mk/bsd.prefs.mk"
+.if ${MACHINE_PLATFORM:MNetBSD-*-aarch64*}
CMAKE_ARGS+= -DAVOID_INT128=ON
.endif
@@ -116,10 +109,12 @@ TOOL_DEPENDS+= ${RUBY_BASE}>=${RUBY_VERSION}:${RUBY_SRCDIR}
CMAKE_ARGS+= -DRUBY_EXECUTABLE=${RUBY}
PYTHON_FOR_BUILD_ONLY= yes
+.include "../../lang/python/batteries-included.mk"
.include "../../lang/python/application.mk"
CMAKE_ARGS+= -DPYTHON_EXECUTABLE=${PYTHONBIN}
CXXFLAGS.SunOS+= -fpermissive
+#CXXFLAGS+= -Iglib-2.0
.include "../../mk/compiler.mk"
.if !empty(PKGSRC_COMPILER:Mclang)
@@ -140,6 +135,7 @@ CHECK_PORTABILITY_SKIP+= Source/WebKit/Scripts/generate-feature-flags-plist.sh
.include "options.mk"
+.include "../../devel/cmake/build.mk"
BUILDLINK_API_DEPENDS.glib2+= glib2>=2.32.1
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
@@ -155,6 +151,8 @@ BUILDLINK_API_DEPENDS.cairo+= cairo>=1.18
.include "../../graphics/cairo/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/libwebp/buildlink3.mk"
+.include "../../wip/libjxl/buildlink3.mk"
+.include "../../graphics/libepoxy/buildlink3.mk"
.include "../../mk/jpeg.buildlink3.mk"
.include "../../graphics/lcms2/buildlink3.mk"
BUILDLINK_API_DEPENDS.png+= png>=1.5.1beta08
@@ -165,6 +163,8 @@ BUILDLINK_API_DEPENDS.gst-plugins1-base+= gst-plugins1-base>=1.0.3
.include "../../multimedia/gst-plugins1-good/buildlink3.mk"
.include "../../net/libsoup/buildlink3.mk"
.include "../../security/libsecret/buildlink3.mk"
+.include "../../wip/libbacktrace/buildlink3.mk"
+.include "../../wip/libstacktrace/buildlink3.mk"
.include "../../security/libtasn1/buildlink3.mk"
.include "../../sysutils/libnotify/buildlink3.mk"
.include "../../textproc/icu/buildlink3.mk"
diff --git a/webkit-gtk/PLIST b/webkit-gtk/PLIST
index e8cde20749..721ab733b8 100644
--- a/webkit-gtk/PLIST
+++ b/webkit-gtk/PLIST
@@ -221,10 +221,10 @@ lib/girepository-1.0/WebKit2-4.0.typelib
lib/girepository-1.0/WebKit2WebExtension-4.0.typelib
lib/libjavascriptcoregtk-4.0.so
lib/libjavascriptcoregtk-4.0.so.18
-lib/libjavascriptcoregtk-4.0.so.18.21.8
+lib/libjavascriptcoregtk-4.0.so.18.20.12
lib/libwebkit2gtk-4.0.so
lib/libwebkit2gtk-4.0.so.37
-lib/libwebkit2gtk-4.0.so.37.57.8
+lib/libwebkit2gtk-4.0.so.37.56.12
lib/pkgconfig/javascriptcoregtk-4.0.pc
lib/pkgconfig/webkit2gtk-4.0.pc
lib/pkgconfig/webkit2gtk-web-extension-4.0.pc
diff --git a/webkit-gtk/TODO b/webkit-gtk/TODO
index 8f3e2cfccd..feff4f7fc1 100644
--- a/webkit-gtk/TODO
+++ b/webkit-gtk/TODO
@@ -1,48 +1,128 @@
-On NetBSD/amd64 9.99.98 when running MiniBrowser (or surf and probably
-any other WebKitGTK+ web browsers) WebKitWebProcess crashes with:
-
-```
-$ gdb -core WebKitWebProcess.core /usr/pkg/libexec/webkit2gtk-4.0/WebKitWebProcess
-Reading symbols from /usr/pkg/libexec/webkit2gtk-4.0/WebKitWebProcess...
-(No debugging symbols found in /usr/pkg/libexec/webkit2gtk-4.0/WebKitWebProcess)
-[New process 8556]
-[New process 28884]
-[New process 19013]
-[New process 13540]
-[New process 26379]
-[New process 24988]
-Core was generated by `WebKitWebProcess'.
-Program terminated with signal SIGABRT, Aborted.
-#0 0x000078a9e17a4d5a in _lwp_kill () from /usr/lib/libc.so.12
-[Current thread is 1 (process 8556)]
-(gdb) bt
-#0 0x000078a9e17a4d5a in _lwp_kill () from /usr/lib/libc.so.12
-#1 0x000078a9e17a521e in abort () at /usr/src/lib/libc/stdlib/abort.c:74
-#2 0x000078a9e7425cfe in WTFCrashWithInfoImpl(int, char const*, char const*, int, unsigned long, unsigned long, unsigned long, unsigned long) () from /usr/pkg/lib/libjavascriptcoregtk-4.0.so.18
-#3 0x000078a9e72217e3 in JSC::sanitizeStackForVM(JSC::VM&) () from /usr/pkg/lib/libjavascriptcoregtk-4.0.so.18
-#4 0x000078a9e789ab55 in ?? () from /usr/pkg/lib/libjavascriptcoregtk-4.0.so.18
-#5 0x000078a9e722775c in ?? () from /usr/pkg/lib/libjavascriptcoregtk-4.0.so.18
-#6 0x000078a9e7229034 in JSC::VM::create(JSC::HeapType, WTF::RunLoop*) () from /usr/pkg/lib/libjavascriptcoregtk-4.0.so.18
-#7 0x000078a9ec6724d0 in ?? () from /usr/pkg/lib/libwebkit2gtk-4.0.so.37
-#8 0x000078a9eba710bd in ?? () from /usr/pkg/lib/libwebkit2gtk-4.0.so.37
-#9 0x000078a9eb72c202 in ?? () from /usr/pkg/lib/libwebkit2gtk-4.0.so.37
-#10 0x000078a9eb875675 in ?? () from /usr/pkg/lib/libwebkit2gtk-4.0.so.37
-#11 0x000078a9eb876c20 in ?? () from /usr/pkg/lib/libwebkit2gtk-4.0.so.37
-#12 0x000078a9e73cc1a4 in ?? () from /usr/pkg/lib/libjavascriptcoregtk-4.0.so.18
-#13 0x000078a9e7404689 in ?? () from /usr/pkg/lib/libjavascriptcoregtk-4.0.so.18
-#14 0x000078a9e7404fb9 in ?? () from /usr/pkg/lib/libjavascriptcoregtk-4.0.so.18
-#15 0x000078a9e2e54bdf in g_main_context_dispatch () from /usr/pkg/lib/libglib-2.0.so.0
-#16 0x000078a9e2e54f88 in g_main_context_iterate.constprop () from /usr/pkg/lib/libglib-2.0.so.0
-#17 0x000078a9e2e55283 in g_main_loop_run () from /usr/pkg/lib/libglib-2.0.so.0
-#18 0x000078a9e7405110 in WTF::RunLoop::run() () from /usr/pkg/lib/libjavascriptcoregtk-4.0.so.18
-#19 0x000078a9ed702270 in ?? () from /usr/pkg/lib/libwebkit2gtk-4.0.so.37
-#20 0x00000000dce00b5e in ?? ()
-#21 0x00007f7f7920c3a8 in ?? () from /usr/libexec/ld.elf_so
-#22 0x0000000000000003 in ?? ()
-#23 0x00007f7fff501358 in ?? ()
-#24 0x00007f7fff501389 in ?? ()
-#25 0x00007f7fff50138c in ?? ()
-#26 0x0000000000000000 in ?? ()
-```
-
-Investigate what is going on.
+confiugre fails with:
+
+-- Enabled features:
+-- ENABLE_BUBBLEWRAP_SANDBOX ..................... OFF
+-- ENABLE_DOCUMENTATION ON
+-- ENABLE_DRAG_SUPPORT ........................... ON
+-- ENABLE_GAMEPAD OFF
+-- ENABLE_INTROSPECTION .......................... ON
+-- ENABLE_JOURNALD_LOG OFF
+-- ENABLE_MINIBROWSER ............................ ON
+-- ENABLE_PDFJS ON
+-- ENABLE_QUARTZ_TARGET .......................... OFF
+-- ENABLE_SPELLCHECK ON
+-- ENABLE_TOUCH_EVENTS ........................... ON
+-- ENABLE_VIDEO ON
+-- ENABLE_WAYLAND_TARGET ......................... ON
+-- ENABLE_WEBDRIVER ON
+-- ENABLE_WEB_AUDIO .............................. ON
+-- ENABLE_X11_TARGET ON
+-- USE_AVIF ...................................... ON
+-- USE_GBM ON
+-- USE_GSTREAMER_TRANSCODER ...................... OFF
+-- USE_GSTREAMER_WEBRTC OFF
+-- USE_JPEGXL .................................... ON
+-- USE_LCMS ON
+-- USE_LIBBACKTRACE .............................. ON
+-- USE_LIBDRM ON
+-- USE_LIBHYPHEN ................................. OFF
+-- USE_LIBSECRET ON
+-- USE_SOUP2 ..................................... ON
+-- USE_WOFF2 ON
+-- Configuring done (28.4s)
+CMake Error at Source/ThirdParty/skia/CMakeLists.txt:906 (target_link_libraries):
+ Target "Skia" links to:
+
+ Epoxy::Epoxy
+
+ but the target was not found. Possible reasons include:
+
+ * There is a typo in the target name.
+ * A find_package call is missing for an IMPORTED target.
+ * An ALIAS target is missing.
+
+
+
+CMake Error at Source/cmake/WebKitMacros.cmake:150 (target_link_libraries):
+ Target "WebCore" links to:
+
+ Epoxy::Epoxy
+
+ but the target was not found. Possible reasons include:
+
+ * There is a typo in the target name.
+ * A find_package call is missing for an IMPORTED target.
+ * An ALIAS target is missing.
+
+Call Stack (most recent call first):
+ Source/cmake/WebKitMacros.cmake:322 (_WEBKIT_TARGET)
+ Source/WebCore/CMakeLists.txt:2861 (WEBKIT_FRAMEWORK)
+
+
+CMake Error at Source/cmake/WebKitMacros.cmake:150 (target_link_libraries):
+ Target "WebCoreTestSupport" links to:
+
+ Epoxy::Epoxy
+
+ but the target was not found. Possible reasons include:
+
+ * There is a typo in the target name.
+ * A find_package call is missing for an IMPORTED target.
+ * An ALIAS target is missing.
+
+Call Stack (most recent call first):
+ Source/cmake/WebKitMacros.cmake:348 (_WEBKIT_TARGET)
+ Source/WebCore/CMakeLists.txt:2888 (WEBKIT_LIBRARY)
+
+
+CMake Error at Source/cmake/WebKitMacros.cmake:153 (target_link_libraries):
+ Target "WebKit" links to:
+
+ Epoxy::Epoxy
+
+ but the target was not found. Possible reasons include:
+
+ * There is a typo in the target name.
+ * A find_package call is missing for an IMPORTED target.
+ * An ALIAS target is missing.
+
+Call Stack (most recent call first):
+ Source/cmake/WebKitMacros.cmake:322 (_WEBKIT_TARGET)
+ Source/WebKit/CMakeLists.txt:906 (WEBKIT_FRAMEWORK)
+
+
+CMake Error at Source/cmake/WebKitMacros.cmake:309 (target_link_libraries):
+ The link interface of target "WebKit_PostBuild" contains:
+
+ Epoxy::Epoxy
+
+ but the target was not found. Possible reasons include:
+
+ * There is a typo in the target name.
+ * A find_package call is missing for an IMPORTED target.
+ * An ALIAS target is missing.
+
+Call Stack (most recent call first):
+ Source/cmake/WebKitMacros.cmake:343 (_WEBKIT_TARGET_INTERFACE)
+ Source/WebKit/CMakeLists.txt:906 (WEBKIT_FRAMEWORK)
+
+
+-- Generating done (3.8s)
+CMake Warning:
+ Manually-specified variables were not used by the project:
+
+ FETCHCONTENT_FULLY_DISCONNECTED
+ USE_OPENGL_OR_ES
+ USE_OPENJPEG
+ USE_WPE_RENDERER
+
+
+CMake Generate step failed. Build files cannot be regenerated correctly.
+*** Error code 1
+
+Stop.
+make[1]: stopped in /export/CHROOT/usr/pkgsrc/wip/webkit-gtk
+*** Error code 1
+
+Stop.
+make: stopped in /export/CHROOT/usr/pkgsrc/wip/webkit-gtk
diff --git a/webkit-gtk/buildlink3.mk b/webkit-gtk/buildlink3.mk
index 9a3b1fe8bd..87ddaf6dff 100644
--- a/webkit-gtk/buildlink3.mk
+++ b/webkit-gtk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.93 2022/11/23 16:19:06 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.104 2024/04/07 07:35:13 wiz Exp $
BUILDLINK_TREE+= webkit-gtk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= webkit-gtk
WEBKIT_GTK_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.webkit-gtk+= webkit-gtk>=2.8
-BUILDLINK_ABI_DEPENDS.webkit-gtk?= webkit-gtk>=2.36.8nb1
+BUILDLINK_ABI_DEPENDS.webkit-gtk?= webkit-gtk>=2.36.8nb12
BUILDLINK_PKGSRCDIR.webkit-gtk?= ../../www/webkit-gtk
# This is necessary to match the package requirement.
diff --git a/webkit-gtk/distinfo b/webkit-gtk/distinfo
index b9141edec8..c038160dd1 100644
--- a/webkit-gtk/distinfo
+++ b/webkit-gtk/distinfo
@@ -1,48 +1,35 @@
-$NetBSD: distinfo,v 1.173 2022/10/23 07:33:51 mcf Exp $
+$NetBSD: distinfo,v 1.175 2024/04/14 12:44:52 tsutsui Exp $
-BLAKE2s (webkitgtk-2.38.5.tar.xz) = 0fa33a5986b42eaeec189f75aeba652702bd7ce2e3db204f0a56ace5c7eec290
-SHA512 (webkitgtk-2.38.5.tar.xz) = 9038892910e95d3b7819396c9071b59ee51eadd6cad62130fdd4e02d3f5187b7a2986c5939a378190e14059149f2db0a0b57feb23ac44f5ea764c160e6181eef
-Size (webkitgtk-2.38.5.tar.xz) = 33011600 bytes
+BLAKE2s (webkitgtk-2.45.3.tar.xz) = 1d00639c39d135faa6ad805cfb3f0a89cac373771956f8340b1d1242b9fa3afa
+SHA512 (webkitgtk-2.45.3.tar.xz) = f2a5547356592bc6637e11128d8cd90f689f72cdd4f3032d1559afa77afc52ef7bf4532086a176be19e87106f56c86643a7ee6a176afc22c1df2b8a3d2a9ff67
+Size (webkitgtk-2.45.3.tar.xz) = 40790940 bytes
SHA1 (patch-Source_JavaScriptCore_Scripts_check-xcfilelists.sh) = f4f117e6c1cd8eb8e4905f74946e0367156ed528
-SHA1 (patch-Source_JavaScriptCore_Scripts_generate-unified-sources.sh) = 532091a5a3d77a2e380041e7538a0920fced027f
-SHA1 (patch-Source_JavaScriptCore_assembler_ARM64Assembler.h) = 79c282ca90d0ba2ef4769da40d4648f5f709951b
+SHA1 (patch-Source_JavaScriptCore_Scripts_generate-unified-sources.sh) = 7f70191e07468bef8169f56bc21b4ff0b0743598
SHA1 (patch-Source_JavaScriptCore_assembler_ARMv7Assembler.h) = 70975aac175ec4131a4ed26a54dfe51e16ffb7cd
SHA1 (patch-Source_JavaScriptCore_heap_MarkedSpace.cpp) = 8f324091df41be96b011bcbeed5fd64c4464f010
SHA1 (patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp) = 26eaf16f38a6fd3f37a7acfc99aa359968eb2212
SHA1 (patch-Source_JavaScriptCore_offlineasm_arm64.rb) = 351e477eea36357e9aaeea8f8befb3fbc4eab30f
-SHA1 (patch-Source_ThirdParty_ANGLE_src_common_third__party_smhasher_src_PMurHash.cpp) = 73dfe781efe7e8aa7d49094af8820a87c501818f
+SHA1 (patch-Source_JavaScriptCore_runtime_MachineContext.h) = 6c3bdbf8041df27510da5999ee85f4e5ed09be8b
SHA1 (patch-Source_ThirdParty_ANGLE_src_compiler_translator_SymbolTable.h) = 10debffda84bc752ed434657a337a466aad19a3a
-SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = ac07d4d8faa6dab606bcea31936340d260fcda33
SHA1 (patch-Source_WTF_wtf_Assertions.h) = 427de20eba4627578087feaa7de2f23e80b9debf
SHA1 (patch-Source_WTF_wtf_FileSystem.cpp) = 2fe7b7755646d9a1cc022aec3d01091766378aba
SHA1 (patch-Source_WTF_wtf_PlatformEnable.h) = eb5598c20c8453314daba7897066f15827bbede7
-SHA1 (patch-Source_WTF_wtf_PlatformOS.h) = 80aa6ff20f10407d447fdb41606d4bb4989351aa
SHA1 (patch-Source_WTF_wtf_PlatformUse.h) = 595486b48e7d89378208c0a209a121ef136415e6
SHA1 (patch-Source_WTF_wtf_StackBounds.cpp) = 22a71daac8443f079ad8bcc7285cfd7319c972b3
SHA1 (patch-Source_WebCore_Scripts_check-xcfilelists.sh) = b292baf2494bcd459d9af91386263123046c6615
-SHA1 (patch-Source_WebCore_Scripts_generate-unified-sources.sh) = 64b876041b6a444690e828fe186ee41a1f7cd1b4
-SHA1 (patch-Source_WebCore_crypto_algorithms_CryptoAlgorithmAES__GCM.cpp) = 03337c5eec54d6974dfea1766b14cb2c1b9f7750
-SHA1 (patch-Source_WebCore_css_calc_CSSCalcOperationNode.cpp) = 8c8e60692152a3bb67a820b214bde0a6e6b72611
-SHA1 (patch-Source_WebCore_css_calc_CSSCalcOperationNode.h) = f9c7f117490e58bd8d58f57f6202f63aad6fc423
-SHA1 (patch-Source_WebCore_css_calc_CSSCalcValue.cpp) = c219e5c4ac9a5c9df042614e3d250fcb97efb10c
+SHA1 (patch-Source_WebCore_Scripts_generate-unified-sources.sh) = dbe9f43b0ec0d2c79634f1cc4c45f04adedad3cc
SHA1 (patch-Source_WebCore_inspector_InspectorFrontendHost.cpp) = daf6351a1a0b5a49592a2bb6db0d54620c7b09e3
-SHA1 (patch-Source_WebCore_platform_graphics_filters_FEMorphology.cpp) = 43f423af652533a64d0793ec6d15150b908da0f8
SHA1 (patch-Source_WebCore_platform_network_DNS.h) = dd9fb67aae0029c6a452e7d8f09eeed1235d5700
SHA1 (patch-Source_WebCore_rendering_RenderBox.h) = e43015aa76b38848079bc598ca8af9cfc585b99b
-SHA1 (patch-Source_WebCore_rendering_RenderLayerBacking.h) = ecf722df1d1cca13573786b34fe1e3d85edf1e1e
SHA1 (patch-Source_WebCore_rendering_shapes_RasterShape.cpp) = 551e47698dee50d097b11e3218f13bb3447edfea
-SHA1 (patch-Source_WebCore_rendering_shapes_ShapeOutsideInfo.cpp) = 3a4d9415e7d3ac78a948b9e7eb5e0377575835c3
-SHA1 (patch-Source_WebKit_CMakeLists.txt) = 86d11b8a1142a1ab267e412873cca4f8924aaae8
SHA1 (patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp) = 14dfbee895aa7c70bf3b61b4dbb5bccd96d9583a
-SHA1 (patch-Source_WebKit_PlatformGTK.cmake) = 61d2b4942b83d3f3c1b642d122f109ba90bbff9d
-SHA1 (patch-Source_WebKit_Platform_IPC_unix_ConnectionUnix.cpp) = f2ee81bf200fe1fe1bc59cb571e4459163a9cbde
SHA1 (patch-Source_WebKit_Platform_classifier_ResourceLoadStatisticsClassifier.cpp) = 920376ec8697780637f376b2fff312b7e214a7f6
SHA1 (patch-Source_WebKit_Scripts_check-xcfilelists.sh) = 22cc5ba1ababc6395aa0ef467db0c27c2fbf6878
-SHA1 (patch-Source_WebKit_Scripts_generate-unified-sources.sh) = 2180a91bd03eca7188bc712b5fa6ba4ccde28ab3
+SHA1 (patch-Source_WebKit_Scripts_generate-unified-sources.sh) = 309e6952be68693c0eae1bd82693e4a9eeb85f27
SHA1 (patch-Source_bmalloc_bmalloc_BPlatform.h) = 28d1f657fde427062a729b26398e96825082fc4d
SHA1 (patch-Source_bmalloc_bmalloc_VMAllocate.h) = 22c23689fa79c930145068ed7966844bbf92a6a9
SHA1 (patch-Source_cmake_OptionsCommon.cmake) = 83f0bfdb104e9e5c5c9afb155d399ae4c767c450
-SHA1 (patch-Source_cmake_WebKitCommon.cmake) = 73a0da491ef93d5cc25214e7733b54bbdacd487e
+SHA1 (patch-Source_cmake_OptionsGTK.cmake) = c39615dc26bf4e4f42c40e92e1924ef01bb276a0
SHA1 (patch-Tools_TestWebKitAPI_Scripts_check-xcfilelists.sh) = 6e8327bf46150806910b21b298767f313e1eb3ce
SHA1 (patch-Tools_TestWebKitAPI_Scripts_generate-unified-sources.sh) = 06747f279263558f05bb01c8da9c994a357ce74a
-SHA1 (patch-aj) = ec60907df4336b755d1d1924c026b3041805f431
+SHA1 (patch-aj) = 430274a515e94084b40289638620f0010b968ede
diff --git a/webkit-gtk/options.mk b/webkit-gtk/options.mk
index 67c6883317..24598543bf 100644
--- a/webkit-gtk/options.mk
+++ b/webkit-gtk/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.23 2022/06/07 20:28:43 wiz Exp $
+# $NetBSD: options.mk,v 1.24 2024/01/21 00:53:46 nikita Exp $
#
PKG_OPTIONS_VAR= PKG_OPTIONS.webkit-gtk
@@ -65,6 +65,7 @@ CMAKE_ARGS+= -DENABLE_SPELLCHECK=OFF
#
.if !empty(PKG_OPTIONS:Mdebug)
CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Debug
+.include "../../lang/ruby/buildlink3.mk"
.else
CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
.endif
diff --git a/webkit-gtk/patches/patch-Source_JavaScriptCore_Scripts_generate-unified-sources.sh b/webkit-gtk/patches/patch-Source_JavaScriptCore_Scripts_generate-unified-sources.sh
index 91a1dfaef4..d175b565c0 100644
--- a/webkit-gtk/patches/patch-Source_JavaScriptCore_Scripts_generate-unified-sources.sh
+++ b/webkit-gtk/patches/patch-Source_JavaScriptCore_Scripts_generate-unified-sources.sh
@@ -1,9 +1,9 @@
-$NetBSD: patch-Source_JavaScriptCore_Scripts_generate-unified-sources.sh,v 1.1 2019/03/13 20:49:40 leot Exp $
+$NetBSD$
-Avoid unportable `==' test(1) operator.
+ERROR: [check-portability.awk]
---- Source/JavaScriptCore/Scripts/generate-unified-sources.sh.orig 2022-08-31 07:59:51.490491200 +0000
-+++ Source/JavaScriptCore/Scripts/generate-unified-sources.sh
+--- Source/JavaScriptCore/Scripts/generate-unified-sources.sh.orig 2023-09-18 16:56:43.203176000 +0900
++++ Source/JavaScriptCore/Scripts/generate-unified-sources.sh 2024-06-22 16:55:48.705322278 +0900
@@ -7,7 +7,7 @@ ARGS=("$@")
cd $SRCROOT
diff --git a/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h b/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h
deleted file mode 100644
index 38e8011156..0000000000
--- a/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-Source_JavaScriptCore_assembler_ARM64Assembler.h,v 1.5 2020/03/10 18:14:04 leot Exp $
-
-- Add support for FreeBSD and NetBSD.
- Based on patch from FreeBSD ports but using __builtin___clear_cache()
- instead of __clear_cache() (the former is also available in gcc).
-
---- Source/JavaScriptCore/assembler/ARM64Assembler.h.orig 2020-02-04 10:23:58.000000000 +0000
-+++ Source/JavaScriptCore/assembler/ARM64Assembler.h
-@@ -2809,6 +2809,8 @@ public:
- {
- #if OS(DARWIN)
- sys_cache_control(kCacheFunctionPrepareForExecution, code, size);
-+#elif OS(FREEBSD) || OS(NETBSD)
-+ __builtin___clear_cache(code, reinterpret_cast<char*>(code) + size);
- #elif OS(FUCHSIA)
- zx_cache_flush(code, size, ZX_CACHE_FLUSH_INSN);
- #elif OS(LINUX)
diff --git a/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_MachineContext.h b/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_MachineContext.h
new file mode 100644
index 0000000000..a7a72f4355
--- /dev/null
+++ b/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_MachineContext.h
@@ -0,0 +1,123 @@
+$NetBSD: patch-Source_JavaScriptCore_runtime_MachineContext.h,v 1.4 2022/06/08 20:56:50 leot Exp $
+
+Add support for NetBSD.
+
+Shared and applied upstream via <https://bugs.webkit.org/show_bug.cgi?id=241125>.
+
+--- Source/JavaScriptCore/runtime/MachineContext.h.orig 2021-05-05 05:33:24.000000000 +0000
++++ Source/JavaScriptCore/runtime/MachineContext.h
+@@ -196,6 +196,22 @@ static inline void*& stackPointerImpl(mc
+ #error Unknown Architecture
+ #endif
+
++#elif OS(NETBSD)
++
++#if CPU(X86)
++ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_UESP]);
++#elif CPU(X86_64)
++ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_RSP]);
++#elif CPU(ARM)
++ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_SP]);
++#elif CPU(ARM64)
++ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_SP]);
++#elif CPU(MIPS)
++ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_SP]);
++#else
++#error Unknown Architecture
++#endif
++
+ #elif OS(FUCHSIA) || OS(LINUX)
+
+ #if CPU(X86)
+@@ -347,6 +363,22 @@ static inline void*& framePointerImpl(mc
+ #error Unknown Architecture
+ #endif
+
++#elif OS(NETBSD)
++
++#if CPU(X86)
++ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_EBP]);
++#elif CPU(X86_64)
++ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_RBP]);
++#elif CPU(ARM)
++ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_FP]);
++#elif CPU(ARM64)
++ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_FP]);
++#elif CPU(MIPS)
++ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_S8]);
++#else
++#error Unknown Architecture
++#endif
++
+ #elif OS(FUCHSIA) || OS(LINUX)
+
+ // The following sequence depends on glibc's sys/ucontext.h.
+@@ -497,6 +529,22 @@ static inline void*& instructionPointerI
+ #else
+ #error Unknown Architecture
+ #endif
++
++#elif OS(NETBSD)
++
++#if CPU(X86)
++ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_EIP]);
++#elif CPU(X86_64)
++ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_RIP]);
++#elif CPU(ARM)
++ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_PC]);
++#elif CPU(ARM64)
++ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_PC]);
++#elif CPU(MIPS)
++ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_EPC]);
++#else
++#error Unknown Architecture
++#endif
+
+ #elif OS(FUCHSIA) || OS(LINUX)
+
+@@ -655,6 +703,22 @@ inline void*& argumentPointer<1>(mcontex
+ #else
+ #error Unknown Architecture
+ #endif
++
++#elif OS(NETBSD)
++
++#if CPU(X86)
++ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_EDX]);
++#elif CPU(X86_64)
++ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_RSI]);
++#elif CPU(ARM)
++ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_R1]);
++#elif CPU(ARM64)
++ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_X1]);
++#elif CPU(MIPS)
++ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_A1]);
++#else
++#error Unknown Architecture
++#endif
+
+ #elif OS(FUCHSIA) || OS(LINUX)
+
+@@ -772,6 +836,22 @@ inline void*& llintInstructionPointer(mc
+ #else
+ #error Unknown Architecture
+ #endif
++
++#elif OS(NETBSD)
++
++#if CPU(X86)
++ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_ESI]);
++#elif CPU(X86_64)
++ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_R8]);
++#elif CPU(ARM)
++ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_R8]);
++#elif CPU(ARM64)
++ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_X4]);
++#elif CPU(MIPS)
++ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_T4]);
++#else
++#error Unknown Architecture
++#endif
+
+ #elif OS(FUCHSIA) || OS(LINUX)
+
diff --git a/webkit-gtk/patches/patch-Source_ThirdParty_ANGLE_src_common_third__party_smhasher_src_PMurHash.cpp b/webkit-gtk/patches/patch-Source_ThirdParty_ANGLE_src_common_third__party_smhasher_src_PMurHash.cpp
deleted file mode 100644
index 0fd286a91a..0000000000
--- a/webkit-gtk/patches/patch-Source_ThirdParty_ANGLE_src_common_third__party_smhasher_src_PMurHash.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-Source_ThirdParty_ANGLE_src_common_third__party_smhasher_src_PMurHash.cpp,v 1.1 2021/01/12 15:21:31 jperkin Exp $
-
-Need endian.h on SunOS.
-
---- Source/ThirdParty/ANGLE/src/common/third_party/smhasher/src/PMurHash.cpp.orig 2020-08-12 09:17:53.000000000 +0000
-+++ Source/ThirdParty/ANGLE/src/common/third_party/smhasher/src/PMurHash.cpp
-@@ -48,6 +48,9 @@ on big endian machines, or a byte-by-byt
- -----------------------------------------------------------------------------*/
-
- #include "PMurHash.h"
-+#ifdef __sun
-+#include <endian.h>
-+#endif
- #include <stdint.h>
-
- /* I used ugly type names in the header to avoid potential conflicts with
diff --git a/webkit-gtk/patches/patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h b/webkit-gtk/patches/patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h
deleted file mode 100644
index d6a33d4e5c..0000000000
--- a/webkit-gtk/patches/patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h,v 1.5 2021/09/28 22:11:54 leot Exp $
-
---- Source/ThirdParty/gtest/include/gtest/internal/gtest-port.h.orig 2021-09-01 09:16:47.000000000 +0000
-+++ Source/ThirdParty/gtest/include/gtest/internal/gtest-port.h
-@@ -42,6 +42,7 @@
-
- #ifndef GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_H_
- #define GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_H_
-+#include <ciso646>
-
- // Environment-describing macros
- // -----------------------------
-@@ -261,6 +262,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <unistd.h>
-
- #include <cerrno>
- #include <cstdint>
diff --git a/webkit-gtk/patches/patch-Source_WTF_wtf_PlatformOS.h b/webkit-gtk/patches/patch-Source_WTF_wtf_PlatformOS.h
deleted file mode 100644
index 596754fbb7..0000000000
--- a/webkit-gtk/patches/patch-Source_WTF_wtf_PlatformOS.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-Source_WTF_wtf_PlatformOS.h,v 1.1 2020/03/10 18:14:04 leot Exp $
-
-Add OS(SOLARIS) definition and add them to Unix systems.
-
---- Source/WTF/wtf/PlatformOS.h.orig 2020-02-04 10:24:07.000000000 +0000
-+++ Source/WTF/wtf/PlatformOS.h
-@@ -114,6 +114,11 @@
- #define WTF_OS_OPENBSD 1
- #endif
-
-+/* OS(SOLARIS) - Solaris and derivatives */
-+#ifdef __sun
-+#define WTF_OS_SOLARIS 1
-+#endif
-+
- /* OS(WINDOWS) - Any version of Windows */
- #if defined(WIN32) || defined(_WIN32)
- #define WTF_OS_WINDOWS 1
-@@ -129,6 +134,7 @@
- || OS(LINUX) \
- || OS(NETBSD) \
- || OS(OPENBSD) \
-+ || OS(SOLARIS) \
- || defined(unix) \
- || defined(__unix) \
- || defined(__unix__)
diff --git a/webkit-gtk/patches/patch-Source_WebCore_Scripts_generate-unified-sources.sh b/webkit-gtk/patches/patch-Source_WebCore_Scripts_generate-unified-sources.sh
index 912a6fba7f..a63e79ed3e 100644
--- a/webkit-gtk/patches/patch-Source_WebCore_Scripts_generate-unified-sources.sh
+++ b/webkit-gtk/patches/patch-Source_WebCore_Scripts_generate-unified-sources.sh
@@ -1,9 +1,7 @@
-$NetBSD: patch-Source_WebCore_Scripts_generate-unified-sources.sh,v 1.2 2020/09/11 14:47:35 leot Exp $
+$NetBSD$
-Avoid unportable `==' test(1) operator.
-
---- Source/WebCore/Scripts/generate-unified-sources.sh.orig 2022-08-31 07:59:55.654515700 +0000
-+++ Source/WebCore/Scripts/generate-unified-sources.sh
+--- Source/WebCore/Scripts/generate-unified-sources.sh.orig 2023-09-18 16:56:45.591109000 +0900
++++ Source/WebCore/Scripts/generate-unified-sources.sh 2024-06-22 17:09:39.103668986 +0900
@@ -7,7 +7,7 @@ ARGS=("$@")
cd $SRCROOT
@@ -16,7 +14,7 @@ Avoid unportable `==' test(1) operator.
@@ -23,7 +23,7 @@ if [ $# -eq 0 ]; then
fi
- SOURCES="Sources.txt SourcesCocoa.txt"
+ SOURCES="Sources.txt SourcesCocoa.txt platform/SourcesLibWebRTC.txt"
-if [ "${USE_INTERNAL_SDK}" == "YES" ]; then
+if [ "${USE_INTERNAL_SDK}" = "YES" ]; then
SOURCES="${SOURCES} SourcesCocoaInternalSDK.txt"
diff --git a/webkit-gtk/patches/patch-Source_WebCore_crypto_algorithms_CryptoAlgorithmAES__GCM.cpp b/webkit-gtk/patches/patch-Source_WebCore_crypto_algorithms_CryptoAlgorithmAES__GCM.cpp
deleted file mode 100644
index fc20a3f8c3..0000000000
--- a/webkit-gtk/patches/patch-Source_WebCore_crypto_algorithms_CryptoAlgorithmAES__GCM.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-Source_WebCore_crypto_algorithms_CryptoAlgorithmAES__GCM.cpp,v 1.1 2020/07/28 14:24:03 leot Exp $
-
-Define non-stardard __WORDSIZE.
-
---- Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_GCM.cpp.orig 2020-02-04 10:24:07.000000000 +0000
-+++ Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_GCM.cpp
-@@ -26,6 +26,10 @@
- #include "config.h"
- #include "CryptoAlgorithmAES_GCM.h"
-
-+#ifndef __WORDSIZE
-+#define __WORDSIZE (__SIZEOF_LONG__ * 8)
-+#endif
-+
- #if ENABLE(WEB_CRYPTO)
-
- #include "CryptoAlgorithmAesGcmParams.h"
diff --git a/webkit-gtk/patches/patch-Source_WebCore_css_calc_CSSCalcOperationNode.cpp b/webkit-gtk/patches/patch-Source_WebCore_css_calc_CSSCalcOperationNode.cpp
deleted file mode 100644
index 6225b0918a..0000000000
--- a/webkit-gtk/patches/patch-Source_WebCore_css_calc_CSSCalcOperationNode.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-$NetBSD$
-
-Properly calls std::{isinf,signbits}()
-
---- Source/WebCore/css/calc/CSSCalcOperationNode.cpp.orig 2022-08-31 07:59:55.834516800 +0000
-+++ Source/WebCore/css/calc/CSSCalcOperationNode.cpp
-@@ -1459,10 +1459,10 @@ double CSSCalcOperationNode::evaluateOpe
- case CalcOperator::Up: {
- if (children.size() != 2)
- return std::numeric_limits<double>::quiet_NaN();
-- if (!isinf(children[0]) && std::isinf(children[1])) {
-+ if (!std::isinf(children[0]) && std::isinf(children[1])) {
- if (!children[0])
- return children[0];
-- return signbit(children[0]) ? -0.0 : std::numeric_limits<double>::infinity();
-+ return std::signbit(children[0]) ? -0.0 : std::numeric_limits<double>::infinity();
- }
- auto ret = getNearestMultiples(children[0], children[1]);
- return ret.second;
-@@ -1470,10 +1470,10 @@ double CSSCalcOperationNode::evaluateOpe
- case CalcOperator::Down: {
- if (children.size() != 2)
- return std::numeric_limits<double>::quiet_NaN();
-- if (!isinf(children[0]) && isinf(children[1])) {
-+ if (!std::isinf(children[0]) && std::isinf(children[1])) {
- if (!children[0])
- return children[0];
-- return signbit(children[0]) ? -std::numeric_limits<double>::infinity() : +0.0;
-+ return std::signbit(children[0]) ? -std::numeric_limits<double>::infinity() : +0.0;
- }
- auto ret = getNearestMultiples(children[0], children[1]);
- return ret.first;
-@@ -1481,8 +1481,8 @@ double CSSCalcOperationNode::evaluateOpe
- case CalcOperator::Nearest: {
- if (children.size() != 2)
- return std::numeric_limits<double>::quiet_NaN();
-- if (!isinf(children[0]) && isinf(children[1]))
-- return signbit(children[0]) ? -0.0 : +0.0;
-+ if (!std::isinf(children[0]) && std::isinf(children[1]))
-+ return std::signbit(children[0]) ? -0.0 : +0.0;
- auto ret = getNearestMultiples(children[0], children[1]);
- auto upperB = ret.second;
- auto lowerB = ret.first;
-@@ -1491,8 +1491,8 @@ double CSSCalcOperationNode::evaluateOpe
- case CalcOperator::ToZero: {
- if (children.size() != 2)
- return std::numeric_limits<double>::quiet_NaN();
-- if (!isinf(children[0]) && isinf(children[1]))
-- return signbit(children[0]) ? -0.0 : +0.0;
-+ if (!std::isinf(children[0]) && std::isinf(children[1]))
-+ return std::signbit(children[0]) ? -0.0 : +0.0;
- auto ret = getNearestMultiples(children[0], children[1]);
- auto upperB = ret.second;
- auto lowerB = ret.first;
diff --git a/webkit-gtk/patches/patch-Source_WebCore_css_calc_CSSCalcOperationNode.h b/webkit-gtk/patches/patch-Source_WebCore_css_calc_CSSCalcOperationNode.h
deleted file mode 100644
index 4700ae3ab6..0000000000
--- a/webkit-gtk/patches/patch-Source_WebCore_css_calc_CSSCalcOperationNode.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Properly calls std::isnan()
-
---- Source/WebCore/css/calc/CSSCalcOperationNode.h.orig 2022-08-31 07:59:55.834516800 +0000
-+++ Source/WebCore/css/calc/CSSCalcOperationNode.h
-@@ -132,7 +132,7 @@ private:
-
- static double convertToTopLevelValue(double value)
- {
-- if (isnan(value))
-+ if (std::isnan(value))
- value = std::numeric_limits<double>::infinity();
- return value;
- }
diff --git a/webkit-gtk/patches/patch-Source_WebCore_css_calc_CSSCalcValue.cpp b/webkit-gtk/patches/patch-Source_WebCore_css_calc_CSSCalcValue.cpp
deleted file mode 100644
index 4c0338fa11..0000000000
--- a/webkit-gtk/patches/patch-Source_WebCore_css_calc_CSSCalcValue.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Properly calls std::is{inf,nan}()
-
---- Source/WebCore/css/calc/CSSCalcValue.cpp.orig 2022-08-31 07:59:55.834516800 +0000
-+++ Source/WebCore/css/calc/CSSCalcValue.cpp
-@@ -325,7 +325,7 @@ bool CSSCalcValue::equals(const CSSCalcV
-
- inline double CSSCalcValue::clampToPermittedRange(double value) const
- {
-- if (primitiveType() == CSSUnitType::CSS_DEG && (isnan(value) || isinf(value)))
-+ if (primitiveType() == CSSUnitType::CSS_DEG && (std::isnan(value) || std::isinf(value)))
- return 0;
- return m_shouldClampToNonNegative && value < 0 ? 0 : value;
- }
diff --git a/webkit-gtk/patches/patch-Source_WebCore_platform_graphics_filters_FEMorphology.cpp b/webkit-gtk/patches/patch-Source_WebCore_platform_graphics_filters_FEMorphology.cpp
deleted file mode 100644
index 02d70de406..0000000000
--- a/webkit-gtk/patches/patch-Source_WebCore_platform_graphics_filters_FEMorphology.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-Source_WebCore_platform_graphics_filters_FEMorphology.cpp,v 1.2 2022/05/29 17:47:15 leot Exp $
-
-Avoid ambiguous function call.
-
---- Source/WebCore/platform/graphics/filters/FEMorphology.cpp.orig 2022-02-23 08:59:02.000000000 +0000
-+++ Source/WebCore/platform/graphics/filters/FEMorphology.cpp
-@@ -29,6 +29,8 @@
- #include "FEMorphologySoftwareApplier.h"
- #include <wtf/text/TextStream.h>
-
-+using std::sqrt;
-+
- namespace WebCore {
-
- Ref<FEMorphology> FEMorphology::create(MorphologyOperatorType type, float radiusX, float radiusY)
diff --git a/webkit-gtk/patches/patch-Source_WebCore_rendering_RenderLayerBacking.h b/webkit-gtk/patches/patch-Source_WebCore_rendering_RenderLayerBacking.h
deleted file mode 100644
index a5bc9bd4af..0000000000
--- a/webkit-gtk/patches/patch-Source_WebCore_rendering_RenderLayerBacking.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-Source_WebCore_rendering_RenderLayerBacking.h,v 1.1 2020/07/28 14:24:03 leot Exp $
-
-Define non-stardard __WORDSIZE.
-
---- Source/WebCore/rendering/RenderLayerBacking.h.orig 2020-02-04 10:24:08.000000000 +0000
-+++ Source/WebCore/rendering/RenderLayerBacking.h
-@@ -33,6 +33,10 @@
- #include "RenderLayerCompositor.h"
- #include "ScrollingCoordinator.h"
-
-+#ifndef __WORDSIZE
-+#define __WORDSIZE (__SIZEOF_LONG__ * 8)
-+#endif
-+
- namespace WebCore {
-
- class EventRegionContext;
diff --git a/webkit-gtk/patches/patch-Source_WebCore_rendering_shapes_ShapeOutsideInfo.cpp b/webkit-gtk/patches/patch-Source_WebCore_rendering_shapes_ShapeOutsideInfo.cpp
deleted file mode 100644
index fbe298c119..0000000000
--- a/webkit-gtk/patches/patch-Source_WebCore_rendering_shapes_ShapeOutsideInfo.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-Source_WebCore_rendering_shapes_ShapeOutsideInfo.cpp,v 1.1 2021/03/30 12:47:42 leot Exp $
-
-Properly calls std::isnan()
-
---- Source/WebCore/rendering/shapes/ShapeOutsideInfo.cpp.orig 2021-02-26 09:57:14.000000000 +0000
-+++ Source/WebCore/rendering/shapes/ShapeOutsideInfo.cpp
-@@ -172,7 +172,7 @@ const Shape& ShapeOutsideInfo::computedS
- WritingMode writingMode = containingBlockStyle.writingMode();
- auto margin = [&] {
- auto shapeMargin = floatValueForLength(m_renderer.style().shapeMargin(), m_renderer.containingBlock() ? m_renderer.containingBlock()->contentWidth() : 0_lu);
-- return isnan(shapeMargin) ? 0.0f : shapeMargin;
-+ return std::isnan(shapeMargin) ? 0.0f : shapeMargin;
- }();
- float shapeImageThreshold = style.shapeImageThreshold();
- const ShapeValue& shapeValue = *style.shapeOutside();
diff --git a/webkit-gtk/patches/patch-Source_WebKit_CMakeLists.txt b/webkit-gtk/patches/patch-Source_WebKit_CMakeLists.txt
deleted file mode 100644
index 69b049b631..0000000000
--- a/webkit-gtk/patches/patch-Source_WebKit_CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-Source_WebKit_CMakeLists.txt,v 1.2 2021/04/27 07:57:06 leot Exp $
-
-SunOS requires libsocket.
-
---- Source/WebKit/CMakeLists.txt.orig 2021-03-25 13:27:32.000000000 +0000
-+++ Source/WebKit/CMakeLists.txt
-@@ -362,6 +362,10 @@ if (UNIX)
- endif ()
- endif ()
-
-+if (CMAKE_SYSTEM_NAME MATCHES "SunOS")
-+ list(APPEND WebKit_LIBRARIES socket)
-+endif ()
-+
- macro(ADD_WEBKIT_PREFIX_HEADER _target)
- if (WebKit_USE_PREFIX_HEADER)
- get_target_property(OLD_COMPILE_FLAGS ${_target} COMPILE_FLAGS)
diff --git a/webkit-gtk/patches/patch-Source_WebKit_PlatformGTK.cmake b/webkit-gtk/patches/patch-Source_WebKit_PlatformGTK.cmake
deleted file mode 100644
index 175dc3b51d..0000000000
--- a/webkit-gtk/patches/patch-Source_WebKit_PlatformGTK.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-Source_WebKit_PlatformGTK.cmake,v 1.3 2019/03/13 20:49:41 leot Exp $
-
-SunOS ld does not support --version-script.
-
---- Source/WebKit/PlatformGTK.cmake.orig 2019-02-20 11:21:53.000000000 +0000
-+++ Source/WebKit/PlatformGTK.cmake
-@@ -22,7 +22,7 @@ add_definitions(-DLOCALEDIR="${CMAKE_INS
- add_definitions(-DDATADIR="${CMAKE_INSTALL_FULL_DATADIR}")
- add_definitions(-DLIBDIR="${LIB_INSTALL_DIR}")
-
--if (NOT DEVELOPER_MODE AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
-+if (NOT DEVELOPER_MODE AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin" AND NOT CMAKE_SYSTEM_NAME MATCHES "SunOS")
- WEBKIT_ADD_TARGET_PROPERTIES(WebKit LINK_FLAGS "-Wl,--version-script,${CMAKE_CURRENT_SOURCE_DIR}/webkitglib-symbols.map")
- endif ()
-
diff --git a/webkit-gtk/patches/patch-Source_WebKit_Platform_IPC_unix_ConnectionUnix.cpp b/webkit-gtk/patches/patch-Source_WebKit_Platform_IPC_unix_ConnectionUnix.cpp
deleted file mode 100644
index ba5ed3e896..0000000000
--- a/webkit-gtk/patches/patch-Source_WebKit_Platform_IPC_unix_ConnectionUnix.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-Source_WebKit_Platform_IPC_unix_ConnectionUnix.cpp,v 1.3 2021/01/12 15:21:31 jperkin Exp $
-
-On NetBSD we see "Error sending IPC message: Message too long" due to
-the use of sendmsg with a large message body (EMSGSIZE).
-
-WebKit already uses shared memory to communicate the message body when
-the message is too large, so force it to always use this method to avoid
-encountering EMSGSIZE.
-
---- Source/WebKit/Platform/IPC/unix/ConnectionUnix.cpp.orig 2020-08-12 09:17:56.000000000 +0000
-+++ Source/WebKit/Platform/IPC/unix/ConnectionUnix.cpp
-@@ -56,6 +56,10 @@
- #endif
- #endif // SOCK_SEQPACKET
-
-+#ifndef MSG_NOSIGNAL
-+#define MSG_NOSIGNAL 0
-+#endif
-+
- namespace IPC {
-
- static const size_t messageMaxSize = 4096;
-@@ -417,8 +421,12 @@ bool Connection::sendOutgoingMessage(std
- return false;
- }
-
-+#if 0
- size_t messageSizeWithBodyInline = sizeof(MessageInfo) + (outputMessage.attachments().size() * sizeof(AttachmentInfo)) + outputMessage.bodySize();
- if (messageSizeWithBodyInline > messageMaxSize && outputMessage.bodySize()) {
-+#else
-+ {
-+#endif
- RefPtr<WebKit::SharedMemory> oolMessageBody = WebKit::SharedMemory::allocate(encoder->bufferSize());
- if (!oolMessageBody)
- return false;
diff --git a/webkit-gtk/patches/patch-Source_WebKit_Scripts_generate-unified-sources.sh b/webkit-gtk/patches/patch-Source_WebKit_Scripts_generate-unified-sources.sh
index 53aca6d6d0..fb49dba2e6 100644
--- a/webkit-gtk/patches/patch-Source_WebKit_Scripts_generate-unified-sources.sh
+++ b/webkit-gtk/patches/patch-Source_WebKit_Scripts_generate-unified-sources.sh
@@ -1,9 +1,9 @@
-$NetBSD: patch-Source_WebKit_Scripts_generate-unified-sources.sh,v 1.1 2019/03/13 20:49:41 leot Exp $
+$NetBSD$
-Avoid unportable `==' test(1) operator.
+ERROR: [check-portability.awk]
---- Source/WebKit/Scripts/generate-unified-sources.sh.orig 2022-08-31 07:59:56.790522600 +0000
-+++ Source/WebKit/Scripts/generate-unified-sources.sh
+--- Source/WebKit/Scripts/generate-unified-sources.sh.orig 2023-09-18 16:56:46.395086500 +0900
++++ Source/WebKit/Scripts/generate-unified-sources.sh 2024-06-22 17:00:22.862100529 +0900
@@ -7,7 +7,7 @@ ARGS=("$@")
cd $SRCROOT
diff --git a/webkit-gtk/patches/patch-Source_cmake_OptionsGTK.cmake b/webkit-gtk/patches/patch-Source_cmake_OptionsGTK.cmake
new file mode 100644
index 0000000000..62620db2cf
--- /dev/null
+++ b/webkit-gtk/patches/patch-Source_cmake_OptionsGTK.cmake
@@ -0,0 +1,32 @@
+$NetBSD$
+
+
+--- ./Source/cmake/OptionsGTK.cmake.orig 2024-05-28 19:57:38.761533500 +0900
++++ ./Source/cmake/OptionsGTK.cmake 2024-06-22 17:58:28.687546450 +0900
+@@ -19,7 +19,7 @@ find_package(Libtasn1 REQUIRED)
+ find_package(HarfBuzz 1.4.2 REQUIRED COMPONENTS ICU)
+ find_package(ICU 61.2 REQUIRED COMPONENTS data i18n uc)
+ find_package(JPEG REQUIRED)
+-find_package(Epoxy 1.5.4 REQUIRED)
++#ind_package(Epoxy 1.5.4 REQUIRED)
+ find_package(LibXml2 2.8.0 REQUIRED)
+ find_package(PNG REQUIRED)
+ find_package(SQLite3 REQUIRED)
+@@ -51,7 +51,7 @@ WEBKIT_OPTION_DEFINE(ENABLE_QUARTZ_TARGE
+ WEBKIT_OPTION_DEFINE(ENABLE_WAYLAND_TARGET "Whether to enable support for the Wayland windowing target." PUBLIC ON)
+ WEBKIT_OPTION_DEFINE(ENABLE_X11_TARGET "Whether to enable support for the X11 windowing target." PUBLIC ON)
+ WEBKIT_OPTION_DEFINE(USE_GBM "Whether to enable usage of GBM." PUBLIC ON)
+-WEBKIT_OPTION_DEFINE(USE_GTK4 "Whether to enable usage of GTK4 instead of GTK3." PUBLIC ON)
++#EBKIT_OPTION_DEFINE(USE_GTK4 "Whether to enable usage of GTK4 instead of GTK3." PUBLIC ON)
+ WEBKIT_OPTION_DEFINE(USE_LIBBACKTRACE "Whether to enable usage of libbacktrace." PUBLIC ON)
+ WEBKIT_OPTION_DEFINE(USE_LIBDRM "Whether to enable usage of libdrm." PUBLIC ON)
+ WEBKIT_OPTION_DEFINE(USE_LIBHYPHEN "Whether to enable the default automatic hyphenation implementation." PUBLIC ON)
+@@ -61,7 +61,7 @@ WEBKIT_OPTION_DEFINE(USE_SOUP2 "Whether
+ WEBKIT_OPTION_DEPEND(ENABLE_DOCUMENTATION ENABLE_INTROSPECTION)
+ WEBKIT_OPTION_DEPEND(USE_GBM USE_LIBDRM)
+
+-WEBKIT_OPTION_CONFLICT(USE_GTK4 USE_SOUP2)
++# WEBKIT_OPTION_CONFLICT(USE_GTK4 USE_SOUP2)
+
+ # Private options specific to the GTK port. Changing these options is
+ # completely unsupported. They are intended for use only by WebKit developers.
diff --git a/webkit-gtk/patches/patch-Source_cmake_WebKitCommon.cmake b/webkit-gtk/patches/patch-Source_cmake_WebKitCommon.cmake
deleted file mode 100644
index 543a91fa59..0000000000
--- a/webkit-gtk/patches/patch-Source_cmake_WebKitCommon.cmake
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-Source_cmake_WebKitCommon.cmake,v 1.2 2022/05/29 17:47:15 leot Exp $
-
-- Fix support for arm
-- Fix support for ppc, from FreeBSD.
-
---- Source/cmake/WebKitCommon.cmake.orig 2022-02-23 08:59:06.000000000 +0000
-+++ Source/cmake/WebKitCommon.cmake
-@@ -88,7 +88,7 @@ if (NOT HAS_RUN_WEBKIT_COMMON)
- endif ()
- if (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(^aarch64|^arm64|^cortex-?[am][2-7][2-8])")
- set(WTF_CPU_ARM64 1)
-- elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(^arm|^cortex)")
-+ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(^arm|^cortex|^earm)")
- set(WTF_CPU_ARM 1)
- elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64")
- set(WTF_CPU_MIPS64 1)
-@@ -106,9 +106,9 @@ if (NOT HAS_RUN_WEBKIT_COMMON)
- endif ()
- elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86|x86)")
- set(WTF_CPU_X86 1)
-- elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc")
-+ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(ppc|powerpc)")
- set(WTF_CPU_PPC 1)
-- elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64")
-+ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(ppc64|powerpc64)")
- set(WTF_CPU_PPC64 1)
- elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le")
- set(WTF_CPU_PPC64LE 1)
diff --git a/webkit-gtk/patches/patch-aj b/webkit-gtk/patches/patch-aj
index 127e1897ca..53bb6f1350 100644
--- a/webkit-gtk/patches/patch-aj
+++ b/webkit-gtk/patches/patch-aj
@@ -2,14 +2,15 @@ $NetBSD: patch-aj,v 1.7 2018/10/24 18:31:08 leot Exp $
Add support for NetBSD, OpenBSD and Solaris.
---- Source/WTF/wtf/InlineASM.h.orig 2017-02-20 16:20:15.000000000 +0000
-+++ Source/WTF/wtf/InlineASM.h
-@@ -40,7 +40,7 @@
+--- /tmp/www/webkit-gtk/work/webkitgtk-2.45.3/Source/WTF/wtf/InlineASM.h.orig 2024-05-28 16:43:21.278210900 +0900
++++ Source/WTF/wtf/InlineASM.h 2024-06-22 16:50:35.581212779 +0900
+@@ -43,7 +43,8 @@
#define THUMB_FUNC_PARAM(name)
#endif
--#if (OS(LINUX) || OS(FREEBSD)) && CPU(X86_64)
-+#if ((OS(LINUX) || OS(FREEBSD) || OS(NETBSD) || OS(OPENBSD) || OS(SOLARIS)) && CPU(X86_64)) || (OS(SOLARIS) && CPU(X86))
+-#if (OS(LINUX) || OS(FREEBSD) || OS(QNX)) && CPU(X86_64)
++#if ((OS(LINUX) || OS(FREEBSD) || OS(NETBSD) || OS(OPENBSD) || OS(SOLARIS)) && CPU(X86_64)) || (OS(SOLARIS) && CPU(X86)) || OS(QNX)) && CPU(X86_64
++
#define GLOBAL_REFERENCE(name) #name "@plt"
- #elif CPU(X86) && COMPILER(MINGW)
- #define GLOBAL_REFERENCE(name) "@" #name "@4"
+ #elif OS(LINUX) && CPU(X86) && defined(__PIC__)
+ #define GLOBAL_REFERENCE(name) SYMBOL_STRING(name) "@plt"
Home |
Main Index |
Thread Index |
Old Index