From 2b13079b351c3ee5debc6f34451b25d803e627d5 Mon Sep 17 00:00:00 2001
From: Andrew Kaster <andrew@ladybird.org>
Date: Thu, 26 Sep 2024 13:09:58 -0600
Subject: [PATCH] Meta: Update Ladybird and services to build again with gn

---
 Meta/gn/secondary/Ladybird/BUILD.gn             | 17 ++++++++++++++---
 .../secondary/Ladybird/RequestServer/BUILD.gn   | 12 +++---------
 Meta/gn/secondary/Ladybird/WebContent/BUILD.gn  |  2 ++
 Meta/gn/secondary/Ladybird/WebWorker/BUILD.gn   |  2 ++
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/Meta/gn/secondary/Ladybird/BUILD.gn b/Meta/gn/secondary/Ladybird/BUILD.gn
index 4390cfe91fe..15032afaf7f 100644
--- a/Meta/gn/secondary/Ladybird/BUILD.gn
+++ b/Meta/gn/secondary/Ladybird/BUILD.gn
@@ -114,7 +114,6 @@ executable("ladybird_executable") {
   } else if (enable_appkit) {
     sources += [
       "AppKit/Application/Application.mm",
-      "AppKit/Application/ApplicationBridge.cpp",
       "AppKit/Application/ApplicationDelegate.mm",
       "AppKit/Application/EventLoopImplementation.mm",
       "AppKit/UI/Event.mm",
@@ -158,8 +157,10 @@ executable("ladybird_executable") {
       ":ladybird_copy_cacert",
       ":ladybird_copy_config_resources",
       ":ladybird_copy_fonts",
+      ":ladybird_copy_icons_128x128",
       ":ladybird_copy_icons_16x16",
       ":ladybird_copy_icons_32x32",
+      ":ladybird_copy_icons_48x48",
       ":ladybird_copy_icons_browser",
       ":ladybird_copy_themes",
       ":ladybird_copy_web_resources",
@@ -397,7 +398,6 @@ if (current_os != "mac") {
       "//Userland/Libraries/LibTextCodec",
       "//Userland/Libraries/LibThreading",
       "//Userland/Libraries/LibURL",
-      "//Userland/Libraries/LibVideo",
       "//Userland/Libraries/LibWasm",
       "//Userland/Libraries/LibWeb",
       "//Userland/Libraries/LibWebSocket",
@@ -452,6 +452,16 @@ if (current_os != "mac") {
     outputs = [ "{{bundle_resources_dir}}/icons/32x32/{{source_file_part}}" ]
   }
 
+  bundle_data("ladybird_icons_48x48") {
+    sources = icons_48x48
+    outputs = [ "{{bundle_resources_dir}}/icons/48x48/{{source_file_part}}" ]
+  }
+
+  bundle_data("ladybird_icons_128x128") {
+    sources = icons_128x128
+    outputs = [ "{{bundle_resources_dir}}/icons/128x128/{{source_file_part}}" ]
+  }
+
   bundle_data("ladybird_icons_browser") {
     sources = icons_browser
     outputs = [ "{{bundle_resources_dir}}/icons/browser/{{source_file_part}}" ]
@@ -532,11 +542,12 @@ if (current_os != "mac") {
       ":ladybird_bundle_libs",
       ":ladybird_cacert",
       ":ladybird_config_resources",
-      ":ladybird_emoji",
       ":ladybird_fonts",
       ":ladybird_icon",
+      ":ladybird_icons_128x128",
       ":ladybird_icons_16x16",
       ":ladybird_icons_32x32",
+      ":ladybird_icons_48x48",
       ":ladybird_icons_browser",
       ":ladybird_themes",
       ":ladybird_web_resources",
diff --git a/Meta/gn/secondary/Ladybird/RequestServer/BUILD.gn b/Meta/gn/secondary/Ladybird/RequestServer/BUILD.gn
index 67aadffe786..be0885919ab 100644
--- a/Meta/gn/secondary/Ladybird/RequestServer/BUILD.gn
+++ b/Meta/gn/secondary/Ladybird/RequestServer/BUILD.gn
@@ -6,27 +6,21 @@ executable("RequestServer") {
   ]
   deps = [
     "//AK",
+    "//Meta/gn/build/libs/curl",
     "//Userland/Libraries/LibCore",
     "//Userland/Libraries/LibCrypto",
     "//Userland/Libraries/LibFileSystem",
-    "//Userland/Libraries/LibHTTP",
     "//Userland/Libraries/LibIPC",
     "//Userland/Libraries/LibMain",
-    "//Userland/Libraries/LibRequests",
+    "//Userland/Libraries/LibRequests:RequestClientEndpoint",
+    "//Userland/Libraries/LibRequests:RequestServerEndpoint",
     "//Userland/Libraries/LibTLS",
     "//Userland/Libraries/LibThreading",
     "//Userland/Libraries/LibURL",
     "//Userland/Libraries/LibWebSocket",
   ]
   sources = [
-    "//Userland/Services/RequestServer/ConnectionCache.cpp",
     "//Userland/Services/RequestServer/ConnectionFromClient.cpp",
-    "//Userland/Services/RequestServer/HttpProtocol.cpp",
-    "//Userland/Services/RequestServer/HttpRequest.cpp",
-    "//Userland/Services/RequestServer/HttpsProtocol.cpp",
-    "//Userland/Services/RequestServer/HttpsRequest.cpp",
-    "//Userland/Services/RequestServer/Protocol.cpp",
-    "//Userland/Services/RequestServer/Request.cpp",
     "main.cpp",
   ]
   output_dir = "$root_out_dir/libexec"
diff --git a/Meta/gn/secondary/Ladybird/WebContent/BUILD.gn b/Meta/gn/secondary/Ladybird/WebContent/BUILD.gn
index c283de0f235..3f6f83f1262 100644
--- a/Meta/gn/secondary/Ladybird/WebContent/BUILD.gn
+++ b/Meta/gn/secondary/Ladybird/WebContent/BUILD.gn
@@ -38,6 +38,7 @@ executable("WebContent") {
   ]
   deps = [
     "//AK",
+    "//Meta/gn/build/libs/fontconfig",
     "//Meta/gn/build/libs/pulse",
     "//Userland/Libraries/LibCore",
     "//Userland/Libraries/LibFileSystem",
@@ -61,6 +62,7 @@ executable("WebContent") {
     "//Ladybird/HelperProcess.cpp",
     "//Ladybird/ImageCodecPlugin.cpp",
     "//Ladybird/Utilities.cpp",
+    "//Userland/Services/WebContent/BackingStoreManager.cpp",
     "//Userland/Services/WebContent/ConnectionFromClient.cpp",
     "//Userland/Services/WebContent/ConsoleGlobalEnvironmentExtensions.cpp",
     "//Userland/Services/WebContent/PageClient.cpp",
diff --git a/Meta/gn/secondary/Ladybird/WebWorker/BUILD.gn b/Meta/gn/secondary/Ladybird/WebWorker/BUILD.gn
index 0e5eafeb38a..650226e6f76 100644
--- a/Meta/gn/secondary/Ladybird/WebWorker/BUILD.gn
+++ b/Meta/gn/secondary/Ladybird/WebWorker/BUILD.gn
@@ -6,6 +6,7 @@ executable("WebWorker") {
   ]
   deps = [
     "//AK",
+    "//Meta/gn/build/libs/fontconfig",
     "//Userland/Libraries/LibCore",
     "//Userland/Libraries/LibFileSystem",
     "//Userland/Libraries/LibGfx",
@@ -21,6 +22,7 @@ executable("WebWorker") {
     "//Userland/Libraries/LibWebView",
   ]
   sources = [
+    "//Ladybird/FontPlugin.cpp",
     "//Ladybird/HelperProcess.cpp",
     "//Ladybird/Utilities.cpp",
     "//Userland/Services/WebWorker/ConnectionFromClient.cpp",