pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

webkit-gtk60: enable DEVELOPER_MODE by default



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Mon May 11 21:56:15 2026 +0200
Changeset:	1dc86b2a762e24665ddb4b6b2aebe963cc9ffffa

Modified Files:
	webkit-gtk60/Makefile
	webkit-gtk60/distinfo
Added Files:
	webkit-gtk60/patches/patch-CMakeLists.txt
	webkit-gtk60/patches/patch-Tools_PlatformGTK.cmake

Log Message:
webkit-gtk60: enable DEVELOPER_MODE by default

for easier testing

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1dc86b2a762e24665ddb4b6b2aebe963cc9ffffa

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 webkit-gtk60/Makefile                              | 14 +++++++++++++-
 webkit-gtk60/distinfo                              |  4 +++-
 webkit-gtk60/patches/patch-CMakeLists.txt          | 19 +++++++++++++++++++
 webkit-gtk60/patches/patch-Tools_PlatformGTK.cmake | 17 +++++++++++++++++
 4 files changed, 52 insertions(+), 2 deletions(-)

diffs:
diff --git a/webkit-gtk60/Makefile b/webkit-gtk60/Makefile
index 94da3e308b..b2ad8d8af0 100644
--- a/webkit-gtk60/Makefile
+++ b/webkit-gtk60/Makefile
@@ -28,7 +28,7 @@ CXXFLAGS+=	-I${PREFIX}/include/gstreamer-1.0
 
 # Avoid million warnings
 CFLAGS+=		-Wno-unused-parameter -Wno-undef
-CXXFLAGS+=		-Wno-unused-parameter -Wno-undef
+CXXFLAGS+=		-Wno-unused-parameter -Wno-undef -Wno-narrowing
 
 # g-ir-scanner dumps core with full RELRO
 RELRO_SUPPORTED=	partial
@@ -68,6 +68,18 @@ CMAKE_CONFIGURE_ARGS+=		-DUSE_LIBDRM=OFF
 # otherwise, libsqlite3.so from ${BUILDLINK_DIR} is hardcoded into some binaries
 CMAKE_CONFIGURE_ARGS+=		-DSQLite3_LIBRARY=${BUILDLINK_PREFIX.sqlite3}/lib/libsqlite3.so
 
+# DEVELOPER_MODE enables WEBKIT_EXEC_PATH env var so MiniBrowser can be run
+# from the build tree without installing; also auto-discovers helpers next to
+# the MiniBrowser binary itself.
+CMAKE_CONFIGURE_ARGS+=		-DDEVELOPER_MODE=ON
+# DEVELOPER_MODE defaults ENABLE_API_TESTS and ENABLE_LAYOUT_TESTS to ON, but
+# the release tarball does not ship those test sources; disable them explicitly.
+# CLANGD_AUTO_SETUP is also enabled by DEVELOPER_MODE but requires Tools/clangd/
+# scripts not present in the tarball.
+CMAKE_CONFIGURE_ARGS+=		-DENABLE_API_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+=		-DENABLE_LAYOUT_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+=		-DCLANGD_AUTO_SETUP=OFF
+
 # required for faking a better user-agent
 CMAKE_CONFIGURE_ARGS+=		-DUSER_AGENT_BRANDING="Linux ${MACHINE_ARCH}"
 
diff --git a/webkit-gtk60/distinfo b/webkit-gtk60/distinfo
index 85773bb1fd..92485a6ca0 100644
--- a/webkit-gtk60/distinfo
+++ b/webkit-gtk60/distinfo
@@ -3,6 +3,7 @@ $NetBSD$
 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-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
@@ -16,7 +17,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) = 83b11a9b4187da9a1a857827f3700601a067935e
+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
@@ -46,3 +47,4 @@ SHA1 (patch-Source_bmalloc_libpas_src_libpas_pas__platform.h) = d832e7a7a1bbf8e8
 SHA1 (patch-Source_bmalloc_libpas_src_libpas_pas__random.h) = 161cec597118672f8a7cc4575ff2318284ce13e7
 SHA1 (patch-Source_cmake_FindFlite.cmake) = 83925123ffbac5620865df0fcf2f8e8dfbd3aa57
 SHA1 (patch-Source_cmake_WebKitFeatures.cmake) = 6811f5c3f000900c0404be59a149657fa6b6443b
+SHA1 (patch-Tools_PlatformGTK.cmake) = 043870090fa5a4c7a9c6094323fb8a397600564b
diff --git a/webkit-gtk60/patches/patch-CMakeLists.txt b/webkit-gtk60/patches/patch-CMakeLists.txt
new file mode 100644
index 0000000000..3389ab7fa7
--- /dev/null
+++ b/webkit-gtk60/patches/patch-CMakeLists.txt
@@ -0,0 +1,19 @@
+$NetBSD$
+
+The release tarball does not ship the PerformanceTests directory, so guard
+the add_subdirectory() call against its absence.
+https://github.com/WebKit/WebKit/pull/64697
+
+--- CMakeLists.txt.orig	2025-03-05 09:38:04.000000000 +0000
++++ CMakeLists.txt
+@@ -50,7 +50,9 @@ if (ENABLE_TOOLS)
+ endif ()
+ 
+ if (DEVELOPER_MODE)
+-    add_subdirectory(PerformanceTests)
++    if (EXISTS "${CMAKE_SOURCE_DIR}/PerformanceTests")
++        add_subdirectory(PerformanceTests)
++    endif ()
+ endif ()
+ 
+ # -----------------------------------------------------------------------------
diff --git a/webkit-gtk60/patches/patch-Tools_PlatformGTK.cmake b/webkit-gtk60/patches/patch-Tools_PlatformGTK.cmake
new file mode 100644
index 0000000000..60cda00f5d
--- /dev/null
+++ b/webkit-gtk60/patches/patch-Tools_PlatformGTK.cmake
@@ -0,0 +1,17 @@
+$NetBSD$
+
+The release tarball does not ship the flatpak integration directory used
+for developer builds.  Guard the add_subdirectory() against its absence.
+https://github.com/WebKit/WebKit/pull/64697
+
+--- Tools/PlatformGTK.cmake.orig	2026-05-11 18:25:01.546362945 +0000
++++ Tools/PlatformGTK.cmake
+@@ -1,5 +1,7 @@ if (DEVELOPER_MODE)
+ if (DEVELOPER_MODE)
+-    add_subdirectory(flatpak)
++    if (EXISTS "${CMAKE_SOURCE_DIR}/flatpak")
++        add_subdirectory(flatpak)
++    endif ()
+ endif ()
+ 
+ if (ENABLE_API_TESTS)


Home | Main Index | Thread Index | Old Index