diff options
Diffstat (limited to 'devel/electron32')
| -rw-r--r-- | devel/electron32/Makefile | 5 | ||||
| -rw-r--r-- | devel/electron32/files/patch-build_rust_allocator_lib.rs | 10 | ||||
| -rw-r--r-- | devel/electron32/files/patch-net_dns_BUILD.gn | 16 |
3 files changed, 24 insertions, 7 deletions
diff --git a/devel/electron32/Makefile b/devel/electron32/Makefile index 6e0f325892fa..c8699b2c37eb 100644 --- a/devel/electron32/Makefile +++ b/devel/electron32/Makefile @@ -1,7 +1,7 @@ PORTNAME= electron DISTVERSIONPREFIX= v DISTVERSION= ${ELECTRON_VER} -PORTREVISION= 4 +PORTREVISION= 7 PULSEMV= 16 PULSEV= ${PULSEMV}.1 CATEGORIES= devel @@ -28,6 +28,7 @@ LICENSE_FILE= ${WRKSRC}/electron/LICENSE DEPRECATED= EOLed upstream, switch to newer version EXPIRATION_DATE= 2025-05-31 +BROKEN_i386= fetch fails: node process stalls during fetch phase and eats up all CPUs ONLY_FOR_ARCHS= aarch64 amd64 i386 FETCH_DEPENDS= yarn${NODEJS_SUFFIX}>0:www/yarn${NODEJS_SUFFIX} @@ -247,7 +248,7 @@ YARN_TIMESTAMP= 61171200 IGNORE= you have selected HEIMDAL_BASE but do not have Heimdal installed in base .endif -LLVM_DEFAULT= 19 +LLVM_DEFAULT= 20 BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} BINARY_ALIAS+= cpp=${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} \ cc=${LOCALBASE}/bin/clang${LLVM_DEFAULT} \ diff --git a/devel/electron32/files/patch-build_rust_allocator_lib.rs b/devel/electron32/files/patch-build_rust_allocator_lib.rs index 89fddf278294..d5733d6745ce 100644 --- a/devel/electron32/files/patch-build_rust_allocator_lib.rs +++ b/devel/electron32/files/patch-build_rust_allocator_lib.rs @@ -1,6 +1,6 @@ ---- build/rust/allocator/lib.rs.orig 2025-05-20 09:16:26 UTC +--- build/rust/allocator/lib.rs.orig 2025-08-26 22:27:28 UTC +++ build/rust/allocator/lib.rs -@@ -0,0 +1,119 @@ +@@ -0,0 +1,125 @@ +// 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. @@ -92,6 +92,12 @@ + /// As part of rustc's contract for using `#[global_allocator]` without + /// rustc-generated shims we must define this symbol, since we are opting in + /// to unstable functionality. See https://github.com/rust-lang/rust/issues/123015 ++ #[rustc_std_internal_symbol] ++ #[linkage = "weak"] ++ fn __rust_no_alloc_shim_is_unstable_v2() {} ++ ++ // TODO(crbug.com/422538133) Remove after rolling past ++ // https://github.com/rust-lang/rust/pull/141061 + #[no_mangle] + #[linkage = "weak"] + static __rust_no_alloc_shim_is_unstable: u8 = 0; 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" ] |