diff --git a/devel/electron29/files/patch-net_dns_BUILD.gn b/devel/electron29/files/patch-net_dns_BUILD.gn index d68c15ad483c..c2fde7db3711 100644 --- a/devel/electron29/files/patch-net_dns_BUILD.gn +++ b/devel/electron29/files/patch-net_dns_BUILD.gn @@ -1,31 +1,41 @@ ---- net/dns/BUILD.gn.orig 2024-02-27 21:36:00 UTC +--- net/dns/BUILD.gn.orig 2024-05-15 04:02:38 UTC +++ net/dns/BUILD.gn @@ -134,7 +134,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", -@@ -175,6 +175,7 @@ source_set("dns") { +@@ -168,6 +168,9 @@ source_set("dns") { + } + + deps = [ "//net:net_deps" ] ++ if (is_bsd) { ++ deps += [ "//components/services/screen_ai/buildflags" ] ++ } + + public_deps = [ + ":dns_client", +@@ -175,6 +178,7 @@ source_set("dns") { ":host_resolver_manager", ":mdns_client", "//net:net_public_deps", + "//printing/buildflags", ] allow_circular_includes_from = [ -@@ -442,9 +443,9 @@ source_set("tests") { +@@ -442,9 +446,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" ] } diff --git a/devel/electron29/files/patch-tools_gn_bootstrap_bootstrap.py b/devel/electron29/files/patch-tools_gn_bootstrap_bootstrap.py new file mode 100644 index 000000000000..a9c00cd3ce53 --- /dev/null +++ b/devel/electron29/files/patch-tools_gn_bootstrap_bootstrap.py @@ -0,0 +1,11 @@ +--- tools/gn/bootstrap/bootstrap.py.orig 2024-03-13 00:26:15 UTC ++++ tools/gn/bootstrap/bootstrap.py +@@ -122,7 +122,7 @@ def main(argv): + + shutil.copy2( + os.path.join(BOOTSTRAP_DIR, 'last_commit_position.h'), gn_build_dir) +- cmd = [ninja_binary, '-C', gn_build_dir, '-w', 'dupbuild=err', 'gn'] ++ cmd = [ninja_binary, '-C', gn_build_dir, 'gn'] + if options.jobs: + cmd += ['-j', str(options.jobs)] + subprocess.check_call(cmd)