diff options
Diffstat (limited to 'devel/electron34')
| -rw-r--r-- | devel/electron34/Makefile | 2 | ||||
| -rw-r--r-- | devel/electron34/files/patch-build_rust_allocator_lib.rs | 11 |
2 files changed, 10 insertions, 3 deletions
diff --git a/devel/electron34/Makefile b/devel/electron34/Makefile index 58544d755082..47c2cd95212b 100644 --- a/devel/electron34/Makefile +++ b/devel/electron34/Makefile @@ -1,7 +1,7 @@ PORTNAME= electron DISTVERSIONPREFIX= v DISTVERSION= ${ELECTRON_VER} -PORTREVISION= 6 +PORTREVISION= 7 PULSEMV= 16 PULSEV= ${PULSEMV}.1 CATEGORIES= devel diff --git a/devel/electron34/files/patch-build_rust_allocator_lib.rs b/devel/electron34/files/patch-build_rust_allocator_lib.rs index 3e1dd7dcb48b..b0ec74e92ff3 100644 --- a/devel/electron34/files/patch-build_rust_allocator_lib.rs +++ b/devel/electron34/files/patch-build_rust_allocator_lib.rs @@ -1,6 +1,6 @@ ---- build/rust/allocator/lib.rs.orig 2025-08-26 22:47:37 UTC +--- build/rust/allocator/lib.rs.orig 2025-10-05 11:01:12 UTC +++ build/rust/allocator/lib.rs -@@ -0,0 +1,125 @@ +@@ -0,0 +1,132 @@ +// Copyright 2025 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -102,7 +102,14 @@ + #[linkage = "weak"] + static __rust_no_alloc_shim_is_unstable: u8 = 0; + ++ #[rustc_std_internal_symbol] ++ #[linkage = "weak"] ++ fn __rust_alloc_error_handler_should_panic_v2() -> u8 { ++ 0 ++ } ++ + // Mangle the symbol name as rustc expects. ++ // TODO(crbug.com/440481922): Remove this after rolling past https://github.com/rust-lang/rust/pull/143387 + #[rustc_std_internal_symbol] + #[allow(non_upper_case_globals)] + #[linkage = "weak"] |