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

1 files changed, 39 insertions, 0 deletions

diff --git a/devel/electron39/files/patch-base_debug_stack__trace.cc b/devel/electron39/files/patch-base_debug_stack__trace.cc
new file mode 100644
index 000000000000..383e531c0c4b
--- /dev/null
+++ b/devel/electron39/files/patch-base_debug_stack__trace.cc
@@ -0,0 +1,39 @@
+--- base/debug/stack_trace.cc.orig	2025-10-21 20:19:54 UTC
++++ base/debug/stack_trace.cc
+@@ -292,7 +292,7 @@ bool StackTrace::WillSymbolizeToStreamForTesting() {
+   // Symbols are not expected to be reliable when gn args specifies
+   // symbol_level=0.
+   return false;
+-#elif defined(__UCLIBC__) || defined(_AIX)
++#elif defined(__UCLIBC__) || defined(_AIX) || BUILDFLAG(IS_BSD)
+   // StackTrace::OutputToStream() is not implemented under uclibc, nor AIX.
+   // See https://crbug.com/706728
+   return false;
+@@ -357,7 +357,9 @@ void StackTrace::OutputToStreamWithPrefix(std::ostream
+     }
+     return;
+   }
++#if !BUILDFLAG(IS_BSD)
+   OutputToStreamWithPrefixImpl(os, prefix_string);
++#endif
+ }
+ 
+ std::string StackTrace::ToString() const {
+@@ -366,7 +368,7 @@ std::string StackTrace::ToStringWithPrefix(cstring_vie
+ 
+ std::string StackTrace::ToStringWithPrefix(cstring_view prefix_string) const {
+   std::stringstream stream;
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if !defined(__UCLIBC__) && !defined(_AIX) && !BUILDFLAG(IS_BSD)
+   OutputToStreamWithPrefix(&stream, prefix_string);
+ #endif
+   return stream.str();
+@@ -390,7 +392,7 @@ std::ostream& operator<<(std::ostream& os, const Stack
+ }
+ 
+ std::ostream& operator<<(std::ostream& os, const StackTrace& s) {
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if !defined(__UCLIBC__) && !defined(_AIX) && !BUILDFLAG(IS_BSD)
+   s.OutputToStream(&os);
+ #else
+   os << "StackTrace::OutputToStream not implemented.";