Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main

1 files changed, 29 insertions, 0 deletions

diff --git a/devel/electron39/files/patch-chrome_browser_global__features.cc b/devel/electron39/files/patch-chrome_browser_global__features.cc
new file mode 100644
index 000000000000..bee01c3316bb
--- /dev/null
+++ b/devel/electron39/files/patch-chrome_browser_global__features.cc
@@ -0,0 +1,29 @@
+--- chrome/browser/global_features.cc.orig	2025-10-21 20:19:54 UTC
++++ chrome/browser/global_features.cc
+@@ -25,7 +25,7 @@
+ #include "chrome/browser/glic/public/glic_enabling.h"               // nogncheck
+ #endif
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // This causes a gn error on Android builds, because gn does not understand
+ // buildflags, so we include it only on platforms where it is used.
+ #include "chrome/browser/ui/webui/whats_new/whats_new_registrar.h"
+@@ -71,7 +71,7 @@ void GlobalFeatures::Init() {
+ 
+ void GlobalFeatures::Init() {
+   system_permissions_platform_handle_ = CreateSystemPermissionsPlatformHandle();
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   whats_new_registry_ = CreateWhatsNewRegistry();
+ #endif
+ 
+@@ -123,7 +123,7 @@ GlobalFeatures::CreateSystemPermissionsPlatformHandle(
+   return system_permission_settings::PlatformHandle::Create();
+ }
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ std::unique_ptr<whats_new::WhatsNewRegistry>
+ GlobalFeatures::CreateWhatsNewRegistry() {
+   return whats_new::CreateWhatsNewRegistry();