MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-11-04 19:56:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'webkit-flags' into 'master'

Browse Source 
Reduce webkit flags

See merge request redox-os/redox!2291
This commit is contained in:
Jeremy Soller 2026-09-12 07:02:15 -06:00
commit ebb762fc15
6 changed files with 92 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
recipes/wip/libs/media/libjxl/recipe.toml
View File

@ -8,6 +8,11 @@ shallow_clone = true
template = "cmake"
cmakeflags = [
"-DBUILD_TESTING=OFF",
"-DJPEGXL_ENABLE_EXAMPLES=OFF",
"-DJPEGXL_ENABLE_FUZZERS=OFF",
"-DJPEGXL_BUNDLE_LIBPNG=OFF",
"-DJPEGXL_FORCE_SYSTEM_BROTLI=ON",
"-DJPEGXL_ENABLE_BENCHMARK=OFF",
"-DJPEGXL_ENABLE_DOXYGEN=OFF",
"-DJPEGXL_ENABLE_MANPAGES=OFF",
]
@ -16,6 +21,5 @@ dependencies = [
"libjpeg",
"libgif",
"libpng",
"libwebp",
"openexr",
]

3
recipes/wip/libs/other/libimath/recipe.toml
View File

@ -4,3 +4,6 @@
tar = "https://github.com/AcademySoftwareFoundation/Imath/releases/download/v3.2.2/Imath-3.2.2.tar.gz"
[build]
template = "cmake"
dev-dependencies = [
"libstdcxx"
]

11
recipes/wip/libs/other/libwoff2/recipe.toml Normal file
View File

@ -0,0 +1,11 @@
#TODO not compiled or tested
[source]
tar = "https://github.com/google/woff2/archive/refs/tags/v1.0.2.tar.gz"
[build]
template = "cmake"
dependencies = [
"libbrotli",
]
dev-dependencies = [
"libstdcxx"
]

6
recipes/wip/libs/other/openexr/recipe.toml
View File

@ -8,3 +8,9 @@ dependencies = [
"libdeflate",
"libimath"
]
cmakeflags = [
"-DBUILD_TESTING=OFF"
]
dev-dependencies = [
"libstdcxx"
]

56
recipes/wip/web/webkitgtk3/recipe.toml
View File

