mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
29ced1215a
* chore: bump chromium in DEPS to 111.0.5563.19 * chore: bump chromium in DEPS to 111.0.5563.33 * chore: bump chromium in DEPS to 111.0.5563.41 * chore: update patches * refactor: remove GetFontLookupTableCacheDir Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4191820 (cherry picked from commit52740f127f) * chore: remove dead DecodeToken code (cherry picked from commite7ac425771) * chore: add stub impls for WCO routing Refs: https://chromium-review.googlesource.com/c/chromium/src/+/4182690 (cherry picked from commit911e353b07) * refacotr: switch mojom::NetworkHintsHandler to use SchemeHostPair instead of URL Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4185417 (cherry picked from commita8b3befdd7) * chore: bump chromium in DEPS to 111.0.5563.50 * chore: update patches * 4240360: [intl] Revert date formatting behavior change from ICU 72 https://chromium-review.googlesource.com/c/v8/v8/+/4240360 * chore: update patches --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Samuel Attard <marshallofsound@electronjs.org> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
24 lines
1.1 KiB
Diff
24 lines
1.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: VerteDinde <vertedinde@electronjs.org>
|
|
Date: Tue, 1 Mar 2022 12:07:25 -0800
|
|
Subject: build: disable partition alloc on mac
|
|
|
|
Enabling partition alloc caused a crash when spawning
|
|
a child process. This patch disables partition alloc for mac,
|
|
and can be removed when the crash in fork is resolved.
|
|
Related issue: https://github.com/electron/electron/issues/32718
|
|
|
|
diff --git a/build_overrides/partition_alloc.gni b/build_overrides/partition_alloc.gni
|
|
index e90ccba879dc5823c15acf35869cd5bd211b717b..a95d2b46b37e007405cd472bd9f882c1d180d809 100644
|
|
--- a/build_overrides/partition_alloc.gni
|
|
+++ b/build_overrides/partition_alloc.gni
|
|
@@ -46,7 +46,7 @@ _disable_partition_alloc_everywhere = is_component_build || (is_win && is_debug)
|
|
if (is_ios) {
|
|
_is_partition_alloc_everywhere_platform = ios_partition_alloc_enabled
|
|
} else {
|
|
- _is_partition_alloc_everywhere_platform = !is_nacl
|
|
+ _is_partition_alloc_everywhere_platform = !is_nacl && !is_mac
|
|
}
|
|
|
|
# Under Windows debug build, the allocator shim is not compatible with CRT.
|