From 11930b4e1eea595b9ff130cb573816e8c6399a5b Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Thu, 5 Jun 2025 13:48:07 +0200
Subject: [PATCH] ladybird: 0-unstable-2025-05-24 -> 0-unstable-2025-06-03

---
 .../la/ladybird/001-revert-fake-skia-update.patch | 13 -------------
 pkgs/by-name/la/ladybird/package.nix              | 15 ++++-----------
 2 files changed, 4 insertions(+), 24 deletions(-)
 delete mode 100644 pkgs/by-name/la/ladybird/001-revert-fake-skia-update.patch

diff --git a/pkgs/by-name/la/ladybird/001-revert-fake-skia-update.patch b/pkgs/by-name/la/ladybird/001-revert-fake-skia-update.patch
deleted file mode 100644
index 257fa212fc55..000000000000
--- a/pkgs/by-name/la/ladybird/001-revert-fake-skia-update.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/vcpkg.json b/vcpkg.json
-index 5a824884b2..e4193aa45f 100644
---- a/vcpkg.json
-+++ b/vcpkg.json
-@@ -199,7 +199,7 @@
-     },
-     {
-       "name": "skia",
--      "version": "134#2"
-+      "version": "129#0"
-     },
-     {
-       "name": "sqlite3",
diff --git a/pkgs/by-name/la/ladybird/package.nix b/pkgs/by-name/la/ladybird/package.nix
index 45cc7bd1b20d..7c054e74e004 100644
--- a/pkgs/by-name/la/ladybird/package.nix
+++ b/pkgs/by-name/la/ladybird/package.nix
@@ -38,22 +38,15 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "ladybird";
-  version = "0-unstable-2025-05-24";
+  version = "0-unstable-2025-06-03";
 
   src = fetchFromGitHub {
     owner = "LadybirdWebBrowser";
     repo = "ladybird";
-    rev = "fbd1f771613fc6f13fcc20dcad04c7065633a2c2";
-    hash = "sha256-Gtfnq46JrzfpcapMr6Ez+5BNQ59H/Djsgp7n6QvMSUM=";
+    rev = "4c54a28c45be4e8185158d40a37e083e038a6465";
+    hash = "sha256-YHWkG2RJk6NaouRvis2L+njtYWKB7T569y1Tq+mYdz0=";
   };
 
-  patches = [
-    # Revert https://github.com/LadybirdBrowser/ladybird/commit/51d189198d3fc61141fc367dc315c7f50492a57e
-    # This commit doesn't update the skia used by ladybird vcpkg, but it does update the skia that
-    # that cmake wants.
-    ./001-revert-fake-skia-update.patch
-  ];
-
   postPatch = ''
     sed -i '/iconutil/d' UI/CMakeLists.txt
 
@@ -146,7 +139,7 @@ stdenv.mkDerivation (finalAttrs: {
   # ld: [...]/OESVertexArrayObject.cpp.o: undefined reference to symbol 'glIsVertexArrayOES'
   # ld: [...]/libGL.so.1: error adding symbols: DSO missing from command line
   # https://github.com/LadybirdBrowser/ladybird/issues/371#issuecomment-2616415434
-  env.NIX_LDFLAGS = "-lGL";
+  env.NIX_LDFLAGS = "-lGL -lfontconfig";
 
   postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
     mkdir -p $out/Applications $out/bin