From 47fd7d3d40feb8990a6be4d0bd60be22a43bc1eb Mon Sep 17 00:00:00 2001 From: uint Date: Thu, 18 Dec 2025 20:16:00 +0000 Subject: update patches --- build_patches/CMakeLists.txt.patch | 15 +++++++++ build_patches/Meta_CMake_lagom_options.cmake.patch | 10 ++++++ build_patches/UI_CMakeLists.txt.patch | 13 ++++++++ build_patches/cmake.patch | 15 --------- build_patches/lagom_options.patch | 10 ------ build_patches/ui_cmake.patch | 13 -------- build_patches/vcpkg.json.patch | 37 ++++++++++++++++++++++ build_patches/vcpkg.patch | 28 ---------------- 8 files changed, 75 insertions(+), 66 deletions(-) create mode 100644 build_patches/CMakeLists.txt.patch create mode 100644 build_patches/Meta_CMake_lagom_options.cmake.patch create mode 100644 build_patches/UI_CMakeLists.txt.patch delete mode 100644 build_patches/cmake.patch delete mode 100644 build_patches/lagom_options.patch delete mode 100644 build_patches/ui_cmake.patch create mode 100644 build_patches/vcpkg.json.patch delete mode 100644 build_patches/vcpkg.patch (limited to 'build_patches') diff --git a/build_patches/CMakeLists.txt.patch b/build_patches/CMakeLists.txt.patch new file mode 100644 index 0000000..1da02b6 --- /dev/null +++ b/build_patches/CMakeLists.txt.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index afcc5bf2..e7a12776 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -69,6 +69,10 @@ if (ENABLE_QT AND ENABLE_GUI_TARGETS) + find_package(Qt6 REQUIRED COMPONENTS Core Widgets) + endif() + ++if (ENABLE_QUARTZ AND ENABLE_GUI_TARGETS) ++ include(Meta/CMake/SDL3.cmake) ++endif() ++ + # We need to find OpenSSL in order to link it explicitly with all targets. + find_package(OpenSSL REQUIRED) + diff --git a/build_patches/Meta_CMake_lagom_options.cmake.patch b/build_patches/Meta_CMake_lagom_options.cmake.patch new file mode 100644 index 0000000..da4f590 --- /dev/null +++ b/build_patches/Meta_CMake_lagom_options.cmake.patch @@ -0,0 +1,10 @@ +diff --git a/Meta/CMake/lagom_options.cmake b/Meta/CMake/lagom_options.cmake +index cd4a0e15..fe886cd4 100644 +--- a/Meta/CMake/lagom_options.cmake ++++ b/Meta/CMake/lagom_options.cmake +@@ -30,3 +30,5 @@ if (ANDROID OR APPLE) + else() + ladybird_option(ENABLE_QT ON CACHE BOOL "Build ladybird application using Qt GUI") + endif() ++ ++ladybird_option(ENABLE_QUARTZ OFF CACHE BOOL "Build ladybird application using Quartz GUI") diff --git a/build_patches/UI_CMakeLists.txt.patch b/build_patches/UI_CMakeLists.txt.patch new file mode 100644 index 0000000..6413a2f --- /dev/null +++ b/build_patches/UI_CMakeLists.txt.patch @@ -0,0 +1,13 @@ +diff --git a/UI/CMakeLists.txt b/UI/CMakeLists.txt +index ad7a0b3a..6e58b166 100644 +--- a/UI/CMakeLists.txt ++++ b/UI/CMakeLists.txt +@@ -49,6 +49,8 @@ endfunction() + # Select UI Framework + if (ENABLE_QT) + add_subdirectory(Qt) ++elseif (ENABLE_QUARTZ) ++ add_subdirectory(quartz) + elseif (APPLE) + add_subdirectory(AppKit) + elseif(ANDROID) diff --git a/build_patches/cmake.patch b/build_patches/cmake.patch deleted file mode 100644 index 1da02b6..0000000 --- a/build_patches/cmake.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index afcc5bf2..e7a12776 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -69,6 +69,10 @@ if (ENABLE_QT AND ENABLE_GUI_TARGETS) - find_package(Qt6 REQUIRED COMPONENTS Core Widgets) - endif() - -+if (ENABLE_QUARTZ AND ENABLE_GUI_TARGETS) -+ include(Meta/CMake/SDL3.cmake) -+endif() -+ - # We need to find OpenSSL in order to link it explicitly with all targets. - find_package(OpenSSL REQUIRED) - diff --git a/build_patches/lagom_options.patch b/build_patches/lagom_options.patch deleted file mode 100644 index da4f590..0000000 --- a/build_patches/lagom_options.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/Meta/CMake/lagom_options.cmake b/Meta/CMake/lagom_options.cmake -index cd4a0e15..fe886cd4 100644 ---- a/Meta/CMake/lagom_options.cmake -+++ b/Meta/CMake/lagom_options.cmake -@@ -30,3 +30,5 @@ if (ANDROID OR APPLE) - else() - ladybird_option(ENABLE_QT ON CACHE BOOL "Build ladybird application using Qt GUI") - endif() -+ -+ladybird_option(ENABLE_QUARTZ OFF CACHE BOOL "Build ladybird application using Quartz GUI") diff --git a/build_patches/ui_cmake.patch b/build_patches/ui_cmake.patch deleted file mode 100644 index 12a318f..0000000 --- a/build_patches/ui_cmake.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/UI/CMakeLists.txt b/UI/CMakeLists.txt -index d02cec2d..ce8a1943 100644 ---- a/UI/CMakeLists.txt -+++ b/UI/CMakeLists.txt -@@ -49,6 +49,8 @@ endfunction() - # Select UI Framework - if (ENABLE_QT) - add_subdirectory(Qt) -+elseif (ENABLE_QUARTZ) -+ add_subdirectory(quartz) - elseif (APPLE) - add_subdirectory(AppKit) - elseif(ANDROID) diff --git a/build_patches/vcpkg.json.patch b/build_patches/vcpkg.json.patch new file mode 100644 index 0000000..6ca3561 --- /dev/null +++ b/build_patches/vcpkg.json.patch @@ -0,0 +1,37 @@ +diff --git a/vcpkg.json b/vcpkg.json +index d32fb707..ea114950 100644 +--- a/vcpkg.json ++++ b/vcpkg.json +@@ -161,6 +161,32 @@ + }, + { + "name": "sdl3", ++ "platform": "linux", ++ "default-features": false, ++ "features": [ ++ "x11", ++ "wayland" ++ ] ++ }, ++ { ++ "name": "sdl3", ++ "platform": "freebsd | openbsd | netbsd | illumos", ++ "default-features": false, ++ "features": [ ++ "x11" ++ ] ++ }, ++ { ++ "name": "sdl3", ++ "platform": "darwin", ++ "default-features": false, ++ "features": [ ++ "cocoa" ++ ] ++ }, ++ { ++ "name": "sdl3", ++ "platform": "!(linux | freebsd | openbsd | netbsd | illumos | darwin)", + "default-features": false + }, + "simdutf", diff --git a/build_patches/vcpkg.patch b/build_patches/vcpkg.patch deleted file mode 100644 index 5902701..0000000 --- a/build_patches/vcpkg.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/vcpkg.json b/vcpkg.json -index 6317530e..ea6ff163 100644 ---- a/vcpkg.json -+++ b/vcpkg.json -@@ -160,10 +160,20 @@ - }, - { - "name": "sdl3", -+ "platform": "linux | freebsd", -+ "default-features": false, -+ "features": [ -+ "x11", -+ "wayland" -+ ] -+ }, -+ { -+ "name": "sdl3", -+ "platform": "!(linux | freebsd)", - "default-features": false -- }, -- "simdutf", -- { -+ }, -+ "simdutf", -+ { - "name": "skia", - "platform": "osx", - "features": [ -- cgit v1.2.3