Date: Wed, 15 May 2024 04:18:25 GMT From: "Jason E. Hale" <jhale@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 8beb8289395d - main - www/ungoogled-chromium: Fix build with ninja 1.12.0 Message-ID: <202405150418.44F4IP6q072272@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=8beb8289395df3672318409f0674d8f6084d8fd9 commit 8beb8289395df3672318409f0674d8f6084d8fd9 Author: Jason E. Hale <jhale@FreeBSD.org> AuthorDate: 2024-05-11 05:01:44 +0000 Commit: Jason E. Hale <jhale@FreeBSD.org> CommitDate: 2024-05-15 04:11:42 +0000 www/ungoogled-chromium: Fix build with ninja 1.12.0 Fix race conditions where generated headers are not created before they are needed in the build. PR: 278693 Approved by: portmgr (blanket) --- .../files/patch-chrome_browser_devtools_BUILD.gn | 10 ++++++++++ .../files/patch-chrome_browser_extensions_BUILD.gn | 12 ++++++++++-- www/ungoogled-chromium/files/patch-net_dns_BUILD.gn | 16 +++++++++++++--- 3 files changed, 33 insertions(+), 5 deletions(-) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_devtools_BUILD.gn b/www/ungoogled-chromium/files/patch-chrome_browser_devtools_BUILD.gn new file mode 100644 index 000000000000..06adbd4b64ff --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_devtools_BUILD.gn @@ -0,0 +1,10 @@ +--- chrome/browser/devtools/BUILD.gn.orig 2024-04-30 23:46:45 UTC ++++ chrome/browser/devtools/BUILD.gn +@@ -113,6 +113,7 @@ static_library("devtools") { + "//chrome/browser/autofill:autofill", + "//components/autofill/content/browser:browser", + "//components/autofill/core/browser:browser", ++ "//components/enterprise/buildflags", + "//components/paint_preview/buildflags:buildflags", + "//content/public/browser", + "//net", diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_BUILD.gn b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_BUILD.gn index c8d6a576c705..6d684075152e 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_BUILD.gn @@ -1,6 +1,14 @@ ---- chrome/browser/extensions/BUILD.gn.orig 2024-04-23 07:42:17 UTC +--- chrome/browser/extensions/BUILD.gn.orig 2024-04-24 01:31:09 UTC +++ chrome/browser/extensions/BUILD.gn -@@ -1378,6 +1378,10 @@ static_library("extensions") { +@@ -826,6 +826,7 @@ static_library("extensions") { + "//components/device_reauth", + "//components/optimization_guide/core:features", + "//components/safe_browsing/content/browser", ++ "//components/safe_browsing/content/common/proto:download_file_types_proto", + "//components/safe_browsing/core/browser:safe_browsing_metrics_collector", + "//components/security_interstitials/content:security_interstitial_page", + "//components/site_engagement/core/mojom:mojo_bindings", +@@ -1384,6 +1385,10 @@ static_library("extensions") { deps += [ "//chrome/services/printing/public/mojom" ] } diff --git a/www/ungoogled-chromium/files/patch-net_dns_BUILD.gn b/www/ungoogled-chromium/files/patch-net_dns_BUILD.gn index 00a74cb5750b..dd5a55548aa8 100644 --- a/www/ungoogled-chromium/files/patch-net_dns_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-net_dns_BUILD.gn @@ -1,4 +1,4 @@ ---- net/dns/BUILD.gn.orig 2024-04-23 07:42:17 UTC +--- net/dns/BUILD.gn.orig 2024-04-30 23:47:00 UTC +++ net/dns/BUILD.gn @@ -136,7 +136,7 @@ source_set("dns") { "dns_config_service_android.cc", @@ -9,7 +9,17 @@ sources += [ "dns_config_service_linux.cc", "dns_config_service_linux.h", -@@ -177,6 +177,7 @@ source_set("dns") { +@@ -170,6 +170,9 @@ source_set("dns") { + } + + deps = [ "//net:net_deps" ] ++ if (is_bsd) { ++ deps += [ "//services/screen_ai/buildflags" ] ++ } + + public_deps = [ + ":dns_client", +@@ -177,6 +180,7 @@ source_set("dns") { ":host_resolver_manager", ":mdns_client", "//net:net_public_deps", @@ -17,7 +27,7 @@ ] allow_circular_includes_from = [ -@@ -444,9 +445,9 @@ source_set("tests") { +@@ -444,9 +448,9 @@ source_set("tests") { if (is_android) { sources += [ "dns_config_service_android_unittest.cc" ]
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202405150418.44F4IP6q072272>