Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main

1 files changed, 39 insertions, 0 deletions

diff --git a/devel/electron39/files/patch-net_dns_BUILD.gn b/devel/electron39/files/patch-net_dns_BUILD.gn
new file mode 100644
index 000000000000..d95d10eb9cc0
--- /dev/null
+++ b/devel/electron39/files/patch-net_dns_BUILD.gn
@@ -0,0 +1,39 @@
+--- net/dns/BUILD.gn.orig	2025-11-02 19:17:57 UTC
++++ net/dns/BUILD.gn
+@@ -142,7 +142,7 @@ source_set("dns") {
+       "dns_config_service_android.cc",
+       "dns_config_service_android.h",
+     ]
+-  } else if (is_linux) {
++  } else if (is_linux && !is_bsd) {
+     sources += [
+       "dns_config_service_linux.cc",
+       "dns_config_service_linux.h",
+@@ -176,6 +176,7 @@ source_set("dns") {
+   }
+ 
+   deps = [ "//net:net_deps" ]
++  deps += [ "//services/screen_ai/buildflags" ]
+ 
+   public_deps = [
+     ":dns_client",
+@@ -183,6 +184,7 @@ source_set("dns") {
+     ":host_resolver_manager",
+     ":mdns_client",
+     "//net:net_public_deps",
++    "//printing/buildflags",
+   ]
+ 
+   if (enable_mdns) {
+@@ -460,9 +462,9 @@ source_set("tests") {
+ 
+   if (is_android) {
+     sources += [ "dns_config_service_android_unittest.cc" ]
+-  } else if (is_linux) {
++  } else if (is_linux && !is_bsd) {
+     sources += [ "dns_config_service_linux_unittest.cc" ]
+-  } else if (is_posix) {
++  } else if (is_posix && !is_bsd) {
+     sources += [ "dns_config_service_posix_unittest.cc" ]
+   }
+