From bdb6e0413fd754cfd7a2bdbcc88849bbdc94fb56 Mon Sep 17 00:00:00 2001 From: "Jason E. Hale" Date: Fri, 22 Aug 2025 02:25:52 -0400 Subject: [PATCH] devel/ninja: Update to 1.13.1 Preemptively fix chromium-based ports. These fixes will be committed separately, but are included here for convenience. --- devel/electron32/files/patch-net_dns_BUILD.gn | 16 ++++++++++--- devel/electron34/files/patch-net_dns_BUILD.gn | 16 ++++++++++--- devel/electron35/files/patch-net_dns_BUILD.gn | 18 ++++++++++---- devel/electron36/files/patch-net_dns_BUILD.gn | 18 ++++++++++---- devel/electron37/files/patch-net_dns_BUILD.gn | 18 ++++++++++---- devel/ninja/Makefile | 2 +- devel/ninja/distinfo | 6 ++--- www/chromium/files/patch-net_dns_BUILD.gn | 16 ++++++++++--- .../files/patch-content_browser_BUILD.gn | 14 ++++++++--- www/iridium/files/patch-net_BUILD.gn | 24 ++++++++++++------- .../files/patch-net_dns_BUILD.gn | 18 ++++++++++---- 11 files changed, 126 insertions(+), 40 deletions(-) diff --git a/devel/electron32/files/patch-net_dns_BUILD.gn b/devel/electron32/files/patch-net_dns_BUILD.gn index f1e85f0ddb01..e1fd322aea84 100644 --- a/devel/electron32/files/patch-net_dns_BUILD.gn +++ b/devel/electron32/files/patch-net_dns_BUILD.gn @@ -1,4 +1,4 @@ ---- net/dns/BUILD.gn.orig 2024-06-30 11:48:27 UTC +--- net/dns/BUILD.gn.orig 2025-03-29 00:50:57 UTC +++ net/dns/BUILD.gn @@ -138,7 +138,7 @@ source_set("dns") { "dns_config_service_android.cc", @@ -9,7 +9,17 @@ sources += [ "dns_config_service_linux.cc", "dns_config_service_linux.h", -@@ -179,6 +179,7 @@ source_set("dns") { +@@ -172,6 +172,9 @@ source_set("dns") { + } + + deps = [ "//net:net_deps" ] ++ if (is_bsd) { ++ deps += [ "//services/screen_ai/buildflags" ] ++ } + + public_deps = [ + ":dns_client", +@@ -179,6 +182,7 @@ source_set("dns") { ":host_resolver_manager", ":mdns_client", "//net:net_public_deps", @@ -17,7 +27,7 @@ ] allow_circular_includes_from = [ -@@ -449,9 +450,9 @@ source_set("tests") { +@@ -447,9 +451,9 @@ source_set("tests") { if (is_android) { sources += [ "dns_config_service_android_unittest.cc" ] diff --git a/devel/electron34/files/patch-net_dns_BUILD.gn b/devel/electron34/files/patch-net_dns_BUILD.gn index f1e85f0ddb01..e1fd322aea84 100644 --- a/devel/electron34/files/patch-net_dns_BUILD.gn +++ b/devel/electron34/files/patch-net_dns_BUILD.gn @@ -1,4 +1,4 @@ ---- net/dns/BUILD.gn.orig 2024-06-30 11:48:27 UTC +--- net/dns/BUILD.gn.orig 2025-03-29 00:50:57 UTC +++ net/dns/BUILD.gn @@ -138,7 +138,7 @@ source_set("dns") { "dns_config_service_android.cc", @@ -9,7 +9,17 @@ sources += [ "dns_config_service_linux.cc", "dns_config_service_linux.h", -@@ -179,6 +179,7 @@ source_set("dns") { +@@ -172,6 +172,9 @@ source_set("dns") { + } + + deps = [ "//net:net_deps" ] ++ if (is_bsd) { ++ deps += [ "//services/screen_ai/buildflags" ] ++ } + + public_deps = [ + ":dns_client", +@@ -179,6 +182,7 @@ source_set("dns") { ":host_resolver_manager", ":mdns_client", "//net:net_public_deps", @@ -17,7 +27,7 @@ ] allow_circular_includes_from = [ -@@ -449,9 +450,9 @@ source_set("tests") { +@@ -447,9 +451,9 @@ source_set("tests") { if (is_android) { sources += [ "dns_config_service_android_unittest.cc" ] diff --git a/devel/electron35/files/patch-net_dns_BUILD.gn b/devel/electron35/files/patch-net_dns_BUILD.gn index d51291a1422a..e1fd322aea84 100644 --- a/devel/electron35/files/patch-net_dns_BUILD.gn +++ b/devel/electron35/files/patch-net_dns_BUILD.gn @@ -1,6 +1,6 @@ ---- net/dns/BUILD.gn.orig 2025-04-06 11:53:44 UTC +--- net/dns/BUILD.gn.orig 2025-03-29 00:50:57 UTC +++ net/dns/BUILD.gn -@@ -140,7 +140,7 @@ source_set("dns") { +@@ -138,7 +138,7 @@ source_set("dns") { "dns_config_service_android.cc", "dns_config_service_android.h", ] @@ -9,7 +9,17 @@ sources += [ "dns_config_service_linux.cc", "dns_config_service_linux.h", -@@ -181,6 +181,7 @@ source_set("dns") { +@@ -172,6 +172,9 @@ source_set("dns") { + } + + deps = [ "//net:net_deps" ] ++ if (is_bsd) { ++ deps += [ "//services/screen_ai/buildflags" ] ++ } + + public_deps = [ + ":dns_client", +@@ -179,6 +182,7 @@ source_set("dns") { ":host_resolver_manager", ":mdns_client", "//net:net_public_deps", @@ -17,7 +27,7 @@ ] allow_circular_includes_from = [ -@@ -452,9 +453,9 @@ source_set("tests") { +@@ -447,9 +451,9 @@ source_set("tests") { if (is_android) { sources += [ "dns_config_service_android_unittest.cc" ] diff --git a/devel/electron36/files/patch-net_dns_BUILD.gn b/devel/electron36/files/patch-net_dns_BUILD.gn index d51291a1422a..e1fd322aea84 100644 --- a/devel/electron36/files/patch-net_dns_BUILD.gn +++ b/devel/electron36/files/patch-net_dns_BUILD.gn @@ -1,6 +1,6 @@ ---- net/dns/BUILD.gn.orig 2025-04-06 11:53:44 UTC +--- net/dns/BUILD.gn.orig 2025-03-29 00:50:57 UTC +++ net/dns/BUILD.gn -@@ -140,7 +140,7 @@ source_set("dns") { +@@ -138,7 +138,7 @@ source_set("dns") { "dns_config_service_android.cc", "dns_config_service_android.h", ] @@ -9,7 +9,17 @@ sources += [ "dns_config_service_linux.cc", "dns_config_service_linux.h", -@@ -181,6 +181,7 @@ source_set("dns") { +@@ -172,6 +172,9 @@ source_set("dns") { + } + + deps = [ "//net:net_deps" ] ++ if (is_bsd) { ++ deps += [ "//services/screen_ai/buildflags" ] ++ } + + public_deps = [ + ":dns_client", +@@ -179,6 +182,7 @@ source_set("dns") { ":host_resolver_manager", ":mdns_client", "//net:net_public_deps", @@ -17,7 +27,7 @@ ] allow_circular_includes_from = [ -@@ -452,9 +453,9 @@ source_set("tests") { +@@ -447,9 +451,9 @@ source_set("tests") { if (is_android) { sources += [ "dns_config_service_android_unittest.cc" ] diff --git a/devel/electron37/files/patch-net_dns_BUILD.gn b/devel/electron37/files/patch-net_dns_BUILD.gn index d51291a1422a..e1fd322aea84 100644 --- a/devel/electron37/files/patch-net_dns_BUILD.gn +++ b/devel/electron37/files/patch-net_dns_BUILD.gn @@ -1,6 +1,6 @@ ---- net/dns/BUILD.gn.orig 2025-04-06 11:53:44 UTC +--- net/dns/BUILD.gn.orig 2025-03-29 00:50:57 UTC +++ net/dns/BUILD.gn -@@ -140,7 +140,7 @@ source_set("dns") { +@@ -138,7 +138,7 @@ source_set("dns") { "dns_config_service_android.cc", "dns_config_service_android.h", ] @@ -9,7 +9,17 @@ sources += [ "dns_config_service_linux.cc", "dns_config_service_linux.h", -@@ -181,6 +181,7 @@ source_set("dns") { +@@ -172,6 +172,9 @@ source_set("dns") { + } + + deps = [ "//net:net_deps" ] ++ if (is_bsd) { ++ deps += [ "//services/screen_ai/buildflags" ] ++ } + + public_deps = [ + ":dns_client", +@@ -179,6 +182,7 @@ source_set("dns") { ":host_resolver_manager", ":mdns_client", "//net:net_public_deps", @@ -17,7 +27,7 @@ ] allow_circular_includes_from = [ -@@ -452,9 +453,9 @@ source_set("tests") { +@@ -447,9 +451,9 @@ source_set("tests") { if (is_android) { sources += [ "dns_config_service_android_unittest.cc" ] diff --git a/devel/ninja/Makefile b/devel/ninja/Makefile index 27d411e3bad9..931e9b910a68 100644 --- a/devel/ninja/Makefile +++ b/devel/ninja/Makefile @@ -1,5 +1,5 @@ PORTNAME= ninja -PORTVERSION= 1.11.1 +PORTVERSION= 1.13.1 DISTVERSIONPREFIX= v PORTEPOCH= 4 CATEGORIES= devel diff --git a/devel/ninja/distinfo b/devel/ninja/distinfo index c9fcd675c558..60e7d21f0fd6 100644 --- a/devel/ninja/distinfo +++ b/devel/ninja/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1716360440 -SHA256 (ninja-build-ninja-v1.11.1_GH0.tar.gz) = 31747ae633213f1eda3842686f83c2aa1412e0f5691d1c14dbbcc67fe7400cea -SIZE (ninja-build-ninja-v1.11.1_GH0.tar.gz) = 229479 +TIMESTAMP = 1755246529 +SHA256 (ninja-build-ninja-v1.13.1_GH0.tar.gz) = f0055ad0369bf2e372955ba55128d000cfcc21777057806015b45e4accbebf23 +SIZE (ninja-build-ninja-v1.13.1_GH0.tar.gz) = 292098 diff --git a/www/chromium/files/patch-net_dns_BUILD.gn b/www/chromium/files/patch-net_dns_BUILD.gn index 2a4999bdc858..fc4d80d959a0 100644 --- a/www/chromium/files/patch-net_dns_BUILD.gn +++ b/www/chromium/files/patch-net_dns_BUILD.gn @@ -1,4 +1,4 @@ ---- net/dns/BUILD.gn.orig 2025-08-07 06:57:29 UTC +--- net/dns/BUILD.gn.orig 2025-08-11 22:26:04 UTC +++ net/dns/BUILD.gn @@ -140,7 +140,7 @@ source_set("dns") { "dns_config_service_android.cc", @@ -9,7 +9,17 @@ sources += [ "dns_config_service_linux.cc", "dns_config_service_linux.h", -@@ -181,6 +181,7 @@ source_set("dns") { +@@ -174,6 +174,9 @@ source_set("dns") { + } + + deps = [ "//net:net_deps" ] ++ if (is_bsd) { ++ deps += [ "//services/screen_ai/buildflags" ] ++ } + + public_deps = [ + ":dns_client", +@@ -181,6 +184,7 @@ source_set("dns") { ":host_resolver_manager", ":mdns_client", "//net:net_public_deps", @@ -17,7 +27,7 @@ ] if (enable_mdns) { -@@ -454,9 +455,9 @@ source_set("tests") { +@@ -454,9 +458,9 @@ source_set("tests") { if (is_android) { sources += [ "dns_config_service_android_unittest.cc" ] diff --git a/www/iridium/files/patch-content_browser_BUILD.gn b/www/iridium/files/patch-content_browser_BUILD.gn index e8240806ac8c..477ca0ded3bb 100644 --- a/www/iridium/files/patch-content_browser_BUILD.gn +++ b/www/iridium/files/patch-content_browser_BUILD.gn @@ -1,6 +1,14 @@ ---- content/browser/BUILD.gn.orig 2025-06-19 07:37:57 UTC +--- content/browser/BUILD.gn.orig 2025-06-18 12:17:42 UTC +++ content/browser/BUILD.gn -@@ -2571,6 +2571,14 @@ source_set("browser") { +@@ -125,6 +125,7 @@ source_set("browser") { + "//components/optimization_guide/core:features", + "//components/optimization_guide/public/mojom", + "//components/os_crypt/sync", ++ "//components/paint_preview/buildflags:buildflags", + "//components/payments/content/icon", + "//components/payments/mojom", + "//components/performance_manager/scenario_api", +@@ -2571,6 +2572,14 @@ source_set("browser") { ] } @@ -15,7 +23,7 @@ if (is_linux || is_chromeos) { sources -= [ "file_system_access/file_path_watcher/file_path_watcher_stub.cc" ] -@@ -2616,6 +2624,15 @@ source_set("browser") { +@@ -2616,6 +2625,15 @@ source_set("browser") { if (allow_oop_video_decoder) { sources += [ "media/oop_video_decoder_factory.cc" ] deps += [ "//media/mojo/mojom" ] diff --git a/www/iridium/files/patch-net_BUILD.gn b/www/iridium/files/patch-net_BUILD.gn index cd6138a37fae..d30dac474cef 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 2025-06-19 07:37:57 UTC +--- net/BUILD.gn.orig 2025-06-18 12:17:42 UTC +++ net/BUILD.gn @@ -126,7 +126,7 @@ net_configs = [ "//build/config/compiler:wexit_time_destructors", @@ -9,7 +9,15 @@ net_configs += [ "//build/config/linux:libresolv" ] } -@@ -1334,6 +1334,19 @@ component("net") { +@@ -1138,6 +1138,7 @@ component("net") { + ":net_deps", + "//components/miracle_parameter/common", + "//components/network_time/time_tracker", ++ "//content/public/common:buildflags", + "//net/http:transport_security_state_generated_files", + "//third_party/simdutf:simdutf", + ] +@@ -1334,6 +1335,19 @@ component("net") { ] } @@ -29,7 +37,7 @@ if (is_mac) { sources += [ "base/network_notification_thread_mac.cc", -@@ -1497,7 +1510,7 @@ component("net") { +@@ -1497,7 +1511,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", -@@ -2207,7 +2220,7 @@ static_library("test_support") { +@@ -2207,7 +2221,7 @@ static_library("test_support") { ] } @@ -47,7 +55,7 @@ sources += [ "base/address_tracker_linux_test_util.cc", "base/address_tracker_linux_test_util.h", -@@ -3030,14 +3043,14 @@ target(_test_target_type, "net_unittests") { +@@ -3030,14 +3044,14 @@ target(_test_target_type, "net_unittests") { ] } @@ -64,7 +72,7 @@ sources += [ "base/address_tracker_linux_unittest.cc", "base/network_interfaces_linux_unittest.cc", -@@ -3135,6 +3148,10 @@ target(_test_target_type, "net_unittests") { +@@ -3135,6 +3149,10 @@ target(_test_target_type, "net_unittests") { ] } @@ -75,7 +83,7 @@ if (enable_websockets) { sources += [ "server/http_connection_unittest.cc", -@@ -3200,7 +3217,7 @@ target(_test_target_type, "net_unittests") { +@@ -3200,7 +3218,7 @@ target(_test_target_type, "net_unittests") { ] } @@ -84,7 +92,7 @@ sources += [ "tools/quic/quic_simple_server_test.cc" ] } -@@ -3339,7 +3356,7 @@ target(_test_target_type, "net_unittests") { +@@ -3339,7 +3357,7 @@ target(_test_target_type, "net_unittests") { } # Use getifaddrs() on POSIX platforms, except Linux. diff --git a/www/ungoogled-chromium/files/patch-net_dns_BUILD.gn b/www/ungoogled-chromium/files/patch-net_dns_BUILD.gn index 6646c9edc97b..e1fd322aea84 100644 --- a/www/ungoogled-chromium/files/patch-net_dns_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-net_dns_BUILD.gn @@ -1,6 +1,6 @@ ---- net/dns/BUILD.gn.orig 2025-02-20 09:59:21 UTC +--- net/dns/BUILD.gn.orig 2025-03-29 00:50:57 UTC +++ net/dns/BUILD.gn -@@ -140,7 +140,7 @@ source_set("dns") { +@@ -138,7 +138,7 @@ source_set("dns") { "dns_config_service_android.cc", "dns_config_service_android.h", ] @@ -9,7 +9,17 @@ sources += [ "dns_config_service_linux.cc", "dns_config_service_linux.h", -@@ -181,6 +181,7 @@ source_set("dns") { +@@ -172,6 +172,9 @@ source_set("dns") { + } + + deps = [ "//net:net_deps" ] ++ if (is_bsd) { ++ deps += [ "//services/screen_ai/buildflags" ] ++ } + + public_deps = [ + ":dns_client", +@@ -179,6 +182,7 @@ source_set("dns") { ":host_resolver_manager", ":mdns_client", "//net:net_public_deps", @@ -17,7 +27,7 @@ ] allow_circular_includes_from = [ -@@ -450,9 +451,9 @@ source_set("tests") { +@@ -447,9 +451,9 @@ source_set("tests") { if (is_android) { sources += [ "dns_config_service_android_unittest.cc" ] -- 2.50.1