From nobody Wed May 15 04:18:27 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VfKhz4lyhz5K5jC; Wed, 15 May 2024 04:18:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VfKhz1Sd0z48ts; Wed, 15 May 2024 04:18:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715746707; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KbrAwxgztwgcEs3WoS0T+TLcru02MTwx2oSJEG+U2Rc=; b=tgezafWA908qpJ7Ebcah7GnF7ayilmeqAjWnjL47CgnbOR6g2+bqusjqJXoa0sM3mDmBIA 9ElKPtjEVntUwDrr07m1taOAU74cgLBUyDT3oWSQWsq73zkqIIm8suCsPL3FgGgfm6qrVG wWoKrg3hq28yetUHHSGGQqt+LDNwFQCGEWfe61BHIWvQVz0OJ5vEw1Yi8k8ibHfP+vK/25 mh4VF4yACKOPa9IpmLulG/eNH6N7jS39W62ALuuRpB5KltmN3LVkCtn6EGyBlpWMVSfbUS u+Ey75b19NaTJV7m4Bi4W1mMD0OX3yqtf2VpwwMS8bAAW1rNI9savYLZqEOVsg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715746707; a=rsa-sha256; cv=none; b=wp4vOD1KCrDDXfBWklTRDSpdYVKqgAU+xe7jm3jTwwGgdVxU1nNj23zvvTLtnRWcyRz/I3 92IYkVHb37sqp3AkbQ3EhR7eEqMkmBHaXC76SaI3O3s8QIAbRjQ0V5vF9X+G4MduudYW4Q y/JsTvFnDqzxesraL0FiU1Zs/WyETygeRi9GJacVt3/tmGZ/ZL3lbWdNOvaOa1RdgM/6Ti b5jGAb3b28satf9WyZuOK9iEdKnYfVSp+TkCLUwk7HWGgh7VU65Ti2ShxuS7AaIGqrn9v4 iMfFJoLn0HG2FL7hFQ4dewcsJ1bQMosjsC/rdaDTmt4rlUKFdmOZJXWou40SQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715746707; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KbrAwxgztwgcEs3WoS0T+TLcru02MTwx2oSJEG+U2Rc=; b=I0Y0uKU/vB26fb/0ehiADFTHeTYPPAAvbCADGijHhtZSB4P1WhN0dDrDm1FxqbXGYDLSk+ axsQCI7StyYiHyz5alqepwdnhdlrcjNP9jaGqfvtuG4txhgx9EGAXuvjtkhfvXkm9+eyi0 eYxJUBewSTGJmuvJSKZToh/NyAtZJ7LMqOuKr2/2TsHls8ccjVRJVnrQ9E0kJLxFwv8cch Aiq2tuYwiacAd5aXbZQ1TFgv2g5qPESXThcMx1q6MuVKw533v/ro5Cr3GRTWiEsuj2v21y /bEhCIu2ISyq9niRwn9lNd+w1LOZwfaAfWrmYHeuX/c7BYSHYj/MMrM4RXFCmQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VfKhz147Zz10kG; Wed, 15 May 2024 04:18:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44F4IRff072334; Wed, 15 May 2024 04:18:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44F4IRpW072331; Wed, 15 May 2024 04:18:27 GMT (envelope-from git) Date: Wed, 15 May 2024 04:18:27 GMT Message-Id: <202405150418.44F4IRpW072331@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: 923eae5c85ec - main - www/iridium: Fix build with ninja 1.12.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 923eae5c85ec6db32f326d9e32acfd605b10087b Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=923eae5c85ec6db32f326d9e32acfd605b10087b commit 923eae5c85ec6db32f326d9e32acfd605b10087b Author: Jason E. Hale AuthorDate: 2024-05-15 03:31:08 +0000 Commit: Jason E. Hale CommitDate: 2024-05-15 04:11:51 +0000 www/iridium: Fix build with ninja 1.12.0 Fix race conditions where generated headers are not created before they are needed in the build. Ninja 1.12.0 removed the `-w dupbuild` option and the default behavior is now equivalent to passing `-w dupbuild=err` in previous versions. PR: 278693 Approved by: portmgr (blanket) --- .../files/patch-chrome_browser_devtools_BUILD.gn | 10 ++++ .../patch-chrome_browser_safe__browsing_BUILD.gn | 10 ++++ www/iridium/files/patch-components_BUILD.gn | 22 +++++++++ www/iridium/files/patch-content_browser_BUILD.gn | 57 +++++++++++++++++++--- www/iridium/files/patch-net_BUILD.gn | 22 ++++++--- www/iridium/files/patch-net_dns_BUILD.gn | 16 ++++-- .../files/patch-tools_gn_bootstrap_bootstrap.py | 11 +++++ 7 files changed, 130 insertions(+), 18 deletions(-) diff --git a/www/iridium/files/patch-chrome_browser_devtools_BUILD.gn b/www/iridium/files/patch-chrome_browser_devtools_BUILD.gn new file mode 100644 index 000000000000..dcfd5a407511 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_devtools_BUILD.gn @@ -0,0 +1,10 @@ +--- chrome/browser/devtools/BUILD.gn.orig 2024-01-25 17:18:37 UTC ++++ chrome/browser/devtools/BUILD.gn +@@ -121,6 +121,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/iridium/files/patch-chrome_browser_safe__browsing_BUILD.gn b/www/iridium/files/patch-chrome_browser_safe__browsing_BUILD.gn new file mode 100644 index 000000000000..a5b1c7875a14 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_safe__browsing_BUILD.gn @@ -0,0 +1,10 @@ +--- chrome/browser/safe_browsing/BUILD.gn.orig 2024-01-25 17:18:38 UTC ++++ chrome/browser/safe_browsing/BUILD.gn +@@ -144,6 +144,7 @@ static_library("safe_browsing") { + "//chrome/browser/profiles:profile", + "//chrome/common/safe_browsing:proto", + "//components/autofill/core/browser", ++ "//components/compose:buildflags", + "//components/content_settings/core/browser", + "//components/no_state_prefetch/browser", + "//components/omnibox/browser", diff --git a/www/iridium/files/patch-components_BUILD.gn b/www/iridium/files/patch-components_BUILD.gn new file mode 100644 index 000000000000..5ad595adf643 --- /dev/null +++ b/www/iridium/files/patch-components_BUILD.gn @@ -0,0 +1,22 @@ +--- components/BUILD.gn.orig 2024-01-25 17:18:39 UTC ++++ components/BUILD.gn +@@ -812,8 +812,7 @@ test("components_unittests") { + # Since //chrome depends on //extensions, we also only assert_no_deps on + # extensions targets for non-lacros builds. + if (!is_chromeos_lacros) { +- assert_no_deps = [ "//chrome/*" ] +- assert_no_deps += disallowed_extension_deps_ ++ assert_no_deps = disallowed_extension_deps_ + } + + if (is_ios) { +@@ -1100,8 +1099,7 @@ if (use_blink) { + # Since //chrome depends on //extensions, we also only assert_no_deps on + # extensions targets for non-lacros builds. + if (!is_chromeos_lacros) { +- assert_no_deps = [ "//chrome/*" ] +- assert_no_deps += disallowed_extension_deps_ ++ assert_no_deps = disallowed_extension_deps_ + } + + if (is_fuchsia) { diff --git a/www/iridium/files/patch-content_browser_BUILD.gn b/www/iridium/files/patch-content_browser_BUILD.gn index ecbab49cb8cc..ef9136e8dc3e 100644 --- a/www/iridium/files/patch-content_browser_BUILD.gn +++ b/www/iridium/files/patch-content_browser_BUILD.gn @@ -1,16 +1,57 @@ ---- content/browser/BUILD.gn.orig 2024-02-04 14:46:08 UTC +--- content/browser/BUILD.gn.orig 2024-01-25 17:18:41 UTC +++ content/browser/BUILD.gn -@@ -2474,6 +2474,13 @@ source_set("browser") { +@@ -12,6 +12,7 @@ import("//chromeos/ash/components/assistant/assistant. + import("//build/config/ozone.gni") + import("//build/config/ui.gni") + import("//chromeos/ash/components/assistant/assistant.gni") ++import("//components/supervised_user/buildflags.gni") + import("//components/viz/common/debugger/viz_debugger.gni") + import("//content/common/features.gni") + import("//content/public/common/zygote/features.gni") +@@ -66,11 +67,13 @@ source_set("browser") { + "//build:branding_buildflags", + "//build:chromecast_buildflags", + "//build:chromeos_buildflags", ++ "//build/config/chromebox_for_meetings:buildflags", + "//build/config/compiler:compiler_buildflags", + "//cc", + "//cc/animation", + "//cc/mojo_embedder", + "//cc/paint", ++ "//chrome/common:buildflags", + "//components/attribution_reporting:mojom", + "//components/back_forward_cache:enum", + "//components/browsing_topics/common:common", +@@ -91,6 +94,7 @@ source_set("browser") { + "//components/offline_pages/buildflags", + "//components/offline_pages/core/request_header", + "//components/os_crypt/sync", ++ "//components/paint_preview/buildflags:buildflags", + "//components/payments/content/icon", + "//components/payments/mojom", + "//components/power_monitor", +@@ -103,8 +107,10 @@ source_set("browser") { + "//components/services/storage/public/cpp", + "//components/services/storage/public/mojom", + "//components/sqlite_proto", ++ "//components/supervised_user/core/common:buildflags", + "//components/system_media_controls", + "//components/tracing:startup_tracing", ++ "//components/translate/content/common", + "//components/ui_devtools", + "//components/ukm", + "//components/ukm/debug:util", +@@ -2472,6 +2478,13 @@ source_set("browser") { + if (allow_oop_video_decoder) { + sources += [ "media/stable_video_decoder_factory.cc" ] deps += [ "//media/mojo/mojom/stable:stable_video_decoder" ] - } - ++ } ++ + if (is_bsd) { + sources -= [ + "sandbox_ipc_linux.cc", + "sandbox_ipc_linux.h", + ] -+ } -+ + } + if (is_chromeos) { - sources += [ - "handwriting/handwriting_recognition_service_impl_cros.cc", diff --git a/www/iridium/files/patch-net_BUILD.gn b/www/iridium/files/patch-net_BUILD.gn index c905001584c7..a2d622107922 100644 --- a/www/iridium/files/patch-net_BUILD.gn +++ b/www/iridium/files/patch-net_BUILD.gn @@ -1,4 +1,4 @@ ---- net/BUILD.gn.orig 2024-02-04 14:46:08 UTC +--- net/BUILD.gn.orig 2024-01-25 17:17:56 UTC +++ net/BUILD.gn @@ -122,7 +122,7 @@ net_configs = [ "//build/config/compiler:wexit_time_destructors", @@ -9,7 +9,15 @@ net_configs += [ "//build/config/linux:libresolv" ] } -@@ -1240,6 +1240,19 @@ component("net") { +@@ -1095,6 +1095,7 @@ component("net") { + ":net_deps", + "//build:chromeos_buildflags", + "//components/miracle_parameter/common", ++ "//media:media_buildflags", + "//net/http:transport_security_state_generated_files", + ] + +@@ -1240,6 +1241,19 @@ component("net") { ] } @@ -29,7 +37,7 @@ if (is_mac) { sources += [ "base/network_notification_thread_mac.cc", -@@ -1396,7 +1409,7 @@ component("net") { +@@ -1396,7 +1410,7 @@ component("net") { } # Use getifaddrs() on POSIX platforms, except Linux. @@ -38,7 +46,7 @@ sources += [ "base/network_interfaces_getifaddrs.cc", "base/network_interfaces_getifaddrs.h", -@@ -2886,7 +2899,7 @@ test("net_unittests") { +@@ -2886,7 +2900,7 @@ test("net_unittests") { ] } @@ -47,7 +55,7 @@ sources += [ "base/address_tracker_linux_unittest.cc", "base/network_interfaces_linux_unittest.cc", -@@ -2974,6 +2987,10 @@ test("net_unittests") { +@@ -2974,6 +2988,10 @@ test("net_unittests") { ] } @@ -58,7 +66,7 @@ if (enable_websockets) { deps += [ "//net/server:tests" ] } -@@ -3044,7 +3061,7 @@ test("net_unittests") { +@@ -3044,7 +3062,7 @@ test("net_unittests") { ] } @@ -67,7 +75,7 @@ sources += [ "tools/quic/quic_simple_server_test.cc" ] } -@@ -3179,7 +3196,7 @@ test("net_unittests") { +@@ -3179,7 +3197,7 @@ test("net_unittests") { } # Use getifaddrs() on POSIX platforms, except Linux. diff --git a/www/iridium/files/patch-net_dns_BUILD.gn b/www/iridium/files/patch-net_dns_BUILD.gn index 064fead49a33..f30aaac0dd85 100644 --- a/www/iridium/files/patch-net_dns_BUILD.gn +++ b/www/iridium/files/patch-net_dns_BUILD.gn @@ -1,4 +1,4 @@ ---- net/dns/BUILD.gn.orig 2023-08-28 20:17:35 UTC +--- net/dns/BUILD.gn.orig 2024-01-25 17:17:56 UTC +++ net/dns/BUILD.gn @@ -128,7 +128,7 @@ source_set("dns") { "dns_config_service_android.cc", @@ -9,7 +9,17 @@ sources += [ "dns_config_service_linux.cc", "dns_config_service_linux.h", -@@ -169,6 +169,7 @@ source_set("dns") { +@@ -162,6 +162,9 @@ source_set("dns") { + } + + deps = [ "//net:net_deps" ] ++ if (is_bsd) { ++ deps += [ "//components/services/screen_ai/buildflags" ] ++ } + + public_deps = [ + ":dns_client", +@@ -169,6 +172,7 @@ source_set("dns") { ":host_resolver_manager", ":mdns_client", "//net:net_public_deps", @@ -17,7 +27,7 @@ ] allow_circular_includes_from = [ -@@ -434,9 +435,9 @@ source_set("tests") { +@@ -434,9 +438,9 @@ source_set("tests") { if (is_android) { sources += [ "dns_config_service_android_unittest.cc" ] diff --git a/www/iridium/files/patch-tools_gn_bootstrap_bootstrap.py b/www/iridium/files/patch-tools_gn_bootstrap_bootstrap.py new file mode 100644 index 000000000000..8f51d62c3310 --- /dev/null +++ b/www/iridium/files/patch-tools_gn_bootstrap_bootstrap.py @@ -0,0 +1,11 @@ +--- tools/gn/bootstrap/bootstrap.py.orig 2024-04-19 13:02:56 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)