diff --git a/devel/electron25/files/patch-net_dns_BUILD.gn b/devel/electron25/files/patch-net_dns_BUILD.gn index 1760e1ccad94..5b564d8b900f 100644 --- a/devel/electron25/files/patch-net_dns_BUILD.gn +++ b/devel/electron25/files/patch-net_dns_BUILD.gn @@ -1,31 +1,41 @@ --- net/dns/BUILD.gn.orig 2023-02-15 13:08:45 UTC +++ net/dns/BUILD.gn @@ -124,7 +124,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", -@@ -165,6 +165,7 @@ source_set("dns") { +@@ -158,6 +158,9 @@ source_set("dns") { + } + + deps = [ "//net:net_deps" ] ++ if (is_bsd) { ++ deps += [ "//components/services/screen_ai/buildflags" ] ++ } + + public_deps = [ + ":dns_client", +@@ -165,6 +168,7 @@ source_set("dns") { ":host_resolver_manager", ":mdns_client", "//net:net_public_deps", + "//printing/buildflags", ] allow_circular_includes_from = [ @@ -430,9 +431,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/electron25/files/patch-tools_gn_bootstrap_bootstrap.py b/devel/electron25/files/patch-tools_gn_bootstrap_bootstrap.py new file mode 100644 index 000000000000..5b825230bdc1 --- /dev/null +++ b/devel/electron25/files/patch-tools_gn_bootstrap_bootstrap.py @@ -0,0 +1,11 @@ +--- tools/gn/bootstrap/bootstrap.py.orig 2023-06-27 00:56:05 UTC ++++ tools/gn/bootstrap/bootstrap.py +@@ -123,7 +123,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)