git: 14c58447f1c4 - main - devel/electron22: update to 22.1.0 and take maintainership
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 31 Jan 2023 12:16:05 UTC
The branch main has been updated by tagattie:
URL: https://cgit.FreeBSD.org/ports/commit/?id=14c58447f1c4052fe2689d318a7d99a37a909be1
commit 14c58447f1c4052fe2689d318a7d99a37a909be1
Author: Hiroki Tagato <tagattie@FreeBSD.org>
AuthorDate: 2023-01-31 12:12:33 +0000
Commit: Hiroki Tagato <tagattie@FreeBSD.org>
CommitDate: 2023-01-31 12:12:33 +0000
devel/electron22: update to 22.1.0 and take maintainership
Changelog:
- https://github.com/electron/electron/releases/tag/v22.0.2
- https://github.com/electron/electron/releases/tag/v22.0.3
- https://github.com/electron/electron/releases/tag/v22.1.0
PR: 269194
Reported by: Yonas Yanfa <yonas.yanfa@gmail.com>
Approved by: mikael (maintainer)
---
devel/electron22/Makefile | 15 +-
devel/electron22/Makefile.version | 2 +-
devel/electron22/distinfo | 16 +-
devel/electron22/files/package.json | 6 +-
devel/electron22/files/patch-BUILD.gn | 10 +-
.../files/patch-build_config_BUILDCONFIG.gn | 10 +-
...tch-chrome_browser_process__singleton__posix.cc | 4 +-
devel/electron22/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 | 10 +-
...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 +-
...h-content_browser_utility__sandbox__delegate.cc | 6 +-
...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 +-
.../electron22/files/patch-electron_filenames.gni | 4 +-
.../files/patch-electron_lib_browser_api_app.ts | 4 +-
.../patch-electron_lib_common_api_clipboard.ts | 4 +-
...js => patch-electron_script_lib_get-version.js} | 18 +-
.../files/patch-electron_script_lib_utils.js | 4 +-
.../files/patch-electron_script_spec-runner.js | 8 +-
...-electron_shell_app_electron__main__delegate.cc | 13 +-
.../files/patch-electron_shell_app_node__main.cc | 22 +-
...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 | 16 +-
...hell_browser_api_electron__api__web__contents.h | 4 +-
.../files/patch-electron_shell_browser_browser.h | 6 +-
...shell_browser_electron__browser__main__parts.cc | 16 +-
..._shell_browser_electron__browser__main__parts.h | 10 +-
...electron_shell_browser_native__window__views.cc | 26 +-
...rowser_net_system__network__context__manager.cc | 8 +-
...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_api-app-spec.ts | 42 +-
.../patch-electron_spec_api-clipboard-spec.ts | 8 +-
.../patch-electron_spec_api-crash-reporter-spec.ts | 13 +-
.../patch-electron_spec_api-native-image-spec.ts | 4 +-
.../files/patch-electron_spec_api-net-log-spec.ts | 4 +-
.../patch-electron_spec_api-power-monitor-spec.ts | 6 +-
.../files/patch-electron_spec_api-process-spec.ts | 13 +-
.../patch-electron_spec_api-safe-storage-spec.ts | 4 +-
.../files/patch-electron_spec_api-screen-spec.ts | 8 +-
.../files/patch-electron_spec_api-shell-spec.ts | 6 +-
...patch-electron_spec_api-utility-process-spec.ts | 11 +
...patch-electron_spec_api-web-frame-main-spec.ts} | 4 +-
.../files/patch-electron_spec_chromium-spec.ts | 50 +-
.../files/patch-electron_spec_crash-spec.ts | 11 +
.../files/patch-electron_spec_node-spec.ts | 11 +
.../files/patch-electron_spec_version-bump-spec.ts | 4 +-
.../files/patch-electron_spec_webview-spec.ts | 4 +-
devel/electron22/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/electron22/files/patch-ui_color_color__id.h | 4 +-
.../files/patch-ui_compositor_compositor.h | 4 +-
devel/electron22/files/patch-ui_gfx_switches.cc | 4 +-
devel/electron22/files/patch-ui_gfx_switches.h | 4 +-
devel/electron22/files/patch-ui_gtk_gtk__compat.cc | 29 +-
.../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/electron22/files/patch-v8_BUILD.gn | 8 +-
devel/electron22/files/yarn.lock | 502 ++++++++++++++++++++-
82 files changed, 930 insertions(+), 311 deletions(-)
diff --git a/devel/electron22/Makefile b/devel/electron22/Makefile
index 8661179592ee..9d1b6a800ed0 100644
--- a/devel/electron22/Makefile
+++ b/devel/electron22/Makefile
@@ -2,15 +2,17 @@ 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/v22.0.3/: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}
-MAINTAINER= mikael@FreeBSD.org
+MAINTAINER= tagattie@FreeBSD.org
COMMENT= Build cross-platform desktop apps with JavaScript, HTML, and CSS
WWW= https://electronjs.org/
@@ -131,7 +133,7 @@ GN_BOOTSTRAP_FLAGS= --no-clean --no-rebuild --skip-generate-buildfiles
PLIST_SUB= ELECTRON_VER=${ELECTRON_VER} \
ELECTRON_VER_MAJOR=${ELECTRON_VER_MAJOR}
-OPTIONS_DEFINE= CODECS CUPS DEBUG DIST DRIVER KERBEROS LTO
+OPTIONS_DEFINE= CODECS CUPS DEBUG DIST DRIVER KERBEROS LTO
OPTIONS_DEFAULT= CODECS CUPS DRIVER KERBEROS SNDIO
OPTIONS_EXCLUDE_aarch64=LTO
OPTIONS_GROUP= AUDIO
@@ -203,7 +205,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= 108.0.5359.125
+CHROMIUM_VER= 108.0.5359.179
+# See ${WRKSRC}/third_party/node/node_modules.tar.gz.sha1 for CHROMIUM_NODE_MODULES_HASH
+CHROMIUM_NODE_MODULES_HASH= f8b5da24d33317766d3933fb6711b0603fc4fb6f
# 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
@@ -217,7 +221,7 @@ REACTIVEOBJC_VER= 74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76
# See ${WRKSRC}/electron/DEPS for MANTLE_VER
MANTLE_VER= 78d3966b3c331292ea29ec38661b25df0a245948
-YARN_TIMESTAMP= 1661146515
+YARN_TIMESTAMP= 1675054791
.include "Makefile.version"
.include <bsd.port.pre.mk>
@@ -304,6 +308,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/electron22/Makefile.version b/devel/electron22/Makefile.version
index e636b59b62d6..2c72596efedf 100644
--- a/devel/electron22/Makefile.version
+++ b/devel/electron22/Makefile.version
@@ -1,2 +1,2 @@
-ELECTRON_VER= 22.0.1
+ELECTRON_VER= 22.1.0
ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//}
diff --git a/devel/electron22/distinfo b/devel/electron22/distinfo
index f6c1f83ed5bd..f90fff0a63cf 100644
--- a/devel/electron22/distinfo
+++ b/devel/electron22/distinfo
@@ -1,12 +1,14 @@
-TIMESTAMP = 1674205773
-SHA256 (electron/chromium-108.0.5359.125.tar.xz) = 16e26bef292f99efbb72559990f6383f1d39cb20bfa38450fbcd6c7cf88b0a59
-SIZE (electron/chromium-108.0.5359.125.tar.xz) = 1731584944
+TIMESTAMP = 1675056031
+SHA256 (electron/chromium-108.0.5359.179.tar.xz) = 5e0e06cf8b43091347d908b651a919d5b94cdde2178d5e175dad4e2a75cf4ac8
+SIZE (electron/chromium-108.0.5359.179.tar.xz) = 1584561116
+SHA256 (electron/f8b5da24d33317766d3933fb6711b0603fc4fb6f) = 63706737ca75e0e5c97885186b2a7ab019ca71d1315ee08870193bbfa7486bfc
+SIZE (electron/f8b5da24d33317766d3933fb6711b0603fc4fb6f) = 9900677
SHA256 (electron/336e775eec536b2d785cc80eff6ac39051931286) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
SIZE (electron/336e775eec536b2d785cc80eff6ac39051931286) = 32624734
-SHA256 (electron/electron-yarn-cache-22.0.1.tar.xz) = 404b61b615f680868d00d05a8214103aa3e7f1779d4452cc2c9db55b782a955c
-SIZE (electron/electron-yarn-cache-22.0.1.tar.xz) = 36702856
-SHA256 (electron/electron-electron-v22.0.1_GH0.tar.gz) = c6bdbd95549e59c7a16707906b67e2999107e5d61e398dc6429db2c83181c5e7
-SIZE (electron/electron-electron-v22.0.1_GH0.tar.gz) = 10500431
+SHA256 (electron/electron-yarn-cache-22.1.0.tar.xz) = 8120999809490d73c9291295ffebaa49dcad2e4427720a773040f4a593e0cc50
+SIZE (electron/electron-yarn-cache-22.1.0.tar.xz) = 38469072
+SHA256 (electron/electron-electron-v22.1.0_GH0.tar.gz) = 9bd7fb2aa96402312f97111231cf343ce806b466fba1fc3e2e1a708a0ca0cbf6
+SIZE (electron/electron-electron-v22.1.0_GH0.tar.gz) = 10510560
SHA256 (electron/nodejs-node-v16.17.1_GH0.tar.gz) = e63378aa6aa18b9e05486e46eaca6c6e09904366e5100d7e04c6dbd344a42f60
SIZE (electron/nodejs-node-v16.17.1_GH0.tar.gz) = 90485310
SHA256 (electron/nodejs-nan-16fa32231e2ccd89d2804b3f765319128b20c4ac_GH0.tar.gz) = 3807ae6a1e451a29f068540472f100f9718d457c60ac62f2f8469d1d57475d39
diff --git a/devel/electron22/files/package.json b/devel/electron22/files/package.json
index cc35521e32e9..e2a9b536620d 100644
--- a/devel/electron22/files/package.json
+++ b/devel/electron22/files/package.json
@@ -6,8 +6,9 @@
"devDependencies": {
"@azure/storage-blob": "^12.9.0",
"@electron/docs-parser": "^1.0.0",
+ "@electron/fiddle-core": "^1.0.4",
+ "@electron/github-app-auth": "^1.5.0",
"@electron/typescript-definitions": "^8.10.0",
- "@octokit/auth-app": "^2.10.0",
"@octokit/rest": "^18.0.3",
"@primer/octicons": "^10.0.0",
"@types/basic-auth": "^1.1.3",
@@ -142,7 +143,8 @@
"ts-node script/check-patch-diff.ts"
],
"DEPS": [
- "node script/gen-hunspell-filenames.js"
+ "node script/gen-hunspell-filenames.js",
+ "node script/gen-libc++-filenames.js"
]
},
"resolutions": {
diff --git a/devel/electron22/files/patch-BUILD.gn b/devel/electron22/files/patch-BUILD.gn
index 5740081ea8f4..838261c7b363 100644
--- a/devel/electron22/files/patch-BUILD.gn
+++ b/devel/electron22/files/patch-BUILD.gn
@@ -1,4 +1,4 @@
---- BUILD.gn.orig 2022-11-30 08:12:58 UTC
+--- BUILD.gn.orig 2023-01-30 07:58:58 UTC
+++ BUILD.gn
@@ -59,7 +59,7 @@ declare_args() {
root_extra_deps = []
@@ -51,7 +51,7 @@
deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
}
-@@ -1107,7 +1115,7 @@ if (!is_ios) {
+@@ -1110,7 +1118,7 @@ if (!is_ios) {
]
}
@@ -60,7 +60,7 @@
# WPT Webdriver tests runner
# chrome/test/chromedriver/test/run_webdriver_tests.py
script_test("webdriver_wpt_tests") {
-@@ -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" ]
}
@@ -69,7 +69,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)" ]
}
@@ -78,7 +78,7 @@
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
-@@ -1655,7 +1663,7 @@ group("chromium_builder_perf") {
+@@ -1658,7 +1666,7 @@ group("chromium_builder_perf") {
data_deps += [ "//chrome/test:performance_browser_tests" ]
}
diff --git a/devel/electron22/files/patch-build_config_BUILDCONFIG.gn b/devel/electron22/files/patch-build_config_BUILDCONFIG.gn
index d0508a977723..30174f1a37a4 100644
--- a/devel/electron22/files/patch-build_config_BUILDCONFIG.gn
+++ b/devel/electron22/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-01-30 07:58:58 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/electron22/files/patch-chrome_browser_process__singleton__posix.cc b/devel/electron22/files/patch-chrome_browser_process__singleton__posix.cc
index b0776be5bbcf..4b865dd4e088 100644
--- a/devel/electron22/files/patch-chrome_browser_process__singleton__posix.cc
+++ b/devel/electron22/files/patch-chrome_browser_process__singleton__posix.cc
@@ -1,6 +1,6 @@
---- chrome/browser/process_singleton_posix.cc.orig 2022-08-31 12:19:35 UTC
+--- chrome/browser/process_singleton_posix.cc.orig 2023-01-30 07:58:59 UTC
+++ chrome/browser/process_singleton_posix.cc
-@@ -351,7 +351,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo
+@@ -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/electron22/files/patch-chrome_test_BUILD.gn b/devel/electron22/files/patch-chrome_test_BUILD.gn
index a6fe89e70953..292c03c0a0a1 100644
--- a/devel/electron22/files/patch-chrome_test_BUILD.gn
+++ b/devel/electron22/files/patch-chrome_test_BUILD.gn
@@ -1,6 +1,6 @@
---- chrome/test/BUILD.gn.orig 2022-11-30 08:12:58 UTC
+--- chrome/test/BUILD.gn.orig 2023-01-30 07:58:59 UTC
+++ chrome/test/BUILD.gn
-@@ -10087,7 +10087,7 @@ test("chrome_app_unittests") {
+@@ -10094,7 +10094,7 @@ test("chrome_app_unittests") {
"//components/heap_profiling/in_process",
"//components/safe_browsing:buildflags",
]
diff --git a/devel/electron22/files/patch-components_viz_host_host__display__client.cc b/devel/electron22/files/patch-components_viz_host_host__display__client.cc
index 928e130abee9..ae1cfd002c1b 100644
--- a/devel/electron22/files/patch-components_viz_host_host__display__client.cc
+++ b/devel/electron22/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-01-30 07:58:58 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/electron22/files/patch-components_viz_host_host__display__client.h b/devel/electron22/files/patch-components_viz_host_host__display__client.h
index 2786ca6b69fb..7b5db1727779 100644
--- a/devel/electron22/files/patch-components_viz_host_host__display__client.h
+++ b/devel/electron22/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-01-30 07:58:58 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/electron22/files/patch-components_viz_host_renderer__settings__creation.cc b/devel/electron22/files/patch-components_viz_host_renderer__settings__creation.cc
index 9dd671db141b..7bad086ec6dd 100644
--- a/devel/electron22/files/patch-components_viz_host_renderer__settings__creation.cc
+++ b/devel/electron22/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-01-30 07:58:58 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/electron22/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc b/devel/electron22/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc
index c5162e337d17..fcd4bc14f502 100644
--- a/devel/electron22/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc
+++ b/devel/electron22/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-11-30 08:12:58 UTC
+--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2023-01-30 07:58:58 UTC
+++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
-@@ -98,7 +98,7 @@ RootCompositorFrameSinkImpl::Create(
+@@ -99,7 +99,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);
-@@ -577,7 +577,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw
+@@ -578,7 +578,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/electron22/files/patch-content_app_content__main__runner__impl.cc b/devel/electron22/files/patch-content_app_content__main__runner__impl.cc
index 56e3ece8e397..be224c86def5 100644
--- a/devel/electron22/files/patch-content_app_content__main__runner__impl.cc
+++ b/devel/electron22/files/patch-content_app_content__main__runner__impl.cc
@@ -1,6 +1,6 @@
---- content/app/content_main_runner_impl.cc.orig 2022-11-30 08:12:58 UTC
+--- content/app/content_main_runner_impl.cc.orig 2023-01-30 07:58:59 UTC
+++ content/app/content_main_runner_impl.cc
-@@ -135,13 +135,13 @@
+@@ -136,13 +136,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"
-@@ -180,6 +180,10 @@
+@@ -181,6 +181,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"
-@@ -382,7 +386,7 @@ void InitializeZygoteSandboxForBrowserProcess(
+@@ -386,7 +390,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
-@@ -418,7 +422,7 @@ void PreloadLibraryCdms() {
+@@ -422,7 +426,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
-@@ -441,6 +445,11 @@ void PreSandboxInit() {
+@@ -445,6 +449,11 @@ void PreSandboxInit() {
}
#endif
@@ -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.
-@@ -623,7 +632,7 @@ int NO_STACK_PROTECTOR RunZygote(ContentMainDelegate*
+@@ -627,7 +636,7 @@ int NO_STACK_PROTECTOR RunZygote(ContentMainDelegate*
delegate->ZygoteStarting(&zygote_fork_delegates);
media::InitializeMediaLibrary();
@@ -66,7 +66,7 @@
PreSandboxInit();
#endif
-@@ -817,11 +826,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
+@@ -821,11 +830,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
kFieldTrialDescriptor + base::GlobalDescriptors::kBaseDescriptor);
#endif // !BUILDFLAG(IS_ANDROID)
@@ -80,7 +80,7 @@
#endif // !BUILDFLAG(IS_WIN)
-@@ -1007,6 +1015,16 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
+@@ -1011,6 +1019,16 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
}
#endif
@@ -97,7 +97,7 @@
delegate_->SandboxInitialized(process_type);
#if BUILDFLAG(USE_ZYGOTE_HANDLE)
-@@ -1070,7 +1088,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
+@@ -1074,7 +1092,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
process_type);
}
@@ -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
-@@ -1103,6 +1121,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
+@@ -1107,6 +1125,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
content_main_params_.reset();
RegisterMainThreadFactories();
diff --git a/devel/electron22/files/patch-content_browser_child__process__launcher__helper__linux.cc b/devel/electron22/files/patch-content_browser_child__process__launcher__helper__linux.cc
index fd5e88cf7c45..060a8956dc23 100644
--- a/devel/electron22/files/patch-content_browser_child__process__launcher__helper__linux.cc
+++ b/devel/electron22/files/patch-content_browser_child__process__launcher__helper__linux.cc
@@ -1,4 +1,4 @@
---- content/browser/child_process_launcher_helper_linux.cc.orig 2023-01-23 08:53:25 UTC
+--- content/browser/child_process_launcher_helper_linux.cc.orig 2023-01-30 07:58:59 UTC
+++ content/browser/child_process_launcher_helper_linux.cc
@@ -20,7 +20,9 @@
#include "content/public/common/result_codes.h"
@@ -14,18 +14,18 @@
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()));
-@@ -68,6 +71,7 @@ bool ChildProcessLauncherHelper::BeforeLaunchOnLaunche
+@@ -67,6 +70,7 @@ bool ChildProcessLauncherHelper::BeforeLaunchOnLaunche
+ if (!zygote_handle) {
options->allow_new_privs = true;
}
-
+#endif
+
for (const auto& remapped_fd : file_data_->additional_remapped_fds) {
options->fds_to_remap.emplace_back(remapped_fd.second.get(),
- remapped_fd.first);
@@ -88,6 +92,7 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr
int* launch_result) {
*is_synchronous_launch = true;
diff --git a/devel/electron22/files/patch-content_browser_gpu_gpu__process__host.cc b/devel/electron22/files/patch-content_browser_gpu_gpu__process__host.cc
index 1bd444ae2dbe..b4546555f794 100644
--- a/devel/electron22/files/patch-content_browser_gpu_gpu__process__host.cc
+++ b/devel/electron22/files/patch-content_browser_gpu_gpu__process__host.cc
@@ -1,6 +1,6 @@
---- content/browser/gpu/gpu_process_host.cc.orig 2022-11-30 08:12:58 UTC
+--- content/browser/gpu/gpu_process_host.cc.orig 2023-01-30 07:58:58 UTC
+++ content/browser/gpu/gpu_process_host.cc
-@@ -255,6 +255,7 @@ static const char* const kSwitchNames[] = {
+@@ -256,6 +256,7 @@ static const char* const kSwitchNames[] = {
switches::kEnableBackgroundThreadPool,
switches::kEnableGpuRasterization,
switches::kEnableLogging,
@@ -8,7 +8,7 @@
switches::kEnableDeJelly,
switches::kDeJellyScreenWidth,
switches::kDoubleBufferCompositing,
-@@ -288,7 +289,7 @@ static const char* const kSwitchNames[] = {
+@@ -289,7 +290,7 @@ static const char* const kSwitchNames[] = {
switches::kOzoneDumpFile,
switches::kDisableBufferBWCompression,
#endif
diff --git a/devel/electron22/files/patch-content_browser_media_media__keys__listener__manager__impl.cc b/devel/electron22/files/patch-content_browser_media_media__keys__listener__manager__impl.cc
index 3646f04d18b3..874d4c95ad85 100644
--- a/devel/electron22/files/patch-content_browser_media_media__keys__listener__manager__impl.cc
+++ b/devel/electron22/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-01-30 07:58:59 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/electron22/files/patch-content_browser_renderer__host_render__process__host__impl.cc b/devel/electron22/files/patch-content_browser_renderer__host_render__process__host__impl.cc
index 8dbb58049f8e..3e709af68c6f 100644
--- a/devel/electron22/files/patch-content_browser_renderer__host_render__process__host__impl.cc
+++ b/devel/electron22/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-11-30 08:12:58 UTC
+--- content/browser/renderer_host/render_process_host_impl.cc.orig 2023-01-30 07:58:58 UTC
+++ content/browser/renderer_host/render_process_host_impl.cc
-@@ -213,7 +213,7 @@
+@@ -214,7 +214,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
-@@ -1137,7 +1137,7 @@ static constexpr size_t kUnknownPlatformProcessLimit =
+@@ -1138,7 +1138,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;
-@@ -1224,7 +1224,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public
+@@ -1225,7 +1225,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;
-@@ -2119,7 +2119,7 @@ void RenderProcessHostImpl::ReinitializeLogging(
+@@ -2127,7 +2127,7 @@ void RenderProcessHostImpl::ReinitializeLogging(
}
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -36,7 +36,7 @@
void RenderProcessHostImpl::CreateStableVideoDecoder(
mojo::PendingReceiver<media::stable::mojom::StableVideoDecoder> receiver) {
if (!stable_video_decoder_factory_remote_.is_bound()) {
-@@ -3269,6 +3269,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin
+@@ -3278,6 +3278,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin
switches::kDisableSpeechAPI,
switches::kDisableThreadedCompositing,
switches::kDisableTouchDragDrop,
@@ -44,7 +44,7 @@
switches::kDisableV8IdleTasks,
switches::kDisableVideoCaptureUseGpuMemoryBuffer,
switches::kDisableWebGLImageChromium,
-@@ -4742,7 +4743,7 @@ void RenderProcessHostImpl::ResetIPC() {
+@@ -4751,7 +4752,7 @@ void RenderProcessHostImpl::ResetIPC() {
coordinator_connector_receiver_.reset();
tracing_registration_.reset();
diff --git a/devel/electron22/files/patch-content_browser_utility__sandbox__delegate.cc b/devel/electron22/files/patch-content_browser_utility__sandbox__delegate.cc
index 6c34995b1968..ffe596251aa8 100644
--- a/devel/electron22/files/patch-content_browser_utility__sandbox__delegate.cc
+++ b/devel/electron22/files/patch-content_browser_utility__sandbox__delegate.cc
@@ -1,6 +1,6 @@
---- content/browser/utility_sandbox_delegate.cc.orig 2022-10-24 13:33:33 UTC
+--- content/browser/utility_sandbox_delegate.cc.orig 2023-01-30 07:58:59 UTC
+++ content/browser/utility_sandbox_delegate.cc
-@@ -63,10 +63,10 @@ UtilitySandboxedProcessLauncherDelegate::
+@@ -65,10 +65,10 @@ UtilitySandboxedProcessLauncherDelegate::
#if BUILDFLAG(ENABLE_PPAPI)
sandbox_type_ == sandbox::mojom::Sandbox::kPpapi ||
#endif
@@ -13,7 +13,7 @@
sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoDecoding ||
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -109,7 +109,7 @@ ZygoteHandle UtilitySandboxedProcessLauncherDelegate::
+@@ -117,7 +117,7 @@ ZygoteHandle UtilitySandboxedProcessLauncherDelegate::
// unsandboxed zygote and then apply their actual sandboxes in the forked
// process upon startup.
if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork ||
diff --git a/devel/electron22/files/patch-content_browser_web__contents_web__contents__view__aura.cc b/devel/electron22/files/patch-content_browser_web__contents_web__contents__view__aura.cc
index 28ff9d5e64fa..9bcec158c12b 100644
--- a/devel/electron22/files/patch-content_browser_web__contents_web__contents__view__aura.cc
+++ b/devel/electron22/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-12-14 08:02:29 UTC
+--- content/browser/web_contents/web_contents_view_aura.cc.orig 2023-01-30 07:58:58 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.
-@@ -1366,7 +1366,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent*
+@@ -1363,7 +1363,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/electron22/files/patch-content_gpu_gpu__main.cc b/devel/electron22/files/patch-content_gpu_gpu__main.cc
index f6fc2fc350eb..2a356975c364 100644
--- a/devel/electron22/files/patch-content_gpu_gpu__main.cc
+++ b/devel/electron22/files/patch-content_gpu_gpu__main.cc
@@ -1,4 +1,4 @@
---- content/gpu/gpu_main.cc.orig 2022-11-30 08:12:58 UTC
+--- content/gpu/gpu_main.cc.orig 2023-01-30 07:58:58 UTC
+++ content/gpu/gpu_main.cc
@@ -87,7 +87,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_);
-@@ -268,7 +268,7 @@ int GpuMain(MainFunctionParams parameters) {
+@@ -272,7 +272,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
-@@ -403,7 +403,7 @@ int GpuMain(MainFunctionParams parameters) {
+@@ -406,7 +406,7 @@ int GpuMain(MainFunctionParams parameters) {
namespace {
diff --git a/devel/electron22/files/patch-content_renderer_render__process__impl.cc b/devel/electron22/files/patch-content_renderer_render__process__impl.cc
index cdb252e501e4..47bf8bb020be 100644
--- a/devel/electron22/files/patch-content_renderer_render__process__impl.cc
+++ b/devel/electron22/files/patch-content_renderer_render__process__impl.cc
@@ -1,4 +1,4 @@
---- content/renderer/render_process_impl.cc.orig 2022-11-30 08:12:58 UTC
+--- content/renderer/render_process_impl.cc.orig 2023-01-30 07:58:59 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,
-@@ -228,7 +228,7 @@ RenderProcessImpl::RenderProcessImpl()
- SetV8FlagIfNotFeature(features::kWebAssemblyDynamicTiering,
- "--no-wasm-dynamic-tiering");
+@@ -231,7 +231,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/electron22/files/patch-content_renderer_renderer__blink__platform__impl.h b/devel/electron22/files/patch-content_renderer_renderer__blink__platform__impl.h
index e61b5ac77e34..9e501b497b8d 100644
--- a/devel/electron22/files/patch-content_renderer_renderer__blink__platform__impl.h
+++ b/devel/electron22/files/patch-content_renderer_renderer__blink__platform__impl.h
@@ -1,4 +1,4 @@
---- content/renderer/renderer_blink_platform_impl.h.orig 2022-11-30 08:12:58 UTC
+--- content/renderer/renderer_blink_platform_impl.h.orig 2023-01-30 07:58:59 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
-@@ -237,7 +237,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
+@@ -240,7 +240,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
-@@ -257,7 +257,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
+@@ -260,7 +260,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/electron22/files/patch-electron_filenames.gni b/devel/electron22/files/patch-electron_filenames.gni
index 6bca3ce73008..68bee7cda7cc 100644
--- a/devel/electron22/files/patch-electron_filenames.gni
+++ b/devel/electron22/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 16:58:16 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/electron22/files/patch-electron_lib_browser_api_app.ts b/devel/electron22/files/patch-electron_lib_browser_api_app.ts
index e3b4f07063db..3164c1cd0c87 100644
--- a/devel/electron22/files/patch-electron_lib_browser_api_app.ts
+++ b/devel/electron22/files/patch-electron_lib_browser_api_app.ts
@@ -1,6 +1,6 @@
---- electron/lib/browser/api/app.ts.orig 2021-11-15 23:45:07 UTC
+--- electron/lib/browser/api/app.ts.orig 2023-01-24 16:58:16 UTC
+++ electron/lib/browser/api/app.ts
-@@ -67,7 +67,7 @@ if (process.platform === 'darwin') {
+@@ -68,7 +68,7 @@ if (process.platform === 'darwin') {
app.dock!.getMenu = () => dockMenu;
}
diff --git a/devel/electron22/files/patch-electron_lib_common_api_clipboard.ts b/devel/electron22/files/patch-electron_lib_common_api_clipboard.ts
index 6fa93e1fb4b1..a194126a2cb5 100644
--- a/devel/electron22/files/patch-electron_lib_common_api_clipboard.ts
+++ b/devel/electron22/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 16:58:16 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/electron22/files/patch-src_electron_script_lib_get-version.js b/devel/electron22/files/patch-electron_script_lib_get-version.js
similarity index 52%
rename from devel/electron22/files/patch-src_electron_script_lib_get-version.js
rename to devel/electron22/files/patch-electron_script_lib_get-version.js
index 5ccc6d86820f..5d0886e82027 100644
--- a/devel/electron22/files/patch-src_electron_script_lib_get-version.js
+++ b/devel/electron22/files/patch-electron_script_lib_get-version.js
@@ -1,17 +1,17 @@
---- electron/script/lib/get-version.js.orig 2023-01-20 15:13:09.374140000 +0100
-+++ electron/script/lib/get-version.js 2023-01-20 15:13:35.153332000 +0100
-@@ -11,12 +11,6 @@ module.exports.getElectronVersion = () => {
+--- electron/script/lib/get-version.js.orig 2023-01-24 16:58:16 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, '..', '..')
- });
-- if (output.status !== 0) {
-- console.error(output.stderr);
-- throw new Error('Failed to get current electron version');
-- }
++ 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, '');
-+ const output = "22.0.1";
-+ return output.toString().trim().replace(/^v/g, '');
++ return output.stdout.toString().trim().replace(/^electron-/g, '');
};
diff --git a/devel/electron22/files/patch-electron_script_lib_utils.js b/devel/electron22/files/patch-electron_script_lib_utils.js
index d5deafff375c..576a3d7aeb87 100644
--- a/devel/electron22/files/patch-electron_script_lib_utils.js
+++ b/devel/electron22/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 16:58:16 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/electron22/files/patch-electron_script_spec-runner.js b/devel/electron22/files/patch-electron_script_spec-runner.js
index 12821b3f867d..13a0f8187e2f 100644
--- a/devel/electron22/files/patch-electron_script_spec-runner.js
+++ b/devel/electron22/files/patch-electron_script_spec-runner.js
@@ -1,8 +1,8 @@
---- electron/script/spec-runner.js.orig 2021-11-08 18:41:28 UTC
+--- electron/script/spec-runner.js.orig 2023-01-24 16:58:16 UTC
+++ electron/script/spec-runner.js
-@@ -126,7 +126,7 @@ async function runElectronTests () {
- async function runTestUsingElectron (specDir, testName) {
- let exe = path.resolve(BASE, utils.getElectronExec());
+@@ -148,7 +148,7 @@ async function runTestUsingElectron (specDir, testName
+ exe = path.resolve(BASE, utils.getElectronExec());
+ }
const runnerArgs = [`electron/${specDir}`, ...unknownArgs.slice(2)];
- if (process.platform === 'linux') {
+ if (process.platform === 'linux' || process.platform === 'freebsd') {
diff --git a/devel/electron22/files/patch-electron_shell_app_electron__main__delegate.cc b/devel/electron22/files/patch-electron_shell_app_electron__main__delegate.cc
index dfe8623dc796..5c44c38ba3d1 100644
--- a/devel/electron22/files/patch-electron_shell_app_electron__main__delegate.cc
+++ b/devel/electron22/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 16:58:16 UTC
+++ electron/shell/app/electron_main_delegate.cc
-@@ -56,13 +56,15 @@
+@@ -56,13 +56,16 @@
#include "chrome/child/v8_crashpad_support_win.h"
#endif
@@ -8,6 +8,7 @@
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "base/nix/xdg_util.h"
+#endif
++
+#if BUILDFLAG(IS_LINUX)
#include "v8/include/v8-wasm-trap-handler-posix.h"
#include "v8/include/v8.h"
@@ -18,7 +19,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"
-@@ -159,7 +161,7 @@ bool ElectronPathProvider(int key, base::FilePath* res
+@@ -159,7 +162,7 @@ bool ElectronPathProvider(int key, base::FilePath* res
create_dir = true;
break;
}
@@ -27,7 +28,7 @@
case DIR_APP_DATA: {
auto env = base::Environment::Create();
cur = base::nix::GetXDGDirectory(
-@@ -293,7 +295,7 @@ absl::optional<int> ElectronMainDelegate::BasicStartup
+@@ -293,7 +296,7 @@ absl::optional<int> ElectronMainDelegate::BasicStartup
base::win::PinUser32();
#endif
@@ -36,7 +37,7 @@
// Check for --no-sandbox parameter when running as root.
if (getuid() == 0 && IsSandboxEnabled(command_line))
LOG(FATAL) << "Running as root without --"
-@@ -345,7 +347,7 @@ void ElectronMainDelegate::PreSandboxStartup() {
+@@ -345,7 +348,7 @@ void ElectronMainDelegate::PreSandboxStartup() {
process_type == ::switches::kZygoteProcess);
#endif
@@ -45,7 +46,7 @@
crash_reporter::InitializeCrashKeys();
#endif
-@@ -380,7 +382,7 @@ void ElectronMainDelegate::PreSandboxStartup() {
+@@ -380,7 +383,7 @@ void ElectronMainDelegate::PreSandboxStartup() {
}
#endif
diff --git a/devel/electron22/files/patch-electron_shell_app_node__main.cc b/devel/electron22/files/patch-electron_shell_app_node__main.cc
index 1e11b086073a..e594a1ce9d0d 100644
--- a/devel/electron22/files/patch-electron_shell_app_node__main.cc
+++ b/devel/electron22/files/patch-electron_shell_app_node__main.cc
@@ -1,4 +1,4 @@
---- electron/shell/app/node_main.cc.orig 2023-01-10 12:17:28 UTC
+--- electron/shell/app/node_main.cc.orig 2023-01-24 16:58:16 UTC
+++ electron/shell/app/node_main.cc
@@ -42,7 +42,7 @@
#include "content/public/common/content_descriptors.h"
@@ -18,7 +18,7 @@
void SetCrashKeyStub(const std::string& key, const std::string& value) {}
void ClearCrashKeyStub(const std::string& key) {}
#endif
-@@ -105,7 +105,7 @@ v8::Local<v8::Value> GetParameters(v8::Isolate* isolat
+@@ -105,7 +105,7 @@ namespace electron {
v8::Local<v8::Value> GetParameters(v8::Isolate* isolate) {
std::map<std::string, std::string> keys;
@@ -27,24 +27,6 @@
electron::crash_keys::GetCrashKeys(&keys);
#endif
return gin::ConvertToV8(isolate, keys);
-@@ -118,7 +118,7 @@ int NodeMain(int argc, char* argv[]) {
- v8_crashpad_support::SetUp();
- #endif
-
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
- auto os_env = base::Environment::Create();
- std::string fd_string, pid_string;
- if (os_env->GetVar("CRASHDUMP_SIGNAL_FD", &fd_string) &&
-@@ -161,7 +161,7 @@ int NodeMain(int argc, char* argv[]) {
- if (result.early_return)
- exit(result.exit_code);
-
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
- // On Linux, initialize crashpad after Nodejs init phase so that
- // crash and termination signal handlers can be set by the crashpad client.
- if (!pid_string.empty()) {
@@ -225,7 +225,7 @@ int NodeMain(int argc, char* argv[]) {
// Setup process.crashReporter in child node processes
gin_helper::Dictionary reporter = gin::Dictionary::CreateEmpty(isolate);
diff --git a/devel/electron22/files/patch-electron_shell_browser_api_electron__api__app.cc b/devel/electron22/files/patch-electron_shell_browser_api_electron__api__app.cc
index ce27be12b61d..87308543399f 100644
--- a/devel/electron22/files/patch-electron_shell_browser_api_electron__api__app.cc
+++ b/devel/electron22/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 16:58:16 UTC
++++ electron/shell/browser/api/electron_api_app.cc
+@@ -708,7 +708,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
+@@ -1038,7 +1038,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
+@@ -1427,7 +1427,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
+@@ -1734,7 +1734,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuild
.SetMethod(
"removeAsDefaultProtocolClient",
base::BindRepeating(&Browser::RemoveAsDefaultProtocolClient, browser))
@@ -36,7 +36,7 @@
.SetMethod(
"getApplicationInfoForProtocol",
base::BindRepeating(&Browser::GetApplicationInfoForProtocol, browser))
*** 2238 LINES SKIPPED ***