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

1 files changed, 31 insertions, 0 deletions

diff --git a/devel/electron39/files/patch-third__party_zlib_BUILD.gn b/devel/electron39/files/patch-third__party_zlib_BUILD.gn
new file mode 100644
index 000000000000..ed80f1855496
--- /dev/null
+++ b/devel/electron39/files/patch-third__party_zlib_BUILD.gn
@@ -0,0 +1,31 @@
+--- third_party/zlib/BUILD.gn.orig	2025-09-10 14:33:47 UTC
++++ third_party/zlib/BUILD.gn
+@@ -128,7 +128,7 @@ if (use_arm_neon_optimizations) {
+     defines = [ "CRC32_ARMV8_CRC32" ]
+     if (is_android) {
+       defines += [ "ARMV8_OS_ANDROID" ]
+-    } else if (is_linux || is_chromeos) {
++    } else if ((is_linux || is_chromeos) && !is_bsd) {
+       defines += [ "ARMV8_OS_LINUX" ]
+     } else if (is_mac) {
+       defines += [ "ARMV8_OS_MACOS" ]
+@@ -138,6 +138,10 @@ if (use_arm_neon_optimizations) {
+       defines += [ "ARMV8_OS_FUCHSIA" ]
+     } else if (is_win) {
+       defines += [ "ARMV8_OS_WINDOWS" ]
++    } else if (is_openbsd) {
++      defines += [ "ARMV8_OS_OPENBSD" ]
++    } else if (is_freebsd) {
++      defines += [ "ARMV8_OS_FREEBSD" ]
+     } else {
+       assert(false, "Unsupported ARM OS")
+     }
+@@ -423,7 +427,7 @@ static_library("minizip") {
+     ]
+   }
+ 
+-  if (is_apple || is_android) {
++  if (is_apple || is_android || is_bsd) {
+     # Mac, Android and the BSDs don't have fopen64, ftello64, or fseeko64. We
+     # use fopen, ftell, and fseek instead on these systems.
+     defines = [ "USE_FILE32API" ]