@ -1,4 +1,4 @@
#TODO runtime hangs
#TODO need testing
[source]
tar = "https://webkitgtk.org/releases/webkitgtk-2.49.1.tar.xz"
blake3 = "7f04acb2f909ad334fc623afb297ebca1d5a5005bda1682946fb37e044e45ecb"
@ -7,12 +7,18 @@ patches = ["redox.patch"]
[build]
template = "custom"
dependencies = [
"gstreamer",
"gtk3",
"libatomic",
"libavif",
"libgcrypt",
"libhyphen",
"libsoup",
"libtasn1",
"libwebp",
"libwoff2",
"libxslt",
"libjxl",
"sqlite3",
]
dev-dependencies = [
@ -23,45 +29,31 @@ script = """
DYNAMIC_INIT
export WEBKIT_USE_SCCACHE=1
export PYTHONDONTWRITEBYTECODE=1
#TODO: enable more features
COOKBOOK_CMAKE_FLAGS+=(
-DENABLE_ASSERTS=ON
-DENABLE_GAMEPAD=OFF
-DENABLE_INTROSPECTION=OFF
-DENABLE_MEDIA_STREAM=OFF
-DENABLE_JOURNALD_LOG=OFF
-DENABLE_RELEASE_LOG=ON
-DENABLE_SPEECH_SYNTHESIS=OFF
-DENABLE_SPELLCHECK=OFF
-DENABLE_WEB_AUDIO=OFF
-DENABLE_WEB_CODECS=OFF
-DENABLE_VIDEO=OFF
# common flags
-DPORT=GTK
-DUNIX=1
-DUSE_AVIF=OFF
-DUSE_GSTREAMER_GL=OFF
-DUSE_GTK4=OFF
-DUSE_JPEGXL=OFF
-DUSE_LCMS=OFF
-DUSE_LIBBACKTRACE=OFF
-DUSE_LIBDRM=OFF
-DUSE_LIBHYPHEN=OFF
-DUSE_LIBSECRET=OFF
-DUSE_SKIA=OFF
-DUSE_SYSPROF_CAPTURE=OFF
-DUSE_SYSTEM_MALLOC=ON
-DUSE_SYSTEM_SYSPROF_CAPTURE=OFF
-DUSE_WOFF2=OFF
#TODO: remove these when runtime hangs solved
# due to lack of dbus
-DENABLE_NOTIFICATIONS=OFF
-DENABLE_GAMEPAD=OFF
-DENABLE_MEDIA_STREAM=OFF
-DENABLE_BUBBLEWRAP_SANDBOX=OFF
-DENABLE_INTROSPECTION=OFF
-DENABLE_JOURNALD_LOG=OFF
# jit issues
-DENABLE_JIT=OFF
-DENABLE_DFG_JIT=OFF
-DENABLE_FTL_JIT=OFF
-DENABLE_OPENGL=OFF
-DENABLE_WEBGL=OFF
-DENABLE_XSLT=OFF
# hardware/library issues
-DENABLE_SPEECH_SYNTHESIS=OFF
-DENABLE_SPELLCHECK=OFF # libenchant
-DUSE_LIBBACKTRACE=OFF
-DUSE_LIBDRM=OFF
-DUSE_LIBSECRET=OFF
-DUSE_SYSPROF_CAPTURE=OFF
-DUSE_SYSTEM_SYSPROF_CAPTURE=OFF
-DENABLE_GEOLOCATION=OFF
-DENABLE_WEBDRIVER=OFF
-DENABLE_BUBBLEWRAP_SANDBOX=OFF
-DUSE_LCMS=OFF
)

63
recipes/wip/web/webkitgtk3/redox.patch
View File

@ -43,6 +43,17 @@ diff -ruwN source/Source/bmalloc/libpas/src/libpas/pas_committed_pages_vector.h
#else
return vector->raw_data[page_index] & (MINCORE_REFERENCED |
MINCORE_REFERENCED_OTHER |
diff -ruwN source/Source/bmalloc/libpas/src/libpas/pas_min_heap.h source-new/Source/bmalloc/libpas/src/libpas/pas_min_heap.h
--- source/Source/bmalloc/libpas/src/libpas/pas_min_heap.h 2023-09-18 09:56:46.743076800 +0200
+++ source-new/Source/bmalloc/libpas/src/libpas/pas_min_heap.h 2026-08-05 17:04:15.526097594 +0200
@@ -28,6 +28,7 @@
#include "pas_allocation_config.h"
#include "pas_utils.h"
+#include <strings.h>
#include <stdio.h>
PAS_BEGIN_EXTERN_C;
diff -ruwN source/Source/bmalloc/libpas/src/libpas/pas_monotonic_time.c source-new/Source/bmalloc/libpas/src/libpas/pas_monotonic_time.c
--- source/Source/bmalloc/libpas/src/libpas/pas_monotonic_time.c 2023-09-18 14:56:46.743076800 +0700
+++ source-new/Source/bmalloc/libpas/src/libpas/pas_monotonic_time.c 2025-10-07 22:23:50.202403881 +0700
@ -423,6 +434,31 @@ diff -ruwN source/Source/ThirdParty/skia/src/gpu/ganesh/GrAutoLocaleSetter.h sou
#define HAVE_LOCALE_T 0
#else
#define HAVE_LOCALE_T 1
diff -ruwN source/Source/ThirdParty/skia/src/ports/SkFontConfigInterface_direct.cpp source-new/Source/ThirdParty/skia/src/ports/SkFontConfigInterface_direct.cpp
--- source/Source/ThirdParty/skia/src/ports/SkFontConfigInterface_direct.cpp 2024-05-30 13:59:23.961655400 +0200
+++ source-new/Source/ThirdParty/skia/src/ports/SkFontConfigInterface_direct.cpp 2026-08-05 16:53:21.573813814 +0200
@@ -21,6 +21,7 @@
#include "src/ports/SkFontConfigInterface_direct.h"
#include <fontconfig/fontconfig.h>
+#include <strings.h>
#include <unistd.h>
namespace {
diff -ruwN source/Source/ThirdParty/skia/src/ports/SkFontMgr_fontconfig.cpp source-new/Source/ThirdParty/skia/src/ports/SkFontMgr_fontconfig.cpp
--- source/Source/ThirdParty/skia/src/ports/SkFontMgr_fontconfig.cpp 2025-03-24 10:55:01.410501000 +0100
+++ source-new/Source/ThirdParty/skia/src/ports/SkFontMgr_fontconfig.cpp 2026-08-05 16:53:15.563471644 +0200
@@ -97,8 +97,8 @@
}
public:
- FCLocker() { lock(); }
- ~FCLocker() { unlock(); }
+ FCLocker() { }
+ ~FCLocker() { }
static void AssertHeld() { SkDEBUGCODE(
if (FcGetVersion() < FontConfigThreadSafeVersion) {
diff -ruwN source/Source/ThirdParty/skia/src/ports/SkMemory_malloc.cpp source-new/Source/ThirdParty/skia/src/ports/SkMemory_malloc.cpp
--- source/Source/ThirdParty/skia/src/ports/SkMemory_malloc.cpp 2024-05-30 18:59:23.965655000 +0700
+++ source-new/Source/ThirdParty/skia/src/ports/SkMemory_malloc.cpp 2025-09-09 09:08:03.579987255 +0700
@ -462,9 +498,9 @@ diff -ruwN source/Source/WebCore/page/Page.cpp source-new/Source/WebCore/page/Pa
#if ENABLE(MEDIA_STREAM)
diff -ruwN source/Source/WebCore/PlatformGTK.cmake source-new/Source/WebCore/PlatformGTK.cmake
--- source/Source/WebCore/PlatformGTK.cmake 2024-12-16 16:07:48.162613200 +0700
+++ source-new/Source/WebCore/PlatformGTK.cmake 2025-09-09 09:08:03.580987266 +0700
@@ -75,21 +75,18 @@
--- source/Source/WebCore/PlatformGTK.cmake 2024-12-16 10:07:48.162613200 +0100
+++ source-new/Source/WebCore/PlatformGTK.cmake 2026-08-05 17:07:39.393738852 +0200
@@ -75,7 +75,6 @@
)
list(APPEND WebCore_LIBRARIES
@ -472,13 +508,7 @@ diff -ruwN source/Source/WebCore/PlatformGTK.cmake source-new/Source/WebCore/Pla
${GLIB_GIO_LIBRARIES}
${GLIB_GMODULE_LIBRARIES}
${GLIB_GOBJECT_LIBRARIES}
${GLIB_LIBRARIES}
${LIBSECRET_LIBRARIES}
${LIBTASN1_LIBRARIES}
- ${HYPHEN_LIBRARIES}
${UPOWERGLIB_LIBRARIES}
${X11_X11_LIB}
GTK::GTK
@@ -89,7 +88,6 @@
)
list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
@ -487,16 +517,9 @@ diff -ruwN source/Source/WebCore/PlatformGTK.cmake source-new/Source/WebCore/Pla
${GLIB_INCLUDE_DIRS}
${LIBSECRET_INCLUDE_DIRS}
diff -ruwN source/Source/WebKit/Platform/IPC/unix/ConnectionUnix.cpp source-new/Source/WebKit/Platform/IPC/unix/ConnectionUnix.cpp
--- source/Source/WebKit/Platform/IPC/unix/ConnectionUnix.cpp 2025-03-31 16:35:43.461813700 +0700
+++ source-new/Source/WebKit/Platform/IPC/unix/ConnectionUnix.cpp 2025-09-09 09:08:03.591987383 +0700
@@ -48,13 +48,13 @@
#include <wtf/glib/GUniquePtr.h>
#endif
-#if OS(DARWIN)
+#if OS(DARWIN) || defined(__redox__)
#define MSG_NOSIGNAL 0
#endif
--- source/Source/WebKit/Platform/IPC/unix/ConnectionUnix.cpp 2025-03-31 11:35:43.461813700 +0200
+++ source-new/Source/WebKit/Platform/IPC/unix/ConnectionUnix.cpp 2026-08-05 16:52:28.679802544 +0200
@@ -54,7 +54,7 @@
// Although it's available on Darwin, SOCK_SEQPACKET seems to work differently
// than in traditional Unix so fallback to STREAM on that platform.