diff options
author | Hiroki Tagato <tagattie@FreeBSD.org> | 2023-02-03 05:01:18 +0000 |
---|---|---|
committer | Hiroki Tagato <tagattie@FreeBSD.org> | 2023-02-03 05:02:39 +0000 |
commit | dc336b38784d8842417b9f9d7474dc9322564464 (patch) | |
tree | 287082284a912230361bedeed094708b160af125 | |
parent | 594ba3e582e75df1ad69e7b039dadb16e164e843 (diff) |
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
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 index 629515fbc7d7..2cc0fe2d1baa 100644 --- 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 @@ -1,6 +1,6 @@ ---- electron/shell/browser/api/electron_api_base_window.cc.orig 2022-08-03 15:31:32 UTC +--- electron/shell/browser/api/electron_api_base_window.cc.orig 2023-01-24 08:00:52 UTC +++ electron/shell/browser/api/electron_api_base_window.cc -@@ -1057,7 +1057,7 @@ void BaseWindow::SetIconImpl(v8::Isolate* isolate, +@@ -1055,7 +1055,7 @@ void BaseWindow::SetIconImpl(v8::Isolate* isolate, static_cast<NativeWindowViews*>(window_.get()) ->SetIcon(native_image->GetHICON(GetSystemMetrics(SM_CXSMICON)), native_image->GetHICON(GetSystemMetrics(SM_CXICON))); diff --git a/devel/electron21/files/patch-electron_shell_browser_api_electron__api__crash__reporter.cc b/devel/electron21/files/patch-electron_shell_browser_api_electron__api__crash__reporter.cc index 393e66f95902..57a3e8d13780 100644 --- a/devel/electron21/files/patch-electron_shell_browser_api_electron__api__crash__reporter.cc +++ b/devel/electron21/files/patch-electron_shell_browser_api_electron__api__crash__reporter.cc @@ -1,4 +1,4 @@ ---- electron/shell/browser/api/electron_api_crash_reporter.cc.orig 2022-05-25 15:32:14 UTC +--- electron/shell/browser/api/electron_api_crash_reporter.cc.orig 2023-01-24 08:00:52 UTC +++ electron/shell/browser/api/electron_api_crash_reporter.cc @@ -30,7 +30,7 @@ #include "shell/common/gin_helper/dictionary.h" @@ -9,16 +9,16 @@ #include "components/crash/core/app/crashpad.h" // nogncheck #include "components/crash/core/browser/crash_upload_list_crashpad.h" // nogncheck #include "components/crash/core/common/crash_key.h" -@@ -70,7 +70,7 @@ namespace api { +@@ -66,7 +66,7 @@ bool g_crash_reporter_initialized = false; - namespace crash_reporter { + namespace electron::api::crash_reporter { -#if defined(MAS_BUILD) +#if defined(MAS_BUILD) || BUILDFLAG(IS_BSD) namespace { void NoOp() {} -@@ -137,7 +137,7 @@ void Start(const std::string& submit_url, +@@ -133,7 +133,7 @@ void Start(const std::string& submit_url, const std::map<std::string, std::string>& extra, bool is_node_process) { TRACE_EVENT0("electron", "crash_reporter::Start"); @@ -27,7 +27,7 @@ if (g_crash_reporter_initialized) return; g_crash_reporter_initialized = true; -@@ -204,7 +204,7 @@ void Start(const std::string& submit_url, +@@ -196,7 +196,7 @@ void Start(const std::string& submit_url, namespace { @@ -36,7 +36,7 @@ void GetUploadedReports( v8::Isolate* isolate, base::OnceCallback<void(v8::Local<v8::Value>)> callback) { -@@ -261,13 +261,13 @@ v8::Local<v8::Value> GetUploadedReports(v8::Isolate* i +@@ -253,13 +253,13 @@ v8::Local<v8::Value> GetUploadedReports(v8::Isolate* i #endif void SetUploadToServer(bool upload) { @@ -52,7 +52,7 @@ return false; #else return ElectronCrashReporterClient::Get()->GetCollectStatsConsent(); -@@ -276,7 +276,7 @@ bool GetUploadToServer() { +@@ -268,7 +268,7 @@ bool GetUploadToServer() { v8::Local<v8::Value> GetParameters(v8::Isolate* isolate) { std::map<std::string, std::string> keys; @@ -61,7 +61,7 @@ electron::crash_keys::GetCrashKeys(&keys); #endif return gin::ConvertToV8(isolate, keys); -@@ -288,7 +288,7 @@ void Initialize(v8::Local<v8::Object> exports, +@@ -280,7 +280,7 @@ void Initialize(v8::Local<v8::Object> exports, void* priv) { gin_helper::Dictionary dict(context->GetIsolate(), exports); dict.SetMethod("start", &electron::api::crash_reporter::Start); diff --git a/devel/electron21/files/patch-electron_shell_browser_api_electron__api__desktop__capturer.cc b/devel/electron21/files/patch-electron_shell_browser_api_electron__api__desktop__capturer.cc new file mode 100644 index 000000000000..366c38c957d4 --- /dev/null +++ b/devel/electron21/files/patch-electron_shell_browser_api_electron__api__desktop__capturer.cc @@ -0,0 +1,29 @@ +--- electron/shell/browser/api/electron_api_desktop_capturer.cc.orig 2023-01-24 08:00:52 UTC ++++ electron/shell/browser/api/electron_api_desktop_capturer.cc +@@ -36,7 +36,7 @@ + #include "third_party/webrtc/modules/desktop_capture/win/dxgi_duplicator_controller.h" + #include "third_party/webrtc/modules/desktop_capture/win/screen_capturer_win_directx.h" + #include "ui/display/win/display_info.h" +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #if defined(USE_OZONE_PLATFORM_X11) + #include "base/logging.h" + #include "ui/base/x/x11_display_util.h" +@@ -48,7 +48,7 @@ + #endif // defined(USE_OZONE_PLATFORM_X11) + #endif // BUILDFLAG(IS_WIN) + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Private function in ui/base/x/x11_display_util.cc + std::map<x11::RandR::Output, int> GetMonitors(int version, + x11::RandR* randr, +@@ -292,7 +292,7 @@ void DesktopCapturer::UpdateSourcesList(DesktopMediaLi + for (auto& source : screen_sources) { + source.display_id = base::NumberToString(source.media_list_source.id.id); + } +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #if defined(USE_OZONE_PLATFORM_X11) + // On Linux, with X11, the source id is the numeric value of the + // display name atom and the display id is either the EDID or the diff --git a/devel/electron21/files/patch-electron_shell_browser_api_electron__api__power__monitor.cc b/devel/electron21/files/patch-electron_shell_browser_api_electron__api__power__monitor.cc index 355d39ab7540..76175e82abf6 100644 --- a/devel/electron21/files/patch-electron_shell_browser_api_electron__api__power__monitor.cc +++ b/devel/electron21/files/patch-electron_shell_browser_api_electron__api__power__monitor.cc @@ -1,6 +1,6 @@ ---- electron/shell/browser/api/electron_api_power_monitor.cc.orig 2022-05-18 15:31:32 UTC +--- electron/shell/browser/api/electron_api_power_monitor.cc.orig 2023-01-24 08:00:52 UTC +++ electron/shell/browser/api/electron_api_power_monitor.cc -@@ -79,6 +79,11 @@ void PowerMonitor::OnResume() { +@@ -77,6 +77,11 @@ void PowerMonitor::OnResume() { Emit("resume"); } @@ -12,7 +12,7 @@ #if BUILDFLAG(IS_LINUX) void PowerMonitor::SetListeningForShutdown(bool is_listening) { if (is_listening) { -@@ -105,7 +110,7 @@ gin::ObjectTemplateBuilder PowerMonitor::GetObjectTemp +@@ -103,7 +108,7 @@ gin::ObjectTemplateBuilder PowerMonitor::GetObjectTemp auto builder = gin_helper::EventEmitterMixin<PowerMonitor>::GetObjectTemplateBuilder( isolate); diff --git a/devel/electron21/files/patch-electron_shell_browser_api_electron__api__power__monitor.h b/devel/electron21/files/patch-electron_shell_browser_api_electron__api__power__monitor.h index 5a72e3b38470..3fa84dfe8909 100644 --- a/devel/electron21/files/patch-electron_shell_browser_api_electron__api__power__monitor.h +++ b/devel/electron21/files/patch-electron_shell_browser_api_electron__api__power__monitor.h @@ -1,6 +1,6 @@ ---- electron/shell/browser/api/electron_api_power_monitor.h.orig 2022-05-18 15:31:32 UTC +--- electron/shell/browser/api/electron_api_power_monitor.h.orig 2023-01-24 08:00:52 UTC +++ electron/shell/browser/api/electron_api_power_monitor.h -@@ -41,7 +41,7 @@ class PowerMonitor : public gin::Wrappable<PowerMonito +@@ -39,7 +39,7 @@ class PowerMonitor : public gin::Wrappable<PowerMonito explicit PowerMonitor(v8::Isolate* isolate); ~PowerMonitor() override; diff --git a/devel/electron21/files/patch-electron_shell_browser_api_electron__api__safe__storage.cc b/devel/electron21/files/patch-electron_shell_browser_api_electron__api__safe__storage.cc index 4d5a815a7048..190f751c191d 100644 --- a/devel/electron21/files/patch-electron_shell_browser_api_electron__api__safe__storage.cc +++ b/devel/electron21/files/patch-electron_shell_browser_api_electron__api__safe__storage.cc @@ -1,6 +1,6 @@ ---- electron/shell/browser/api/electron_api_safe_storage.cc.orig 2022-05-18 15:31:32 UTC +--- electron/shell/browser/api/electron_api_safe_storage.cc.orig 2023-01-24 08:00:52 UTC +++ electron/shell/browser/api/electron_api_safe_storage.cc -@@ -31,7 +31,7 @@ void SetElectronCryptoReady(bool ready) { +@@ -29,7 +29,7 @@ void SetElectronCryptoReady(bool ready) { #endif bool IsEncryptionAvailable() { diff --git a/devel/electron21/files/patch-electron_shell_browser_api_electron__api__web__contents.cc b/devel/electron21/files/patch-electron_shell_browser_api_electron__api__web__contents.cc index 183de28c0b84..e1afd5fa5683 100644 --- a/devel/electron21/files/patch-electron_shell_browser_api_electron__api__web__contents.cc +++ b/devel/electron21/files/patch-electron_shell_browser_api_electron__api__web__contents.cc @@ -1,5 +1,5 @@ ---- electron/shell/browser/api/electron_api_web_contents.cc.orig 2022-12-02 17:34:21.030689000 +0100 -+++ electron/shell/browser/api/electron_api_web_contents.cc 2022-12-02 17:35:44.727900000 +0100 +--- electron/shell/browser/api/electron_api_web_contents.cc.orig 2023-01-24 08:00:52 UTC ++++ electron/shell/browser/api/electron_api_web_contents.cc @@ -153,11 +153,11 @@ #include "ui/base/cocoa/defaults_utils.h" #endif @@ -32,7 +32,7 @@ // Update font settings. static const gfx::FontRenderParams params( gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(), nullptr)); -@@ -2353,7 +2353,7 @@ void WebContents::ForcefullyCrashRenderer() { +@@ -2355,7 +2355,7 @@ void WebContents::ForcefullyCrashRenderer() { content::RenderProcessHost* rph = rwh->GetProcess(); if (rph) { @@ -41,7 +41,7 @@ // A generic |CrashDumpHungChildProcess()| is not implemented for Linux. // Instead we send an explicit IPC to crash on the renderer's IO thread. rph->ForceCrash(); -@@ -2996,7 +2996,7 @@ void WebContents::Focus() { +@@ -2998,7 +2998,7 @@ void WebContents::CopyImageAt(int x, int y) { void WebContents::Focus() { // Focusing on WebContents does not automatically focus the window on macOS // and Linux, do it manually to match the behavior on Windows. @@ -50,7 +50,7 @@ if (owner_window()) owner_window()->Focus(true); #endif -@@ -3800,7 +3800,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() { +@@ -3802,7 +3802,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() { } #endif diff --git a/devel/electron21/files/patch-electron_shell_browser_api_electron__api__web__contents.h b/devel/electron21/files/patch-electron_shell_browser_api_electron__api__web__contents.h index 64a1ddd367c7..498acec1735f 100644 --- a/devel/electron21/files/patch-electron_shell_browser_api_electron__api__web__contents.h +++ b/devel/electron21/files/patch-electron_shell_browser_api_electron__api__web__contents.h @@ -1,6 +1,6 @@ ---- electron/shell/browser/api/electron_api_web_contents.h.orig 2022-08-03 15:31:32 UTC +--- electron/shell/browser/api/electron_api_web_contents.h.orig 2023-01-24 08:00:52 UTC +++ electron/shell/browser/api/electron_api_web_contents.h -@@ -699,7 +699,7 @@ class WebContents : public ExclusiveAccessContext, +@@ -702,7 +702,7 @@ class WebContents : public ExclusiveAccessContext, #if defined(TOOLKIT_VIEWS) && !BUILDFLAG(IS_MAC) ui::ImageModel GetDevToolsWindowIcon() override; #endif diff --git a/devel/electron21/files/patch-electron_shell_browser_browser.h b/devel/electron21/files/patch-electron_shell_browser_browser.h index 7d6659012414..31f3982d1937 100644 --- a/devel/electron21/files/patch-electron_shell_browser_browser.h +++ b/devel/electron21/files/patch-electron_shell_browser_browser.h @@ -1,4 +1,4 @@ ---- electron/shell/browser/browser.h.orig 2022-08-03 15:31:32 UTC +--- electron/shell/browser/browser.h.orig 2023-01-24 08:00:52 UTC +++ electron/shell/browser/browser.h @@ -101,7 +101,7 @@ class Browser : public WindowListObserver { @@ -9,7 +9,7 @@ // get the name, icon and path for an application v8::Local<v8::Promise> GetApplicationInfoForProtocol(v8::Isolate* isolate, const GURL& url); -@@ -261,10 +261,10 @@ class Browser : public WindowListObserver { +@@ -263,10 +263,10 @@ class Browser : public WindowListObserver { PCWSTR GetAppUserModelID(); #endif // BUILDFLAG(IS_WIN) @@ -22,7 +22,7 @@ // Tell the application to open a file. bool OpenFile(const std::string& file_path); -@@ -361,7 +361,7 @@ class Browser : public WindowListObserver { +@@ -363,7 +363,7 @@ class Browser : public WindowListObserver { base::Time last_dock_show_; #endif diff --git a/devel/electron21/files/patch-electron_shell_browser_electron__browser__client.cc b/devel/electron21/files/patch-electron_shell_browser_electron__browser__client.cc index 6f1f1f5aaf61..0e28d569ad90 100644 --- a/devel/electron21/files/patch-electron_shell_browser_electron__browser__client.cc +++ b/devel/electron21/files/patch-electron_shell_browser_electron__browser__client.cc @@ -1,6 +1,6 @@ ---- electron/shell/browser/electron_browser_client.cc.orig 2022-08-03 15:31:32 UTC +--- electron/shell/browser/electron_browser_client.cc.orig 2023-01-24 08:00:52 UTC +++ electron/shell/browser/electron_browser_client.cc -@@ -184,7 +184,7 @@ +@@ -185,7 +185,7 @@ #include "content/public/common/child_process_host.h" #endif diff --git a/devel/electron21/files/patch-electron_shell_browser_electron__browser__main__parts.cc b/devel/electron21/files/patch-electron_shell_browser_electron__browser__main__parts.cc index b714aa85a0c1..d8424a1f0112 100644 --- a/devel/electron21/files/patch-electron_shell_browser_electron__browser__main__parts.cc +++ b/devel/electron21/files/patch-electron_shell_browser_electron__browser__main__parts.cc @@ -1,5 +1,5 @@ ---- electron/shell/browser/electron_browser_main_parts.cc.orig 2022-10-19 17:31:10.000000000 +0200 -+++ electron/shell/browser/electron_browser_main_parts.cc 2022-12-02 17:37:56.982763000 +0100 +--- electron/shell/browser/electron_browser_main_parts.cc.orig 2023-01-24 08:00:52 UTC ++++ electron/shell/browser/electron_browser_main_parts.cc @@ -67,7 +67,7 @@ #include "ui/wm/core/wm_state.h" #endif @@ -54,7 +54,7 @@ // Reset to the original LC_ALL since we should not be changing it. if (!locale.empty()) { if (lc_all) -@@ -382,7 +382,7 @@ void ElectronBrowserMainParts::ToolkitInitialized() { +@@ -383,7 +383,7 @@ void ElectronBrowserMainParts::PostDestroyThreads() { } void ElectronBrowserMainParts::ToolkitInitialized() { @@ -63,7 +63,7 @@ auto linux_ui = ui::CreateLinuxUi(); // Try loading gtk symbols used by Electron. -@@ -502,7 +502,9 @@ void ElectronBrowserMainParts::PostCreateMainMessageLo +@@ -503,7 +503,9 @@ void ElectronBrowserMainParts::PostCreateMainMessageLo ui::OzonePlatform::GetInstance()->PostCreateMainMessageLoop( std::move(shutdown_cb)); bluez::DBusBluezManagerWrapperLinux::Initialize(); @@ -73,7 +73,7 @@ // Set up crypt config. This needs to be done before anything starts the // network service, as the raw encryption key needs to be shared with the // network service for encrypted cookie storage. -@@ -561,7 +563,7 @@ void ElectronBrowserMainParts::PostMainMessageLoopRun( +@@ -562,7 +564,7 @@ void ElectronBrowserMainParts::PostMainMessageLoopRun( fake_browser_process_->PostMainMessageLoopRun(); content::DevToolsAgentHost::StopRemoteDebuggingPipeHandler(); diff --git a/devel/electron21/files/patch-electron_shell_browser_electron__browser__main__parts.h b/devel/electron21/files/patch-electron_shell_browser_electron__browser__main__parts.h index bb5bad77d829..88246df4872e 100644 --- a/devel/electron21/files/patch-electron_shell_browser_electron__browser__main__parts.h +++ b/devel/electron21/files/patch-electron_shell_browser_electron__browser__main__parts.h @@ -1,4 +1,4 @@ ---- electron/shell/browser/electron_browser_main_parts.h.orig 2022-08-03 15:31:58 UTC +--- electron/shell/browser/electron_browser_main_parts.h.orig 2023-01-24 08:00:52 UTC +++ electron/shell/browser/electron_browser_main_parts.h @@ -61,7 +61,7 @@ class ViewsDelegate; class ViewsDelegateMac; @@ -18,7 +18,7 @@ void DetectOzonePlatform(); #endif -@@ -143,7 +143,7 @@ class ElectronBrowserMainParts : public content::Brows +@@ -144,7 +144,7 @@ class ElectronBrowserMainParts : public content::Brows std::unique_ptr<display::Screen> screen_; #endif diff --git a/devel/electron21/files/patch-electron_shell_browser_native__window.cc b/devel/electron21/files/patch-electron_shell_browser_native__window.cc index 90c5ac8bad53..c7ef4d29132c 100644 --- a/devel/electron21/files/patch-electron_shell_browser_native__window.cc +++ b/devel/electron21/files/patch-electron_shell_browser_native__window.cc @@ -1,6 +1,6 @@ ---- electron/shell/browser/native_window.cc.orig 2022-05-18 15:31:32 UTC +--- electron/shell/browser/native_window.cc.orig 2023-01-24 08:00:52 UTC +++ electron/shell/browser/native_window.cc -@@ -185,7 +185,7 @@ void NativeWindow::InitFromOptions(const gin_helper::D +@@ -189,7 +189,7 @@ void NativeWindow::InitFromOptions(const gin_helper::D } else { SetSizeConstraints(size_constraints); } diff --git a/devel/electron21/files/patch-electron_shell_browser_relauncher__linux.cc b/devel/electron21/files/patch-electron_shell_browser_relauncher__linux.cc index ce2055b2f2d8..dd51d55df228 100644 --- a/devel/electron21/files/patch-electron_shell_browser_relauncher__linux.cc +++ b/devel/electron21/files/patch-electron_shell_browser_relauncher__linux.cc @@ -1,4 +1,4 @@ ---- electron/shell/browser/relauncher_linux.cc.orig 2021-01-22 23:55:24 UTC +--- electron/shell/browser/relauncher_linux.cc.orig 2023-01-24 08:00:52 UTC +++ electron/shell/browser/relauncher_linux.cc @@ -6,8 +6,10 @@ @@ -11,7 +11,7 @@ #include "base/files/file_util.h" #include "base/files/scoped_file.h" -@@ -26,6 +28,10 @@ void RelauncherSynchronizeWithParent() { +@@ -24,6 +26,10 @@ void RelauncherSynchronizeWithParent() { base::ScopedFD relauncher_sync_fd(kRelauncherSyncFD); static const auto signum = SIGUSR2; @@ -22,7 +22,7 @@ // send signum to current process when parent process ends. if (HANDLE_EINTR(prctl(PR_SET_PDEATHSIG, signum)) != 0) { PLOG(ERROR) << "prctl"; -@@ -50,6 +56,7 @@ void RelauncherSynchronizeWithParent() { +@@ -48,6 +54,7 @@ void RelauncherSynchronizeWithParent() { // Wait for the parent to exit parentWaiter.Wait(); diff --git a/devel/electron21/files/patch-electron_shell_browser_ui_views_electron__views__delegate.cc b/devel/electron21/files/patch-electron_shell_browser_ui_views_electron__views__delegate.cc index bdc40a9b974d..0c3f3af702db 100644 --- a/devel/electron21/files/patch-electron_shell_browser_ui_views_electron__views__delegate.cc +++ b/devel/electron21/files/patch-electron_shell_browser_ui_views_electron__views__delegate.cc @@ -1,4 +1,4 @@ ---- electron/shell/browser/ui/views/electron_views_delegate.cc.orig 2022-05-18 15:31:32 UTC +--- electron/shell/browser/ui/views/electron_views_delegate.cc.orig 2023-01-24 08:00:52 UTC +++ electron/shell/browser/ui/views/electron_views_delegate.cc @@ -9,7 +9,7 @@ #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" @@ -8,7 +8,7 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "base/environment.h" #include "base/nix/xdg_util.h" - #include "ui/views/linux_ui/linux_ui.h" + #include "ui/linux/linux_ui.h" @@ -17,7 +17,7 @@ namespace { diff --git a/devel/electron21/files/patch-electron_shell_browser_ui_views_menu__bar.cc b/devel/electron21/files/patch-electron_shell_browser_ui_views_menu__bar.cc index d7f0c6edcdc5..99e89721ba2d 100644 --- a/devel/electron21/files/patch-electron_shell_browser_ui_views_menu__bar.cc +++ b/devel/electron21/files/patch-electron_shell_browser_ui_views_menu__bar.cc @@ -1,4 +1,4 @@ ---- electron/shell/browser/ui/views/menu_bar.cc.orig 2022-06-08 15:30:58 UTC +--- electron/shell/browser/ui/views/menu_bar.cc.orig 2023-01-24 08:00:52 UTC +++ electron/shell/browser/ui/views/menu_bar.cc @@ -13,7 +13,7 @@ #include "ui/views/background.h" @@ -9,7 +9,7 @@ #include "ui/gtk/gtk_util.h" // nogncheck #endif -@@ -210,7 +210,7 @@ void MenuBar::ButtonPressed(int id, const ui::Event& e +@@ -211,7 +211,7 @@ void MenuBar::ButtonPressed(size_t id, const ui::Event void MenuBar::RefreshColorCache(const ui::NativeTheme* theme) { if (theme) { @@ -18,7 +18,7 @@ background_color_ = gtk::GetBgColor("GtkMenuBar#menubar"); enabled_color_ = gtk::GetFgColor("GtkMenuBar#menubar GtkMenuItem#menuitem GtkLabel"); -@@ -233,7 +233,7 @@ void MenuBar::RebuildChildren() { +@@ -234,7 +234,7 @@ void MenuBar::RebuildChildren() { } void MenuBar::UpdateViewColors() { @@ -27,7 +27,7 @@ // set menubar background color SetBackground(views::CreateSolidBackground(background_color_)); #endif -@@ -241,7 +241,7 @@ void MenuBar::UpdateViewColors() { +@@ -242,7 +242,7 @@ void MenuBar::UpdateViewColors() { // set child colors if (menu_model_ == nullptr) return; diff --git a/devel/electron21/files/patch-electron_shell_common_api_electron__api__clipboard.cc b/devel/electron21/files/patch-electron_shell_common_api_electron__api__clipboard.cc index bb10f3c5d418..0745693209b8 100644 --- a/devel/electron21/files/patch-electron_shell_common_api_electron__api__clipboard.cc +++ b/devel/electron21/files/patch-electron_shell_common_api_electron__api__clipboard.cc @@ -1,6 +1,6 @@ ---- electron/shell/common/api/electron_api_clipboard.cc.orig 2022-05-18 15:31:32 UTC +--- electron/shell/common/api/electron_api_clipboard.cc.orig 2023-01-24 08:00:52 UTC +++ electron/shell/common/api/electron_api_clipboard.cc -@@ -56,7 +56,7 @@ std::string Clipboard::Read(const std::string& format_ +@@ -54,7 +54,7 @@ std::string Clipboard::Read(const std::string& format_ ui::ClipboardFormatType::CustomPlatformType(format_string)); bool rawFormatAvailable = clipboard->IsFormatAvailable( rawFormat, ui::ClipboardBuffer::kCopyPaste, /* data_dst = */ nullptr); @@ -9,7 +9,7 @@ if (!rawFormatAvailable) { rawFormatAvailable = clipboard->IsFormatAvailable( rawFormat, ui::ClipboardBuffer::kSelection, /* data_dst = */ nullptr); -@@ -72,7 +72,7 @@ std::string Clipboard::Read(const std::string& format_ +@@ -70,7 +70,7 @@ std::string Clipboard::Read(const std::string& format_ custom_format_names = clipboard->ExtractCustomPlatformNames(ui::ClipboardBuffer::kCopyPaste, /* data_dst = */ nullptr); diff --git a/devel/electron21/files/patch-electron_shell_common_api_electron__api__native__image.cc b/devel/electron21/files/patch-electron_shell_common_api_electron__api__native__image.cc index b4be1d7ac04b..488826f44ec5 100644 --- a/devel/electron21/files/patch-electron_shell_common_api_electron__api__native__image.cc +++ b/devel/electron21/files/patch-electron_shell_common_api_electron__api__native__image.cc @@ -1,6 +1,6 @@ ---- electron/shell/common/api/electron_api_native_image.cc.orig 2022-08-03 15:31:32 UTC +--- electron/shell/common/api/electron_api_native_image.cc.orig 2023-01-24 08:00:52 UTC +++ electron/shell/common/api/electron_api_native_image.cc -@@ -651,7 +651,7 @@ void Initialize(v8::Local<v8::Object> exports, +@@ -632,7 +632,7 @@ void Initialize(v8::Local<v8::Object> exports, native_image.SetMethod("createFromDataURL", &NativeImage::CreateFromDataURL); native_image.SetMethod("createFromNamedImage", &NativeImage::CreateFromNamedImage); diff --git a/devel/electron21/files/patch-electron_shell_common_api_electron__api__native__image.h b/devel/electron21/files/patch-electron_shell_common_api_electron__api__native__image.h index f11704a1c66e..c99e837d394d 100644 --- a/devel/electron21/files/patch-electron_shell_common_api_electron__api__native__image.h +++ b/devel/electron21/files/patch-electron_shell_common_api_electron__api__native__image.h @@ -1,6 +1,6 @@ ---- electron/shell/common/api/electron_api_native_image.h.orig 2022-06-08 15:30:58 UTC +--- electron/shell/common/api/electron_api_native_image.h.orig 2023-01-24 08:00:52 UTC +++ electron/shell/common/api/electron_api_native_image.h -@@ -79,7 +79,7 @@ class NativeImage : public gin::Wrappable<NativeImage> +@@ -77,7 +77,7 @@ class NativeImage : public gin::Wrappable<NativeImage> const GURL& url); static gin::Handle<NativeImage> CreateFromNamedImage(gin::Arguments* args, std::string name); diff --git a/devel/electron21/files/patch-electron_shell_common_node__bindings.cc b/devel/electron21/files/patch-electron_shell_common_node__bindings.cc index 69d89a078236..ed53c302ea8e 100644 --- a/devel/electron21/files/patch-electron_shell_common_node__bindings.cc +++ b/devel/electron21/files/patch-electron_shell_common_node__bindings.cc @@ -1,15 +1,15 @@ ---- electron/shell/common/node_bindings.cc.orig 2022-08-17 15:33:00 UTC +--- electron/shell/common/node_bindings.cc.orig 2023-01-24 08:00:52 UTC +++ electron/shell/common/node_bindings.cc -@@ -38,7 +38,7 @@ - #include "shell/common/node_includes.h" +@@ -39,7 +39,7 @@ #include "third_party/blink/renderer/bindings/core/v8/v8_initializer.h" // nogncheck + #include "third_party/electron_node/src/debug_utils.h" -#if !defined(MAS_BUILD) +#if !defined(MAS_BUILD) && !defined(OS_BSD) #include "shell/common/crash_keys.h" #endif -@@ -143,7 +143,7 @@ bool g_is_initialized = false; +@@ -145,7 +145,7 @@ bool g_is_initialized = false; void V8FatalErrorCallback(const char* location, const char* message) { LOG(ERROR) << "Fatal error in V8: " << location << " " << message; @@ -18,7 +18,7 @@ electron::crash_keys::SetCrashKey("electron.v8-fatal.message", message); electron::crash_keys::SetCrashKey("electron.v8-fatal.location", location); #endif -@@ -370,7 +370,7 @@ void NodeBindings::Initialize() { +@@ -372,7 +372,7 @@ void NodeBindings::Initialize() { TRACE_EVENT0("electron", "NodeBindings::Initialize"); // Open node's error reporting system for browser process. diff --git a/devel/electron21/files/patch-electron_spec-main_api-app-spec.ts b/devel/electron21/files/patch-electron_spec-main_api-app-spec.ts index 9df458fc9378..03964a145893 100644 --- a/devel/electron21/files/patch-electron_spec-main_api-app-spec.ts +++ b/devel/electron21/files/patch-electron_spec-main_api-app-spec.ts @@ -1,6 +1,20 @@ ---- electron/spec-main/api-app-spec.ts.orig 2022-08-10 15:31:37 UTC +--- electron/spec-main/api-app-spec.ts.orig 2023-01-24 08:00:52 UTC +++ electron/spec-main/api-app-spec.ts -@@ -174,7 +174,7 @@ describe('app module', () => { +@@ -125,11 +125,11 @@ describe('app module', () => { + }); + + describe('app.getPreferredSystemLanguages()', () => { +- ifit(process.platform !== 'linux')('should not be empty', () => { ++ ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('should not be empty', () => { + expect(app.getPreferredSystemLanguages().length).to.not.equal(0); + }); + +- ifit(process.platform === 'linux')('should be empty or contain C entry', () => { ++ ifit(process.platform === 'linux' || process.platform === 'freebsd')('should be empty or contain C entry', () => { + const languages = app.getPreferredSystemLanguages(); + if (languages.length) { + expect(languages).to.not.include('C'); +@@ -193,7 +193,7 @@ describe('app module', () => { }); it('exits gracefully', async function () { @@ -9,7 +23,7 @@ this.skip(); return; } -@@ -438,7 +438,7 @@ describe('app module', () => { +@@ -457,7 +457,7 @@ describe('app module', () => { // let w = null // before(function () { @@ -18,7 +32,7 @@ // this.skip() // } // }) -@@ -561,7 +561,7 @@ describe('app module', () => { +@@ -580,7 +580,7 @@ describe('app module', () => { describe('app.badgeCount', () => { const platformIsNotSupported = (process.platform === 'win32') || @@ -27,7 +41,7 @@ const expectedBadgeCount = 42; -@@ -605,7 +605,7 @@ describe('app module', () => { +@@ -624,7 +624,7 @@ describe('app module', () => { }); }); @@ -36,7 +50,7 @@ const updateExe = path.resolve(path.dirname(process.execPath), '..', 'Update.exe'); const processStartArgs = [ '--processStart', `"${path.basename(process.execPath)}"`, -@@ -922,7 +922,7 @@ describe('app module', () => { +@@ -941,7 +941,7 @@ describe('app module', () => { }); }); @@ -45,7 +59,7 @@ it('with properties', () => { it('can set accessibility support enabled', () => { expect(app.accessibilitySupportEnabled).to.eql(false); -@@ -1088,7 +1088,7 @@ describe('app module', () => { +@@ -1107,7 +1107,7 @@ describe('app module', () => { let w: BrowserWindow; before(function () { @@ -54,7 +68,7 @@ this.skip(); } session.fromPartition('empty-certificate').setCertificateVerifyProc((req, cb) => { cb(0); }); -@@ -1229,7 +1229,7 @@ describe('app module', () => { +@@ -1248,7 +1248,7 @@ describe('app module', () => { // We can't expect particular app names here, but these protocols should // at least have _something_ registered. Except on our Linux CI // environment apparently. @@ -63,7 +77,7 @@ this.skip(); } -@@ -1247,7 +1247,7 @@ describe('app module', () => { +@@ -1266,7 +1266,7 @@ describe('app module', () => { }); }); @@ -72,7 +86,7 @@ it('returns promise rejection for a bogus protocol', async function () { await expect( app.getApplicationInfoForProtocol('bogus-protocol://') -@@ -1297,7 +1297,7 @@ describe('app module', () => { +@@ -1316,7 +1316,7 @@ describe('app module', () => { }); // FIXME Get these specs running on Linux CI @@ -81,7 +95,7 @@ const iconPath = path.join(__dirname, 'fixtures/assets/icon.ico'); const sizes = { small: 16, -@@ -1378,7 +1378,7 @@ describe('app module', () => { +@@ -1397,7 +1397,7 @@ describe('app module', () => { expect(entry.memory).to.have.property('privateBytes').that.is.greaterThan(0); } @@ -90,7 +104,7 @@ expect(entry.sandboxed).to.be.a('boolean'); } -@@ -1404,7 +1404,7 @@ describe('app module', () => { +@@ -1423,7 +1423,7 @@ describe('app module', () => { }); // FIXME https://github.com/electron/electron/issues/24224 @@ -99,7 +113,7 @@ const appPath = path.join(fixturesPath, 'api', 'gpu-info.js'); const getGPUInfo = async (type: string) => { -@@ -1453,7 +1453,7 @@ describe('app module', () => { +@@ -1472,7 +1472,7 @@ describe('app module', () => { it('succeeds with complete GPUInfo', async () => { const completeInfo = await getGPUInfo('complete'); @@ -108,7 +122,7 @@ // For linux and macOS complete info is same as basic info await verifyBasicGPUInfo(completeInfo); const basicInfo = await getGPUInfo('basic'); -@@ -1483,7 +1483,7 @@ describe('app module', () => { +@@ -1502,7 +1502,7 @@ describe('app module', () => { const socketPath = process.platform === 'win32' ? '\\\\.\\pipe\\electron-mixed-sandbox' : '/tmp/electron-mixed-sandbox'; beforeEach(function (done) { diff --git a/devel/electron21/files/patch-electron_spec-main_api-browser-view-spec.ts b/devel/electron21/files/patch-electron_spec-main_api-browser-view-spec.ts deleted file mode 100644 index ec4e875601ff..000000000000 --- a/devel/electron21/files/patch-electron_spec-main_api-browser-view-spec.ts +++ /dev/null @@ -1,20 +0,0 @@ ---- electron/spec-main/api-browser-view-spec.ts.orig 2022-06-08 15:30:58 UTC -+++ electron/spec-main/api-browser-view-spec.ts -@@ -63,7 +63,7 @@ describe('BrowserView module', () => { - }); - - // Linux and arm64 platforms (WOA and macOS) do not return any capture sources -- ifit(process.platform !== 'linux' && process.arch !== 'arm64')('sets the background color to transparent if none is set', async () => { -+ ifit((process.platform !== 'linux' && process.platform !== 'freebsd') && process.arch !== 'arm64')('sets the background color to transparent if none is set', async () => { - const display = screen.getPrimaryDisplay(); - const WINDOW_BACKGROUND_COLOR = '#55ccbb'; - -@@ -87,7 +87,7 @@ describe('BrowserView module', () => { - }); - - // Linux and arm64 platforms (WOA and macOS) do not return any capture sources -- ifit(process.platform !== 'linux' && process.arch !== 'arm64')('successfully applies the background color', async () => { -+ ifit((process.platform !== 'linux' && process.platform !== 'freebsd') && process.arch !== 'arm64')('successfully applies the background color', async () => { - const WINDOW_BACKGROUND_COLOR = '#55ccbb'; - const VIEW_BACKGROUND_COLOR = '#ff00ff'; - const display = screen.getPrimaryDisplay(); diff --git a/devel/electron21/files/patch-electron_spec-main_api-browser-window-spec.ts b/devel/electron21/files/patch-electron_spec-main_api-browser-window-spec.ts index b4d1eb486781..2defeaff8281 100644 --- a/devel/electron21/files/patch-electron_spec-main_api-browser-window-spec.ts +++ b/devel/electron21/files/patch-electron_spec-main_api-browser-window-spec.ts @@ -1,4 +1,4 @@ ---- electron/spec-main/api-browser-window-spec.ts.orig 2022-08-10 15:31:37 UTC +--- electron/spec-main/api-browser-window-spec.ts.orig 2023-01-24 08:00:52 UTC +++ electron/spec-main/api-browser-window-spec.ts @@ -58,7 +58,7 @@ describe('BrowserWindow module', () => { }).not.to.throw(); @@ -54,7 +54,7 @@ it('checks normal bounds when minimized', async () => { const bounds = w.getBounds(); const minimize = emittedOnce(w, 'minimize'); -@@ -2271,7 +2271,7 @@ describe('BrowserWindow module', () => { +@@ -2277,7 +2277,7 @@ describe('BrowserWindow module', () => { describe('BrowserWindow.setOpacity(opacity)', () => { afterEach(closeAllWindows); @@ -63,7 +63,7 @@ it('make window with initial opacity', () => { const w = new BrowserWindow({ show: false, opacity: 0.5 }); expect(w.getOpacity()).to.equal(0.5); -@@ -2297,7 +2297,7 @@ describe('BrowserWindow module', () => { +@@ -2303,7 +2303,7 @@ describe('BrowserWindow module', () => { }); }); @@ -72,7 +72,7 @@ it('sets 1 regardless of parameter', () => { const w = new BrowserWindow({ show: false }); w.setOpacity(0); -@@ -3229,7 +3229,7 @@ describe('BrowserWindow module', () => { +@@ -3235,7 +3235,7 @@ describe('BrowserWindow module', () => { expect(test.versions).to.deep.equal(process.versions); expect(test.contextId).to.be.a('string'); @@ -81,7 +81,7 @@ expect(test.creationTime).to.be.null('creation time'); expect(test.systemMemoryInfo).to.be.null('system memory info'); } else { -@@ -3810,7 +3810,7 @@ describe('BrowserWindow module', () => { +@@ -3813,7 +3813,7 @@ describe('BrowserWindow module', () => { }); }); @@ -90,7 +90,7 @@ afterEach(closeAllWindows); it('emits an event when window is maximized', async () => { const w = new BrowserWindow({ show: false }); -@@ -4069,7 +4069,7 @@ describe('BrowserWindow module', () => { +@@ -4072,7 +4072,7 @@ describe('BrowserWindow module', () => { }); // TODO(dsanders11): Enable once maximize event works on Linux again on CI @@ -99,7 +99,7 @@ afterEach(closeAllWindows); it('should show the window if it is not currently shown', async () => { const w = new BrowserWindow({ show: false }); -@@ -4106,7 +4106,7 @@ describe('BrowserWindow module', () => { +@@ -4109,7 +4109,7 @@ describe('BrowserWindow module', () => { // TODO(dsanders11): Enable once minimize event works on Linux again. // See https://github.com/electron/electron/issues/28699 @@ -108,7 +108,7 @@ const w = new BrowserWindow(); const minimize = emittedOnce(w, 'minimize'); w.minimize(); -@@ -4469,7 +4469,7 @@ describe('BrowserWindow module', () => { +@@ -4472,7 +4472,7 @@ describe('BrowserWindow module', () => { }); // On Linux there is no "resizable" property of a window. @@ -117,7 +117,7 @@ const w = new BrowserWindow({ show: false }); expect(w.resizable).to.be.true('resizable'); -@@ -4561,7 +4561,7 @@ describe('BrowserWindow module', () => { +@@ -4564,7 +4564,7 @@ describe('BrowserWindow module', () => { }); }); @@ -126,21 +126,3 @@ // Not implemented on Linux. afterEach(closeAllWindows); -@@ -5580,7 +5580,7 @@ describe('BrowserWindow module', () => { - }); - - // Linux and arm64 platforms (WOA and macOS) do not return any capture sources -- ifit(process.platform !== 'linux' && process.arch !== 'arm64')('should not display a visible background', async () => { -+ ifit((process.platform !== 'linux' && process.platform !== 'freebsd') && process.arch !== 'arm64')('should not display a visible background', async () => { - const display = screen.getPrimaryDisplay(); - - const backgroundWindow = new BrowserWindow({ -@@ -5622,7 +5622,7 @@ describe('BrowserWindow module', () => { - afterEach(closeAllWindows); - - // Linux/WOA doesn't return any capture sources. -- ifit(process.platform !== 'linux' && (process.platform !== 'win32' || process.arch !== 'arm64'))('should display the set color', async () => { -+ ifit((process.platform !== 'linux' && process.platform !== 'freebsd') && (process.platform !== 'win32' || process.arch !== 'arm64'))('should display the set color', async () => { - const display = screen.getPrimaryDisplay(); - - const w = new BrowserWindow({ diff --git a/devel/electron21/files/patch-electron_spec-main_api-clipboard-spec.ts b/devel/electron21/files/patch-electron_spec-main_api-clipboard-spec.ts index 720a2542a63e..0a37c5decd83 100644 --- a/devel/electron21/files/patch-electron_spec-main_api-clipboard-spec.ts +++ b/devel/electron21/files/patch-electron_spec-main_api-clipboard-spec.ts @@ -1,6 +1,6 @@ ---- electron/spec-main/api-clipboard-spec.ts.orig 2021-12-03 01:46:05 UTC +--- electron/spec-main/api-clipboard-spec.ts.orig 2023-01-24 08:00:52 UTC +++ electron/spec-main/api-clipboard-spec.ts -@@ -44,7 +44,7 @@ ifdescribe(process.platform !== 'win32' || process.arc +@@ -43,7 +43,7 @@ ifdescribe(process.platform !== 'win32' || process.arc }); }); @@ -9,7 +9,7 @@ it('returns title and url', () => { clipboard.writeBookmark('a title', 'https://electronjs.org'); -@@ -63,7 +63,7 @@ ifdescribe(process.platform !== 'win32' || process.arc +@@ -62,7 +62,7 @@ ifdescribe(process.platform !== 'win32' || process.arc }); describe('clipboard.read()', () => { @@ -18,7 +18,7 @@ const type = process.platform === 'darwin' ? 'NSFilenamesPboardType' : 'FileNameW'; expect(() => { -@@ -100,7 +100,7 @@ ifdescribe(process.platform !== 'win32' || process.arc +@@ -99,7 +99,7 @@ ifdescribe(process.platform !== 'win32' || process.arc const readImage = clipboard.readImage(); expect(readImage.toDataURL()).to.equal(i.toDataURL()); diff --git a/devel/electron21/files/patch-electron_spec-main_api-native-image-spec.ts b/devel/electron21/files/patch-electron_spec-main_api-native-image-spec.ts index 14a4006394e7..9c8c51960a92 100644 --- a/devel/electron21/files/patch-electron_spec-main_api-native-image-spec.ts +++ b/devel/electron21/files/patch-electron_spec-main_api-native-image-spec.ts @@ -1,6 +1,6 @@ ---- electron/spec-main/api-native-image-spec.ts.orig 2021-01-22 23:55:24 UTC +--- electron/spec-main/api-native-image-spec.ts.orig 2023-01-24 08:00:52 UTC +++ electron/spec-main/api-native-image-spec.ts -@@ -491,7 +491,7 @@ describe('nativeImage module', () => { +@@ -423,7 +423,7 @@ describe('nativeImage module', () => { }); }); diff --git a/devel/electron21/files/patch-electron_spec-main_api-net-log-spec.ts b/devel/electron21/files/patch-electron_spec-main_api-net-log-spec.ts index 66f40d4a3a96..b16f0f16d6bf 100644 --- a/devel/electron21/files/patch-electron_spec-main_api-net-log-spec.ts +++ b/devel/electron21/files/patch-electron_spec-main_api-net-log-spec.ts @@ -1,5 +1,5 @@ ---- electron/spec-main/api-net-log-spec.ts.orig 2022-10-19 17:31:10.000000000 +0200 -+++ electron/spec-main/api-net-log-spec.ts 2022-12-02 17:47:59.229362000 +0100 +--- electron/spec-main/api-net-log-spec.ts.orig 2023-01-24 08:00:52 UTC ++++ electron/spec-main/api-net-log-spec.ts @@ -121,7 +121,7 @@ describe('netLog module', () => { expect(JSON.parse(dump).events.some((x: any) => x.params && x.params.bytes && Buffer.from(x.params.bytes, 'base64').includes(unique))).to.be.true('uuid present in dump'); }); diff --git a/devel/electron21/files/patch-electron_spec-main_api-power-monitor-spec.ts b/devel/electron21/files/patch-electron_spec-main_api-power-monitor-spec.ts index b22fec5f7844..04b40e77057a 100644 --- a/devel/electron21/files/patch-electron_spec-main_api-power-monitor-spec.ts +++ b/devel/electron21/files/patch-electron_spec-main_api-power-monitor-spec.ts @@ -1,6 +1,6 @@ ---- electron/spec-main/api-power-monitor-spec.ts.orig 2022-10-19 17:31:10.000000000 +0200 -+++ electron/spec-main/api-power-monitor-spec.ts 2022-12-02 17:49:13.141645000 +0100 -@@ -14,7 +14,7 @@ describe('powerMonitor', () => { +--- electron/spec-main/api-power-monitor-spec.ts.orig 2023-01-24 08:00:52 UTC ++++ electron/spec-main/api-power-monitor-spec.ts +@@ -14,7 +14,7 @@ import { promisify } from 'util'; describe('powerMonitor', () => { let logindMock: any, dbusMockPowerMonitor: any, getCalls: any, emitSignal: any, reset: any; diff --git a/devel/electron21/files/patch-electron_spec-main_api-process-spec.ts b/devel/electron21/files/patch-electron_spec-main_api-process-spec.ts index cc14f7d2ac9f..39d040159f25 100644 --- a/devel/electron21/files/patch-electron_spec-main_api-process-spec.ts +++ b/devel/electron21/files/patch-electron_spec-main_api-process-spec.ts @@ -1,5 +1,5 @@ ---- electron/spec-main/api-process-spec.ts.orig 2022-10-19 17:31:10.000000000 +0200 -+++ electron/spec-main/api-process-spec.ts 2022-12-02 17:44:33.364867000 +0100 +--- electron/spec-main/api-process-spec.ts.orig 2023-01-24 08:00:52 UTC ++++ electron/spec-main/api-process-spec.ts @@ -54,7 +54,7 @@ describe('process module', () => { it('resolves promise successfully with valid data', async () => { const memoryInfo = await w.webContents.executeJavaScript('process.getProcessMemoryInfo()'); @@ -9,3 +9,12 @@ expect(memoryInfo.residentSet).to.be.a('number').greaterThan(0); } expect(memoryInfo.private).to.be.a('number').greaterThan(0); +@@ -164,7 +164,7 @@ describe('process module', () => { + it('resolves promise successfully with valid data', async () => { + const memoryInfo = await process.getProcessMemoryInfo(); + expect(memoryInfo).to.be.an('object'); +- if (process.platform === 'linux' || process.platform === 'win32') { ++ if (process.platform === 'linux' || process.platform === 'win32' || process.platform === 'freebsd') { + expect(memoryInfo.residentSet).to.be.a('number').greaterThan(0); + } + expect(memoryInfo.private).to.be.a('number').greaterThan(0); diff --git a/devel/electron21/files/patch-electron_spec-main_api-screen-spec.ts b/devel/electron21/files/patch-electron_spec-main_api-screen-spec.ts index 4bdd3ef89563..3bd5e32d6d51 100644 --- a/devel/electron21/files/patch-electron_spec-main_api-screen-spec.ts +++ b/devel/electron21/files/patch-electron_spec-main_api-screen-spec.ts @@ -1,4 +1,4 @@ ---- electron/spec-main/api-screen-spec.ts.orig 2021-04-20 23:32:33 UTC +--- electron/spec-main/api-screen-spec.ts.orig 2023-01-24 08:00:52 UTC +++ electron/spec-main/api-screen-spec.ts @@ -29,7 +29,7 @@ describe('screen module', () => { }); @@ -9,7 +9,7 @@ const display = screen.getPrimaryDisplay(); expect(display).to.have.property('scaleFactor').that.is.a('number'); -@@ -46,7 +46,7 @@ describe('screen module', () => { +@@ -47,7 +47,7 @@ describe('screen module', () => { }); it('has a size object property', function () { @@ -18,7 +18,7 @@ const display = screen.getPrimaryDisplay(); expect(display).to.have.property('size').that.is.an('object'); -@@ -56,7 +56,7 @@ describe('screen module', () => { +@@ -57,7 +57,7 @@ describe('screen module', () => { }); it('has a workAreaSize object property', function () { @@ -27,7 +27,7 @@ const display = screen.getPrimaryDisplay(); expect(display).to.have.property('workAreaSize').that.is.an('object'); -@@ -66,7 +66,7 @@ describe('screen module', () => { +@@ -67,7 +67,7 @@ describe('screen module', () => { }); it('has a bounds object property', function () { diff --git a/devel/electron21/files/patch-electron_spec-main_api-shell-spec.ts b/devel/electron21/files/patch-electron_spec-main_api-shell-spec.ts index 0b4939eb0dac..38dcc62d7fff 100644 --- a/devel/electron21/files/patch-electron_spec-main_api-shell-spec.ts +++ b/devel/electron21/files/patch-electron_spec-main_api-shell-spec.ts @@ -1,6 +1,6 @@ ---- electron/spec-main/api-shell-spec.ts.orig 2021-10-27 21:25:28 UTC +--- electron/spec-main/api-shell-spec.ts.orig 2023-01-24 08:00:52 UTC +++ electron/spec-main/api-shell-spec.ts -@@ -23,7 +23,7 @@ describe('shell module', () => { +@@ -24,7 +24,7 @@ describe('shell module', () => { afterEach(async () => { // reset env vars to prevent side effects @@ -9,7 +9,7 @@ process.env.DE = envVars.de; process.env.BROWSER = envVars.browser; process.env.DISPLAY = envVars.display; -@@ -36,6 +36,11 @@ describe('shell module', () => { +@@ -37,6 +37,11 @@ describe('shell module', () => { let requestReceived: Promise<any>; if (process.platform === 'linux') { process.env.BROWSER = '/bin/true'; diff --git a/devel/electron21/files/patch-electron_spec-main_api-web-frame-main-spec.ts b/devel/electron21/files/patch-electron_spec-main_api-web-frame-main-spec.ts index 82f2ee8c761e..b69939b1b1fb 100644 --- a/devel/electron21/files/patch-electron_spec-main_api-web-frame-main-spec.ts +++ b/devel/electron21/files/patch-electron_spec-main_api-web-frame-main-spec.ts @@ -1,6 +1,6 @@ ---- electron/spec-main/api-web-frame-main-spec.ts.orig 2022-05-18 15:31:32 UTC +--- electron/spec-main/api-web-frame-main-spec.ts.orig 2023-01-24 08:00:52 UTC +++ electron/spec-main/api-web-frame-main-spec.ts -@@ -204,7 +204,7 @@ describe('webFrameMain module', () => { +@@ -292,7 +292,7 @@ describe('webFrameMain module', () => { }); // TODO(jkleinsc) fix this flaky test on linux diff --git a/devel/electron21/files/patch-electron_spec-main_chromium-spec.ts b/devel/electron21/files/patch-electron_spec-main_chromium-spec.ts index 43d0dd8a1270..6982a7d14003 100644 --- a/devel/electron21/files/patch-electron_spec-main_chromium-spec.ts +++ b/devel/electron21/files/patch-electron_spec-main_chromium-spec.ts @@ -1,11 +1,53 @@ ---- electron/spec-main/chromium-spec.ts.orig 2022-10-19 17:31:10.000000000 +0200 -+++ electron/spec-main/chromium-spec.ts 2022-12-02 17:46:26.770558000 +0100 -@@ -1761,7 +1761,7 @@ describe('chromium features', () => { +--- electron/spec-main/chromium-spec.ts.orig 2023-01-24 08:00:52 UTC ++++ electron/spec-main/chromium-spec.ts +@@ -403,13 +403,13 @@ describe('command line switches', () => { + it('should not set an invalid locale', async () => testLocale('asdfkl', `${currentLocale}|${currentSystemLocale}|${currentPreferredLanguages}`)); + + const lcAll = String(process.env.LC_ALL); +- ifit(process.platform === 'linux')('current process has a valid LC_ALL env', async () => { ++ ifit(process.platform === 'linux' || process.platform === 'freebsd')('current process has a valid LC_ALL env', async () => { + // The LC_ALL env should not be set to DOM locale string. + expect(lcAll).to.not.equal(app.getLocale()); + }); +- ifit(process.platform === 'linux')('should not change LC_ALL', async () => testLocale('fr', lcAll, true)); +- ifit(process.platform === 'linux')('should not change LC_ALL when setting invalid locale', async () => testLocale('asdfkl', lcAll, true)); +- ifit(process.platform === 'linux')('should not change LC_ALL when --lang is not set', async () => testLocale('', lcAll, true)); ++ ifit(process.platform === 'linux' || process.platform === 'freebsd')('should not change LC_ALL', async () => testLocale('fr', lcAll, true)); ++ ifit(process.platform === 'linux' || process.platform === 'freebsd')('should not change LC_ALL when setting invalid locale', async () => testLocale('asdfkl', lcAll, true)); ++ ifit(process.platform === 'linux' || process.platform === 'freebsd')('should not change LC_ALL when --lang is not set', async () => testLocale('', lcAll, true)); + }); + + describe('--remote-debugging-pipe switch', () => { +@@ -1762,7 +1762,7 @@ describe('chromium features', () => { }); }); - ifdescribe(process.platform !== 'win32' && process.platform !== 'linux')('webgl', () => { -+ ifdescribe(process.platform !== 'win32' && process.platform !== 'linux' && || process.platform !== 'freebsd')('webgl', () => { ++ ifdescribe(process.platform !== 'win32' && process.platform !== 'linux' && process.platform !== 'freebsd')('webgl', () => { it('can be gotten as context in canvas', async () => { const w = new BrowserWindow({ show: false }); w.loadURL('about:blank'); +@@ -1858,12 +1858,12 @@ describe('font fallback', () => { + expect(fonts[0].familyName).to.equal('Arial'); + } else if (process.platform === 'darwin') { + expect(fonts[0].familyName).to.equal('Helvetica'); +- } else if (process.platform === 'linux') { ++ } else if (process.platform === 'linux' || process.platform === 'freebsd') { + expect(fonts[0].familyName).to.equal('DejaVu Sans'); + } // I think this depends on the distro? We don't specify a default. + }); + +- ifit(process.platform !== 'linux')('should fall back to Japanese font for sans-serif Japanese script', async function () { ++ ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('should fall back to Japanese font for sans-serif Japanese script', async function () { + const html = ` + <html lang="ja-JP"> + <head> +@@ -2166,7 +2166,7 @@ describe('navigator.clipboard', () => { + }); + }); + +-ifdescribe((process.platform !== 'linux' || app.isUnityRunning()))('navigator.setAppBadge/clearAppBadge', () => { ++ifdescribe(((process.platform !== 'linux' && process.platform !== 'freebsd') || app.isUnityRunning()))('navigator.setAppBadge/clearAppBadge', () => { + let w: BrowserWindow; + + const expectedBadgeCount = 42; diff --git a/devel/electron21/files/patch-electron_spec-main_crash-spec.ts b/devel/electron21/files/patch-electron_spec-main_crash-spec.ts new file mode 100644 index 000000000000..80aeea9a2355 --- /dev/null +++ b/devel/electron21/files/patch-electron_spec-main_crash-spec.ts @@ -0,0 +1,11 @@ +--- electron/spec-main/crash-spec.ts.orig 2023-01-24 08:00:52 UTC ++++ electron/spec-main/crash-spec.ts +@@ -39,7 +39,7 @@ const shouldRunCase = (crashCase: string) => { + } + // TODO(jkleinsc) fix this test on Linux on arm/arm64 + case 'js-execute-iframe': { +- return (process.platform !== 'linux' || (process.arch !== 'arm64' && process.arch !== 'arm')); ++ return ((process.platform !== 'linux' && process.platform !== 'freebsd') || (process.arch !== 'arm64' && process.arch !== 'arm')); + } + default: { + return true; diff --git a/devel/electron21/files/patch-electron_spec-main_version-bump-spec.ts b/devel/electron21/files/patch-electron_spec-main_version-bump-spec.ts index 1581c8ed08d6..523ce8315fa1 100644 --- a/devel/electron21/files/patch-electron_spec-main_version-bump-spec.ts +++ b/devel/electron21/files/patch-electron_spec-main_version-bump-spec.ts @@ -1,6 +1,6 @@ ---- electron/spec-main/version-bump-spec.ts.orig 2021-11-15 23:45:07 UTC +--- electron/spec-main/version-bump-spec.ts.orig 2023-01-24 08:00:52 UTC +++ electron/spec-main/version-bump-spec.ts -@@ -186,7 +186,7 @@ describe('version-bumper', () => { +@@ -92,7 +92,7 @@ describe('version-bumper', () => { // On macOS Circle CI we don't have a real git environment due to running // gclient sync on a linux machine. These tests therefore don't run as expected. diff --git a/devel/electron21/files/patch-electron_spec-main_webview-spec.ts b/devel/electron21/files/patch-electron_spec-main_webview-spec.ts index 122d19e92c6b..002cf66ec69c 100644 --- a/devel/electron21/files/patch-electron_spec-main_webview-spec.ts +++ b/devel/electron21/files/patch-electron_spec-main_webview-spec.ts @@ -1,6 +1,6 @@ ---- electron/spec-main/webview-spec.ts.orig 2022-08-03 15:31:58 UTC +--- electron/spec-main/webview-spec.ts.orig 2023-01-24 08:00:52 UTC +++ electron/spec-main/webview-spec.ts -@@ -482,7 +482,7 @@ describe('<webview> tag', function () { +@@ -485,7 +485,7 @@ describe('<webview> tag', function () { }); // FIXME(zcbenz): Fullscreen events do not work on Linux. diff --git a/devel/electron21/files/patch-media_audio_BUILD.gn b/devel/electron21/files/patch-media_audio_BUILD.gn index 7a25ea8bc0d8..1fff4acdcb2c 100644 --- a/devel/electron21/files/patch-media_audio_BUILD.gn +++ b/devel/electron21/files/patch-media_audio_BUILD.gn @@ -1,6 +1,6 @@ ---- media/audio/BUILD.gn.orig 2022-07-22 17:30:31 UTC +--- media/audio/BUILD.gn.orig 2023-02-01 13:31:45 UTC +++ media/audio/BUILD.gn -@@ -248,9 +248,20 @@ source_set("audio") { +@@ -254,9 +254,20 @@ source_set("audio") { ] } diff --git a/devel/electron21/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc b/devel/electron21/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc index 5522619a709a..2fe44ab759ae 100644 --- a/devel/electron21/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc +++ b/devel/electron21/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2022-09-24 10:57:32 UTC +--- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2023-02-01 13:31:45 UTC +++ third_party/blink/renderer/core/exported/web_view_impl.cc -@@ -404,7 +404,7 @@ SkFontHinting RendererPreferencesToSkiaHinting( +@@ -405,7 +405,7 @@ SkFontHinting RendererPreferencesToSkiaHinting( const blink::RendererPreferences& prefs) { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. @@ -9,7 +9,7 @@ if (!prefs.should_antialias_text) { // When anti-aliasing is off, GTK maps all non-zero hinting settings to // 'Normal' hinting so we do the same. Otherwise, folks who have 'Slight' -@@ -3254,7 +3254,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs +@@ -3256,7 +3256,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs renderer_preferences_.use_subpixel_positioning); // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/devel/electron21/files/patch-third__party_boringssl_BUILD.gn b/devel/electron21/files/patch-third__party_boringssl_BUILD.gn index 990e5f02025e..0c4665391909 100644 --- a/devel/electron21/files/patch-third__party_boringssl_BUILD.gn +++ b/devel/electron21/files/patch-third__party_boringssl_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/boringssl/BUILD.gn.orig 2022-03-25 21:59:56 UTC +--- third_party/boringssl/BUILD.gn.orig 2023-02-01 13:31:45 UTC +++ third_party/boringssl/BUILD.gn -@@ -92,7 +92,7 @@ if (is_win && !is_msan && current_cpu != "arm64") { +@@ -106,7 +106,7 @@ if (is_win && !is_msan && current_cpu != "arm64") { public_configs = [ ":no_asm_config" ] } } else if (current_cpu == "arm64") { diff --git a/devel/electron21/files/patch-third__party_zlib_BUILD.gn b/devel/electron21/files/patch-third__party_zlib_BUILD.gn index 432ffb7ffd27..908ecf06c31c 100644 --- a/devel/electron21/files/patch-third__party_zlib_BUILD.gn +++ b/devel/electron21/files/patch-third__party_zlib_BUILD.gn @@ -1,4 +1,4 @@ ---- third_party/zlib/BUILD.gn.orig 2022-07-22 17:30:31 UTC +--- third_party/zlib/BUILD.gn.orig 2023-02-01 13:31:45 UTC +++ third_party/zlib/BUILD.gn @@ -117,7 +117,7 @@ if (use_arm_neon_optimizations) { # Disabled for iPhone, as described in DDI0487C_a_armv8_arm: @@ -18,7 +18,7 @@ include_dirs = [ "." ] if (!is_win && !is_clang) { -@@ -401,7 +401,7 @@ static_library("minizip") { +@@ -405,7 +405,7 @@ static_library("minizip") { ] } diff --git a/devel/electron21/files/patch-ui_color_color__id.h b/devel/electron21/files/patch-ui_color_color__id.h index be24eb6e1e52..2ee8247f288e 100644 --- a/devel/electron21/files/patch-ui_color_color__id.h +++ b/devel/electron21/files/patch-ui_color_color__id.h @@ -1,6 +1,6 @@ ---- ui/color/color_id.h.orig 2022-09-24 10:57:32 UTC +--- ui/color/color_id.h.orig 2023-02-01 13:31:45 UTC +++ ui/color/color_id.h -@@ -240,7 +240,7 @@ +@@ -251,7 +251,7 @@ E_CPONLY(kColorNativeColor6) \ E_CPONLY(kColorNativeBaseColor) \ E_CPONLY(kColorNativeSecondaryColor) diff --git a/devel/electron21/files/patch-ui_compositor_compositor.h b/devel/electron21/files/patch-ui_compositor_compositor.h index 0df1df33f9ea..f4642305e8ca 100644 --- a/devel/electron21/files/patch-ui_compositor_compositor.h +++ b/devel/electron21/files/patch-ui_compositor_compositor.h @@ -1,6 +1,6 @@ ---- ui/compositor/compositor.h.orig 2022-08-31 12:19:35 UTC +--- ui/compositor/compositor.h.orig 2023-02-01 13:31:45 UTC +++ ui/compositor/compositor.h -@@ -414,7 +414,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe +@@ -428,7 +428,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/devel/electron21/files/patch-ui_gfx_switches.cc b/devel/electron21/files/patch-ui_gfx_switches.cc index 3f5285b48ac9..8a4c843b0cbb 100644 --- a/devel/electron21/files/patch-ui_gfx_switches.cc +++ b/devel/electron21/files/patch-ui_gfx_switches.cc @@ -1,6 +1,6 @@ ---- ui/gfx/switches.cc.orig 2022-02-28 16:54:41 UTC +--- ui/gfx/switches.cc.orig 2023-02-01 13:31:45 UTC +++ ui/gfx/switches.cc -@@ -26,7 +26,7 @@ const char kForcePrefersReducedMotion[] = "force-prefe +@@ -28,7 +28,7 @@ const char kForcePrefersReducedMotion[] = "force-prefe // Run in headless mode, i.e., without a UI or display server dependencies. const char kHeadless[] = "headless"; diff --git a/devel/electron21/files/patch-ui_gfx_switches.h b/devel/electron21/files/patch-ui_gfx_switches.h index 0bacccff8c67..a4982fb5be4f 100644 --- a/devel/electron21/files/patch-ui_gfx_switches.h +++ b/devel/electron21/files/patch-ui_gfx_switches.h @@ -1,6 +1,6 @@ ---- ui/gfx/switches.h.orig 2022-02-28 16:54:41 UTC +--- ui/gfx/switches.h.orig 2023-02-01 13:31:45 UTC +++ ui/gfx/switches.h -@@ -17,7 +17,7 @@ GFX_SWITCHES_EXPORT extern const char kEnableNativeGpu +@@ -18,7 +18,7 @@ GFX_SWITCHES_EXPORT extern const char kEnableNativeGpu GFX_SWITCHES_EXPORT extern const char kForcePrefersReducedMotion[]; GFX_SWITCHES_EXPORT extern const char kHeadless[]; diff --git a/devel/electron21/files/patch-ui_gtk_gtk__compat.cc b/devel/electron21/files/patch-ui_gtk_gtk__compat.cc index 82c8459fee4a..c31fb3c615be 100644 --- a/devel/electron21/files/patch-ui_gtk_gtk__compat.cc +++ b/devel/electron21/files/patch-ui_gtk_gtk__compat.cc @@ -1,6 +1,6 @@ ---- ui/gtk/gtk_compat.cc.orig 2022-02-07 13:39:41 UTC +--- ui/gtk/gtk_compat.cc.orig 2023-02-01 13:31:45 UTC +++ ui/gtk/gtk_compat.cc -@@ -62,22 +62,38 @@ void* GetLibGio() { +@@ -62,22 +62,38 @@ auto DlCast(void* symbol) { } void* GetLibGio() { @@ -39,3 +39,15 @@ return libgtk4; } +@@ -124,7 +140,11 @@ gfx::Insets InsetsFromGtkBorder(const GtkBorder& borde + } // namespace + + void* GetLibGdkPixbuf() { ++#if defined(OS_BSD) ++ static void* libgdk_pixbuf = DlOpen("libgdk_pixbuf-2.0.so"); ++#else + static void* libgdk_pixbuf = DlOpen("libgdk_pixbuf-2.0.so.0"); ++#endif + return libgdk_pixbuf; + } + diff --git a/devel/electron21/files/patch-ui_gtk_printing_print__dialog__gtk.cc b/devel/electron21/files/patch-ui_gtk_printing_print__dialog__gtk.cc index a30f51fb7ac3..0523a63fbf6c 100644 --- a/devel/electron21/files/patch-ui_gtk_printing_print__dialog__gtk.cc +++ b/devel/electron21/files/patch-ui_gtk_printing_print__dialog__gtk.cc @@ -1,6 +1,6 @@ ---- ui/gtk/printing/print_dialog_gtk.cc.orig 2022-08-31 12:19:35 UTC +--- ui/gtk/printing/print_dialog_gtk.cc.orig 2023-02-01 13:31:45 UTC +++ ui/gtk/printing/print_dialog_gtk.cc -@@ -398,7 +398,7 @@ void PrintDialogGtk::ShowDialog( +@@ -416,7 +416,7 @@ void PrintDialogGtk::ShowDialog( GtkPrintCapabilities cap = static_cast<GtkPrintCapabilities>( GTK_PRINT_CAPABILITY_GENERATE_PDF | GTK_PRINT_CAPABILITY_PAGE_SET | GTK_PRINT_CAPABILITY_COPIES | GTK_PRINT_CAPABILITY_COLLATE | diff --git a/devel/electron21/files/patch-ui_ozone_platform_x11_ozone__platform__x11.cc b/devel/electron21/files/patch-ui_ozone_platform_x11_ozone__platform__x11.cc index fe1ac69932dd..ed3953161ac5 100644 --- a/devel/electron21/files/patch-ui_ozone_platform_x11_ozone__platform__x11.cc +++ b/devel/electron21/files/patch-ui_ozone_platform_x11_ozone__platform__x11.cc @@ -1,6 +1,6 @@ ---- ui/ozone/platform/x11/ozone_platform_x11.cc.orig 2022-09-24 10:57:32 UTC +--- ui/ozone/platform/x11/ozone_platform_x11.cc.orig 2023-02-01 13:31:45 UTC +++ ui/ozone/platform/x11/ozone_platform_x11.cc -@@ -196,7 +196,7 @@ class OzonePlatformX11 : public OzonePlatform, +@@ -197,7 +197,7 @@ class OzonePlatformX11 : public OzonePlatform, properties->supports_global_application_menus = true; properties->app_modal_dialogs_use_event_blocker = true; properties->fetch_buffer_formats_for_gmb_on_gpu = true; diff --git a/devel/electron21/files/patch-ui_ozone_public_ozone__platform.h b/devel/electron21/files/patch-ui_ozone_public_ozone__platform.h index f471cc5c5cfd..1afedffd66a3 100644 --- a/devel/electron21/files/patch-ui_ozone_public_ozone__platform.h +++ b/devel/electron21/files/patch-ui_ozone_public_ozone__platform.h @@ -1,6 +1,6 @@ ---- ui/ozone/public/ozone_platform.h.orig 2022-09-24 10:57:32 UTC +--- ui/ozone/public/ozone_platform.h.orig 2023-02-01 13:31:45 UTC +++ ui/ozone/public/ozone_platform.h -@@ -148,7 +148,7 @@ class COMPONENT_EXPORT(OZONE) OzonePlatform { +@@ -152,7 +152,7 @@ class COMPONENT_EXPORT(OZONE) OzonePlatform { // back via gpu extra info. bool fetch_buffer_formats_for_gmb_on_gpu = false; diff --git a/devel/electron21/files/patch-v8_BUILD.gn b/devel/electron21/files/patch-v8_BUILD.gn index f3dba14c0069..6b439aac3e63 100644 --- a/devel/electron21/files/patch-v8_BUILD.gn +++ b/devel/electron21/files/patch-v8_BUILD.gn @@ -1,6 +1,6 @@ ---- v8/BUILD.gn.orig 2022-09-24 10:57:32 UTC +--- v8/BUILD.gn.orig 2023-02-01 13:31:45 UTC +++ v8/BUILD.gn -@@ -1327,6 +1327,14 @@ config("toolchain") { +@@ -1331,6 +1331,14 @@ config("toolchain") { } else if (target_os == "win") { defines += [ "V8_HAVE_TARGET_OS" ] defines += [ "V8_TARGET_OS_WIN" ] @@ -15,7 +15,7 @@ } # TODO(infra): Support v8_enable_prof on Windows. -@@ -5571,7 +5579,7 @@ v8_component("v8_libbase") { +@@ -5578,7 +5586,7 @@ v8_component("v8_libbase") { } } @@ -24,7 +24,7 @@ sources += [ "src/base/debug/stack_trace_posix.cc", "src/base/platform/platform-linux.cc", -@@ -5582,6 +5590,18 @@ v8_component("v8_libbase") { +@@ -5589,6 +5597,18 @@ v8_component("v8_libbase") { "dl", "rt", ] diff --git a/devel/electron21/files/yarn.lock b/devel/electron21/files/yarn.lock index 88ae9c5a8583..f1c9b4a492f2 100644 --- a/devel/electron21/files/yarn.lock +++ b/devel/electron21/files/yarn.lock @@ -106,10 +106,22 @@ esutils "^2.0.2" js-tokens "^4.0.0" -"@electron/docs-parser@^0.12.4": - version "0.12.4" - resolved "https://registry.yarnpkg.com/@electron/docs-parser/-/docs-parser-0.12.4.tgz#cca403c8c2200181339c3115cdd25f3fbfc7dea3" - integrity sha512-vdkjcvkI7zTd2v1A8qsl5+HY+9AQCrW5Eh60I9rhPtUPoxo2V1pQwogTW6kzc3XZ54crTa7R3KxwkZpSbcGCug== +"@electron/asar@^3.2.1": + version "3.2.1" + resolved "https://registry.yarnpkg.com/@electron/asar/-/asar-3.2.1.tgz#c4143896f3dd43b59a80a9c9068d76f77efb62ea" + integrity sha512-hE2cQMZ5+4o7+6T2lUaVbxIzrOjZZfX7dB02xuapyYFJZEAiWTelq6J3mMoxzd0iONDvYLPVKecB5tyjIoVDVA== + dependencies: + chromium-pickle-js "^0.2.0" + commander "^5.0.0" + glob "^7.1.6" + minimatch "^3.0.4" + optionalDependencies: + "@types/glob" "^7.1.1" + +"@electron/docs-parser@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@electron/docs-parser/-/docs-parser-1.0.0.tgz#1844ed2e18528ea56aaef0ace1cfa0633a6fa1b1" + integrity sha512-nIqEO8Ga6LavdaY2aJMPfq2vSOPVlgOvNv7jpiyaoqsAz5vYnWNUnxeCyaalCaDyFiKhVeHbKwP8Kt2TENwneg== dependencies: "@types/markdown-it" "^10.0.0" chai "^4.2.0" @@ -121,10 +133,18 @@ ora "^4.0.3" pretty-ms "^5.1.0" -"@electron/typescript-definitions@^8.9.5": - version "8.9.5" - resolved "https://registry.yarnpkg.com/@electron/typescript-definitions/-/typescript-definitions-8.9.5.tgz#e6cb08e0e7c9656e178b892eab50866a8a80bf7a" - integrity sha512-xDLFl6joGpA8c9cGSPWC3DFHyIGf9+OWZmDrPbGJW1URt6C1ukdQWKSmjb1Rttb94QQxBrGuUlSyz27IQgLFsw== +"@electron/github-app-auth@^1.5.0": + version "1.5.0" + resolved "https://registry.yarnpkg.com/@electron/github-app-auth/-/github-app-auth-1.5.0.tgz#426e64ba50143417d9b68f2795a1b119cb62108b" + integrity sha512-t6Za+3E7jdIf1CX06nNV/avZhqSXNEkCLJ1xeAt5FKU9HdGbjzwSfirM+UlHO7lMGyuf13BGCZOCB1kODhDLWQ== + dependencies: + "@octokit/auth-app" "^3.6.1" + "@octokit/rest" "^18.12.0" + +"@electron/typescript-definitions@^8.10.0": + version "8.10.0" + resolved "https://registry.yarnpkg.com/@electron/typescript-definitions/-/typescript-definitions-8.10.0.tgz#e9cf2b329ec4b0b76947ef751725383a6cf8994d" + integrity sha512-FVc2y0GUfxFZDoma0scYiMxkoalle19Fq332fNFGWoCJ9rCj5OUvriewSjPtGBsRuHv2xaMS5MhBuy2/pRuFuQ== dependencies: "@types/node" "^11.13.7" chalk "^2.4.2" @@ -158,20 +178,79 @@ "@nodelib/fs.scandir" "2.1.3" fastq "^1.6.0" -"@octokit/auth-app@^2.10.0": - version "2.10.0" - resolved "https://registry.yarnpkg.com/@octokit/auth-app/-/auth-app-2.10.0.tgz#ad79369fca1cc3035859f797310d5e81cc6e49c4" - integrity sha512-mKFU7O5wI651iWgecs4fmJ2aLqOM3sWD1FJsUTm7nx21I4ePDhS+rGQmS5TZk5yz75Va6wEXesxUNFzuqCbP2A== +"@octokit/auth-app@^3.6.1": + version "3.6.1" + resolved "https://registry.yarnpkg.com/@octokit/auth-app/-/auth-app-3.6.1.tgz#aa5b02cc211175cbc28ce6c03c73373c1206d632" + integrity sha512-6oa6CFphIYI7NxxHrdVOzhG7hkcKyGyYocg7lNDSJVauVOLtylg8hNJzoUyPAYKKK0yUeoZamE/lMs2tG+S+JA== dependencies: - "@octokit/request" "^5.3.0" - "@octokit/request-error" "^2.0.0" - "@octokit/types" "^5.0.0" + "@octokit/auth-oauth-app" "^4.3.0" + "@octokit/auth-oauth-user" "^1.2.3" + "@octokit/request" "^5.6.0" + "@octokit/request-error" "^2.1.0" + "@octokit/types" "^6.0.3" "@types/lru-cache" "^5.1.0" deprecation "^2.3.1" lru-cache "^6.0.0" universal-github-app-jwt "^1.0.1" universal-user-agent "^6.0.0" +"@octokit/auth-oauth-app@^4.3.0": + version "4.3.4" + resolved "https://registry.yarnpkg.com/@octokit/auth-oauth-app/-/auth-oauth-app-4.3.4.tgz#7030955b1a59d4d977904775c606477d95fcfe8e" + integrity sha512-OYOTSSINeUAiLMk1uelaGB/dEkReBqHHr8+hBejzMG4z1vA4c7QSvDAS0RVZSr4oD4PEUPYFzEl34K7uNrXcWA== + dependencies: + "@octokit/auth-oauth-device" "^3.1.1" + "@octokit/auth-oauth-user" "^2.0.0" + "@octokit/request" "^5.6.3" + "@octokit/types" "^6.0.3" + "@types/btoa-lite" "^1.0.0" + btoa-lite "^1.0.0" + universal-user-agent "^6.0.0" + +"@octokit/auth-oauth-device@^3.1.1": + version "3.1.4" + resolved "https://registry.yarnpkg.com/@octokit/auth-oauth-device/-/auth-oauth-device-3.1.4.tgz#703c42f27a1e2eb23498a7001ad8e9ecf4a2f477" + integrity sha512-6sHE/++r+aEFZ/BKXOGPJcH/nbgbBjS1A4CHfq/PbPEwb0kZEt43ykW98GBO/rYBPAYaNpCPvXfGwzgR9yMCXg== + dependencies: + "@octokit/oauth-methods" "^2.0.0" + "@octokit/request" "^6.0.0" + "@octokit/types" "^6.10.0" + universal-user-agent "^6.0.0" + +"@octokit/auth-oauth-device@^4.0.0": + version "4.0.3" + resolved "https://registry.yarnpkg.com/@octokit/auth-oauth-device/-/auth-oauth-device-4.0.3.tgz#00ce77233517e0d7d39e42a02652f64337d9df81" + integrity sha512-KPTx5nMntKjNZzzltO3X4T68v22rd7Cp/TcLJXQE2U8aXPcZ9LFuww9q9Q5WUNSu3jwi3lRwzfkPguRfz1R8Vg== + dependencies: + "@octokit/oauth-methods" "^2.0.0" + "@octokit/request" "^6.0.0" + "@octokit/types" "^8.0.0" + universal-user-agent "^6.0.0" + +"@octokit/auth-oauth-user@^1.2.3": + version "1.3.0" + resolved "https://registry.yarnpkg.com/@octokit/auth-oauth-user/-/auth-oauth-user-1.3.0.tgz#da4e4529145181a6aa717ae858afb76ebd6e3360" + integrity sha512-3QC/TAdk7onnxfyZ24BnJRfZv8TRzQK7SEFUS9vLng4Vv6Hv6I64ujdk/CUkREec8lhrwU764SZ/d+yrjjqhaQ== + dependencies: + "@octokit/auth-oauth-device" "^3.1.1" + "@octokit/oauth-methods" "^1.1.0" + "@octokit/request" "^5.4.14" + "@octokit/types" "^6.12.2" + btoa-lite "^1.0.0" + universal-user-agent "^6.0.0" + +"@octokit/auth-oauth-user@^2.0.0": + version "2.0.4" + resolved "https://registry.yarnpkg.com/@octokit/auth-oauth-user/-/auth-oauth-user-2.0.4.tgz#88f060ec678d7d493695af8d827e115dd064e212" + integrity sha512-HrbDzTPqz6GcGSOUkR+wSeF3vEqsb9NMsmPja/qqqdiGmlk/Czkxctc3KeWYogHonp62Ml4kjz2VxKawrFsadQ== + dependencies: + "@octokit/auth-oauth-device" "^4.0.0" + "@octokit/oauth-methods" "^2.0.0" + "@octokit/request" "^6.0.0" + "@octokit/types" "^8.0.0" + btoa-lite "^1.0.0" + universal-user-agent "^6.0.0" + "@octokit/auth-token@^2.4.0": version "2.4.2" resolved "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-2.4.2.tgz#10d0ae979b100fa6b72fa0e8e63e27e6d0dbff8a" @@ -179,6 +258,13 @@ dependencies: "@octokit/types" "^5.0.0" +"@octokit/auth-token@^2.4.4": + version "2.5.0" + resolved "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-2.5.0.tgz#27c37ea26c205f28443402477ffd261311f21e36" + integrity sha512-r5FVUJCOLl19AxiuZD2VRZ/ORjp/4IN98Of6YJoJOkY75CIBuYfmiNHGrDwXr+aLGG55igl9QrxX3hbiXlLb+g== + dependencies: + "@octokit/types" "^6.0.3" + "@octokit/core@^3.0.0": version "3.1.1" resolved "https://registry.yarnpkg.com/@octokit/core/-/core-3.1.1.tgz#1856745aa8fb154cf1544a2a1b82586c809c5e66" @@ -191,6 +277,19 @@ before-after-hook "^2.1.0" universal-user-agent "^6.0.0" +"@octokit/core@^3.5.1": + version "3.6.0" + resolved "https://registry.yarnpkg.com/@octokit/core/-/core-3.6.0.tgz#3376cb9f3008d9b3d110370d90e0a1fcd5fe6085" + integrity sha512-7RKRKuA4xTjMhY+eG3jthb3hlZCsOwg3rztWh75Xc+ShDWOfDDATWbeZpAHBNRpm4Tv9WgBMOy1zEJYXG6NJ7Q== + dependencies: + "@octokit/auth-token" "^2.4.4" + "@octokit/graphql" "^4.5.8" + "@octokit/request" "^5.6.3" + "@octokit/request-error" "^2.0.5" + "@octokit/types" "^6.0.3" + before-after-hook "^2.2.0" + universal-user-agent "^6.0.0" + "@octokit/endpoint@^6.0.1": version "6.0.5" resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-6.0.5.tgz#43a6adee813c5ffd2f719e20cfd14a1fee7c193a" @@ -200,6 +299,15 @@ is-plain-object "^4.0.0" universal-user-agent "^6.0.0" +"@octokit/endpoint@^7.0.0": + version "7.0.3" + resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-7.0.3.tgz#0b96035673a9e3bedf8bab8f7335de424a2147ed" + integrity sha512-57gRlb28bwTsdNXq+O3JTQ7ERmBTuik9+LelgcLIVfYwf235VHbN9QNo4kXExtp/h8T423cR5iJThKtFYxC7Lw== + dependencies: + "@octokit/types" "^8.0.0" + is-plain-object "^5.0.0" + universal-user-agent "^6.0.0" + "@octokit/graphql@^4.3.1": version "4.5.3" resolved "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-4.5.3.tgz#d5ff0d4a8a33e98614a2a7359dac98bc285e062f" @@ -209,6 +317,64 @@ "@octokit/types" "^5.0.0" universal-user-agent "^6.0.0" +"@octokit/graphql@^4.5.8": + version "4.8.0" + resolved "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-4.8.0.tgz#664d9b11c0e12112cbf78e10f49a05959aa22cc3" + integrity sha512-0gv+qLSBLKF0z8TKaSKTsS39scVKF9dbMxJpj3U0vC7wjNWFuIpL/z76Qe2fiuCbDRcJSavkXsVtMS6/dtQQsg== + dependencies: + "@octokit/request" "^5.6.0" + "@octokit/types" "^6.0.3" + universal-user-agent "^6.0.0" + +"@octokit/oauth-authorization-url@^4.3.1": + version "4.3.3" + resolved "https://registry.yarnpkg.com/@octokit/oauth-authorization-url/-/oauth-authorization-url-4.3.3.tgz#6a6ef38f243086fec882b62744f39b517528dfb9" + integrity sha512-lhP/t0i8EwTmayHG4dqLXgU+uPVys4WD/qUNvC+HfB1S1dyqULm5Yx9uKc1x79aP66U1Cb4OZeW8QU/RA9A4XA== + +"@octokit/oauth-authorization-url@^5.0.0": + version "5.0.0" + resolved "https://registry.yarnpkg.com/@octokit/oauth-authorization-url/-/oauth-authorization-url-5.0.0.tgz#029626ce87f3b31addb98cd0d2355c2381a1c5a1" + integrity sha512-y1WhN+ERDZTh0qZ4SR+zotgsQUE1ysKnvBt1hvDRB2WRzYtVKQjn97HEPzoehh66Fj9LwNdlZh+p6TJatT0zzg== + +"@octokit/oauth-methods@^1.1.0": + version "1.2.6" + resolved "https://registry.yarnpkg.com/@octokit/oauth-methods/-/oauth-methods-1.2.6.tgz#b9ac65e374b2cc55ee9dd8dcdd16558550438ea7" + integrity sha512-nImHQoOtKnSNn05uk2o76om1tJWiAo4lOu2xMAHYsNr0fwopP+Dv+2MlGvaMMlFjoqVd3fF3X5ZDTKCsqgmUaQ== + dependencies: + "@octokit/oauth-authorization-url" "^4.3.1" + "@octokit/request" "^5.4.14" + "@octokit/request-error" "^2.0.5" + "@octokit/types" "^6.12.2" + btoa-lite "^1.0.0" + +"@octokit/oauth-methods@^2.0.0": + version "2.0.4" + resolved "https://registry.yarnpkg.com/@octokit/oauth-methods/-/oauth-methods-2.0.4.tgz#6abd9593ca7f91fe5068375a363bd70abd5516dc" + integrity sha512-RDSa6XL+5waUVrYSmOlYROtPq0+cfwppP4VaQY/iIei3xlFb0expH6YNsxNrZktcLhJWSpm9uzeom+dQrXlS3A== + dependencies: + "@octokit/oauth-authorization-url" "^5.0.0" + "@octokit/request" "^6.0.0" + "@octokit/request-error" "^3.0.0" + "@octokit/types" "^8.0.0" + btoa-lite "^1.0.0" + +"@octokit/openapi-types@^12.11.0": + version "12.11.0" + resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-12.11.0.tgz#da5638d64f2b919bca89ce6602d059f1b52d3ef0" + integrity sha512-VsXyi8peyRq9PqIz/tpqiL2w3w80OgVMwBHltTml3LmVvXiphgeqmY9mvBw9Wu7e0QWk/fqD37ux8yP5uVekyQ== + +"@octokit/openapi-types@^14.0.0": + version "14.0.0" + resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-14.0.0.tgz#949c5019028c93f189abbc2fb42f333290f7134a" + integrity sha512-HNWisMYlR8VCnNurDU6os2ikx0s0VyEjDYHNS/h4cgb8DeOxQ0n72HyinUtdDVxJhFy3FWLGl0DJhfEWk3P5Iw== + +"@octokit/plugin-paginate-rest@^2.16.8": + version "2.21.3" + resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.21.3.tgz#7f12532797775640dbb8224da577da7dc210c87e" + integrity sha512-aCZTEf0y2h3OLbrgKkrfFdjRL6eSOo8komneVQJnYecAxIej7Bafor2xhuDJOIFau4pk0i/P28/XgtbyPF0ZHw== + dependencies: + "@octokit/types" "^6.40.0" + "@octokit/plugin-paginate-rest@^2.2.0": version "2.3.0" resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.3.0.tgz#7d1073e56cfd15d3f99dcfe81fa5d2b466f3a6f6" @@ -221,6 +387,11 @@ resolved "https://registry.yarnpkg.com/@octokit/plugin-request-log/-/plugin-request-log-1.0.0.tgz#eef87a431300f6148c39a7f75f8cfeb218b2547e" integrity sha512-ywoxP68aOT3zHCLgWZgwUJatiENeHE7xJzYjfz8WI0goynp96wETBF+d95b8g/uL4QmS6owPVlaxiz3wyMAzcw== +"@octokit/plugin-request-log@^1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz#5e50ed7083a613816b1e4a28aeec5fb7f1462e85" + integrity sha512-mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA== + "@octokit/plugin-rest-endpoint-methods@4.1.2": version "4.1.2" resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-4.1.2.tgz#546a8f3e0b514f434a4ad4ef926005f1c81a5a5a" @@ -229,6 +400,14 @@ "@octokit/types" "^5.1.1" deprecation "^2.3.1" +"@octokit/plugin-rest-endpoint-methods@^5.12.0": + version "5.16.2" + resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.16.2.tgz#7ee8bf586df97dd6868cf68f641354e908c25342" + integrity sha512-8QFz29Fg5jDuTPXVtey05BLm7OB+M8fnvE64RNegzX7U+5NUXcOcnpTIK0YfSHBg8gYd0oxIq3IZTe9SfPZiRw== + dependencies: + "@octokit/types" "^6.39.0" + deprecation "^2.3.1" + "@octokit/request-error@^2.0.0": version "2.0.2" resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-2.0.2.tgz#0e76b83f5d8fdda1db99027ea5f617c2e6ba9ed0" @@ -238,6 +417,24 @@ deprecation "^2.0.0" once "^1.4.0" +"@octokit/request-error@^2.0.5", "@octokit/request-error@^2.1.0": + version "2.1.0" + resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-2.1.0.tgz#9e150357831bfc788d13a4fd4b1913d60c74d677" + integrity sha512-1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg== + dependencies: + "@octokit/types" "^6.0.3" + deprecation "^2.0.0" + once "^1.4.0" + +"@octokit/request-error@^3.0.0": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-3.0.2.tgz#f74c0f163d19463b87528efe877216c41d6deb0a" + integrity sha512-WMNOFYrSaX8zXWoJg9u/pKgWPo94JXilMLb2VManNOby9EZxrQaBe/QSC4a1TzpAlpxofg2X/jMnCyZgL6y7eg== + dependencies: + "@octokit/types" "^8.0.0" + deprecation "^2.0.0" + once "^1.4.0" + "@octokit/request@^5.3.0", "@octokit/request@^5.4.0": version "5.4.7" resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.4.7.tgz#fd703ee092e0463ceba49ff7a3e61cb4cf8a0fde" @@ -252,6 +449,30 @@ once "^1.4.0" universal-user-agent "^6.0.0" +"@octokit/request@^5.4.14", "@octokit/request@^5.6.0", "@octokit/request@^5.6.3": + version "5.6.3" + resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.6.3.tgz#19a022515a5bba965ac06c9d1334514eb50c48b0" + integrity sha512-bFJl0I1KVc9jYTe9tdGGpAMPy32dLBXXo1dS/YwSCTL/2nd9XeHsY616RE3HPXDVk+a+dBuzyz5YdlXwcDTr2A== + dependencies: + "@octokit/endpoint" "^6.0.1" + "@octokit/request-error" "^2.1.0" + "@octokit/types" "^6.16.1" + is-plain-object "^5.0.0" + node-fetch "^2.6.7" + universal-user-agent "^6.0.0" + +"@octokit/request@^6.0.0": + version "6.2.2" + resolved "https://registry.yarnpkg.com/@octokit/request/-/request-6.2.2.tgz#a2ba5ac22bddd5dcb3f539b618faa05115c5a255" + integrity sha512-6VDqgj0HMc2FUX2awIs+sM6OwLgwHvAi4KCK3mT2H2IKRt6oH9d0fej5LluF5mck1lRR/rFWN0YIDSYXYSylbw== + dependencies: + "@octokit/endpoint" "^7.0.0" + "@octokit/request-error" "^3.0.0" + "@octokit/types" "^8.0.0" + is-plain-object "^5.0.0" + node-fetch "^2.6.7" + universal-user-agent "^6.0.0" + "@octokit/rest@^18.0.3": version "18.0.3" resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-18.0.3.tgz#96a15ddb3a38dca5de9d75121378d6aa4a234fa5" @@ -262,6 +483,16 @@ "@octokit/plugin-request-log" "^1.0.0" "@octokit/plugin-rest-endpoint-methods" "4.1.2" +"@octokit/rest@^18.12.0": + version "18.12.0" + resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-18.12.0.tgz#f06bc4952fc87130308d810ca9d00e79f6988881" + integrity sha512-gDPiOHlyGavxr72y0guQEhLsemgVjwRePayJ+FcKc2SJqKUbxbkvf5kAZEWA/MKvsfYlQAMVzNJE3ezQcxMJ2Q== + dependencies: + "@octokit/core" "^3.5.1" + "@octokit/plugin-paginate-rest" "^2.16.8" + "@octokit/plugin-request-log" "^1.0.4" + "@octokit/plugin-rest-endpoint-methods" "^5.12.0" + "@octokit/types@^5.0.0", "@octokit/types@^5.0.1", "@octokit/types@^5.1.1", "@octokit/types@^5.2.0": version "5.2.0" resolved "https://registry.yarnpkg.com/@octokit/types/-/types-5.2.0.tgz#d075dc23bf293f540739250b6879e2c1be2fc20c" @@ -269,6 +500,20 @@ dependencies: "@types/node" ">= 8" +"@octokit/types@^6.0.3", "@octokit/types@^6.10.0", "@octokit/types@^6.12.2", "@octokit/types@^6.16.1", "@octokit/types@^6.39.0", "@octokit/types@^6.40.0": + version "6.41.0" + resolved "https://registry.yarnpkg.com/@octokit/types/-/types-6.41.0.tgz#e58ef78d78596d2fb7df9c6259802464b5f84a04" + integrity sha512-eJ2jbzjdijiL3B4PrSQaSjuF2sPEQPVCPzBvTHJD9Nz+9dw2SGH4K4xeQJ77YfTq5bRQ+bD8wT11JbeDPmxmGg== + dependencies: + "@octokit/openapi-types" "^12.11.0" + +"@octokit/types@^8.0.0": + version "8.0.0" + resolved "https://registry.yarnpkg.com/@octokit/types/-/types-8.0.0.tgz#93f0b865786c4153f0f6924da067fe0bb7426a9f" + integrity sha512-65/TPpOJP1i3K4lBJMnWqPUJ6zuOtzhtagDvydAWbEXpbFYA0oMKKyLb95NFZZP0lSh/4b6K+DQlzvYQJQQePg== + dependencies: + "@octokit/openapi-types" "^14.0.0" + "@opentelemetry/api@^1.0.1": version "1.0.4" resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.0.4.tgz#a167e46c10d05a07ab299fc518793b0cff8f6924" @@ -325,6 +570,11 @@ "@types/connect" "*" "@types/node" "*" +"@types/btoa-lite@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@types/btoa-lite/-/btoa-lite-1.0.0.tgz#e190a5a548e0b348adb0df9ac7fa5f1151c7cca4" + integrity sha512-wJsiX1tosQ+J5+bY5LrSahHxr2wT+uME5UDwdN1kg4frt40euqA+wzECkmq4t5QbveHiJepfdThgQrPw6KiSlg== + "@types/busboy@^0.2.3": version "0.2.3" resolved "https://registry.yarnpkg.com/@types/busboy/-/busboy-0.2.3.tgz#6697ad29873246c530f09a3ff5a40861824230d5" @@ -1208,18 +1458,6 @@ arrify@^1.0.0: resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0= -asar@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/asar/-/asar-3.1.0.tgz#70b0509449fe3daccc63beb4d3c7d2e24d3c6473" - integrity sha512-vyxPxP5arcAqN4F/ebHd/HhwnAiZtwhglvdmc7BR2f0ywbVNTOpSeyhLDbGXtE/y58hv1oC75TaNIXutnsOZsQ== - dependencies: - chromium-pickle-js "^0.2.0" - commander "^5.0.0" - glob "^7.1.6" - minimatch "^3.0.4" - optionalDependencies: - "@types/glob" "^7.1.1" - asn1.js@^4.0.0: version "4.10.1" resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0" @@ -1325,6 +1563,11 @@ before-after-hook@^2.1.0: resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.1.0.tgz#b6c03487f44e24200dd30ca5e6a1979c5d2fb635" integrity sha512-IWIbu7pMqyw3EAJHzzHbWa85b6oud/yfKYg5rqB5hNE8CeMi3nX+2C2sj0HswfblST86hpVEOAb9x34NZd6P7A== +before-after-hook@^2.2.0: + version "2.2.3" + resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.2.3.tgz#c51e809c81a4e354084422b9b26bad88249c517c" + integrity sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ== + big.js@^5.2.2: version "5.2.2" resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" @@ -1461,6 +1704,11 @@ browserify-zlib@^0.2.0: dependencies: pako "~1.0.5" +btoa-lite@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/btoa-lite/-/btoa-lite-1.0.0.tgz#337766da15801210fdd956c22e9c6891ab9d0337" + integrity sha512-gvW7InbIyF8AicrqWoptdW08pUxuhq8BEgowNajy9RhiE86fmGAGl+bLKo6oB8QP0CkqHLowfN0oJdKC/J6LbA== + buffer-equal-constant-time@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819" @@ -1910,7 +2158,7 @@ compress-brotli@^1.3.8: concat-map@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= + integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== concat-stream@^1.5.0: version "1.6.2" @@ -4030,6 +4278,11 @@ is-plain-object@^4.0.0: resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-4.1.1.tgz#1a14d6452cbd50790edc7fdaa0aed5a40a35ebb5" integrity sha512-5Aw8LLVsDlZsETVMhoMXzqsXwQqr/0vlnBYzIXJbYo2F4yYlhLHs+Ez7Bod7IIQKWkJbJfxrWD7pA1Dw1TKrwA== +is-plain-object@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344" + integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q== + is-regex@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491" @@ -5037,9 +5290,9 @@ minimalistic-crypto-utils@^1.0.1: integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo= minimatch@^3.0.2, minimatch@^3.0.4, minimatch@~3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" - integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== + version "3.0.8" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.8.tgz#5e6a59bd11e2ab0de1cfb843eb2d82e546c321c1" + integrity sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q== dependencies: brace-expansion "^1.1.7" |