update patches

7 files changed, 49 insertions, 37 deletions

diff --git a/Makefile b/Makefile
index 443c894..e6e47be 100644
--- a/Makefile
+++ b/Makefile
@@ -4,14 +4,17 @@ CXXFLAGS = -std=c++23 -Os -Wall -Wextra
 PKG_CONFIG = pkg-config
 
 # CHANGE THIS: ladybird source tree
-LADYBIRD = $(HOME)/clones/ladybird-test
-#          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LADYBIRD = $(HOME)/clones/ladybird
+#          ^^^^^^^^^^^^^^^^^^^^^^^
 BUILD = $(LADYBIRD)/Build/release
 INCS = -I$(LADYBIRD) -I$(LADYBIRD)/Services -I$(LADYBIRD)/Libraries \
        -I$(BUILD)/Lagom -I$(BUILD)/Lagom/Services -I$(BUILD)/Lagom/Libraries \
        -I$(BUILD)/vcpkg_installed/x64-linux-dynamic/include \
        $$($(PKG_CONFIG) --cflags sdl3 2>/dev/null)
 
+# for patch
+ROOT = $(PWD)
+
 # ladybird libs
 LAGOM_LIBS = -L$(BUILD)/lib \
 			 -llagom-webview \
@@ -80,12 +83,12 @@ run: install
 
 patch:
 	cd $(LADYBIRD) && \
-	git apply $$PWD/build_patches/cmake.patch && \
-	git apply $$PWD/build_patches/lagom_options.patch && \
-	git apply $$PWD/build_patches/vcpkg.patch && \
-	git apply $$PWD/build_patches/ui_cmake.patch && \
+	git apply $(ROOT)/build_patches/CMakeLists.txt.patch && \
+	git apply $(ROOT)/build_patches/Meta_CMake_lagom_options.cmake.patch && \
+	git apply $(ROOT)/build_patches/vcpkg.json.patch && \
+	git apply $(ROOT)/build_patches/UI_CMakeLists.txt.patch && \
 	rm -f $(LADYBIRD)/UI/quartz && \
-	ln -sf $$PWD/quartz $(LADYBIRD)/UI/quartz
+	ln -sf $(ROOT)/quartz $(LADYBIRD)/UI/quartz
 
 ladybird:
 	cd $(LADYBIRD) && \
diff --git a/README.md b/README.md
index 155a45d..1866fe7 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # quartz browser
+**patches tested for commit `12ff11d9ea74325324692f8c867666078fc017da`**
 
 ## prerequisites
-
 - ladybird source tree (https://github.com/LadybirdBrowser/ladybird)
 - sdl3, sdl3_ttf
 - c++23 compiler
diff --git a/build_patches/cmake.patch b/build_patches/CMakeLists.txt.patch
index 1da02b6..1da02b6 100644
--- a/build_patches/cmake.patch
+++ b/build_patches/CMakeLists.txt.patch
diff --git a/build_patches/lagom_options.patch b/build_patches/Meta_CMake_lagom_options.cmake.patch
index da4f590..da4f590 100644
--- a/build_patches/lagom_options.patch
+++ b/build_patches/Meta_CMake_lagom_options.cmake.patch
diff --git a/build_patches/ui_cmake.patch b/build_patches/UI_CMakeLists.txt.patch
index 12a318f..6413a2f 100644
--- a/build_patches/ui_cmake.patch
+++ b/build_patches/UI_CMakeLists.txt.patch
@@ -1,5 +1,5 @@
 diff --git a/UI/CMakeLists.txt b/UI/CMakeLists.txt
-index d02cec2d..ce8a1943 100644
+index ad7a0b3a..6e58b166 100644
 --- a/UI/CMakeLists.txt
 +++ b/UI/CMakeLists.txt
 @@ -49,6 +49,8 @@ endfunction()
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": [