git: dc336b38784d - main - devel/electron21: update to 21.4.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 03 Feb 2023 05:02:48 UTC
The branch main has been updated by tagattie:
URL: https://cgit.FreeBSD.org/ports/commit/?id=dc336b38784d8842417b9f9d7474dc9322564464
commit dc336b38784d8842417b9f9d7474dc9322564464
Author: Hiroki Tagato <tagattie@FreeBSD.org>
AuthorDate: 2023-02-03 05:01:18 +0000
Commit: Hiroki Tagato <tagattie@FreeBSD.org>
CommitDate: 2023-02-03 05:02:39 +0000
devel/electron21: update to 21.4.0
Changelog:
- https://github.com/electron/electron/releases/tag/v21.2.1
- https://github.com/electron/electron/releases/tag/v21.2.2
- https://github.com/electron/electron/releases/tag/v21.2.3
- https://github.com/electron/electron/releases/tag/v21.3.0
- https://github.com/electron/electron/releases/tag/v21.3.1
- https://github.com/electron/electron/releases/tag/v21.3.3
- https://github.com/electron/electron/releases/tag/v21.3.4
- https://github.com/electron/electron/releases/tag/v21.3.5
- https://github.com/electron/electron/releases/tag/v21.4.0
---
devel/electron21/Makefile | 12 +-
devel/electron21/Makefile.version | 2 +-
devel/electron21/distinfo | 16 +-
devel/electron21/files/package.json | 12 +-
devel/electron21/files/patch-BUILD.gn | 8 +-
...locator_partition__allocator_partition__root.cc | 4 +-
.../files/patch-build_config_BUILDCONFIG.gn | 10 +-
.../files/patch-build_config_compiler_pgo_pgo.gni | 4 +-
...tch-chrome_browser_process__singleton__posix.cc | 11 +-
devel/electron21/files/patch-chrome_test_BUILD.gn | 4 +-
...ch-components_viz_host_host__display__client.cc | 4 +-
...tch-components_viz_host_host__display__client.h | 4 +-
...onents_viz_host_renderer__settings__creation.cc | 4 +-
...e__sinks_root__compositor__frame__sink__impl.cc | 6 +-
...atch-content_app_content__main__runner__impl.cc | 22 +-
...wser_child__process__launcher__helper__linux.cc | 6 +-
...patch-content_browser_gpu_gpu__process__host.cc | 6 +-
...r_media_media__keys__listener__manager__impl.cc | 4 +-
...r_renderer__host_render__process__host__impl.cc | 14 +-
...wser_web__contents_web__contents__view__aura.cc | 4 +-
.../files/patch-content_gpu_gpu__main.cc | 6 +-
...patch-content_renderer_render__process__impl.cc | 8 +-
...tent_renderer_renderer__blink__platform__impl.h | 6 +-
devel/electron21/files/patch-electron_BUILD.gn | 29 +-
.../electron21/files/patch-electron_filenames.gni | 4 +-
.../patch-electron_lib_common_api_clipboard.ts | 4 +-
.../files/patch-electron_script_lib_get-version.js | 17 ++
.../files/patch-electron_script_lib_utils.js | 4 +-
...-electron_shell_app_electron__main__delegate.cc | 12 +-
...lectron_shell_browser_api_electron__api__app.cc | 14 +-
...hell_browser_api_electron__api__base__window.cc | 4 +-
...l_browser_api_electron__api__crash__reporter.cc | 16 +-
...browser_api_electron__api__desktop__capturer.cc | 29 ++
...ll_browser_api_electron__api__power__monitor.cc | 6 +-
...ell_browser_api_electron__api__power__monitor.h | 4 +-
...ell_browser_api_electron__api__safe__storage.cc | 4 +-
...ell_browser_api_electron__api__web__contents.cc | 10 +-
...hell_browser_api_electron__api__web__contents.h | 4 +-
.../files/patch-electron_shell_browser_browser.h | 6 +-
...tron_shell_browser_electron__browser__client.cc | 4 +-
...shell_browser_electron__browser__main__parts.cc | 10 +-
..._shell_browser_electron__browser__main__parts.h | 4 +-
.../patch-electron_shell_browser_native__window.cc | 4 +-
...tch-electron_shell_browser_relauncher__linux.cc | 6 +-
...l_browser_ui_views_electron__views__delegate.cc | 4 +-
...ch-electron_shell_browser_ui_views_menu__bar.cc | 8 +-
...on_shell_common_api_electron__api__clipboard.cc | 6 +-
...hell_common_api_electron__api__native__image.cc | 4 +-
...shell_common_api_electron__api__native__image.h | 4 +-
.../patch-electron_shell_common_node__bindings.cc | 10 +-
.../files/patch-electron_spec-main_api-app-spec.ts | 42 ++-
...tch-electron_spec-main_api-browser-view-spec.ts | 20 --
...h-electron_spec-main_api-browser-window-spec.ts | 36 +--
.../patch-electron_spec-main_api-clipboard-spec.ts | 8 +-
...tch-electron_spec-main_api-native-image-spec.ts | 4 +-
.../patch-electron_spec-main_api-net-log-spec.ts | 4 +-
...ch-electron_spec-main_api-power-monitor-spec.ts | 6 +-
.../patch-electron_spec-main_api-process-spec.ts | 13 +-
.../patch-electron_spec-main_api-screen-spec.ts | 8 +-
.../patch-electron_spec-main_api-shell-spec.ts | 6 +-
...h-electron_spec-main_api-web-frame-main-spec.ts | 4 +-
.../patch-electron_spec-main_chromium-spec.ts | 50 +++-
.../files/patch-electron_spec-main_crash-spec.ts | 11 +
.../patch-electron_spec-main_version-bump-spec.ts | 4 +-
.../files/patch-electron_spec-main_webview-spec.ts | 4 +-
devel/electron21/files/patch-media_audio_BUILD.gn | 4 +-
...blink_renderer_core_exported_web__view__impl.cc | 6 +-
.../files/patch-third__party_boringssl_BUILD.gn | 4 +-
.../files/patch-third__party_zlib_BUILD.gn | 4 +-
devel/electron21/files/patch-ui_color_color__id.h | 4 +-
.../files/patch-ui_compositor_compositor.h | 4 +-
devel/electron21/files/patch-ui_gfx_switches.cc | 4 +-
devel/electron21/files/patch-ui_gfx_switches.h | 4 +-
devel/electron21/files/patch-ui_gtk_gtk__compat.cc | 16 +-
.../patch-ui_gtk_printing_print__dialog__gtk.cc | 4 +-
...h-ui_ozone_platform_x11_ozone__platform__x11.cc | 4 +-
.../files/patch-ui_ozone_public_ozone__platform.h | 4 +-
devel/electron21/files/patch-v8_BUILD.gn | 8 +-
devel/electron21/files/yarn.lock | 315 +++++++++++++++++++--
79 files changed, 684 insertions(+), 329 deletions(-)
diff --git a/devel/electron21/Makefile b/devel/electron21/Makefile
index 808765d5b067..a2a0e5689b80 100644
--- a/devel/electron21/Makefile
+++ b/devel/electron21/Makefile
@@ -2,10 +2,12 @@ PORTNAME= electron
DISTVERSIONPREFIX= v
DISTVERSION= ${ELECTRON_VER:S/-beta./.b/}
CATEGORIES= devel
-MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/:chromium \
+MASTER_SITES= https://github.com/tagattie/FreeBSD-Electron/releases/download/v21.4.0/:chromium \
+ https://commondatastorage.googleapis.com/chromium-nodejs/:chromium_node \
https://commondatastorage.googleapis.com/chromium-fonts/:chromium_testfonts
PKGNAMESUFFIX= ${ELECTRON_VER_MAJOR}
DISTFILES= chromium-${CHROMIUM_VER}${EXTRACT_SUFX}:chromium \
+ ${CHROMIUM_NODE_MODULES_HASH}:chromium_node \
${CHROMIUM_TEST_FONTS_HASH}:chromium_testfonts \
electron-yarn-cache-${ELECTRON_VER}${EXTRACT_SUFX}:prefetch
DIST_SUBDIR= ${PORTNAME}
@@ -137,7 +139,9 @@ SNDIO_VARS= GN_ARGS+=use_sndio=true
SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false
# See ${WRKSRC}/electron/DEPS for CHROMIUM_VER
-CHROMIUM_VER= 106.0.5249.119
+CHROMIUM_VER= 106.0.5249.199
+# See ${WRKSRC}/third_party/node/node_modules.tar.gz.sha1 for CHROMIUM_NODE_MODULES_HASH
+CHROMIUM_NODE_MODULES_HASH= 80c023f0deb4d0ff28b42c4848257d26b7207725
# See ${WRKSRC}/third_party/test_fonts/test_fonts.tar.gz.sha1 for CHROMIUM_TEST_FONTS_HASH
CHROMIUM_TEST_FONTS_HASH= 336e775eec536b2d785cc80eff6ac39051931286
# See ${WRKSRC}/electron/DEPS for NODE_VER
@@ -151,14 +155,13 @@ REACTIVEOBJC_VER= 74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76
# See ${WRKSRC}/electron/DEPS for MANTLE_VER
MANTLE_VER= 78d3966b3c331292ea29ec38661b25df0a245948
-YARN_TIMESTAMP= 1661146515
+YARN_TIMESTAMP= 1675227603
GN_ARGS+= clang_use_chrome_plugins=false \
enable_hangout_services_extension=true \
enable_js_type_check=false \
enable_nacl=false \
enable_remoting=false \
- enable_wmax_tokens=false \
fatal_linker_warnings=false \
icu_use_data_file=false \
is_clang=true \
@@ -245,6 +248,7 @@ post-extract:
${WRKSRC}/third_party/squirrel.mac/vendor/ReactiveObjC
${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_mantle}-${MANTLE_VER} \
${WRKSRC}/third_party/squirrel.mac/vendor/Mantle
+ ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/node_modules ${WRKSRC}/third_party/node
${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/test_fonts ${WRKSRC}/third_party/test_fonts
# Install node modules for electron
${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/yarn-offline-cache ${WRKDIR}
diff --git a/devel/electron21/Makefile.version b/devel/electron21/Makefile.version
index cdad2cdcf1e5..14ff2fa8b7ca 100644
--- a/devel/electron21/Makefile.version
+++ b/devel/electron21/Makefile.version
@@ -1,2 +1,2 @@
-ELECTRON_VER= 21.2.0
+ELECTRON_VER= 21.4.0
ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//}
diff --git a/devel/electron21/distinfo b/devel/electron21/distinfo
index e4455975ec61..de8c47a7c023 100644
--- a/devel/electron21/distinfo
+++ b/devel/electron21/distinfo
@@ -1,12 +1,14 @@
-TIMESTAMP = 1670151730
-SHA256 (electron/chromium-106.0.5249.119.tar.xz) = 0f091b4950e120d5c3e23ab391bacfdb6ce8eb8d0acab55e9dae1a8c247dd192
-SIZE (electron/chromium-106.0.5249.119.tar.xz) = 1611067204
+TIMESTAMP = 1675231973
+SHA256 (electron/chromium-106.0.5249.199.tar.xz) = 2f39a6b570f2abb41e9c642cb054144796d1ab0096be6b44d3c59e20252c9318
+SIZE (electron/chromium-106.0.5249.199.tar.xz) = 1458418844
+SHA256 (electron/80c023f0deb4d0ff28b42c4848257d26b7207725) = 57c83bdd82a021d319eb520c3743e962056b7d184077192aa565cf8aef5ba54d
+SIZE (electron/80c023f0deb4d0ff28b42c4848257d26b7207725) = 12142959
SHA256 (electron/336e775eec536b2d785cc80eff6ac39051931286) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
SIZE (electron/336e775eec536b2d785cc80eff6ac39051931286) = 32624734
-SHA256 (electron/electron-yarn-cache-21.2.0.tar.xz) = f9d0417abf6221ad3e39698f5213d4deb6b9750c0e5dcf72a8405eff630b536e
-SIZE (electron/electron-yarn-cache-21.2.0.tar.xz) = 38029868
-SHA256 (electron/electron-electron-v21.2.0_GH0.tar.gz) = dc840125f94b851191593eea9031949978ab69b628506b094b3ffa33d679f413
-SIZE (electron/electron-electron-v21.2.0_GH0.tar.gz) = 10492135
+SHA256 (electron/electron-yarn-cache-21.4.0.tar.xz) = f28b9136e809001a2600314da6692d7476e0d98b150a8e8b7710f6fd6005f801
+SIZE (electron/electron-yarn-cache-21.4.0.tar.xz) = 39022492
+SHA256 (electron/electron-electron-v21.4.0_GH0.tar.gz) = 720137a5eec575111ea7eec45c39f0a15e1584eca653dd3f4a5df24470a44fa3
+SIZE (electron/electron-electron-v21.4.0_GH0.tar.gz) = 10558451
SHA256 (electron/nodejs-node-v16.16.0_GH0.tar.gz) = e86cb6b24c38f7fbdbfe7722ed3207b041d923e38dbeedf20fe9baa59c29e907
SIZE (electron/nodejs-node-v16.16.0_GH0.tar.gz) = 89632384
SHA256 (electron/nodejs-nan-16fa32231e2ccd89d2804b3f765319128b20c4ac_GH0.tar.gz) = 3807ae6a1e451a29f068540472f100f9718d457c60ac62f2f8469d1d57475d39
diff --git a/devel/electron21/files/package.json b/devel/electron21/files/package.json
index 5e526afc7733..bfffba1e73d5 100644
--- a/devel/electron21/files/package.json
+++ b/devel/electron21/files/package.json
@@ -1,13 +1,14 @@
{
"name": "electron",
- "version": "21.2.0",
+ "version": "0.0.0-development",
"repository": "https://github.com/electron/electron",
"description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
"devDependencies": {
"@azure/storage-blob": "^12.9.0",
- "@electron/docs-parser": "^0.12.4",
- "@electron/typescript-definitions": "^8.9.5",
- "@octokit/auth-app": "^2.10.0",
+ "@electron/asar": "^3.2.1",
+ "@electron/docs-parser": "^1.0.0",
+ "@electron/github-app-auth": "^1.5.0",
+ "@electron/typescript-definitions": "^8.10.0",
"@octokit/rest": "^18.0.3",
"@primer/octicons": "^10.0.0",
"@types/basic-auth": "^1.1.3",
@@ -31,7 +32,6 @@
"@types/webpack-env": "^1.16.3",
"@typescript-eslint/eslint-plugin": "^4.4.1",
"@typescript-eslint/parser": "^4.4.1",
- "asar": "^3.1.0",
"aws-sdk": "^2.814.0",
"check-for-leaks": "^1.2.1",
"colors": "1.4.0",
@@ -89,7 +89,7 @@
"lint:docs-relative-links": "python3 ./script/check-relative-doc-links.py",
"lint:markdownlint": "markdownlint \"*.md\" \"docs/**/*.md\"",
"lint:js-in-markdown": "standard-markdown docs",
- "create-api-json": "electron-docs-parser --dir=./",
+ "create-api-json": "node script/create-api-json.js",
"create-typescript-definitions": "npm run create-api-json && electron-typescript-definitions --api=electron-api.json && node spec/ts-smoke/runner.js",
"gn-typescript-definitions": "npm run create-typescript-definitions && shx cp electron.d.ts",
"pre-flight": "pre-flight",
diff --git a/devel/electron21/files/patch-BUILD.gn b/devel/electron21/files/patch-BUILD.gn
index 94898e0b104e..e86a660f278e 100644
--- a/devel/electron21/files/patch-BUILD.gn
+++ b/devel/electron21/files/patch-BUILD.gn
@@ -1,4 +1,4 @@
---- BUILD.gn.orig 2022-09-24 10:57:32 UTC
+--- BUILD.gn.orig 2023-02-01 13:31:45 UTC
+++ BUILD.gn
@@ -53,7 +53,7 @@ declare_args() {
root_extra_deps = []
@@ -51,7 +51,7 @@
deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
}
-@@ -1202,7 +1210,7 @@ if (!is_ios) {
+@@ -1205,7 +1213,7 @@ if (!is_ios) {
data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ]
}
@@ -60,7 +60,7 @@
data_deps +=
[ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
}
-@@ -1211,7 +1219,7 @@ if (!is_ios) {
+@@ -1214,7 +1222,7 @@ if (!is_ios) {
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
@@ -69,7 +69,7 @@
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
-@@ -1654,7 +1662,7 @@ group("chromium_builder_perf") {
+@@ -1657,7 +1665,7 @@ group("chromium_builder_perf") {
data_deps += [ "//chrome/test:performance_browser_tests" ]
}
diff --git a/devel/electron21/files/patch-base_allocator_partition__allocator_partition__root.cc b/devel/electron21/files/patch-base_allocator_partition__allocator_partition__root.cc
index f3bde11bbbaf..bd71d492f0b0 100644
--- a/devel/electron21/files/patch-base_allocator_partition__allocator_partition__root.cc
+++ b/devel/electron21/files/patch-base_allocator_partition__allocator_partition__root.cc
@@ -1,4 +1,4 @@
---- base/allocator/partition_allocator/partition_root.cc.orig 2022-09-24 10:57:32 UTC
+--- base/allocator/partition_allocator/partition_root.cc.orig 2023-02-01 05:17:57 UTC
+++ base/allocator/partition_allocator/partition_root.cc
@@ -33,7 +33,7 @@
#include "wow64apiset.h"
@@ -23,7 +23,7 @@
(PartitionPageSize() * kMaxPartitionPagesPerRegularSlotSpan) /
MaxPurgeableSlotSize();
-#elif BUILDFLAG(IS_APPLE) || (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64))
-+#elif BUILDFLAG(IS_APPLE) || ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64))
++#elif BUILDFLAG(IS_APPLE) || ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) && defined(ARCH_CPU_ARM64))
// It's better for slot_usage to be stack-allocated and fixed-size, which
// demands that its size be constexpr. On IS_APPLE and Linux on arm64,
// PartitionPageSize() is always SystemPageSize() << 2, so regardless of
diff --git a/devel/electron21/files/patch-build_config_BUILDCONFIG.gn b/devel/electron21/files/patch-build_config_BUILDCONFIG.gn
index d0508a977723..7b08eef3a660 100644
--- a/devel/electron21/files/patch-build_config_BUILDCONFIG.gn
+++ b/devel/electron21/files/patch-build_config_BUILDCONFIG.gn
@@ -1,6 +1,6 @@
---- build/config/BUILDCONFIG.gn.orig 2022-04-21 18:48:31 UTC
+--- build/config/BUILDCONFIG.gn.orig 2023-02-01 13:31:45 UTC
+++ build/config/BUILDCONFIG.gn
-@@ -136,7 +136,8 @@ declare_args() {
+@@ -139,7 +139,8 @@ declare_args() {
is_official_build = false
# Set to true when compiling with the Clang compiler.
@@ -10,7 +10,7 @@
(current_cpu != "s390x" && current_cpu != "s390" &&
current_cpu != "ppc64" && current_cpu != "ppc" &&
current_cpu != "mips" && current_cpu != "mips64" &&
-@@ -220,6 +221,10 @@ if (host_toolchain == "") {
+@@ -223,6 +224,10 @@ if (host_toolchain == "") {
host_toolchain = "//build/toolchain/aix:$host_cpu"
} else if (host_os == "zos") {
host_toolchain = "//build/toolchain/zos:$host_cpu"
@@ -21,7 +21,7 @@
} else {
assert(false, "Unsupported host_os: $host_os")
}
-@@ -264,6 +269,8 @@ if (target_os == "android") {
+@@ -267,6 +272,8 @@ if (target_os == "android") {
_default_toolchain = "//build/toolchain/aix:$target_cpu"
} else if (target_os == "zos") {
_default_toolchain = "//build/toolchain/zos:$target_cpu"
@@ -30,7 +30,7 @@
} else {
assert(false, "Unsupported target_os: $target_os")
}
-@@ -298,7 +305,11 @@ is_android = current_os == "android"
+@@ -301,7 +308,11 @@ is_android = current_os == "android"
is_chromeos = current_os == "chromeos"
is_fuchsia = current_os == "fuchsia"
is_ios = current_os == "ios"
diff --git a/devel/electron21/files/patch-build_config_compiler_pgo_pgo.gni b/devel/electron21/files/patch-build_config_compiler_pgo_pgo.gni
index 48e398b498cc..7f0526726a08 100644
--- a/devel/electron21/files/patch-build_config_compiler_pgo_pgo.gni
+++ b/devel/electron21/files/patch-build_config_compiler_pgo_pgo.gni
@@ -1,5 +1,5 @@
---- build/config/compiler/pgo/pgo.gni.orig 2022-12-03 09:23:06.609476000 +0100
-+++ build/config/compiler/pgo/pgo.gni 2022-12-03 09:23:28.402670000 +0100
+--- build/config/compiler/pgo/pgo.gni.orig 2023-02-01 05:17:58 UTC
++++ build/config/compiler/pgo/pgo.gni
@@ -24,7 +24,7 @@ declare_args() {
# to chromecast and determine whether chromeos_is_browser_only is
# obsolete.
diff --git a/devel/electron21/files/patch-chrome_browser_process__singleton__posix.cc b/devel/electron21/files/patch-chrome_browser_process__singleton__posix.cc
index 06bcc813434b..36d8c30394d5 100644
--- a/devel/electron21/files/patch-chrome_browser_process__singleton__posix.cc
+++ b/devel/electron21/files/patch-chrome_browser_process__singleton__posix.cc
@@ -1,14 +1,5 @@
---- chrome/browser/process_singleton_posix.cc.orig 2022-08-31 12:19:35 UTC
+--- chrome/browser/process_singleton_posix.cc.orig 2023-02-01 13:31:45 UTC
+++ chrome/browser/process_singleton_posix.cc
-@@ -99,7 +99,7 @@
- #include "ui/base/l10n/l10n_util.h"
-
- #if 0
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/ui/process_singleton_dialog_linux.h"
- #endif
- #endif
@@ -357,7 +357,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo
if (g_disable_prompt)
return g_user_opted_unlock_in_use_profile;
diff --git a/devel/electron21/files/patch-chrome_test_BUILD.gn b/devel/electron21/files/patch-chrome_test_BUILD.gn
index a210d8ad7038..46924d19cbfa 100644
--- a/devel/electron21/files/patch-chrome_test_BUILD.gn
+++ b/devel/electron21/files/patch-chrome_test_BUILD.gn
@@ -1,6 +1,6 @@
---- chrome/test/BUILD.gn.orig 2022-09-24 10:57:32 UTC
+--- chrome/test/BUILD.gn.orig 2023-02-01 13:31:45 UTC
+++ chrome/test/BUILD.gn
-@@ -9861,7 +9861,7 @@ test("chrome_app_unittests") {
+@@ -9868,7 +9868,7 @@ test("chrome_app_unittests") {
"//components/heap_profiling/in_process",
"//components/safe_browsing:buildflags",
]
diff --git a/devel/electron21/files/patch-components_viz_host_host__display__client.cc b/devel/electron21/files/patch-components_viz_host_host__display__client.cc
index 928e130abee9..9d99894bac18 100644
--- a/devel/electron21/files/patch-components_viz_host_host__display__client.cc
+++ b/devel/electron21/files/patch-components_viz_host_host__display__client.cc
@@ -1,6 +1,6 @@
---- components/viz/host/host_display_client.cc.orig 2022-02-28 16:54:41 UTC
+--- components/viz/host/host_display_client.cc.orig 2023-02-01 13:31:45 UTC
+++ components/viz/host/host_display_client.cc
-@@ -61,7 +61,7 @@ void HostDisplayClient::CreateLayeredWindowUpdater(
+@@ -65,7 +65,7 @@ void HostDisplayClient::CreateLayeredWindowUpdater(
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/devel/electron21/files/patch-components_viz_host_host__display__client.h b/devel/electron21/files/patch-components_viz_host_host__display__client.h
index 2786ca6b69fb..1d3501826025 100644
--- a/devel/electron21/files/patch-components_viz_host_host__display__client.h
+++ b/devel/electron21/files/patch-components_viz_host_host__display__client.h
@@ -1,6 +1,6 @@
---- components/viz/host/host_display_client.h.orig 2022-02-28 16:54:41 UTC
+--- components/viz/host/host_display_client.h.orig 2023-02-01 13:31:45 UTC
+++ components/viz/host/host_display_client.h
-@@ -48,7 +48,7 @@ class VIZ_HOST_EXPORT HostDisplayClient : public mojom
+@@ -47,7 +47,7 @@ class VIZ_HOST_EXPORT HostDisplayClient : public mojom
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/devel/electron21/files/patch-components_viz_host_renderer__settings__creation.cc b/devel/electron21/files/patch-components_viz_host_renderer__settings__creation.cc
index 9dd671db141b..dff21549ae0b 100644
--- a/devel/electron21/files/patch-components_viz_host_renderer__settings__creation.cc
+++ b/devel/electron21/files/patch-components_viz_host_renderer__settings__creation.cc
@@ -1,6 +1,6 @@
---- components/viz/host/renderer_settings_creation.cc.orig 2022-02-28 16:54:41 UTC
+--- components/viz/host/renderer_settings_creation.cc.orig 2023-02-01 13:31:45 UTC
+++ components/viz/host/renderer_settings_creation.cc
-@@ -52,7 +52,7 @@ RendererSettings CreateRendererSettings() {
+@@ -55,7 +55,7 @@ RendererSettings CreateRendererSettings() {
renderer_settings.partial_swap_enabled =
!command_line->HasSwitch(switches::kUIDisablePartialSwap);
diff --git a/devel/electron21/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc b/devel/electron21/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc
index 8093e9ac2e5a..9f5e5bb30393 100644
--- a/devel/electron21/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc
+++ b/devel/electron21/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc
@@ -1,6 +1,6 @@
---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2022-09-24 10:57:32 UTC
+--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2023-02-01 13:31:45 UTC
+++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
-@@ -97,7 +97,7 @@ RootCompositorFrameSinkImpl::Create(
+@@ -98,7 +98,7 @@ RootCompositorFrameSinkImpl::Create(
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -9,7 +9,7 @@
// For X11, we need notify client about swap completion after resizing, so the
// client can use it for synchronize with X11 WM.
output_surface->SetNeedsSwapSizeNotifications(true);
-@@ -576,7 +576,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw
+@@ -577,7 +577,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw
display_client_->DidCompleteSwapWithSize(pixel_size);
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/devel/electron21/files/patch-content_app_content__main__runner__impl.cc b/devel/electron21/files/patch-content_app_content__main__runner__impl.cc
index bf22333c2c4e..43eb6ccf6482 100644
--- a/devel/electron21/files/patch-content_app_content__main__runner__impl.cc
+++ b/devel/electron21/files/patch-content_app_content__main__runner__impl.cc
@@ -1,6 +1,6 @@
---- content/app/content_main_runner_impl.cc.orig 2022-09-24 10:57:32 UTC
+--- content/app/content_main_runner_impl.cc.orig 2023-02-01 13:31:45 UTC
+++ content/app/content_main_runner_impl.cc
-@@ -130,13 +130,13 @@
+@@ -132,13 +132,13 @@
#include "base/posix/global_descriptors.h"
#include "content/public/common/content_descriptors.h"
@@ -16,7 +16,7 @@
#include "base/native_library.h"
#include "base/rand_util.h"
#include "content/public/common/zygote/sandbox_support_linux.h"
-@@ -175,6 +175,10 @@
+@@ -177,6 +177,10 @@
#include "media/base/media_switches.h"
#endif
@@ -27,7 +27,7 @@
#if BUILDFLAG(IS_ANDROID)
#include "base/system/sys_info.h"
#include "content/browser/android/battery_metrics.h"
-@@ -360,7 +364,7 @@ void InitializeZygoteSandboxForBrowserProcess(
+@@ -365,7 +369,7 @@ void InitializeZygoteSandboxForBrowserProcess(
}
#endif // BUILDFLAG(USE_ZYGOTE_HANDLE)
@@ -36,7 +36,7 @@
#if BUILDFLAG(ENABLE_PPAPI)
// Loads the (native) libraries but does not initialize them (i.e., does not
-@@ -396,7 +400,7 @@ void PreloadLibraryCdms() {
+@@ -401,7 +405,7 @@ void PreloadLibraryCdms() {
}
#endif // BUILDFLAG(ENABLE_LIBRARY_CDMS)
@@ -45,7 +45,7 @@
void PreSandboxInit() {
// Pre-acquire resources needed by BoringSSL. See
// https://boringssl.googlesource.com/boringssl/+/HEAD/SANDBOXING.md
-@@ -412,6 +416,11 @@ void PreSandboxInit() {
+@@ -417,6 +421,11 @@ void PreSandboxInit() {
#endif
InitializeWebRtcModule();
@@ -57,7 +57,7 @@
// Set the android SkFontMgr for blink. We need to ensure this is done
// before the sandbox is initialized to allow the font manager to access
// font configuration files on disk.
-@@ -594,7 +603,7 @@ int NO_STACK_PROTECTOR RunZygote(ContentMainDelegate*
+@@ -599,7 +608,7 @@ int NO_STACK_PROTECTOR RunZygote(ContentMainDelegate*
delegate->ZygoteStarting(&zygote_fork_delegates);
media::InitializeMediaLibrary();
@@ -66,7 +66,7 @@
PreSandboxInit();
#endif
-@@ -785,11 +794,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
+@@ -790,11 +799,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
kFieldTrialDescriptor + base::GlobalDescriptors::kBaseDescriptor);
#endif // !BUILDFLAG(IS_ANDROID)
@@ -80,7 +80,7 @@
#endif // !BUILDFLAG(IS_WIN)
-@@ -972,6 +980,16 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
+@@ -977,6 +985,16 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
}
#endif
@@ -97,7 +97,7 @@
delegate_->SandboxInitialized(process_type);
#if BUILDFLAG(USE_ZYGOTE_HANDLE)
-@@ -1031,7 +1049,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
+@@ -1036,7 +1054,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
mojo::core::InitFeatures();
}
@@ -106,7 +106,7 @@
// If dynamic Mojo Core is being used, ensure that it's loaded very early in
// the child/zygote process, before any sandbox is initialized. The library
// is not fully initialized with IPC support until a ChildProcess is later
-@@ -1064,6 +1082,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
+@@ -1069,6 +1087,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
content_main_params_.reset();
RegisterMainThreadFactories();
diff --git a/devel/electron21/files/patch-content_browser_child__process__launcher__helper__linux.cc b/devel/electron21/files/patch-content_browser_child__process__launcher__helper__linux.cc
index 8a041942e2ad..aa82e65c1d25 100644
--- a/devel/electron21/files/patch-content_browser_child__process__launcher__helper__linux.cc
+++ b/devel/electron21/files/patch-content_browser_child__process__launcher__helper__linux.cc
@@ -1,5 +1,5 @@
---- content/browser/child_process_launcher_helper_linux.cc.orig 2022-12-02 18:29:21.024493000 +0100
-+++ content/browser/child_process_launcher_helper_linux.cc 2022-12-03 09:43:25.213559000 +0100
+--- content/browser/child_process_launcher_helper_linux.cc.orig 2023-02-01 13:31:45 UTC
++++ content/browser/child_process_launcher_helper_linux.cc
@@ -20,7 +20,9 @@
#include "content/public/common/result_codes.h"
#include "content/public/common/sandboxed_process_launcher_delegate.h"
@@ -14,7 +14,7 @@
options->fds_to_remap = files_to_register.GetMappingWithIDAdjustment(
base::GlobalDescriptors::kBaseDescriptor);
-+# if !BUILDFLAG(IS_BSD)
++#if !BUILDFLAG(IS_BSD)
if (GetProcessType() == switches::kRendererProcess) {
const int sandbox_fd = SandboxHostLinux::GetInstance()->GetChildSocket();
options->fds_to_remap.push_back(std::make_pair(sandbox_fd, GetSandboxFD()));
diff --git a/devel/electron21/files/patch-content_browser_gpu_gpu__process__host.cc b/devel/electron21/files/patch-content_browser_gpu_gpu__process__host.cc
index fe9f7a6a6fa7..b1a7fc4147e1 100644
--- a/devel/electron21/files/patch-content_browser_gpu_gpu__process__host.cc
+++ b/devel/electron21/files/patch-content_browser_gpu_gpu__process__host.cc
@@ -1,4 +1,4 @@
---- content/browser/gpu/gpu_process_host.cc.orig 2022-07-22 17:30:31 UTC
+--- content/browser/gpu/gpu_process_host.cc.orig 2023-02-01 13:31:45 UTC
+++ content/browser/gpu/gpu_process_host.cc
@@ -101,7 +101,7 @@
#include "ui/ozone/public/ozone_switches.h"
@@ -9,7 +9,7 @@
#include "ui/gfx/switches.h"
#endif
-@@ -253,6 +253,7 @@ static const char* const kSwitchNames[] = {
+@@ -254,6 +254,7 @@ static const char* const kSwitchNames[] = {
switches::kEnableBackgroundThreadPool,
switches::kEnableGpuRasterization,
switches::kEnableLogging,
@@ -17,7 +17,7 @@
switches::kEnableDeJelly,
switches::kDeJellyScreenWidth,
switches::kDoubleBufferCompositing,
-@@ -286,7 +287,7 @@ static const char* const kSwitchNames[] = {
+@@ -287,7 +288,7 @@ static const char* const kSwitchNames[] = {
switches::kOzoneDumpFile,
switches::kDisableBufferBWCompression,
#endif
diff --git a/devel/electron21/files/patch-content_browser_media_media__keys__listener__manager__impl.cc b/devel/electron21/files/patch-content_browser_media_media__keys__listener__manager__impl.cc
index 3646f04d18b3..b9f960cf5af8 100644
--- a/devel/electron21/files/patch-content_browser_media_media__keys__listener__manager__impl.cc
+++ b/devel/electron21/files/patch-content_browser_media_media__keys__listener__manager__impl.cc
@@ -1,6 +1,6 @@
---- content/browser/media/media_keys_listener_manager_impl.cc.orig 2022-04-21 18:48:31 UTC
+--- content/browser/media/media_keys_listener_manager_impl.cc.orig 2023-02-01 13:31:45 UTC
+++ content/browser/media/media_keys_listener_manager_impl.cc
-@@ -233,7 +233,7 @@ void MediaKeysListenerManagerImpl::StartListeningForMe
+@@ -237,7 +237,7 @@ void MediaKeysListenerManagerImpl::StartListeningForMe
// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
// complete.
#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
diff --git a/devel/electron21/files/patch-content_browser_renderer__host_render__process__host__impl.cc b/devel/electron21/files/patch-content_browser_renderer__host_render__process__host__impl.cc
index 140f949b7fdb..fad739e1371d 100644
--- a/devel/electron21/files/patch-content_browser_renderer__host_render__process__host__impl.cc
+++ b/devel/electron21/files/patch-content_browser_renderer__host_render__process__host__impl.cc
@@ -1,6 +1,6 @@
---- content/browser/renderer_host/render_process_host_impl.cc.orig 2022-09-24 10:57:32 UTC
+--- content/browser/renderer_host/render_process_host_impl.cc.orig 2023-02-01 13:31:45 UTC
+++ content/browser/renderer_host/render_process_host_impl.cc
-@@ -211,7 +211,7 @@
+@@ -212,7 +212,7 @@
#include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h"
#endif
@@ -9,7 +9,7 @@
#include <sys/resource.h>
#include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck
-@@ -1135,7 +1135,7 @@ static constexpr size_t kUnknownPlatformProcessLimit =
+@@ -1136,7 +1136,7 @@ static constexpr size_t kUnknownPlatformProcessLimit =
// to indicate failure and std::numeric_limits<size_t>::max() to indicate
// unlimited.
size_t GetPlatformProcessLimit() {
@@ -18,7 +18,7 @@
struct rlimit limit;
if (getrlimit(RLIMIT_NPROC, &limit) != 0)
return kUnknownPlatformProcessLimit;
-@@ -1222,7 +1222,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public
+@@ -1223,7 +1223,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public
return;
}
@@ -27,7 +27,7 @@
if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) {
ConnectToFontService(std::move(font_receiver));
return;
-@@ -2114,7 +2114,7 @@ void RenderProcessHostImpl::CreateWebSocketConnector(
+@@ -2122,7 +2122,7 @@ void RenderProcessHostImpl::CreateWebSocketConnector(
std::move(receiver));
}
@@ -36,7 +36,7 @@
void RenderProcessHostImpl::CreateStableVideoDecoder(
mojo::PendingReceiver<media::stable::mojom::StableVideoDecoder> receiver) {
if (!stable_video_decoder_factory_remote_.is_bound()) {
-@@ -3243,6 +3243,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin
+@@ -3252,6 +3252,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin
switches::kDisableSpeechAPI,
switches::kDisableThreadedCompositing,
switches::kDisableTouchDragDrop,
@@ -44,7 +44,7 @@
switches::kDisableV8IdleTasks,
switches::kDisableVideoCaptureUseGpuMemoryBuffer,
switches::kDisableWebGLImageChromium,
-@@ -4716,7 +4717,7 @@ void RenderProcessHostImpl::ResetIPC() {
+@@ -4725,7 +4726,7 @@ void RenderProcessHostImpl::ResetIPC() {
coordinator_connector_receiver_.reset();
tracing_registration_.reset();
diff --git a/devel/electron21/files/patch-content_browser_web__contents_web__contents__view__aura.cc b/devel/electron21/files/patch-content_browser_web__contents_web__contents__view__aura.cc
index f8385f0baafd..55aaa124fa85 100644
--- a/devel/electron21/files/patch-content_browser_web__contents_web__contents__view__aura.cc
+++ b/devel/electron21/files/patch-content_browser_web__contents_web__contents__view__aura.cc
@@ -1,4 +1,4 @@
---- content/browser/web_contents/web_contents_view_aura.cc.orig 2022-09-24 10:57:32 UTC
+--- content/browser/web_contents/web_contents_view_aura.cc.orig 2023-02-01 13:31:45 UTC
+++ content/browser/web_contents/web_contents_view_aura.cc
@@ -176,7 +176,7 @@ class WebDragSourceAura : public content::WebContentsO
raw_ptr<aura::Window> window_;
@@ -18,7 +18,7 @@
// We set the file contents before the URL because the URL also sets file
// contents (to a .URL shortcut). We want to prefer file content data over
// a shortcut so we add it first.
-@@ -1360,7 +1360,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent*
+@@ -1358,7 +1358,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent*
// Linux window managers like to handle raise-on-click themselves. If we
// raise-on-click manually, this may override user settings that prevent
// focus-stealing.
diff --git a/devel/electron21/files/patch-content_gpu_gpu__main.cc b/devel/electron21/files/patch-content_gpu_gpu__main.cc
index 9e7930f313e2..ff743d21b5f1 100644
--- a/devel/electron21/files/patch-content_gpu_gpu__main.cc
+++ b/devel/electron21/files/patch-content_gpu_gpu__main.cc
@@ -1,4 +1,4 @@
---- content/gpu/gpu_main.cc.orig 2022-09-24 10:57:32 UTC
+--- content/gpu/gpu_main.cc.orig 2023-02-01 13:31:45 UTC
+++ content/gpu/gpu_main.cc
@@ -86,7 +86,7 @@
#include "sandbox/win/src/sandbox.h"
@@ -27,7 +27,7 @@
return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs);
#elif BUILDFLAG(IS_WIN)
return StartSandboxWindows(sandbox_info_);
-@@ -266,7 +266,7 @@ int GpuMain(MainFunctionParams parameters) {
+@@ -270,7 +270,7 @@ int GpuMain(MainFunctionParams parameters) {
std::make_unique<base::SingleThreadTaskExecutor>(
gpu_preferences.message_pump_type);
}
@@ -36,7 +36,7 @@
#error "Unsupported Linux platform."
#elif BUILDFLAG(IS_MAC)
// Cross-process CoreAnimation requires a CFRunLoop to function at all, and
-@@ -401,7 +401,7 @@ int GpuMain(MainFunctionParams parameters) {
+@@ -404,7 +404,7 @@ int GpuMain(MainFunctionParams parameters) {
namespace {
diff --git a/devel/electron21/files/patch-content_renderer_render__process__impl.cc b/devel/electron21/files/patch-content_renderer_render__process__impl.cc
index 582c59b45912..6422ac6d1881 100644
--- a/devel/electron21/files/patch-content_renderer_render__process__impl.cc
+++ b/devel/electron21/files/patch-content_renderer_render__process__impl.cc
@@ -1,4 +1,4 @@
---- content/renderer/render_process_impl.cc.orig 2022-07-22 17:30:31 UTC
+--- content/renderer/render_process_impl.cc.orig 2023-02-01 13:31:45 UTC
+++ content/renderer/render_process_impl.cc
@@ -46,7 +46,7 @@
#if BUILDFLAG(IS_WIN)
@@ -18,9 +18,9 @@
SetV8FlagIfFeature(features::kWebAssemblyCodeProtectionPku,
"--wasm-memory-protection-keys");
SetV8FlagIfNotFeature(features::kWebAssemblyCodeProtectionPku,
-@@ -224,7 +224,7 @@ RenderProcessImpl::RenderProcessImpl()
-
- v8::V8::SetFlagsFromString("--freeze-flags-after-init");
+@@ -225,7 +225,7 @@ RenderProcessImpl::RenderProcessImpl()
+ // Freezing flags after init conflicts with node in the renderer.
+ v8::V8::SetFlagsFromString("--no-freeze-flags-after-init");
-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(ARCH_CPU_X86_64)
+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_X86_64)
diff --git a/devel/electron21/files/patch-content_renderer_renderer__blink__platform__impl.h b/devel/electron21/files/patch-content_renderer_renderer__blink__platform__impl.h
index c2bb8ca34aa5..3d1d9228ebd9 100644
--- a/devel/electron21/files/patch-content_renderer_renderer__blink__platform__impl.h
+++ b/devel/electron21/files/patch-content_renderer_renderer__blink__platform__impl.h
@@ -1,4 +1,4 @@
---- content/renderer/renderer_blink_platform_impl.h.orig 2022-09-24 10:57:32 UTC
+--- content/renderer/renderer_blink_platform_impl.h.orig 2023-02-01 13:31:45 UTC
+++ content/renderer/renderer_blink_platform_impl.h
@@ -29,7 +29,7 @@
#include "third_party/blink/public/common/user_agent/user_agent_metadata.h"
@@ -18,7 +18,7 @@
void SetThreadType(base::PlatformThreadId thread_id,
base::ThreadType) override;
#endif
-@@ -235,7 +235,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
+@@ -238,7 +238,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
void Collect3DContextInformation(blink::Platform::GraphicsInfo* gl_info,
const gpu::GPUInfo& gpu_info) const;
@@ -27,7 +27,7 @@
std::unique_ptr<blink::WebSandboxSupport> sandbox_support_;
#endif
-@@ -255,7 +255,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
+@@ -258,7 +258,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
mutable base::WaitableEvent io_thread_id_ready_event_;
base::PlatformThreadId io_thread_id_ = base::kInvalidThreadId;
diff --git a/devel/electron21/files/patch-electron_BUILD.gn b/devel/electron21/files/patch-electron_BUILD.gn
index f9b685b510dd..9300178bf563 100644
--- a/devel/electron21/files/patch-electron_BUILD.gn
+++ b/devel/electron21/files/patch-electron_BUILD.gn
@@ -1,6 +1,15 @@
---- electron/BUILD.gn.orig 2022-08-03 15:31:32 UTC
+--- electron/BUILD.gn.orig 2023-01-24 08:00:52 UTC
+++ electron/BUILD.gn
-@@ -457,7 +457,7 @@ source_set("electron_lib") {
+@@ -111,8 +111,6 @@ electron_version = exec_script("script/print-version.p
+ [],
+ "trim string",
+ [
+- ".git/packed-refs",
+- ".git/HEAD",
+ "script/lib/get-version.js",
+ ])
+
+@@ -493,7 +491,7 @@ source_set("electron_lib") {
defines += [ "GDK_DISABLE_DEPRECATION_WARNINGS" ]
}
@@ -9,7 +18,7 @@
deps += [
"//components/crash/core/app",
"//components/crash/core/browser",
-@@ -499,6 +499,10 @@ source_set("electron_lib") {
+@@ -535,6 +533,10 @@ source_set("electron_lib") {
]
}
@@ -20,7 +29,7 @@
if (is_mac) {
deps += [
"//components/remote_cocoa/app_shim",
-@@ -555,6 +559,12 @@ source_set("electron_lib") {
+@@ -591,6 +593,12 @@ source_set("electron_lib") {
cflags_objcc = [ "-fobjc-weak" ]
}
}
@@ -33,16 +42,16 @@
if (is_linux) {
libs = [ "xshmfence" ]
deps += [
-@@ -1185,7 +1195,7 @@ if (is_mac) {
- ":electron_app_manifest",
+@@ -1237,7 +1245,7 @@ if (is_mac) {
":electron_lib",
+ ":electron_win32_resources",
":packed_resources",
- "//components/crash/core/app",
+ # "//components/crash/core/app",
"//content:sandbox_helper_win",
"//electron/buildflags",
"//ui/strings",
-@@ -1211,7 +1221,7 @@ if (is_mac) {
+@@ -1263,7 +1271,7 @@ if (is_mac) {
public_deps = [ "//tools/v8_context_snapshot:v8_context_snapshot" ]
}
@@ -51,7 +60,7 @@
data_deps += [ "//components/crash/core/app:chrome_crashpad_handler" ]
}
-@@ -1279,7 +1289,7 @@ if (is_mac) {
+@@ -1330,7 +1338,7 @@ if (is_mac) {
configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
}
@@ -60,8 +69,8 @@
deps += [ "//sandbox/linux:chrome_sandbox" ]
}
}
-@@ -1411,7 +1421,7 @@ dist_zip("electron_dist_zip") {
- ":electron_version",
+@@ -1457,7 +1465,7 @@ dist_zip("electron_dist_zip") {
+ ":electron_version_file",
":licenses",
]
- if (is_linux) {
diff --git a/devel/electron21/files/patch-electron_filenames.gni b/devel/electron21/files/patch-electron_filenames.gni
index 6bca3ce73008..c401343828e6 100644
--- a/devel/electron21/files/patch-electron_filenames.gni
+++ b/devel/electron21/files/patch-electron_filenames.gni
@@ -1,6 +1,6 @@
---- electron/filenames.gni.orig 2022-08-03 15:31:32 UTC
+--- electron/filenames.gni.orig 2023-01-24 08:00:52 UTC
+++ electron/filenames.gni
-@@ -245,8 +245,8 @@ filenames = {
+@@ -246,8 +246,8 @@ filenames = {
"shell/app/command_line_args.h",
"shell/app/electron_content_client.cc",
"shell/app/electron_content_client.h",
diff --git a/devel/electron21/files/patch-electron_lib_common_api_clipboard.ts b/devel/electron21/files/patch-electron_lib_common_api_clipboard.ts
index 6fa93e1fb4b1..c58e23756c94 100644
--- a/devel/electron21/files/patch-electron_lib_common_api_clipboard.ts
+++ b/devel/electron21/files/patch-electron_lib_common_api_clipboard.ts
@@ -1,6 +1,6 @@
---- electron/lib/common/api/clipboard.ts.orig 2021-12-03 01:46:05 UTC
+--- electron/lib/common/api/clipboard.ts.orig 2023-01-24 08:00:52 UTC
+++ electron/lib/common/api/clipboard.ts
-@@ -11,7 +11,7 @@ if (process.type === 'renderer') {
+@@ -12,7 +12,7 @@ if (process.type === 'renderer') {
return (...args: any[]) => ipcRendererUtils.invokeSync(IPC_MESSAGES.BROWSER_CLIPBOARD_SYNC, method, ...args);
};
diff --git a/devel/electron21/files/patch-electron_script_lib_get-version.js b/devel/electron21/files/patch-electron_script_lib_get-version.js
new file mode 100644
index 000000000000..e947254affed
--- /dev/null
+++ b/devel/electron21/files/patch-electron_script_lib_get-version.js
@@ -0,0 +1,17 @@
+--- electron/script/lib/get-version.js.orig 2023-01-24 08:00:52 UTC
++++ electron/script/lib/get-version.js
+@@ -11,12 +11,10 @@ module.exports.getElectronVersion = () => {
+ // The only difference in the "git describe" technique is that technically a commit can "change" it's version
+ // number if a tag is created / removed retroactively. i.e. the first time a commit is pushed it will be 1.2.3
+ // and after the tag is made rebuilding the same commit will result in it being 1.2.4
+- const output = spawnSync('git', ['describe', '--tags', '--abbrev=0'], {
+- cwd: path.resolve(__dirname, '..', '..')
+- });
++ const output = spawnSync('basename', [path.resolve(__dirname, '..', '..', '..', '..')]);
+ if (output.status !== 0) {
+ console.error(output.stderr);
+ throw new Error('Failed to get current electron version');
+ }
+- return output.stdout.toString().trim().replace(/^v/g, '');
++ return output.stdout.toString().trim().replace(/^electron-/g, '');
+ };
diff --git a/devel/electron21/files/patch-electron_script_lib_utils.js b/devel/electron21/files/patch-electron_script_lib_utils.js
index d5deafff375c..d33d0fcbdb71 100644
--- a/devel/electron21/files/patch-electron_script_lib_utils.js
+++ b/devel/electron21/files/patch-electron_script_lib_utils.js
@@ -1,6 +1,6 @@
---- electron/script/lib/utils.js.orig 2021-10-11 17:12:26 UTC
+--- electron/script/lib/utils.js.orig 2023-01-24 08:00:52 UTC
+++ electron/script/lib/utils.js
-@@ -21,7 +21,7 @@ function getElectronExec () {
+@@ -22,7 +22,7 @@ function getElectronExec () {
return `out/${OUT_DIR}/Electron.app/Contents/MacOS/Electron`;
case 'win32':
return `out/${OUT_DIR}/electron.exe`;
diff --git a/devel/electron21/files/patch-electron_shell_app_electron__main__delegate.cc b/devel/electron21/files/patch-electron_shell_app_electron__main__delegate.cc
index c2aedf2467aa..c818a58c9a8d 100644
--- a/devel/electron21/files/patch-electron_shell_app_electron__main__delegate.cc
+++ b/devel/electron21/files/patch-electron_shell_app_electron__main__delegate.cc
@@ -1,6 +1,6 @@
---- electron/shell/app/electron_main_delegate.cc.orig 2022-08-03 15:31:32 UTC
+--- electron/shell/app/electron_main_delegate.cc.orig 2023-01-24 08:00:52 UTC
+++ electron/shell/app/electron_main_delegate.cc
-@@ -53,14 +53,17 @@
+@@ -55,14 +55,17 @@
#include "chrome/child/v8_crashpad_support_win.h"
#endif
@@ -20,7 +20,7 @@
#include "components/crash/core/app/crash_switches.h" // nogncheck
#include "components/crash/core/app/crashpad.h" // nogncheck
#include "components/crash/core/common/crash_key.h"
-@@ -157,7 +160,7 @@ bool ElectronPathProvider(int key, base::FilePath* res
+@@ -159,7 +162,7 @@ bool ElectronPathProvider(int key, base::FilePath* res
create_dir = true;
break;
}
@@ -29,7 +29,7 @@
case DIR_APP_DATA: {
auto env = base::Environment::Create();
cur = base::nix::GetXDGDirectory(
-@@ -291,7 +294,7 @@ bool ElectronMainDelegate::BasicStartupComplete(int* e
+@@ -293,7 +296,7 @@ absl::optional<int> ElectronMainDelegate::BasicStartup
base::win::PinUser32();
#endif
@@ -38,7 +38,7 @@
// Check for --no-sandbox parameter when running as root.
if (getuid() == 0 && IsSandboxEnabled(command_line))
LOG(FATAL) << "Running as root without --"
-@@ -346,7 +349,7 @@ void ElectronMainDelegate::PreSandboxStartup() {
+@@ -345,7 +348,7 @@ void ElectronMainDelegate::PreSandboxStartup() {
process_type == ::switches::kZygoteProcess);
#endif
@@ -47,7 +47,7 @@
crash_reporter::InitializeCrashKeys();
#endif
-@@ -385,7 +388,7 @@ void ElectronMainDelegate::PreSandboxStartup() {
+@@ -384,7 +387,7 @@ void ElectronMainDelegate::PreSandboxStartup() {
}
#endif
diff --git a/devel/electron21/files/patch-electron_shell_browser_api_electron__api__app.cc b/devel/electron21/files/patch-electron_shell_browser_api_electron__api__app.cc
index ce27be12b61d..63e3435c4b1e 100644
--- a/devel/electron21/files/patch-electron_shell_browser_api_electron__api__app.cc
+++ b/devel/electron21/files/patch-electron_shell_browser_api_electron__api__app.cc
@@ -1,6 +1,6 @@
---- electron/shell/browser/api/electron_api_app.cc.orig 2022-12-02 17:32:32.785444000 +0100
-+++ electron/shell/browser/api/electron_api_app.cc 2022-12-02 17:33:42.233196000 +0100
-@@ -706,7 +706,7 @@ void App::OnFinishLaunching(base::Value::Dict launch_i
+--- electron/shell/browser/api/electron_api_app.cc.orig 2023-01-24 08:00:52 UTC
++++ electron/shell/browser/api/electron_api_app.cc
+@@ -707,7 +707,7 @@ void App::OnWillFinishLaunching() {
}
void App::OnFinishLaunching(base::Value::Dict launch_info) {
@@ -9,7 +9,7 @@
// Set the application name for audio streams shown in external
// applications. Only affects pulseaudio currently.
media::AudioManager::SetGlobalAppName(Browser::Get()->GetName());
-@@ -1029,7 +1029,7 @@ void App::SetDesktopName(const std::string& desktop_na
+@@ -1030,7 +1030,7 @@ void App::SetPath(gin_helper::ErrorThrower thrower,
}
void App::SetDesktopName(const std::string& desktop_name) {
@@ -18,7 +18,7 @@
auto env = base::Environment::Create();
env->SetVar("CHROME_DESKTOP", desktop_name);
#endif
-@@ -1413,7 +1413,7 @@ std::vector<gin_helper::Dictionary> App::GetAppMetrics
+@@ -1414,7 +1414,7 @@ std::vector<gin_helper::Dictionary> App::GetAppMetrics
pid_dict.Set("name", process_metric.second->name);
}
@@ -27,7 +27,7 @@
auto memory_info = process_metric.second->GetMemoryInfo();
gin_helper::Dictionary memory_dict = gin::Dictionary::CreateEmpty(isolate);
-@@ -1720,7 +1720,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuild
+@@ -1721,7 +1721,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuild
.SetMethod(
"removeAsDefaultProtocolClient",
base::BindRepeating(&Browser::RemoveAsDefaultProtocolClient, browser))
@@ -36,7 +36,7 @@
.SetMethod(
"getApplicationInfoForProtocol",
base::BindRepeating(&Browser::GetApplicationInfoForProtocol, browser))
-@@ -1778,7 +1778,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuild
+@@ -1779,7 +1779,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuild
.SetMethod("getJumpListSettings", &App::GetJumpListSettings)
.SetMethod("setJumpList", &App::SetJumpList)
#endif
diff --git a/devel/electron21/files/patch-electron_shell_browser_api_electron__api__base__window.cc b/devel/electron21/files/patch-electron_shell_browser_api_electron__api__base__window.cc
*** 1711 LINES SKIPPED ***