diff options
| author | Hiroki Tagato <tagattie@FreeBSD.org> | 2023-01-31 12:12:33 +0000 |
|---|---|---|
| committer | Hiroki Tagato <tagattie@FreeBSD.org> | 2023-01-31 12:12:33 +0000 |
| commit | 14c58447f1c4052fe2689d318a7d99a37a909be1 (patch) | |
| tree | 18b44aadc338db467b8e297cda43b9ff2546ccc1 | |
| parent | 1d4dcc44140a99351939cc4bb869c14e9c241db2 (diff) | |
| download | ports-14c58447f1c4052fe2689d318a7d99a37a909be1.tar.gz ports-14c58447f1c4052fe2689d318a7d99a37a909be1.zip | |
devel/electron22: update to 22.1.0 and take maintainership
Changelog:
- https://github.com/electron/electron/releases/tag/v22.0.2
- https://github.com/electron/electron/releases/tag/v22.0.3
- https://github.com/electron/electron/releases/tag/v22.1.0
PR: 269194
Reported by: Yonas Yanfa <yonas.yanfa@gmail.com>
Approved by: mikael (maintainer)
82 files changed, 930 insertions, 311 deletions
diff --git a/devel/electron22/Makefile b/devel/electron22/Makefile index 8661179592ee..9d1b6a800ed0 100644 --- a/devel/electron22/Makefile +++ b/devel/electron22/Makefile @@ -2,15 +2,17 @@ PORTNAME= electron DISTVERSIONPREFIX= v DISTVERSION= ${ELECTRON_VER:S/-beta./.b/} CATEGORIES= devel -MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/:chromium \ +MASTER_SITES= https://github.com/tagattie/FreeBSD-Electron/releases/download/v22.0.3/:chromium \ + https://commondatastorage.googleapis.com/chromium-nodejs/:chromium_node \ https://commondatastorage.googleapis.com/chromium-fonts/:chromium_testfonts PKGNAMESUFFIX= ${ELECTRON_VER_MAJOR} DISTFILES= chromium-${CHROMIUM_VER}${EXTRACT_SUFX}:chromium \ + ${CHROMIUM_NODE_MODULES_HASH}:chromium_node \ ${CHROMIUM_TEST_FONTS_HASH}:chromium_testfonts \ electron-yarn-cache-${ELECTRON_VER}${EXTRACT_SUFX}:prefetch DIST_SUBDIR= ${PORTNAME} -MAINTAINER= mikael@FreeBSD.org +MAINTAINER= tagattie@FreeBSD.org COMMENT= Build cross-platform desktop apps with JavaScript, HTML, and CSS WWW= https://electronjs.org/ @@ -131,7 +133,7 @@ GN_BOOTSTRAP_FLAGS= --no-clean --no-rebuild --skip-generate-buildfiles PLIST_SUB= ELECTRON_VER=${ELECTRON_VER} \ ELECTRON_VER_MAJOR=${ELECTRON_VER_MAJOR} -OPTIONS_DEFINE= CODECS CUPS DEBUG DIST DRIVER KERBEROS LTO +OPTIONS_DEFINE= CODECS CUPS DEBUG DIST DRIVER KERBEROS LTO OPTIONS_DEFAULT= CODECS CUPS DRIVER KERBEROS SNDIO OPTIONS_EXCLUDE_aarch64=LTO OPTIONS_GROUP= AUDIO @@ -203,7 +205,9 @@ SNDIO_VARS= GN_ARGS+=use_sndio=true SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false # See ${WRKSRC}/electron/DEPS for CHROMIUM_VER -CHROMIUM_VER= 108.0.5359.125 +CHROMIUM_VER= 108.0.5359.179 +# See ${WRKSRC}/third_party/node/node_modules.tar.gz.sha1 for CHROMIUM_NODE_MODULES_HASH +CHROMIUM_NODE_MODULES_HASH= f8b5da24d33317766d3933fb6711b0603fc4fb6f # See ${WRKSRC}/third_party/test_fonts/test_fonts.tar.gz.sha1 for CHROMIUM_TEST_FONTS_HASH CHROMIUM_TEST_FONTS_HASH= 336e775eec536b2d785cc80eff6ac39051931286 # See ${WRKSRC}/electron/DEPS for NODE_VER @@ -217,7 +221,7 @@ REACTIVEOBJC_VER= 74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76 # See ${WRKSRC}/electron/DEPS for MANTLE_VER MANTLE_VER= 78d3966b3c331292ea29ec38661b25df0a245948 -YARN_TIMESTAMP= 1661146515 +YARN_TIMESTAMP= 1675054791 .include "Makefile.version" .include <bsd.port.pre.mk> @@ -304,6 +308,7 @@ post-extract: ${WRKSRC}/third_party/squirrel.mac/vendor/ReactiveObjC ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_mantle}-${MANTLE_VER} \ ${WRKSRC}/third_party/squirrel.mac/vendor/Mantle + ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/node_modules ${WRKSRC}/third_party/node ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/test_fonts ${WRKSRC}/third_party/test_fonts # Install node modules for electron ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/yarn-offline-cache ${WRKDIR} diff --git a/devel/electron22/Makefile.version b/devel/electron22/Makefile.version index e636b59b62d6..2c72596efedf 100644 --- a/devel/electron22/Makefile.version +++ b/devel/electron22/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 22.0.1 +ELECTRON_VER= 22.1.0 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron22/distinfo b/devel/electron22/distinfo index f6c1f83ed5bd..f90fff0a63cf 100644 --- a/devel/electron22/distinfo +++ b/devel/electron22/distinfo @@ -1,12 +1,14 @@ -TIMESTAMP = 1674205773 -SHA256 (electron/chromium-108.0.5359.125.tar.xz) = 16e26bef292f99efbb72559990f6383f1d39cb20bfa38450fbcd6c7cf88b0a59 -SIZE (electron/chromium-108.0.5359.125.tar.xz) = 1731584944 +TIMESTAMP = 1675056031 +SHA256 (electron/chromium-108.0.5359.179.tar.xz) = 5e0e06cf8b43091347d908b651a919d5b94cdde2178d5e175dad4e2a75cf4ac8 +SIZE (electron/chromium-108.0.5359.179.tar.xz) = 1584561116 +SHA256 (electron/f8b5da24d33317766d3933fb6711b0603fc4fb6f) = 63706737ca75e0e5c97885186b2a7ab019ca71d1315ee08870193bbfa7486bfc +SIZE (electron/f8b5da24d33317766d3933fb6711b0603fc4fb6f) = 9900677 SHA256 (electron/336e775eec536b2d785cc80eff6ac39051931286) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8 SIZE (electron/336e775eec536b2d785cc80eff6ac39051931286) = 32624734 -SHA256 (electron/electron-yarn-cache-22.0.1.tar.xz) = 404b61b615f680868d00d05a8214103aa3e7f1779d4452cc2c9db55b782a955c -SIZE (electron/electron-yarn-cache-22.0.1.tar.xz) = 36702856 -SHA256 (electron/electron-electron-v22.0.1_GH0.tar.gz) = c6bdbd95549e59c7a16707906b67e2999107e5d61e398dc6429db2c83181c5e7 -SIZE (electron/electron-electron-v22.0.1_GH0.tar.gz) = 10500431 +SHA256 (electron/electron-yarn-cache-22.1.0.tar.xz) = 8120999809490d73c9291295ffebaa49dcad2e4427720a773040f4a593e0cc50 +SIZE (electron/electron-yarn-cache-22.1.0.tar.xz) = 38469072 +SHA256 (electron/electron-electron-v22.1.0_GH0.tar.gz) = 9bd7fb2aa96402312f97111231cf343ce806b466fba1fc3e2e1a708a0ca0cbf6 +SIZE (electron/electron-electron-v22.1.0_GH0.tar.gz) = 10510560 SHA256 (electron/nodejs-node-v16.17.1_GH0.tar.gz) = e63378aa6aa18b9e05486e46eaca6c6e09904366e5100d7e04c6dbd344a42f60 SIZE (electron/nodejs-node-v16.17.1_GH0.tar.gz) = 90485310 SHA256 (electron/nodejs-nan-16fa32231e2ccd89d2804b3f765319128b20c4ac_GH0.tar.gz) = 3807ae6a1e451a29f068540472f100f9718d457c60ac62f2f8469d1d57475d39 diff --git a/devel/electron22/files/package.json b/devel/electron22/files/package.json index cc35521e32e9..e2a9b536620d 100644 --- a/devel/electron22/files/package.json +++ b/devel/electron22/files/package.json @@ -6,8 +6,9 @@ "devDependencies": { "@azure/storage-blob": "^12.9.0", "@electron/docs-parser": "^1.0.0", + "@electron/fiddle-core": "^1.0.4", + "@electron/github-app-auth": "^1.5.0", "@electron/typescript-definitions": "^8.10.0", - "@octokit/auth-app": "^2.10.0", "@octokit/rest": "^18.0.3", "@primer/octicons": "^10.0.0", "@types/basic-auth": "^1.1.3", @@ -142,7 +143,8 @@ "ts-node script/check-patch-diff.ts" ], "DEPS": [ - "node script/gen-hunspell-filenames.js" + "node script/gen-hunspell-filenames.js", + "node script/gen-libc++-filenames.js" ] }, "resolutions": { diff --git a/devel/electron22/files/patch-BUILD.gn b/devel/electron22/files/patch-BUILD.gn index 5740081ea8f4..838261c7b363 100644 --- a/devel/electron22/files/patch-BUILD.gn +++ b/devel/electron22/files/patch-BUILD.gn @@ -1,4 +1,4 @@ ---- BUILD.gn.orig 2022-11-30 08:12:58 UTC +--- BUILD.gn.orig 2023-01-30 07:58:58 UTC +++ BUILD.gn @@ -59,7 +59,7 @@ declare_args() { root_extra_deps = [] @@ -51,7 +51,7 @@ deps += [ "//third_party/breakpad:symupload($host_toolchain)" ] } -@@ -1107,7 +1115,7 @@ if (!is_ios) { +@@ -1110,7 +1118,7 @@ if (!is_ios) { ] } @@ -60,7 +60,7 @@ # WPT Webdriver tests runner # chrome/test/chromedriver/test/run_webdriver_tests.py script_test("webdriver_wpt_tests") { -@@ -1202,7 +1210,7 @@ if (!is_ios) { +@@ -1205,7 +1213,7 @@ if (!is_ios) { data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ] } @@ -69,7 +69,7 @@ data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -1211,7 +1219,7 @@ if (!is_ios) { +@@ -1214,7 +1222,7 @@ if (!is_ios) { data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } @@ -78,7 +78,7 @@ data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } -@@ -1655,7 +1663,7 @@ group("chromium_builder_perf") { +@@ -1658,7 +1666,7 @@ group("chromium_builder_perf") { data_deps += [ "//chrome/test:performance_browser_tests" ] } diff --git a/devel/electron22/files/patch-build_config_BUILDCONFIG.gn b/devel/electron22/files/patch-build_config_BUILDCONFIG.gn index d0508a977723..30174f1a37a4 100644 --- a/devel/electron22/files/patch-build_config_BUILDCONFIG.gn +++ b/devel/electron22/files/patch-build_config_BUILDCONFIG.gn @@ -1,6 +1,6 @@ ---- build/config/BUILDCONFIG.gn.orig 2022-04-21 18:48:31 UTC +--- build/config/BUILDCONFIG.gn.orig 2023-01-30 07:58:58 UTC +++ build/config/BUILDCONFIG.gn -@@ -136,7 +136,8 @@ declare_args() { +@@ -139,7 +139,8 @@ declare_args() { is_official_build = false # Set to true when compiling with the Clang compiler. @@ -10,7 +10,7 @@ (current_cpu != "s390x" && current_cpu != "s390" && current_cpu != "ppc64" && current_cpu != "ppc" && current_cpu != "mips" && current_cpu != "mips64" && -@@ -220,6 +221,10 @@ if (host_toolchain == "") { +@@ -223,6 +224,10 @@ if (host_toolchain == "") { host_toolchain = "//build/toolchain/aix:$host_cpu" } else if (host_os == "zos") { host_toolchain = "//build/toolchain/zos:$host_cpu" @@ -21,7 +21,7 @@ } else { assert(false, "Unsupported host_os: $host_os") } -@@ -264,6 +269,8 @@ if (target_os == "android") { +@@ -267,6 +272,8 @@ if (target_os == "android") { _default_toolchain = "//build/toolchain/aix:$target_cpu" } else if (target_os == "zos") { _default_toolchain = "//build/toolchain/zos:$target_cpu" @@ -30,7 +30,7 @@ } else { assert(false, "Unsupported target_os: $target_os") } -@@ -298,7 +305,11 @@ is_android = current_os == "android" +@@ -301,7 +308,11 @@ is_android = current_os == "android" is_chromeos = current_os == "chromeos" is_fuchsia = current_os == "fuchsia" is_ios = current_os == "ios" diff --git a/devel/electron22/files/patch-chrome_browser_process__singleton__posix.cc b/devel/electron22/files/patch-chrome_browser_process__singleton__posix.cc index b0776be5bbcf..4b865dd4e088 100644 --- a/devel/electron22/files/patch-chrome_browser_process__singleton__posix.cc +++ b/devel/electron22/files/patch-chrome_browser_process__singleton__posix.cc @@ -1,6 +1,6 @@ ---- chrome/browser/process_singleton_posix.cc.orig 2022-08-31 12:19:35 UTC +--- chrome/browser/process_singleton_posix.cc.orig 2023-01-30 07:58:59 UTC +++ chrome/browser/process_singleton_posix.cc -@@ -351,7 +351,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo +@@ -357,7 +357,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo if (g_disable_prompt) return g_user_opted_unlock_in_use_profile; diff --git a/devel/electron22/files/patch-chrome_test_BUILD.gn b/devel/electron22/files/patch-chrome_test_BUILD.gn index a6fe89e70953..292c03c0a0a1 100644 --- a/devel/electron22/files/patch-chrome_test_BUILD.gn +++ b/devel/electron22/files/patch-chrome_test_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/test/BUILD.gn.orig 2022-11-30 08:12:58 UTC +--- chrome/test/BUILD.gn.orig 2023-01-30 07:58:59 UTC +++ chrome/test/BUILD.gn -@@ -10087,7 +10087,7 @@ test("chrome_app_unittests") { +@@ -10094,7 +10094,7 @@ test("chrome_app_unittests") { "//components/heap_profiling/in_process", "//components/safe_browsing:buildflags", ] diff --git a/devel/electron22/files/patch-components_viz_host_host__display__client.cc b/devel/electron22/files/patch-components_viz_host_host__display__client.cc index 928e130abee9..ae1cfd002c1b 100644 --- a/devel/electron22/files/patch-components_viz_host_host__display__client.cc +++ b/devel/electron22/files/patch-components_viz_host_host__display__client.cc @@ -1,6 +1,6 @@ ---- components/viz/host/host_display_client.cc.orig 2022-02-28 16:54:41 UTC +--- components/viz/host/host_display_client.cc.orig 2023-01-30 07:58:58 UTC +++ components/viz/host/host_display_client.cc -@@ -61,7 +61,7 @@ void HostDisplayClient::CreateLayeredWindowUpdater( +@@ -65,7 +65,7 @@ void HostDisplayClient::CreateLayeredWindowUpdater( // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/devel/electron22/files/patch-components_viz_host_host__display__client.h b/devel/electron22/files/patch-components_viz_host_host__display__client.h index 2786ca6b69fb..7b5db1727779 100644 --- a/devel/electron22/files/patch-components_viz_host_host__display__client.h +++ b/devel/electron22/files/patch-components_viz_host_host__display__client.h @@ -1,6 +1,6 @@ ---- components/viz/host/host_display_client.h.orig 2022-02-28 16:54:41 UTC +--- components/viz/host/host_display_client.h.orig 2023-01-30 07:58:58 UTC +++ components/viz/host/host_display_client.h -@@ -48,7 +48,7 @@ class VIZ_HOST_EXPORT HostDisplayClient : public mojom +@@ -47,7 +47,7 @@ class VIZ_HOST_EXPORT HostDisplayClient : public mojom // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/devel/electron22/files/patch-components_viz_host_renderer__settings__creation.cc b/devel/electron22/files/patch-components_viz_host_renderer__settings__creation.cc index 9dd671db141b..7bad086ec6dd 100644 --- a/devel/electron22/files/patch-components_viz_host_renderer__settings__creation.cc +++ b/devel/electron22/files/patch-components_viz_host_renderer__settings__creation.cc @@ -1,6 +1,6 @@ ---- components/viz/host/renderer_settings_creation.cc.orig 2022-02-28 16:54:41 UTC +--- components/viz/host/renderer_settings_creation.cc.orig 2023-01-30 07:58:58 UTC +++ components/viz/host/renderer_settings_creation.cc -@@ -52,7 +52,7 @@ RendererSettings CreateRendererSettings() { +@@ -55,7 +55,7 @@ RendererSettings CreateRendererSettings() { renderer_settings.partial_swap_enabled = !command_line->HasSwitch(switches::kUIDisablePartialSwap); diff --git a/devel/electron22/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc b/devel/electron22/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc index c5162e337d17..fcd4bc14f502 100644 --- a/devel/electron22/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc +++ b/devel/electron22/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc @@ -1,6 +1,6 @@ ---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2022-11-30 08:12:58 UTC +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2023-01-30 07:58:58 UTC +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc -@@ -98,7 +98,7 @@ RootCompositorFrameSinkImpl::Create( +@@ -99,7 +99,7 @@ RootCompositorFrameSinkImpl::Create( // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ // For X11, we need notify client about swap completion after resizing, so the // client can use it for synchronize with X11 WM. output_surface->SetNeedsSwapSizeNotifications(true); -@@ -577,7 +577,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw +@@ -578,7 +578,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw display_client_->DidCompleteSwapWithSize(pixel_size); // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/devel/electron22/files/patch-content_app_content__main__runner__impl.cc b/devel/electron22/files/patch-content_app_content__main__runner__impl.cc index 56e3ece8e397..be224c86def5 100644 --- a/devel/electron22/files/patch-content_app_content__main__runner__impl.cc +++ b/devel/electron22/files/patch-content_app_content__main__runner__impl.cc @@ -1,6 +1,6 @@ ---- content/app/content_main_runner_impl.cc.orig 2022-11-30 08:12:58 UTC +--- content/app/content_main_runner_impl.cc.orig 2023-01-30 07:58:59 UTC +++ content/app/content_main_runner_impl.cc -@@ -135,13 +135,13 @@ +@@ -136,13 +136,13 @@ #include "base/posix/global_descriptors.h" #include "content/public/common/content_descriptors.h" @@ -16,7 +16,7 @@ #include "base/native_library.h" #include "base/rand_util.h" #include "content/public/common/zygote/sandbox_support_linux.h" -@@ -180,6 +180,10 @@ +@@ -181,6 +181,10 @@ #include "media/base/media_switches.h" #endif @@ -27,7 +27,7 @@ #if BUILDFLAG(IS_ANDROID) #include "base/system/sys_info.h" #include "content/browser/android/battery_metrics.h" -@@ -382,7 +386,7 @@ void InitializeZygoteSandboxForBrowserProcess( +@@ -386,7 +390,7 @@ void InitializeZygoteSandboxForBrowserProcess( } #endif // BUILDFLAG(USE_ZYGOTE_HANDLE) @@ -36,7 +36,7 @@ #if BUILDFLAG(ENABLE_PPAPI) // Loads the (native) libraries but does not initialize them (i.e., does not -@@ -418,7 +422,7 @@ void PreloadLibraryCdms() { +@@ -422,7 +426,7 @@ void PreloadLibraryCdms() { } #endif // BUILDFLAG(ENABLE_LIBRARY_CDMS) @@ -45,7 +45,7 @@ void PreSandboxInit() { // Pre-acquire resources needed by BoringSSL. See // https://boringssl.googlesource.com/boringssl/+/HEAD/SANDBOXING.md -@@ -441,6 +445,11 @@ void PreSandboxInit() { +@@ -445,6 +449,11 @@ void PreSandboxInit() { } #endif @@ -57,7 +57,7 @@ // Set the android SkFontMgr for blink. We need to ensure this is done // before the sandbox is initialized to allow the font manager to access // font configuration files on disk. -@@ -623,7 +632,7 @@ int NO_STACK_PROTECTOR RunZygote(ContentMainDelegate* +@@ -627,7 +636,7 @@ int NO_STACK_PROTECTOR RunZygote(ContentMainDelegate* delegate->ZygoteStarting(&zygote_fork_delegates); media::InitializeMediaLibrary(); @@ -66,7 +66,7 @@ PreSandboxInit(); #endif -@@ -817,11 +826,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -821,11 +830,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam kFieldTrialDescriptor + base::GlobalDescriptors::kBaseDescriptor); #endif // !BUILDFLAG(IS_ANDROID) @@ -80,7 +80,7 @@ #endif // !BUILDFLAG(IS_WIN) -@@ -1007,6 +1015,16 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -1011,6 +1019,16 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam } #endif @@ -97,7 +97,7 @@ delegate_->SandboxInitialized(process_type); #if BUILDFLAG(USE_ZYGOTE_HANDLE) -@@ -1070,7 +1088,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { +@@ -1074,7 +1092,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { process_type); } @@ -106,7 +106,7 @@ // If dynamic Mojo Core is being used, ensure that it's loaded very early in // the child/zygote process, before any sandbox is initialized. The library // is not fully initialized with IPC support until a ChildProcess is later -@@ -1103,6 +1121,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { +@@ -1107,6 +1125,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { content_main_params_.reset(); RegisterMainThreadFactories(); diff --git a/devel/electron22/files/patch-content_browser_child__process__launcher__helper__linux.cc b/devel/electron22/files/patch-content_browser_child__process__launcher__helper__linux.cc index fd5e88cf7c45..060a8956dc23 100644 --- a/devel/electron22/files/patch-content_browser_child__process__launcher__helper__linux.cc +++ b/devel/electron22/files/patch-content_browser_child__process__launcher__helper__linux.cc @@ -1,4 +1,4 @@ ---- content/browser/child_process_launcher_helper_linux.cc.orig 2023-01-23 08:53:25 UTC +--- content/browser/child_process_launcher_helper_linux.cc.orig 2023-01-30 07:58:59 UTC +++ content/browser/child_process_launcher_helper_linux.cc @@ -20,7 +20,9 @@ #include "content/public/common/result_codes.h" @@ -14,18 +14,18 @@ options->fds_to_remap = files_to_register.GetMappingWithIDAdjustment( base::GlobalDescriptors::kBaseDescriptor); -+# if !BUILDFLAG(IS_BSD) ++#if !BUILDFLAG(IS_BSD) if (GetProcessType() == switches::kRendererProcess) { const int sandbox_fd = SandboxHostLinux::GetInstance()->GetChildSocket(); options->fds_to_remap.push_back(std::make_pair(sandbox_fd, GetSandboxFD())); -@@ -68,6 +71,7 @@ bool ChildProcessLauncherHelper::BeforeLaunchOnLaunche +@@ -67,6 +70,7 @@ bool ChildProcessLauncherHelper::BeforeLaunchOnLaunche + if (!zygote_handle) { options->allow_new_privs = true; } - +#endif + for (const auto& remapped_fd : file_data_->additional_remapped_fds) { options->fds_to_remap.emplace_back(remapped_fd.second.get(), - remapped_fd.first); @@ -88,6 +92,7 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr int* launch_result) { *is_synchronous_launch = true; diff --git a/devel/electron22/files/patch-content_browser_gpu_gpu__process__host.cc b/devel/electron22/files/patch-content_browser_gpu_gpu__process__host.cc index 1bd444ae2dbe..b4546555f794 100644 --- a/devel/electron22/files/patch-content_browser_gpu_gpu__process__host.cc +++ b/devel/electron22/files/patch-content_browser_gpu_gpu__process__host.cc @@ -1,6 +1,6 @@ ---- content/browser/gpu/gpu_process_host.cc.orig 2022-11-30 08:12:58 UTC +--- content/browser/gpu/gpu_process_host.cc.orig 2023-01-30 07:58:58 UTC +++ content/browser/gpu/gpu_process_host.cc -@@ -255,6 +255,7 @@ static const char* const kSwitchNames[] = { +@@ -256,6 +256,7 @@ static const char* const kSwitchNames[] = { switches::kEnableBackgroundThreadPool, switches::kEnableGpuRasterization, switches::kEnableLogging, @@ -8,7 +8,7 @@ switches::kEnableDeJelly, switches::kDeJellyScreenWidth, switches::kDoubleBufferCompositing, -@@ -288,7 +289,7 @@ static const char* const kSwitchNames[] = { +@@ -289,7 +290,7 @@ static const char* const kSwitchNames[] = { switches::kOzoneDumpFile, switches::kDisableBufferBWCompression, #endif diff --git a/devel/electron22/files/patch-content_browser_media_media__keys__listener__manager__impl.cc b/devel/electron22/files/patch-content_browser_media_media__keys__listener__manager__impl.cc index 3646f04d18b3..874d4c95ad85 100644 --- a/devel/electron22/files/patch-content_browser_media_media__keys__listener__manager__impl.cc +++ b/devel/electron22/files/patch-content_browser_media_media__keys__listener__manager__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/media/media_keys_listener_manager_impl.cc.orig 2022-04-21 18:48:31 UTC +--- content/browser/media/media_keys_listener_manager_impl.cc.orig 2023-01-30 07:58:59 UTC +++ content/browser/media/media_keys_listener_manager_impl.cc -@@ -233,7 +233,7 @@ void MediaKeysListenerManagerImpl::StartListeningForMe +@@ -237,7 +237,7 @@ void MediaKeysListenerManagerImpl::StartListeningForMe // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ diff --git a/devel/electron22/files/patch-content_browser_renderer__host_render__process__host__impl.cc b/devel/electron22/files/patch-content_browser_renderer__host_render__process__host__impl.cc index 8dbb58049f8e..3e709af68c6f 100644 --- a/devel/electron22/files/patch-content_browser_renderer__host_render__process__host__impl.cc +++ b/devel/electron22/files/patch-content_browser_renderer__host_render__process__host__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_process_host_impl.cc.orig 2022-11-30 08:12:58 UTC +--- content/browser/renderer_host/render_process_host_impl.cc.orig 2023-01-30 07:58:58 UTC +++ content/browser/renderer_host/render_process_host_impl.cc -@@ -213,7 +213,7 @@ +@@ -214,7 +214,7 @@ #include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h" #endif @@ -9,7 +9,7 @@ #include <sys/resource.h> #include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck -@@ -1137,7 +1137,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = +@@ -1138,7 +1138,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = // to indicate failure and std::numeric_limits<size_t>::max() to indicate // unlimited. size_t GetPlatformProcessLimit() { @@ -18,7 +18,7 @@ struct rlimit limit; if (getrlimit(RLIMIT_NPROC, &limit) != 0) return kUnknownPlatformProcessLimit; -@@ -1224,7 +1224,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public +@@ -1225,7 +1225,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public return; } @@ -27,7 +27,7 @@ if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) { ConnectToFontService(std::move(font_receiver)); return; -@@ -2119,7 +2119,7 @@ void RenderProcessHostImpl::ReinitializeLogging( +@@ -2127,7 +2127,7 @@ void RenderProcessHostImpl::ReinitializeLogging( } #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -36,7 +36,7 @@ void RenderProcessHostImpl::CreateStableVideoDecoder( mojo::PendingReceiver<media::stable::mojom::StableVideoDecoder> receiver) { if (!stable_video_decoder_factory_remote_.is_bound()) { -@@ -3269,6 +3269,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin +@@ -3278,6 +3278,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin switches::kDisableSpeechAPI, switches::kDisableThreadedCompositing, switches::kDisableTouchDragDrop, @@ -44,7 +44,7 @@ switches::kDisableV8IdleTasks, switches::kDisableVideoCaptureUseGpuMemoryBuffer, switches::kDisableWebGLImageChromium, -@@ -4742,7 +4743,7 @@ void RenderProcessHostImpl::ResetIPC() { +@@ -4751,7 +4752,7 @@ void RenderProcessHostImpl::ResetIPC() { coordinator_connector_receiver_.reset(); tracing_registration_.reset(); diff --git a/devel/electron22/files/patch-content_browser_utility__sandbox__delegate.cc b/devel/electron22/files/patch-content_browser_utility__sandbox__delegate.cc index 6c34995b1968..ffe596251aa8 100644 --- a/devel/electron22/files/patch-content_browser_utility__sandbox__delegate.cc +++ b/devel/electron22/files/patch-content_browser_utility__sandbox__delegate.cc @@ -1,6 +1,6 @@ ---- content/browser/utility_sandbox_delegate.cc.orig 2022-10-24 13:33:33 UTC +--- content/browser/utility_sandbox_delegate.cc.orig 2023-01-30 07:58:59 UTC +++ content/browser/utility_sandbox_delegate.cc -@@ -63,10 +63,10 @@ UtilitySandboxedProcessLauncherDelegate:: +@@ -65,10 +65,10 @@ UtilitySandboxedProcessLauncherDelegate:: #if BUILDFLAG(ENABLE_PPAPI) sandbox_type_ == sandbox::mojom::Sandbox::kPpapi || #endif @@ -13,7 +13,7 @@ sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoDecoding || #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -109,7 +109,7 @@ ZygoteHandle UtilitySandboxedProcessLauncherDelegate:: +@@ -117,7 +117,7 @@ ZygoteHandle UtilitySandboxedProcessLauncherDelegate:: // unsandboxed zygote and then apply their actual sandboxes in the forked // process upon startup. if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork || diff --git a/devel/electron22/files/patch-content_browser_web__contents_web__contents__view__aura.cc b/devel/electron22/files/patch-content_browser_web__contents_web__contents__view__aura.cc index 28ff9d5e64fa..9bcec158c12b 100644 --- a/devel/electron22/files/patch-content_browser_web__contents_web__contents__view__aura.cc +++ b/devel/electron22/files/patch-content_browser_web__contents_web__contents__view__aura.cc @@ -1,4 +1,4 @@ ---- content/browser/web_contents/web_contents_view_aura.cc.orig 2022-12-14 08:02:29 UTC +--- content/browser/web_contents/web_contents_view_aura.cc.orig 2023-01-30 07:58:58 UTC +++ content/browser/web_contents/web_contents_view_aura.cc @@ -176,7 +176,7 @@ class WebDragSourceAura : public content::WebContentsO raw_ptr<aura::Window> window_; @@ -18,7 +18,7 @@ // We set the file contents before the URL because the URL also sets file // contents (to a .URL shortcut). We want to prefer file content data over // a shortcut so we add it first. -@@ -1366,7 +1366,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent* +@@ -1363,7 +1363,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent* // Linux window managers like to handle raise-on-click themselves. If we // raise-on-click manually, this may override user settings that prevent // focus-stealing. diff --git a/devel/electron22/files/patch-content_gpu_gpu__main.cc b/devel/electron22/files/patch-content_gpu_gpu__main.cc index f6fc2fc350eb..2a356975c364 100644 --- a/devel/electron22/files/patch-content_gpu_gpu__main.cc +++ b/devel/electron22/files/patch-content_gpu_gpu__main.cc @@ -1,4 +1,4 @@ ---- content/gpu/gpu_main.cc.orig 2022-11-30 08:12:58 UTC +--- content/gpu/gpu_main.cc.orig 2023-01-30 07:58:58 UTC +++ content/gpu/gpu_main.cc @@ -87,7 +87,7 @@ #include "sandbox/win/src/sandbox.h" @@ -27,7 +27,7 @@ return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs); #elif BUILDFLAG(IS_WIN) return StartSandboxWindows(sandbox_info_); -@@ -268,7 +268,7 @@ int GpuMain(MainFunctionParams parameters) { +@@ -272,7 +272,7 @@ int GpuMain(MainFunctionParams parameters) { std::make_unique<base::SingleThreadTaskExecutor>( gpu_preferences.message_pump_type); } @@ -36,7 +36,7 @@ #error "Unsupported Linux platform." #elif BUILDFLAG(IS_MAC) // Cross-process CoreAnimation requires a CFRunLoop to function at all, and -@@ -403,7 +403,7 @@ int GpuMain(MainFunctionParams parameters) { +@@ -406,7 +406,7 @@ int GpuMain(MainFunctionParams parameters) { namespace { diff --git a/devel/electron22/files/patch-content_renderer_render__process__impl.cc b/devel/electron22/files/patch-content_renderer_render__process__impl.cc index cdb252e501e4..47bf8bb020be 100644 --- a/devel/electron22/files/patch-content_renderer_render__process__impl.cc +++ b/devel/electron22/files/patch-content_renderer_render__process__impl.cc @@ -1,4 +1,4 @@ ---- content/renderer/render_process_impl.cc.orig 2022-11-30 08:12:58 UTC +--- content/renderer/render_process_impl.cc.orig 2023-01-30 07:58:59 UTC +++ content/renderer/render_process_impl.cc @@ -46,7 +46,7 @@ #if BUILDFLAG(IS_WIN) @@ -18,9 +18,9 @@ SetV8FlagIfFeature(features::kWebAssemblyCodeProtectionPku, "--wasm-memory-protection-keys"); SetV8FlagIfNotFeature(features::kWebAssemblyCodeProtectionPku, -@@ -228,7 +228,7 @@ RenderProcessImpl::RenderProcessImpl() - SetV8FlagIfNotFeature(features::kWebAssemblyDynamicTiering, - "--no-wasm-dynamic-tiering"); +@@ -231,7 +231,7 @@ RenderProcessImpl::RenderProcessImpl() + // Freezing flags after init conflicts with node in the renderer. + v8::V8::SetFlagsFromString("--no-freeze-flags-after-init"); -#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(ARCH_CPU_X86_64) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_X86_64) diff --git a/devel/electron22/files/patch-content_renderer_renderer__blink__platform__impl.h b/devel/electron22/files/patch-content_renderer_renderer__blink__platform__impl.h index e61b5ac77e34..9e501b497b8d 100644 --- a/devel/electron22/files/patch-content_renderer_renderer__blink__platform__impl.h +++ b/devel/electron22/files/patch-content_renderer_renderer__blink__platform__impl.h @@ -1,4 +1,4 @@ ---- content/renderer/renderer_blink_platform_impl.h.orig 2022-11-30 08:12:58 UTC +--- content/renderer/renderer_blink_platform_impl.h.orig 2023-01-30 07:58:59 UTC +++ content/renderer/renderer_blink_platform_impl.h @@ -29,7 +29,7 @@ #include "third_party/blink/public/common/user_agent/user_agent_metadata.h" @@ -18,7 +18,7 @@ void SetThreadType(base::PlatformThreadId thread_id, base::ThreadType) override; #endif -@@ -237,7 +237,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -240,7 +240,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi void Collect3DContextInformation(blink::Platform::GraphicsInfo* gl_info, const gpu::GPUInfo& gpu_info) const; @@ -27,7 +27,7 @@ std::unique_ptr<blink::WebSandboxSupport> sandbox_support_; #endif -@@ -257,7 +257,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -260,7 +260,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi mutable base::WaitableEvent io_thread_id_ready_event_; base::PlatformThreadId io_thread_id_ = base::kInvalidThreadId; diff --git a/devel/electron22/files/patch-electron_filenames.gni b/devel/electron22/files/patch-electron_filenames.gni index 6bca3ce73008..68bee7cda7cc 100644 --- a/devel/electron22/files/patch-electron_filenames.gni +++ b/devel/electron22/files/patch-electron_filenames.gni @@ -1,6 +1,6 @@ ---- electron/filenames.gni.orig 2022-08-03 15:31:32 UTC +--- electron/filenames.gni.orig 2023-01-24 16:58:16 UTC +++ electron/filenames.gni -@@ -245,8 +245,8 @@ filenames = { +@@ -246,8 +246,8 @@ filenames = { "shell/app/command_line_args.h", "shell/app/electron_content_client.cc", "shell/app/electron_content_client.h", diff --git a/devel/electron22/files/patch-electron_lib_browser_api_app.ts b/devel/electron22/files/patch-electron_lib_browser_api_app.ts index e3b4f07063db..3164c1cd0c87 100644 --- a/devel/electron22/files/patch-electron_lib_browser_api_app.ts +++ b/devel/electron22/files/patch-electron_lib_browser_api_app.ts @@ -1,6 +1,6 @@ ---- electron/lib/browser/api/app.ts.orig 2021-11-15 23:45:07 UTC +--- electron/lib/browser/api/app.ts.orig 2023-01-24 16:58:16 UTC +++ electron/lib/browser/api/app.ts -@@ -67,7 +67,7 @@ if (process.platform === 'darwin') { +@@ -68,7 +68,7 @@ if (process.platform === 'darwin') { app.dock!.getMenu = () => dockMenu; } diff --git a/devel/electron22/files/patch-electron_lib_common_api_clipboard.ts b/devel/electron22/files/patch-electron_lib_common_api_clipboard.ts index 6fa93e1fb4b1..a194126a2cb5 100644 --- a/devel/electron22/files/patch-electron_lib_common_api_clipboard.ts +++ b/devel/electron22/files/patch-electron_lib_common_api_clipboard.ts @@ -1,6 +1,6 @@ ---- electron/lib/common/api/clipboard.ts.orig 2021-12-03 01:46:05 UTC +--- electron/lib/common/api/clipboard.ts.orig 2023-01-24 16:58:16 UTC +++ electron/lib/common/api/clipboard.ts -@@ -11,7 +11,7 @@ if (process.type === 'renderer') { +@@ -12,7 +12,7 @@ if (process.type === 'renderer') { return (...args: any[]) => ipcRendererUtils.invokeSync(IPC_MESSAGES.BROWSER_CLIPBOARD_SYNC, method, ...args); }; diff --git a/devel/electron22/files/patch-src_electron_script_lib_get-version.js b/devel/electron22/files/patch-electron_script_lib_get-version.js index 5ccc6d86820f..5d0886e82027 100644 --- a/devel/electron22/files/patch-src_electron_script_lib_get-version.js +++ b/devel/electron22/files/patch-electron_script_lib_get-version.js @@ -1,17 +1,17 @@ ---- electron/script/lib/get-version.js.orig 2023-01-20 15:13:09.374140000 +0100 -+++ electron/script/lib/get-version.js 2023-01-20 15:13:35.153332000 +0100 -@@ -11,12 +11,6 @@ module.exports.getElectronVersion = () => { +--- electron/script/lib/get-version.js.orig 2023-01-24 16:58:16 UTC ++++ electron/script/lib/get-version.js +@@ -11,12 +11,10 @@ module.exports.getElectronVersion = () => { // The only difference in the "git describe" technique is that technically a commit can "change" it's version // number if a tag is created / removed retroactively. i.e. the first time a commit is pushed it will be 1.2.3 // and after the tag is made rebuilding the same commit will result in it being 1.2.4 - const output = spawnSync('git', ['describe', '--tags', '--abbrev=0'], { - cwd: path.resolve(__dirname, '..', '..') - }); -- if (output.status !== 0) { -- console.error(output.stderr); -- throw new Error('Failed to get current electron version'); -- } ++ const output = spawnSync('basename', [path.resolve(__dirname, '..', '..', '..', '..')]); + if (output.status !== 0) { + console.error(output.stderr); + throw new Error('Failed to get current electron version'); + } - return output.stdout.toString().trim().replace(/^v/g, ''); -+ const output = "22.0.1"; -+ return output.toString().trim().replace(/^v/g, ''); ++ return output.stdout.toString().trim().replace(/^electron-/g, ''); }; diff --git a/devel/electron22/files/patch-electron_script_lib_utils.js b/devel/electron22/files/patch-electron_script_lib_utils.js index d5deafff375c..576a3d7aeb87 100644 --- a/devel/electron22/files/patch-electron_script_lib_utils.js +++ b/devel/electron22/files/patch-electron_script_lib_utils.js @@ -1,6 +1,6 @@ ---- electron/script/lib/utils.js.orig 2021-10-11 17:12:26 UTC +--- electron/script/lib/utils.js.orig 2023-01-24 16:58:16 UTC +++ electron/script/lib/utils.js -@@ -21,7 +21,7 @@ function getElectronExec () { +@@ -22,7 +22,7 @@ function getElectronExec () { return `out/${OUT_DIR}/Electron.app/Contents/MacOS/Electron`; case 'win32': return `out/${OUT_DIR}/electron.exe`; diff --git a/devel/electron22/files/patch-electron_script_spec-runner.js b/devel/electron22/files/patch-electron_script_spec-runner.js index 12821b3f867d..13a0f8187e2f 100644 --- a/devel/electron22/files/patch-electron_script_spec-runner.js +++ b/devel/electron22/files/patch-electron_script_spec-runner.js @@ -1,8 +1,8 @@ ---- electron/script/spec-runner.js.orig 2021-11-08 18:41:28 UTC +--- electron/script/spec-runner.js.orig 2023-01-24 16:58:16 UTC +++ electron/script/spec-runner.js -@@ -126,7 +126,7 @@ async function runElectronTests () { - async function runTestUsingElectron (specDir, testName) { - let exe = path.resolve(BASE, utils.getElectronExec()); +@@ -148,7 +148,7 @@ async function runTestUsingElectron (specDir, testName + exe = path.resolve(BASE, utils.getElectronExec()); + } const runnerArgs = [`electron/${specDir}`, ...unknownArgs.slice(2)]; - if (process.platform === 'linux') { + if (process.platform === 'linux' || process.platform === 'freebsd') { diff --git a/devel/electron22/files/patch-electron_shell_app_electron__main__delegate.cc b/devel/electron22/files/patch-electron_shell_app_electron__main__delegate.cc index dfe8623dc796..5c44c38ba3d1 100644 --- a/devel/electron22/files/patch-electron_shell_app_electron__main__delegate.cc +++ b/devel/electron22/files/patch-electron_shell_app_electron__main__delegate.cc @@ -1,6 +1,6 @@ ---- electron/shell/app/electron_main_delegate.cc.orig 2022-08-03 15:31:32 UTC +--- electron/shell/app/electron_main_delegate.cc.orig 2023-01-24 16:58:16 UTC +++ electron/shell/app/electron_main_delegate.cc -@@ -56,13 +56,15 @@ +@@ -56,13 +56,16 @@ #include "chrome/child/v8_crashpad_support_win.h" #endif @@ -8,6 +8,7 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "base/nix/xdg_util.h" +#endif ++ +#if BUILDFLAG(IS_LINUX) #include "v8/include/v8-wasm-trap-handler-posix.h" #include "v8/include/v8.h" @@ -18,7 +19,7 @@ #include "components/crash/core/app/crash_switches.h" // nogncheck #include "components/crash/core/app/crashpad.h" // nogncheck #include "components/crash/core/common/crash_key.h" -@@ -159,7 +161,7 @@ bool ElectronPathProvider(int key, base::FilePath* res +@@ -159,7 +162,7 @@ bool ElectronPathProvider(int key, base::FilePath* res create_dir = true; break; } @@ -27,7 +28,7 @@ case DIR_APP_DATA: { auto env = base::Environment::Create(); cur = base::nix::GetXDGDirectory( -@@ -293,7 +295,7 @@ absl::optional<int> ElectronMainDelegate::BasicStartup +@@ -293,7 +296,7 @@ absl::optional<int> ElectronMainDelegate::BasicStartup base::win::PinUser32(); #endif @@ -36,7 +37,7 @@ // Check for --no-sandbox parameter when running as root. if (getuid() == 0 && IsSandboxEnabled(command_line)) LOG(FATAL) << "Running as root without --" -@@ -345,7 +347,7 @@ void ElectronMainDelegate::PreSandboxStartup() { +@@ -345,7 +348,7 @@ void ElectronMainDelegate::PreSandboxStartup() { process_type == ::switches::kZygoteProcess); #endif @@ -45,7 +46,7 @@ crash_reporter::InitializeCrashKeys(); #endif -@@ -380,7 +382,7 @@ void ElectronMainDelegate::PreSandboxStartup() { +@@ -380,7 +383,7 @@ void ElectronMainDelegate::PreSandboxStartup() { } #endif diff --git a/devel/electron22/files/patch-electron_shell_app_node__main.cc b/devel/electron22/files/patch-electron_shell_app_node__main.cc index 1e11b086073a..e594a1ce9d0d 100644 --- a/devel/electron22/files/patch-electron_shell_app_node__main.cc +++ b/devel/electron22/files/patch-electron_shell_app_node__main.cc @@ -1,4 +1,4 @@ ---- electron/shell/app/node_main.cc.orig 2023-01-10 12:17:28 UTC +--- electron/shell/app/node_main.cc.orig 2023-01-24 16:58:16 UTC +++ electron/shell/app/node_main.cc @@ -42,7 +42,7 @@ #include "content/public/common/content_descriptors.h" @@ -18,7 +18,7 @@ void SetCrashKeyStub(const std::string& key, const std::string& value) {} void ClearCrashKeyStub(const std::string& key) {} #endif -@@ -105,7 +105,7 @@ v8::Local<v8::Value> GetParameters(v8::Isolate* isolat +@@ -105,7 +105,7 @@ namespace electron { v8::Local<v8::Value> GetParameters(v8::Isolate* isolate) { std::map<std::string, std::string> keys; @@ -27,24 +27,6 @@ electron::crash_keys::GetCrashKeys(&keys); #endif return gin::ConvertToV8(isolate, keys); -@@ -118,7 +118,7 @@ int NodeMain(int argc, char* argv[]) { - v8_crashpad_support::SetUp(); - #endif - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) - auto os_env = base::Environment::Create(); - std::string fd_string, pid_string; - if (os_env->GetVar("CRASHDUMP_SIGNAL_FD", &fd_string) && -@@ -161,7 +161,7 @@ int NodeMain(int argc, char* argv[]) { - if (result.early_return) - exit(result.exit_code); - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) - // On Linux, initialize crashpad after Nodejs init phase so that - // crash and termination signal handlers can be set by the crashpad client. - if (!pid_string.empty()) { @@ -225,7 +225,7 @@ int NodeMain(int argc, char* argv[]) { // Setup process.crashReporter in child node processes gin_helper::Dictionary reporter = gin::Dictionary::CreateEmpty(isolate); diff --git a/devel/electron22/files/patch-electron_shell_browser_api_electron__api__app.cc b/devel/electron22/files/patch-electron_shell_browser_api_electron__api__app.cc index ce27be12b61d..87308543399f 100644 --- a/devel/electron22/files/patch-electron_shell_browser_api_electron__api__app.cc +++ b/devel/electron22/files/patch-electron_shell_browser_api_electron__api__app.cc @@ -1,6 +1,6 @@ ---- electron/shell/browser/api/electron_api_app.cc.orig 2022-12-02 17:32:32.785444000 +0100 -+++ electron/shell/browser/api/electron_api_app.cc 2022-12-02 17:33:42.233196000 +0100 -@@ -706,7 +706,7 @@ void App::OnFinishLaunching(base::Value::Dict launch_i +--- electron/shell/browser/api/electron_api_app.cc.orig 2023-01-24 16:58:16 UTC ++++ electron/shell/browser/api/electron_api_app.cc +@@ -708,7 +708,7 @@ void App::OnWillFinishLaunching() { } void App::OnFinishLaunching(base::Value::Dict launch_info) { @@ -9,7 +9,7 @@ // Set the application name for audio streams shown in external // applications. Only affects pulseaudio currently. media::AudioManager::SetGlobalAppName(Browser::Get()->GetName()); -@@ -1029,7 +1029,7 @@ void App::SetDesktopName(const std::string& desktop_na +@@ -1038,7 +1038,7 @@ void App::SetPath(gin_helper::ErrorThrower thrower, } void App::SetDesktopName(const std::string& desktop_name) { @@ -18,7 +18,7 @@ auto env = base::Environment::Create(); env->SetVar("CHROME_DESKTOP", desktop_name); #endif -@@ -1413,7 +1413,7 @@ std::vector<gin_helper::Dictionary> App::GetAppMetrics +@@ -1427,7 +1427,7 @@ std::vector<gin_helper::Dictionary> App::GetAppMetrics pid_dict.Set("name", process_metric.second->name); } @@ -27,7 +27,7 @@ auto memory_info = process_metric.second->GetMemoryInfo(); gin_helper::Dictionary memory_dict = gin::Dictionary::CreateEmpty(isolate); -@@ -1720,7 +1720,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuild +@@ -1734,7 +1734,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuild .SetMethod( "removeAsDefaultProtocolClient", base::BindRepeating(&Browser::RemoveAsDefaultProtocolClient, browser)) @@ -36,7 +36,7 @@ .SetMethod( "getApplicationInfoForProtocol", base::BindRepeating(&Browser::GetApplicationInfoForProtocol, browser)) -@@ -1778,7 +1778,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuild +@@ -1792,7 +1792,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuild .SetMethod("getJumpListSettings", &App::GetJumpListSettings) .SetMethod("setJumpList", &App::SetJumpList) #endif diff --git a/devel/electron22/files/patch-electron_shell_browser_api_electron__api__base__window.cc b/devel/electron22/files/patch-electron_shell_browser_api_electron__api__base__window.cc index 629515fbc7d7..2affea904cfe 100644 --- a/devel/electron22/files/patch-electron_shell_browser_api_electron__api__base__window.cc +++ b/devel/electron22/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 16:58:16 UTC +++ electron/shell/browser/api/electron_api_base_window.cc -@@ -1057,7 +1057,7 @@ void BaseWindow::SetIconImpl(v8::Isolate* isolate, +@@ -1038,7 +1038,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/electron22/files/patch-electron_shell_browser_api_electron__api__crash__reporter.cc b/devel/electron22/files/patch-electron_shell_browser_api_electron__api__crash__reporter.cc index 393e66f95902..6dfc534515aa 100644 --- a/devel/electron22/files/patch-electron_shell_browser_api_electron__api__crash__reporter.cc +++ b/devel/electron22/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 16:58:16 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 { +@@ -65,7 +65,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, +@@ -132,7 +132,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, +@@ -182,7 +182,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 +@@ -237,13 +237,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() { +@@ -252,7 +252,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, +@@ -264,7 +264,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/electron22/files/patch-electron_shell_browser_api_electron__api__desktop__capturer.cc b/devel/electron22/files/patch-electron_shell_browser_api_electron__api__desktop__capturer.cc new file mode 100644 index 000000000000..3da9cf62df37 --- /dev/null +++ b/devel/electron22/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 16:58:16 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/electron22/files/patch-electron_shell_browser_api_electron__api__power__monitor.cc b/devel/electron22/files/patch-electron_shell_browser_api_electron__api__power__monitor.cc index 355d39ab7540..72e8f4f335d7 100644 --- a/devel/electron22/files/patch-electron_shell_browser_api_electron__api__power__monitor.cc +++ b/devel/electron22/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 16:58:16 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/electron22/files/patch-electron_shell_browser_api_electron__api__power__monitor.h b/devel/electron22/files/patch-electron_shell_browser_api_electron__api__power__monitor.h index 5a72e3b38470..653b1b098304 100644 --- a/devel/electron22/files/patch-electron_shell_browser_api_electron__api__power__monitor.h +++ b/devel/electron22/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 16:58:16 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/electron22/files/patch-electron_shell_browser_api_electron__api__safe__storage.cc b/devel/electron22/files/patch-electron_shell_browser_api_electron__api__safe__storage.cc index 4d5a815a7048..a807f5cd1aa1 100644 --- a/devel/electron22/files/patch-electron_shell_browser_api_electron__api__safe__storage.cc +++ b/devel/electron22/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 16:58:16 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/electron22/files/patch-electron_shell_browser_api_electron__api__web__contents.cc b/devel/electron22/files/patch-electron_shell_browser_api_electron__api__web__contents.cc index 183de28c0b84..ad52365d656f 100644 --- a/devel/electron22/files/patch-electron_shell_browser_api_electron__api__web__contents.cc +++ b/devel/electron22/files/patch-electron_shell_browser_api_electron__api__web__contents.cc @@ -1,6 +1,6 @@ ---- 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 -@@ -153,11 +153,11 @@ +--- electron/shell/browser/api/electron_api_web_contents.cc.orig 2023-01-24 16:58:16 UTC ++++ electron/shell/browser/api/electron_api_web_contents.cc +@@ -154,11 +154,11 @@ #include "ui/base/cocoa/defaults_utils.h" #endif @@ -14,7 +14,7 @@ #include "ui/gfx/font_render_params.h" #endif -@@ -398,7 +398,7 @@ absl::optional<base::TimeDelta> GetCursorBlinkInterval +@@ -400,7 +400,7 @@ absl::optional<base::TimeDelta> GetCursorBlinkInterval ui::TextInsertionCaretBlinkPeriodFromDefaults()); if (system_value) return *system_value; @@ -23,7 +23,7 @@ if (auto* linux_ui = ui::LinuxUi::instance()) return linux_ui->GetCursorBlinkInterval(); #elif BUILDFLAG(IS_WIN) -@@ -850,7 +850,7 @@ void WebContents::InitWithSessionAndOptions( +@@ -853,7 +853,7 @@ void WebContents::InitWithSessionAndOptions( accept_languages.pop_back(); prefs->accept_languages = accept_languages; @@ -32,7 +32,7 @@ // Update font settings. static const gfx::FontRenderParams params( gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(), nullptr)); -@@ -2353,7 +2353,7 @@ void WebContents::ForcefullyCrashRenderer() { +@@ -2390,7 +2390,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() { +@@ -3033,7 +3033,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() { +@@ -3844,7 +3844,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() { } #endif diff --git a/devel/electron22/files/patch-electron_shell_browser_api_electron__api__web__contents.h b/devel/electron22/files/patch-electron_shell_browser_api_electron__api__web__contents.h index 64a1ddd367c7..34780b982ae6 100644 --- a/devel/electron22/files/patch-electron_shell_browser_api_electron__api__web__contents.h +++ b/devel/electron22/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 16:58:16 UTC +++ electron/shell/browser/api/electron_api_web_contents.h -@@ -699,7 +699,7 @@ class WebContents : public ExclusiveAccessContext, +@@ -710,7 +710,7 @@ class WebContents : public ExclusiveAccessContext, #if defined(TOOLKIT_VIEWS) && !BUILDFLAG(IS_MAC) ui::ImageModel GetDevToolsWindowIcon() override; #endif diff --git a/devel/electron22/files/patch-electron_shell_browser_browser.h b/devel/electron22/files/patch-electron_shell_browser_browser.h index 7d6659012414..fec241bb32fe 100644 --- a/devel/electron22/files/patch-electron_shell_browser_browser.h +++ b/devel/electron22/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 16:58:16 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/electron22/files/patch-electron_shell_browser_electron__browser__main__parts.cc b/devel/electron22/files/patch-electron_shell_browser_electron__browser__main__parts.cc index 3e7c6057a69a..f7d2c044214a 100644 --- a/devel/electron22/files/patch-electron_shell_browser_electron__browser__main__parts.cc +++ b/devel/electron22/files/patch-electron_shell_browser_electron__browser__main__parts.cc @@ -1,4 +1,4 @@ ---- electron/shell/browser/electron_browser_main_parts.cc.orig 2023-01-10 12:17:28 UTC +--- electron/shell/browser/electron_browser_main_parts.cc.orig 2023-01-24 16:58:16 UTC +++ electron/shell/browser/electron_browser_main_parts.cc @@ -73,7 +73,7 @@ #include "ui/wm/core/wm_state.h" @@ -9,7 +9,7 @@ #include "base/environment.h" #include "base/threading/thread_task_runner_handle.h" #include "device/bluetooth/bluetooth_adapter_factory.h" -@@ -127,7 +127,7 @@ namespace { +@@ -127,7 +127,7 @@ namespace electron { namespace { @@ -63,7 +63,7 @@ // Reset to the original LC_ALL since we should not be changing it. if (!locale.empty()) { if (lc_all) -@@ -423,7 +423,7 @@ void ElectronBrowserMainParts::ToolkitInitialized() { +@@ -424,7 +424,7 @@ void ElectronBrowserMainParts::PostDestroyThreads() { } void ElectronBrowserMainParts::ToolkitInitialized() { @@ -72,7 +72,7 @@ auto* linux_ui = ui::GetDefaultLinuxUi(); CHECK(linux_ui); linux_ui_getter_ = std::make_unique<LinuxUiGetterImpl>(); -@@ -535,16 +535,18 @@ void ElectronBrowserMainParts::PostCreateMainMessageLo +@@ -536,7 +536,7 @@ void ElectronBrowserMainParts::WillRunMainMessageLoop( } void ElectronBrowserMainParts::PostCreateMainMessageLoop() { @@ -80,10 +80,8 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) std::string app_name = electron::Browser::Get()->GetName(); #endif --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - auto shutdown_cb = - base::BindOnce(base::RunLoop::QuitCurrentWhenIdleClosureDeprecated()); + #if BUILDFLAG(IS_LINUX) +@@ -545,7 +545,9 @@ void ElectronBrowserMainParts::PostCreateMainMessageLo ui::OzonePlatform::GetInstance()->PostCreateMainMessageLoop( std::move(shutdown_cb)); bluez::DBusBluezManagerWrapperLinux::Initialize(); @@ -93,7 +91,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. -@@ -635,7 +637,7 @@ void ElectronBrowserMainParts::PostMainMessageLoopRun( +@@ -636,7 +638,7 @@ void ElectronBrowserMainParts::PostMainMessageLoopRun( fake_browser_process_->PostMainMessageLoopRun(); content::DevToolsAgentHost::StopRemoteDebuggingPipeHandler(); diff --git a/devel/electron22/files/patch-electron_shell_browser_electron__browser__main__parts.h b/devel/electron22/files/patch-electron_shell_browser_electron__browser__main__parts.h index bb5bad77d829..a61d45127e65 100644 --- a/devel/electron22/files/patch-electron_shell_browser_electron__browser__main__parts.h +++ b/devel/electron22/files/patch-electron_shell_browser_electron__browser__main__parts.h @@ -1,6 +1,6 @@ ---- 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 16:58:16 UTC +++ electron/shell/browser/electron_browser_main_parts.h -@@ -61,7 +61,7 @@ class ViewsDelegate; +@@ -65,7 +65,7 @@ class ViewsDelegate; class ViewsDelegateMac; #endif @@ -9,7 +9,7 @@ class DarkThemeObserver; #endif -@@ -122,7 +122,7 @@ class ElectronBrowserMainParts : public content::Brows +@@ -126,7 +126,7 @@ class ElectronBrowserMainParts : public content::Brows const scoped_refptr<base::SingleThreadTaskRunner>& task_runner); #endif @@ -18,7 +18,7 @@ void DetectOzonePlatform(); #endif -@@ -143,7 +143,7 @@ class ElectronBrowserMainParts : public content::Brows +@@ -148,7 +148,7 @@ class ElectronBrowserMainParts : public content::Brows std::unique_ptr<display::Screen> screen_; #endif @@ -26,4 +26,4 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Used to notify the native theme of changes to dark mode. std::unique_ptr<DarkThemeObserver> dark_theme_observer_; - #endif + diff --git a/devel/electron22/files/patch-electron_shell_browser_native__window__views.cc b/devel/electron22/files/patch-electron_shell_browser_native__window__views.cc index 45aa2bb9ede8..5ad63fb41ac7 100644 --- a/devel/electron22/files/patch-electron_shell_browser_native__window__views.cc +++ b/devel/electron22/files/patch-electron_shell_browser_native__window__views.cc @@ -1,4 +1,4 @@ ---- electron/shell/browser/native_window_views.cc.orig 2022-08-17 15:33:00 UTC +--- electron/shell/browser/native_window_views.cc.orig 2023-01-24 16:58:16 UTC +++ electron/shell/browser/native_window_views.cc @@ -43,7 +43,7 @@ #include "ui/wm/core/shadow_types.h" @@ -18,7 +18,7 @@ std::string name = Browser::Get()->GetName(); // Set WM_WINDOW_ROLE. params.wm_role_name = "browser-window"; -@@ -307,7 +307,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper: +@@ -290,7 +290,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper: std::string window_type; options.Get(options::kType, &window_type); @@ -27,7 +27,7 @@ // Set _GTK_THEME_VARIANT to dark if we have "dark-theme" option set. bool use_dark_theme = false; if (options.Get(options::kDarkTheme, &use_dark_theme) && use_dark_theme) { -@@ -409,7 +409,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper: +@@ -392,7 +392,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper: if (window) window->AddPreTargetHandler(this); @@ -36,7 +36,7 @@ // On linux after the widget is initialized we might have to force set the // bounds if the bounds are smaller than the current display SetBounds(gfx::Rect(GetPosition(), bounds.size()), false); -@@ -559,7 +559,7 @@ bool NativeWindowViews::IsVisible() { +@@ -542,7 +542,7 @@ bool NativeWindowViews::IsVisible() { bool NativeWindowViews::IsEnabled() { #if BUILDFLAG(IS_WIN) return ::IsWindowEnabled(GetAcceleratedWidget()); @@ -45,7 +45,7 @@ #if defined(USE_OZONE_PLATFORM_X11) if (IsX11()) return !event_disabler_.get(); -@@ -617,7 +617,7 @@ void NativeWindowViews::SetEnabledInternal(bool enable +@@ -600,7 +600,7 @@ void NativeWindowViews::SetEnabledInternal(bool enable #endif } @@ -54,7 +54,7 @@ void NativeWindowViews::Maximize() { if (IsVisible()) { widget()->Maximize(); -@@ -744,7 +744,7 @@ void NativeWindowViews::SetBounds(const gfx::Rect& bou +@@ -727,7 +727,7 @@ void NativeWindowViews::SetBounds(const gfx::Rect& bou } #endif @@ -63,7 +63,7 @@ // On Linux and Windows the minimum and maximum size should be updated with // window size when window is not resizable. if (!resizable_) { -@@ -976,7 +976,7 @@ bool NativeWindowViews::IsClosable() { +@@ -959,7 +959,7 @@ bool NativeWindowViews::IsClosable() { return false; } return !(info.fState & MFS_DISABLED); @@ -72,7 +72,7 @@ return true; #endif } -@@ -1364,7 +1364,7 @@ void NativeWindowViews::SetProgressBar(double progress +@@ -1347,7 +1347,7 @@ void NativeWindowViews::SetProgressBar(double progress NativeWindow::ProgressState state) { #if BUILDFLAG(IS_WIN) taskbar_host_.SetProgressBar(GetAcceleratedWidget(), progress, state); @@ -81,7 +81,7 @@ if (unity::IsRunning()) { unity::SetProgressFraction(progress); } -@@ -1426,7 +1426,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM +@@ -1409,7 +1409,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM #if BUILDFLAG(IS_WIN) window_handle = reinterpret_cast<content::DesktopMediaID::Id>(accelerated_widget); @@ -90,7 +90,7 @@ window_handle = static_cast<uint32_t>(accelerated_widget); #endif aura::WindowTreeHost* const host = -@@ -1529,7 +1529,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC +@@ -1512,7 +1512,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC SendMessage(hwnd, WM_SETICON, ICON_BIG, reinterpret_cast<LPARAM>(app_icon_.get())); } @@ -99,7 +99,7 @@ void NativeWindowViews::SetIcon(const gfx::ImageSkia& icon) { auto* tree_host = views::DesktopWindowTreeHostLinux::GetHostForWidget( GetAcceleratedWidget()); -@@ -1599,7 +1599,7 @@ bool NativeWindowViews::CanMaximize() const { +@@ -1582,7 +1582,7 @@ bool NativeWindowViews::CanMaximize() const { bool NativeWindowViews::CanMinimize() const { #if BUILDFLAG(IS_WIN) return minimizable_; @@ -108,7 +108,7 @@ return true; #endif } -@@ -1673,7 +1673,7 @@ void NativeWindowViews::HandleKeyboardEvent( +@@ -1656,7 +1656,7 @@ void NativeWindowViews::HandleKeyboardEvent( if (widget_destroyed_) return; @@ -117,7 +117,7 @@ if (event.windows_key_code == ui::VKEY_BROWSER_BACK) NotifyWindowExecuteAppCommand(kBrowserBackward); else if (event.windows_key_code == ui::VKEY_BROWSER_FORWARD) -@@ -1692,7 +1692,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e +@@ -1675,7 +1675,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e // Alt+Click should not toggle menu bar. root_view_->ResetAltState(); diff --git a/devel/electron22/files/patch-electron_shell_browser_net_system__network__context__manager.cc b/devel/electron22/files/patch-electron_shell_browser_net_system__network__context__manager.cc index 8e34a7577935..5c88c25f4c30 100644 --- a/devel/electron22/files/patch-electron_shell_browser_net_system__network__context__manager.cc +++ b/devel/electron22/files/patch-electron_shell_browser_net_system__network__context__manager.cc @@ -1,8 +1,8 @@ ---- electron/shell/browser/net/system_network_context_manager.cc.orig 2022-05-18 15:31:32 UTC +--- electron/shell/browser/net/system_network_context_manager.cc.orig 2023-01-24 16:58:16 UTC +++ electron/shell/browser/net/system_network_context_manager.cc -@@ -46,7 +46,7 @@ - #include "components/os_crypt/keychain_password_mac.h" - #endif +@@ -42,7 +42,7 @@ + #include "shell/common/options_switches.h" + #include "url/gurl.h" -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/devel/electron22/files/patch-electron_shell_browser_relauncher__linux.cc b/devel/electron22/files/patch-electron_shell_browser_relauncher__linux.cc index ce2055b2f2d8..e5f44888577e 100644 --- a/devel/electron22/files/patch-electron_shell_browser_relauncher__linux.cc +++ b/devel/electron22/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 16:58:16 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/electron22/files/patch-electron_shell_browser_ui_views_electron__views__delegate.cc b/devel/electron22/files/patch-electron_shell_browser_ui_views_electron__views__delegate.cc index bdc40a9b974d..21bc4a31c5f9 100644 --- a/devel/electron22/files/patch-electron_shell_browser_ui_views_electron__views__delegate.cc +++ b/devel/electron22/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 16:58:16 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/electron22/files/patch-electron_shell_browser_ui_views_menu__bar.cc b/devel/electron22/files/patch-electron_shell_browser_ui_views_menu__bar.cc index d7f0c6edcdc5..382b3b8541c9 100644 --- a/devel/electron22/files/patch-electron_shell_browser_ui_views_menu__bar.cc +++ b/devel/electron22/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 16:58:16 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/electron22/files/patch-electron_shell_common_api_electron__api__clipboard.cc b/devel/electron22/files/patch-electron_shell_common_api_electron__api__clipboard.cc index bb10f3c5d418..5211303d05b6 100644 --- a/devel/electron22/files/patch-electron_shell_common_api_electron__api__clipboard.cc +++ b/devel/electron22/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 16:58:16 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/electron22/files/patch-electron_shell_common_api_electron__api__native__image.cc b/devel/electron22/files/patch-electron_shell_common_api_electron__api__native__image.cc index b4be1d7ac04b..e4be2fd79b9a 100644 --- a/devel/electron22/files/patch-electron_shell_common_api_electron__api__native__image.cc +++ b/devel/electron22/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 16:58:16 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/electron22/files/patch-electron_shell_common_api_electron__api__native__image.h b/devel/electron22/files/patch-electron_shell_common_api_electron__api__native__image.h index f11704a1c66e..2a848e11e8c4 100644 --- a/devel/electron22/files/patch-electron_shell_common_api_electron__api__native__image.h +++ b/devel/electron22/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 16:58:16 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/electron22/files/patch-electron_shell_common_node__bindings.cc b/devel/electron22/files/patch-electron_shell_common_node__bindings.cc index 69d89a078236..53e80483fb65 100644 --- a/devel/electron22/files/patch-electron_shell_common_node__bindings.cc +++ b/devel/electron22/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 16:58:16 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; +@@ -148,7 +148,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() { +@@ -391,7 +391,7 @@ void NodeBindings::Initialize() { TRACE_EVENT0("electron", "NodeBindings::Initialize"); // Open node's error reporting system for browser process. diff --git a/devel/electron22/files/patch-electron_spec_api-app-spec.ts b/devel/electron22/files/patch-electron_spec_api-app-spec.ts index fa2d8353942f..14f67901ce6d 100644 --- a/devel/electron22/files/patch-electron_spec_api-app-spec.ts +++ b/devel/electron22/files/patch-electron_spec_api-app-spec.ts @@ -1,6 +1,20 @@ ---- electron/spec/api-app-spec.ts.orig 2022-08-10 15:31:37 UTC +--- electron/spec/api-app-spec.ts.orig 2023-01-24 16:58:16 UTC +++ electron/spec/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/electron22/files/patch-electron_spec_api-clipboard-spec.ts b/devel/electron22/files/patch-electron_spec_api-clipboard-spec.ts index bed19567d737..61f81a44ebd1 100644 --- a/devel/electron22/files/patch-electron_spec_api-clipboard-spec.ts +++ b/devel/electron22/files/patch-electron_spec_api-clipboard-spec.ts @@ -1,6 +1,6 @@ ---- electron/spec/api-clipboard-spec.ts.orig 2021-12-03 01:46:05 UTC +--- electron/spec/api-clipboard-spec.ts.orig 2023-01-24 16:58:16 UTC +++ electron/spec/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/electron22/files/patch-electron_spec_api-crash-reporter-spec.ts b/devel/electron22/files/patch-electron_spec_api-crash-reporter-spec.ts index 4f530f3f7ee4..bab22edd08fa 100644 --- a/devel/electron22/files/patch-electron_spec_api-crash-reporter-spec.ts +++ b/devel/electron22/files/patch-electron_spec_api-crash-reporter-spec.ts @@ -1,6 +1,6 @@ ---- electron/spec/api-crash-reporter-spec.ts.orig 2021-12-03 01:46:05 UTC +--- electron/spec/api-crash-reporter-spec.ts.orig 2023-01-24 16:58:16 UTC +++ electron/spec/api-crash-reporter-spec.ts -@@ -12,7 +12,7 @@ const isWindowsOnArm = process.platform === 'win32' && +@@ -12,7 +12,7 @@ import * as fs from 'fs'; import * as uuid from 'uuid'; const isWindowsOnArm = process.platform === 'win32' && process.arch === 'arm64'; @@ -18,6 +18,15 @@ expect(fields.upload_file_minidump.length).to.be.greaterThan(0); } } +@@ -186,7 +186,7 @@ ifdescribe(!isLinuxOnArm && !process.mas && !process.e + + // Ensures that passing in crashpadHandlerPID flag for Linx child processes + // does not affect child proocess args. +- ifit(process.platform === 'linux')('ensure linux child process args are not modified', async () => { ++ ifit(process.platform === 'linux' || process.platform === 'freebsd')('ensure linux child process args are not modified', async () => { + const { port, waitForCrash } = await startServer(); + let exitCode: number | null = null; + const appPath = path.join(__dirname, 'fixtures', 'apps', 'crash'); @@ -535,7 +535,7 @@ ifdescribe(!isLinuxOnArm && !process.mas && !process.e } } diff --git a/devel/electron22/files/patch-electron_spec_api-native-image-spec.ts b/devel/electron22/files/patch-electron_spec_api-native-image-spec.ts index ade73a8e5635..b77bfa124351 100644 --- a/devel/electron22/files/patch-electron_spec_api-native-image-spec.ts +++ b/devel/electron22/files/patch-electron_spec_api-native-image-spec.ts @@ -1,6 +1,6 @@ ---- electron/spec/api-native-image-spec.ts.orig 2021-01-22 23:55:24 UTC +--- electron/spec/api-native-image-spec.ts.orig 2023-01-24 16:58:16 UTC +++ electron/spec/api-native-image-spec.ts -@@ -491,7 +491,7 @@ describe('nativeImage module', () => { +@@ -423,7 +423,7 @@ describe('nativeImage module', () => { }); }); diff --git a/devel/electron22/files/patch-electron_spec_api-net-log-spec.ts b/devel/electron22/files/patch-electron_spec_api-net-log-spec.ts index ce82f5960e0f..9bcca2f67546 100644 --- a/devel/electron22/files/patch-electron_spec_api-net-log-spec.ts +++ b/devel/electron22/files/patch-electron_spec_api-net-log-spec.ts @@ -1,5 +1,5 @@ ---- electron/spec/api-net-log-spec.ts.orig 2022-10-19 17:31:10.000000000 +0200 -+++ electron/spec/api-net-log-spec.ts 2022-12-02 17:47:59.229362000 +0100 +--- electron/spec/api-net-log-spec.ts.orig 2023-01-24 16:58:16 UTC ++++ electron/spec/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/electron22/files/patch-electron_spec_api-power-monitor-spec.ts b/devel/electron22/files/patch-electron_spec_api-power-monitor-spec.ts index 56a5132eb774..21c053f4cd86 100644 --- a/devel/electron22/files/patch-electron_spec_api-power-monitor-spec.ts +++ b/devel/electron22/files/patch-electron_spec_api-power-monitor-spec.ts @@ -1,6 +1,6 @@ ---- electron/spec/api-power-monitor-spec.ts.orig 2022-10-19 17:31:10.000000000 +0200 -+++ electron/spec/api-power-monitor-spec.ts 2022-12-02 17:49:13.141645000 +0100 -@@ -14,7 +14,7 @@ describe('powerMonitor', () => { +--- electron/spec/api-power-monitor-spec.ts.orig 2023-01-24 16:58:16 UTC ++++ electron/spec/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/electron22/files/patch-electron_spec_api-process-spec.ts b/devel/electron22/files/patch-electron_spec_api-process-spec.ts index e558887ac04d..fa4aaff9d16f 100644 --- a/devel/electron22/files/patch-electron_spec_api-process-spec.ts +++ b/devel/electron22/files/patch-electron_spec_api-process-spec.ts @@ -1,5 +1,5 @@ ---- electron/spec/api-process-spec.ts.orig 2022-10-19 17:31:10.000000000 +0200 -+++ electron/spec/api-process-spec.ts 2022-12-02 17:44:33.364867000 +0100 +--- electron/spec/api-process-spec.ts.orig 2023-01-24 16:58:16 UTC ++++ electron/spec/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/electron22/files/patch-electron_spec_api-safe-storage-spec.ts b/devel/electron22/files/patch-electron_spec_api-safe-storage-spec.ts index 25fe037f6665..024c73d6db1b 100644 --- a/devel/electron22/files/patch-electron_spec_api-safe-storage-spec.ts +++ b/devel/electron22/files/patch-electron_spec_api-safe-storage-spec.ts @@ -1,4 +1,4 @@ ---- electron/spec/api-safe-storage-spec.ts.orig 2022-05-18 15:31:32 UTC +--- electron/spec/api-safe-storage-spec.ts.orig 2023-01-24 16:58:16 UTC +++ electron/spec/api-safe-storage-spec.ts @@ -33,7 +33,7 @@ describe('safeStorage module', () => { }); @@ -8,4 +8,4 @@ +ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd')('safeStorage module', () => { after(async () => { const pathToEncryptedString = path.resolve(__dirname, 'fixtures', 'api', 'safe-storage', 'encrypted.txt'); - if (fs.existsSync(pathToEncryptedString)) { + if (await fs.pathExists(pathToEncryptedString)) { diff --git a/devel/electron22/files/patch-electron_spec_api-screen-spec.ts b/devel/electron22/files/patch-electron_spec_api-screen-spec.ts index 6262a2f62326..d9e5dea67a71 100644 --- a/devel/electron22/files/patch-electron_spec_api-screen-spec.ts +++ b/devel/electron22/files/patch-electron_spec_api-screen-spec.ts @@ -1,4 +1,4 @@ ---- electron/spec/api-screen-spec.ts.orig 2021-04-20 23:32:33 UTC +--- electron/spec/api-screen-spec.ts.orig 2023-01-24 16:58:16 UTC +++ electron/spec/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/electron22/files/patch-electron_spec_api-shell-spec.ts b/devel/electron22/files/patch-electron_spec_api-shell-spec.ts index 46cbe8a55e3f..f5982b587ca5 100644 --- a/devel/electron22/files/patch-electron_spec_api-shell-spec.ts +++ b/devel/electron22/files/patch-electron_spec_api-shell-spec.ts @@ -1,6 +1,6 @@ ---- electron/spec/api-shell-spec.ts.orig 2021-10-27 21:25:28 UTC +--- electron/spec/api-shell-spec.ts.orig 2023-01-24 16:58:16 UTC +++ electron/spec/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/electron22/files/patch-electron_spec_api-utility-process-spec.ts b/devel/electron22/files/patch-electron_spec_api-utility-process-spec.ts new file mode 100644 index 000000000000..e7b7e5f91537 --- /dev/null +++ b/devel/electron22/files/patch-electron_spec_api-utility-process-spec.ts @@ -0,0 +1,11 @@ +--- electron/spec/api-utility-process-spec.ts.orig 2023-01-24 16:58:16 UTC ++++ electron/spec/api-utility-process-spec.ts +@@ -308,7 +308,7 @@ describe('utilityProcess module', () => { + await closeWindow(w); + }); + +- ifit(process.platform === 'linux')('allows executing a setuid binary with child_process', async () => { ++ ifit(process.platform === 'linux' || process.platform === 'freebsd')('allows executing a setuid binary with child_process', async () => { + const child = utilityProcess.fork(path.join(fixturesPath, 'suid.js')); + await emittedOnce(child, 'spawn'); + const [data] = await emittedOnce(child, 'message'); diff --git a/devel/electron22/files/patch-electron_spec_api-web-frame-spec.ts b/devel/electron22/files/patch-electron_spec_api-web-frame-main-spec.ts index b98f3efa11a6..c862b1d1a83b 100644 --- a/devel/electron22/files/patch-electron_spec_api-web-frame-spec.ts +++ b/devel/electron22/files/patch-electron_spec_api-web-frame-main-spec.ts @@ -1,6 +1,6 @@ ---- electron/spec/api-web-frame-main-spec.ts.orig 2022-05-18 15:31:32 UTC +--- electron/spec/api-web-frame-main-spec.ts.orig 2023-01-24 16:58:16 UTC +++ electron/spec/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/electron22/files/patch-electron_spec_chromium-spec.ts b/devel/electron22/files/patch-electron_spec_chromium-spec.ts index 7e9612780497..e9d4674dc7af 100644 --- a/devel/electron22/files/patch-electron_spec_chromium-spec.ts +++ b/devel/electron22/files/patch-electron_spec_chromium-spec.ts @@ -1,11 +1,53 @@ ---- electron/spec/chromium-spec.ts.orig 2022-10-19 17:31:10.000000000 +0200 -+++ electron/spec/chromium-spec.ts 2022-12-02 17:46:26.770558000 +0100 -@@ -1761,7 +1761,7 @@ describe('chromium features', () => { +--- electron/spec/chromium-spec.ts.orig 2023-01-24 16:58:16 UTC ++++ electron/spec/chromium-spec.ts +@@ -427,13 +427,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', () => { +@@ -2027,7 +2027,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'); +@@ -2242,12 +2242,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> +@@ -2594,7 +2594,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/electron22/files/patch-electron_spec_crash-spec.ts b/devel/electron22/files/patch-electron_spec_crash-spec.ts new file mode 100644 index 000000000000..397633235ff2 --- /dev/null +++ b/devel/electron22/files/patch-electron_spec_crash-spec.ts @@ -0,0 +1,11 @@ +--- electron/spec/crash-spec.ts.orig 2023-01-24 16:58:16 UTC ++++ electron/spec/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/electron22/files/patch-electron_spec_node-spec.ts b/devel/electron22/files/patch-electron_spec_node-spec.ts new file mode 100644 index 000000000000..a7b7c7e74ca3 --- /dev/null +++ b/devel/electron22/files/patch-electron_spec_node-spec.ts @@ -0,0 +1,11 @@ +--- electron/spec/node-spec.ts.orig 2023-01-24 16:58:16 UTC ++++ electron/spec/node-spec.ts +@@ -138,7 +138,7 @@ describe('node feature', () => { + }); + + describe('child_process.exec', () => { +- ifit(process.platform === 'linux')('allows executing a setuid binary from non-sandboxed renderer', async () => { ++ ifit(process.platform === 'linux' || process.platform === 'freebsd')('allows executing a setuid binary from non-sandboxed renderer', async () => { + // Chrome uses prctl(2) to set the NO_NEW_PRIVILEGES flag on Linux (see + // https://github.com/torvalds/linux/blob/40fde647cc/Documentation/userspace-api/no_new_privs.rst). + // We disable this for unsandboxed processes, which the renderer tests diff --git a/devel/electron22/files/patch-electron_spec_version-bump-spec.ts b/devel/electron22/files/patch-electron_spec_version-bump-spec.ts index 80cd2eb90704..b21840512b7c 100644 --- a/devel/electron22/files/patch-electron_spec_version-bump-spec.ts +++ b/devel/electron22/files/patch-electron_spec_version-bump-spec.ts @@ -1,6 +1,6 @@ ---- electron/spec/version-bump-spec.ts.orig 2021-11-15 23:45:07 UTC +--- electron/spec/version-bump-spec.ts.orig 2023-01-24 16:58:16 UTC +++ electron/spec/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/electron22/files/patch-electron_spec_webview-spec.ts b/devel/electron22/files/patch-electron_spec_webview-spec.ts index 2eaf84b7fadb..75004d5fed55 100644 --- a/devel/electron22/files/patch-electron_spec_webview-spec.ts +++ b/devel/electron22/files/patch-electron_spec_webview-spec.ts @@ -1,6 +1,6 @@ ---- electron/spec/webview-spec.ts.orig 2022-08-03 15:31:58 UTC +--- electron/spec/webview-spec.ts.orig 2023-01-24 16:58:16 UTC +++ electron/spec/webview-spec.ts -@@ -482,7 +482,7 @@ describe('<webview> tag', function () { +@@ -526,7 +526,7 @@ describe('<webview> tag', function () { }); // FIXME(zcbenz): Fullscreen events do not work on Linux. diff --git a/devel/electron22/files/patch-media_audio_BUILD.gn b/devel/electron22/files/patch-media_audio_BUILD.gn index 19363713f727..05e0983d3de9 100644 --- a/devel/electron22/files/patch-media_audio_BUILD.gn +++ b/devel/electron22/files/patch-media_audio_BUILD.gn @@ -1,6 +1,6 @@ ---- media/audio/BUILD.gn.orig 2022-11-30 08:12:58 UTC +--- media/audio/BUILD.gn.orig 2023-01-30 07:58:58 UTC +++ media/audio/BUILD.gn -@@ -259,9 +259,20 @@ source_set("audio") { +@@ -265,9 +265,20 @@ source_set("audio") { ] } diff --git a/devel/electron22/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc b/devel/electron22/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc index a0a2737ec752..4b5124324bc3 100644 --- a/devel/electron22/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc +++ b/devel/electron22/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-11-30 08:12:58 UTC +--- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2023-01-30 07:58:59 UTC +++ third_party/blink/renderer/core/exported/web_view_impl.cc -@@ -408,7 +408,7 @@ SkFontHinting RendererPreferencesToSkiaHinting( +@@ -409,7 +409,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' -@@ -3278,7 +3278,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs +@@ -3280,7 +3280,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/electron22/files/patch-third__party_boringssl_BUILD.gn b/devel/electron22/files/patch-third__party_boringssl_BUILD.gn index 990e5f02025e..4d22797689b4 100644 --- a/devel/electron22/files/patch-third__party_boringssl_BUILD.gn +++ b/devel/electron22/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-01-30 07:58:58 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/electron22/files/patch-third__party_zlib_BUILD.gn b/devel/electron22/files/patch-third__party_zlib_BUILD.gn index 432ffb7ffd27..d2b0a557b13a 100644 --- a/devel/electron22/files/patch-third__party_zlib_BUILD.gn +++ b/devel/electron22/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-01-30 07:58:59 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/electron22/files/patch-ui_color_color__id.h b/devel/electron22/files/patch-ui_color_color__id.h index aa7d71d35d47..81b24063f60a 100644 --- a/devel/electron22/files/patch-ui_color_color__id.h +++ b/devel/electron22/files/patch-ui_color_color__id.h @@ -1,6 +1,6 @@ ---- ui/color/color_id.h.orig 2022-11-30 08:12:58 UTC +--- ui/color/color_id.h.orig 2023-01-30 07:58:59 UTC +++ ui/color/color_id.h -@@ -351,7 +351,7 @@ +@@ -356,7 +356,7 @@ E_CPONLY(kColorNativeColor6) \ E_CPONLY(kColorNativeBaseColor) \ E_CPONLY(kColorNativeSecondaryColor) diff --git a/devel/electron22/files/patch-ui_compositor_compositor.h b/devel/electron22/files/patch-ui_compositor_compositor.h index 6c80e6709082..bf672bb0d4e9 100644 --- a/devel/electron22/files/patch-ui_compositor_compositor.h +++ b/devel/electron22/files/patch-ui_compositor_compositor.h @@ -1,6 +1,6 @@ ---- ui/compositor/compositor.h.orig 2022-11-30 08:12:58 UTC +--- ui/compositor/compositor.h.orig 2023-01-30 07:58:58 UTC +++ ui/compositor/compositor.h -@@ -420,7 +420,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe +@@ -434,7 +434,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/electron22/files/patch-ui_gfx_switches.cc b/devel/electron22/files/patch-ui_gfx_switches.cc index 3f5285b48ac9..b1b89ec689d0 100644 --- a/devel/electron22/files/patch-ui_gfx_switches.cc +++ b/devel/electron22/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-01-30 07:58:58 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/electron22/files/patch-ui_gfx_switches.h b/devel/electron22/files/patch-ui_gfx_switches.h index 0bacccff8c67..214c6ad9a8de 100644 --- a/devel/electron22/files/patch-ui_gfx_switches.h +++ b/devel/electron22/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-01-30 07:58:58 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/electron22/files/patch-ui_gtk_gtk__compat.cc b/devel/electron22/files/patch-ui_gtk_gtk__compat.cc index dd8067f62f6d..5edb25bf4dc7 100644 --- a/devel/electron22/files/patch-ui_gtk_gtk__compat.cc +++ b/devel/electron22/files/patch-ui_gtk_gtk__compat.cc @@ -1,46 +1,53 @@ ---- ui/gtk/gtk_compat.cc.orig 2022-02-07 13:39:41 UTC +--- ui/gtk/gtk_compat.cc.orig 2023-01-30 07:58:59 UTC +++ ui/gtk/gtk_compat.cc -@@ -62,22 +62,39 @@ void* GetLibGio() { +@@ -62,22 +62,38 @@ auto DlCast(void* symbol) { } void* GetLibGio() { -- static void* libgio = DlOpen("libgio-2.0.so.0"); +#if defined(OS_BSD) + static void* libgio = DlOpen("libgio-2.0.so"); +#else -+ static void* libgio = DlOpen("libgio-2.0.so.0"); + static void* libgio = DlOpen("libgio-2.0.so.0"); +#endif return libgio; } void* GetLibGdk3() { -- static void* libgdk3 = DlOpen("libgdk-3.so.0"); +#if defined(OS_BSD) + static void* libgdk3 = DlOpen("libgdk-3.so"); +#else -+ static void* libgdk3 = DlOpen("libgdk-3.so.0"); + static void* libgdk3 = DlOpen("libgdk-3.so.0"); +#endif return libgdk3; } void* GetLibGtk3(bool check = true) { -- static void* libgtk3 = DlOpen("libgtk-3.so.0", check); +#if defined(OS_BSD) + static void* libgtk3 = DlOpen("libgtk-3.so", check); +#else -+ static void* libgtk3 = DlOpen("libgtk-3.so.0", check); + static void* libgtk3 = DlOpen("libgtk-3.so.0", check); +#endif return libgtk3; } void* GetLibGtk4(bool check = true) { -- static void* libgtk4 = DlOpen("libgtk-4.so.1", check); +#if defined(OS_BSD) + static void* libgtk4 = DlOpen("libgtk-4.so", check); +#else -+ static void* libgtk4 = DlOpen("libgtk-4.so.1", check); + static void* libgtk4 = DlOpen("libgtk-4.so.1", check); +#endif -+ 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/electron22/files/patch-ui_gtk_printing_print__dialog__gtk.cc b/devel/electron22/files/patch-ui_gtk_printing_print__dialog__gtk.cc index 8f7d319d4fa2..ef0884307f8b 100644 --- a/devel/electron22/files/patch-ui_gtk_printing_print__dialog__gtk.cc +++ b/devel/electron22/files/patch-ui_gtk_printing_print__dialog__gtk.cc @@ -1,6 +1,6 @@ ---- ui/gtk/printing/print_dialog_gtk.cc.orig 2022-11-30 08:12:58 UTC +--- ui/gtk/printing/print_dialog_gtk.cc.orig 2023-01-30 07:58:59 UTC +++ ui/gtk/printing/print_dialog_gtk.cc -@@ -400,7 +400,7 @@ void PrintDialogGtk::ShowDialog( +@@ -418,7 +418,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/electron22/files/patch-ui_ozone_platform_x11_ozone__platform__x11.cc b/devel/electron22/files/patch-ui_ozone_platform_x11_ozone__platform__x11.cc index 98f2fa4310a8..8397dddd3934 100644 --- a/devel/electron22/files/patch-ui_ozone_platform_x11_ozone__platform__x11.cc +++ b/devel/electron22/files/patch-ui_ozone_platform_x11_ozone__platform__x11.cc @@ -1,6 +1,6 @@ ---- ui/ozone/platform/x11/ozone_platform_x11.cc.orig 2022-11-30 08:12:58 UTC +--- ui/ozone/platform/x11/ozone_platform_x11.cc.orig 2023-01-30 07:58:59 UTC +++ ui/ozone/platform/x11/ozone_platform_x11.cc -@@ -195,7 +195,7 @@ class OzonePlatformX11 : public OzonePlatform, +@@ -196,7 +196,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/electron22/files/patch-ui_ozone_public_ozone__platform.h b/devel/electron22/files/patch-ui_ozone_public_ozone__platform.h index 36b6a8aea101..ee5b94eacbe0 100644 --- a/devel/electron22/files/patch-ui_ozone_public_ozone__platform.h +++ b/devel/electron22/files/patch-ui_ozone_public_ozone__platform.h @@ -1,6 +1,6 @@ ---- ui/ozone/public/ozone_platform.h.orig 2022-11-30 08:12:58 UTC +--- ui/ozone/public/ozone_platform.h.orig 2023-01-30 07:58:59 UTC +++ ui/ozone/public/ozone_platform.h -@@ -144,7 +144,7 @@ class COMPONENT_EXPORT(OZONE) OzonePlatform { +@@ -148,7 +148,7 @@ class COMPONENT_EXPORT(OZONE) OzonePlatform { // back via gpu extra info. bool fetch_buffer_formats_for_gmb_on_gpu = false; diff --git a/devel/electron22/files/patch-v8_BUILD.gn b/devel/electron22/files/patch-v8_BUILD.gn index 52a8c0d21bac..754517bf4bf7 100644 --- a/devel/electron22/files/patch-v8_BUILD.gn +++ b/devel/electron22/files/patch-v8_BUILD.gn @@ -1,6 +1,6 @@ ---- v8/BUILD.gn.orig 2022-11-30 08:12:58 UTC +--- v8/BUILD.gn.orig 2023-01-30 07:58:59 UTC +++ v8/BUILD.gn -@@ -1242,6 +1242,14 @@ config("toolchain") { +@@ -1246,6 +1246,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. -@@ -5481,7 +5489,7 @@ v8_component("v8_libbase") { +@@ -5485,7 +5493,7 @@ v8_component("v8_libbase") { } } @@ -24,7 +24,7 @@ sources += [ "src/base/debug/stack_trace_posix.cc", "src/base/platform/platform-linux.cc", -@@ -5492,6 +5500,18 @@ v8_component("v8_libbase") { +@@ -5496,6 +5504,18 @@ v8_component("v8_libbase") { "dl", "rt", ] diff --git a/devel/electron22/files/yarn.lock b/devel/electron22/files/yarn.lock index 0fcc08de1120..482276477764 100644 --- a/devel/electron22/files/yarn.lock +++ b/devel/electron22/files/yarn.lock @@ -126,6 +126,44 @@ ora "^4.0.3" pretty-ms "^5.1.0" +"@electron/fiddle-core@^1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@electron/fiddle-core/-/fiddle-core-1.0.4.tgz#d28e330c4d88f3916269558a43d214c4312333af" + integrity sha512-gjPz3IAHK+/f0N52cWVeTZpdgENJo3QHBGeGqMDHFUgzSBRTVyAr8z8Lw8wpu6Ocizs154Rtssn4ba1ysABgLA== + dependencies: + "@electron/get" "^2.0.0" + debug "^4.3.3" + env-paths "^2.2.1" + extract-zip "^2.0.1" + fs-extra "^10.0.0" + getos "^3.2.1" + node-fetch "^2.6.1" + semver "^7.3.5" + simple-git "^3.5.0" + +"@electron/get@^2.0.0": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@electron/get/-/get-2.0.2.tgz#ae2a967b22075e9c25aaf00d5941cd79c21efd7e" + integrity sha512-eFZVFoRXb3GFGd7Ak7W4+6jBl9wBtiZ4AaYOse97ej6mKj5tkyO0dUnUChs1IhJZtx1BENo4/p4WUTXpi6vT+g== + dependencies: + debug "^4.1.1" + env-paths "^2.2.0" + fs-extra "^8.1.0" + got "^11.8.5" + progress "^2.0.3" + semver "^6.2.0" + sumchecker "^3.0.1" + optionalDependencies: + global-agent "^3.0.0" + +"@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" @@ -182,6 +220,18 @@ "@jridgewell/resolve-uri" "^3.0.3" "@jridgewell/sourcemap-codec" "^1.4.10" +"@kwsites/file-exists@^1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@kwsites/file-exists/-/file-exists-1.1.1.tgz#ad1efcac13e1987d8dbaf235ef3be5b0d96faa99" + integrity sha512-m9/5YGR18lIwxSFDwfE3oA7bWuq9kdau6ugN4H2rJeyhFQZcG9AgSHkQtSD15a8WvTgfz9aikZMrKPHvbpqFiw== + dependencies: + debug "^4.1.1" + +"@kwsites/promise-deferred@^1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@kwsites/promise-deferred/-/promise-deferred-1.1.1.tgz#8ace5259254426ccef57f3175bc64ed7095ed919" + integrity sha512-GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw== + "@nodelib/fs.scandir@2.1.3": version "2.1.3" resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz#3a582bdb53804c6ba6d146579c46e52130cf4a3b" @@ -203,20 +253,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" @@ -224,6 +333,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" @@ -236,6 +352,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" @@ -245,6 +374,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" @@ -254,6 +392,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" @@ -266,6 +462,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" @@ -274,6 +475,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" @@ -283,6 +492,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" @@ -297,6 +524,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" @@ -307,6 +558,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" @@ -314,6 +575,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" @@ -365,6 +640,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" @@ -800,6 +1080,13 @@ tapable "^2.2.0" webpack "^5" +"@types/yauzl@^2.9.1": + version "2.10.0" + resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.10.0.tgz#b3248295276cf8c6f153ebe6a9aba0c988cb2599" + integrity sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw== + dependencies: + "@types/node" "*" + "@typescript-eslint/eslint-plugin@^4.4.1": version "4.4.1" resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.4.1.tgz#b8acea0373bd2a388ac47df44652f00bf8b368f5" @@ -1216,6 +1503,11 @@ astral-regex@^2.0.0: resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== +async@^3.2.0: + version "3.2.4" + resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c" + integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ== + asynckit@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" @@ -1266,6 +1558,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" @@ -1292,6 +1589,11 @@ body-parser@1.19.0: raw-body "2.4.0" type-is "~1.6.17" +boolean@^3.0.1: + version "3.2.0" + resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.2.0.tgz#9e5294af4e98314494cbb17979fa54ca159f116b" + integrity sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw== + brace-expansion@^1.1.7: version "1.1.11" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" @@ -1317,6 +1619,16 @@ browserslist@^4.14.5: node-releases "^2.0.6" update-browserslist-db "^1.0.4" +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-crc32@~0.2.3: + version "0.2.13" + resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" + integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ== + 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" @@ -1771,6 +2083,13 @@ debug@^4.0.1, debug@^4.1.1: dependencies: ms "^2.1.1" +debug@^4.1.0, debug@^4.3.3, debug@^4.3.4: + version "4.3.4" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" + integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== + dependencies: + ms "2.1.2" + decompress-response@^3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3" @@ -1863,6 +2182,11 @@ destroy@~1.0.4: resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= +detect-node@^2.0.4: + version "2.1.0" + resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" + integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== + diff@^3.1.0: version "3.5.0" resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12" @@ -2019,6 +2343,11 @@ entities@~2.0.0: resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.0.tgz#68d6084cab1b079767540d80e56a39b423e4abf4" integrity sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw== +env-paths@^2.2.0, env-paths@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2" + integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A== + envinfo@^7.7.3: version "7.8.1" resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475" @@ -2090,6 +2419,11 @@ es-to-primitive@^1.2.1: is-date-object "^1.0.1" is-symbol "^1.0.2" +es6-error@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d" + integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg== + es6-object-assign@^1.0.3: version "1.1.0" resolved "https://registry.yarnpkg.com/es6-object-assign/-/es6-object-assign-1.1.0.tgz#c2c3582656247c39ea107cb1e6652b6f9f24523c" @@ -2110,6 +2444,11 @@ escape-string-regexp@^1.0.5: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= +escape-string-regexp@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" + integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== + eslint-config-standard-jsx@8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/eslint-config-standard-jsx/-/eslint-config-standard-jsx-8.1.0.tgz#314c62a0e6f51f75547f89aade059bec140edfc7" @@ -2556,6 +2895,17 @@ external-editor@^3.0.3: iconv-lite "^0.4.24" tmp "^0.0.33" +extract-zip@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a" + integrity sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg== + dependencies: + debug "^4.1.1" + get-stream "^5.1.0" + yauzl "^2.10.0" + optionalDependencies: + "@types/yauzl" "^2.9.1" + fast-deep-equal@^3.1.1: version "3.1.3" resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" @@ -2602,6 +2952,13 @@ fault@^2.0.0: dependencies: format "^0.2.0" +fd-slicer@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e" + integrity sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g== + dependencies: + pend "~1.2.0" + figgy-pudding@^3.5.1: version "3.5.2" resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e" @@ -2724,6 +3081,15 @@ fresh@0.5.2: resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= +fs-extra@^10.0.0: + version "10.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf" + integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ== + dependencies: + graceful-fs "^4.2.0" + jsonfile "^6.0.1" + universalify "^2.0.0" + fs-extra@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9" @@ -2813,6 +3179,13 @@ get-stream@^5.0.0, get-stream@^5.1.0: dependencies: pump "^3.0.0" +getos@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/getos/-/getos-3.2.1.tgz#0134d1f4e00eb46144c5a9c0ac4dc087cbb27dc5" + integrity sha512-U56CfOK17OKgTVqozZjUKNdkfEv6jk5WISBJ8SHoagjE6L69zOwl3Z+O8myjY9MEW3i2HPWQBt/LTbCgcC973Q== + dependencies: + async "^3.2.0" + glob-parent@^5.0.0, glob-parent@^5.1.0: version "5.1.1" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229" @@ -2856,6 +3229,18 @@ glob@~7.1.6: once "^1.3.0" path-is-absolute "^1.0.0" +global-agent@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz#ae7cd31bd3583b93c5a16437a1afe27cc33a1ab6" + integrity sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q== + dependencies: + boolean "^3.0.1" + es6-error "^4.1.1" + matcher "^3.0.0" + roarr "^2.15.3" + semver "^7.3.2" + serialize-error "^7.0.1" + globals@^12.1.0: version "12.4.0" resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8" @@ -2863,6 +3248,13 @@ globals@^12.1.0: dependencies: type-fest "^0.8.1" +globalthis@^1.0.1: + version "1.0.3" + resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf" + integrity sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA== + dependencies: + define-properties "^1.1.3" + globby@^11.0.0, globby@^11.0.1: version "11.0.1" resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.1.tgz#9a2bf107a068f3ffeabc49ad702c79ede8cfd357" @@ -3281,6 +3673,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" @@ -3404,6 +3801,11 @@ json-stable-stringify-without-jsonify@^1.0.1: resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE= +json-stringify-safe@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" + integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA== + json5@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" @@ -3859,6 +4261,13 @@ matcher-collection@^1.0.0: dependencies: minimatch "^3.0.2" +matcher@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz#bd9060f4c5b70aa8041ccc6f80368760994f30ca" + integrity sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng== + dependencies: + escape-string-regexp "^4.0.0" + mdast-comment-marker@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/mdast-comment-marker/-/mdast-comment-marker-1.1.1.tgz#9c9c18e1ed57feafc1965d92b028f37c3c8da70d" @@ -4267,6 +4676,13 @@ node-fetch@^2.3.0, node-fetch@^2.6.7: dependencies: whatwg-url "^5.0.0" +node-fetch@^2.6.1: + version "2.6.8" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.8.tgz#a68d30b162bc1d8fd71a367e81b997e1f4d4937e" + integrity sha512-RZ6dBYuj8dRSfxpUSu+NsdF1dpPpluJxwOp+6IoDp/sH2QNDSvurYsAa+F1WxY2RjA1iP93xhcsUoYbF2XBqVg== + dependencies: + whatwg-url "^5.0.0" + node-releases@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503" @@ -4639,6 +5055,11 @@ pathval@^1.1.0: resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.1.tgz#8534e77a77ce7ac5a2512ea21e0fdb8fcf6c3d8d" integrity sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ== +pend@~1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" + integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg== + picocolors@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" @@ -5579,6 +6000,18 @@ rimraf@~2.2.6: resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.2.8.tgz#e439be2aaee327321952730f99a8929e4fc50582" integrity sha1-5Dm+Kq7jJzIZUnMPmaiSnk/FBYI= +roarr@^2.15.3: + version "2.15.4" + resolved "https://registry.yarnpkg.com/roarr/-/roarr-2.15.4.tgz#f5fe795b7b838ccfe35dc608e0282b9eba2e7afd" + integrity sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A== + dependencies: + boolean "^3.0.1" + detect-node "^2.0.4" + globalthis "^1.0.1" + json-stringify-safe "^5.0.1" + semver-compare "^1.0.0" + sprintf-js "^1.1.2" + run-async@^2.4.0: version "2.4.1" resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455" @@ -5659,7 +6092,7 @@ semver@^6.0.0: resolved "https://registry.yarnpkg.com/semver/-/semver-6.2.0.tgz#4d813d9590aaf8a9192693d6c85b9344de5901db" integrity sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A== -semver@^6.1.0, semver@^6.1.2: +semver@^6.1.0, semver@^6.1.2, semver@^6.2.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== @@ -5676,6 +6109,13 @@ semver@^7.2.1, semver@^7.3.2: resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938" integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ== +semver@^7.3.5: + version "7.3.8" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798" + integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A== + dependencies: + lru-cache "^6.0.0" + send@0.17.1: version "0.17.1" resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" @@ -5695,6 +6135,13 @@ send@0.17.1: range-parser "~1.2.1" statuses "~1.5.0" +serialize-error@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-7.0.1.tgz#f1360b0447f61ffb483ec4157c737fab7d778e18" + integrity sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw== + dependencies: + type-fest "^0.13.1" + serialize-javascript@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8" @@ -5771,6 +6218,15 @@ signal-exit@^3.0.2: resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== +simple-git@^3.5.0: + version "3.15.1" + resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-3.15.1.tgz#57f595682cb0c2475d5056da078a05c8715a25ef" + integrity sha512-73MVa5984t/JP4JcQt0oZlKGr42ROYWC3BcUZfuHtT3IHKPspIvL0cZBnvPXF7LL3S/qVeVHVdYYmJ3LOTw4Rg== + dependencies: + "@kwsites/file-exists" "^1.1.1" + "@kwsites/promise-deferred" "^1.1.1" + debug "^4.3.4" + slash@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" @@ -5855,6 +6311,11 @@ spdx-license-ids@^3.0.0: resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz#75ecd1a88de8c184ef015eafb51b5b48bfd11bb1" integrity sha512-7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA== +sprintf-js@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673" + integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug== + sprintf-js@~1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" @@ -6026,6 +6487,13 @@ strip-json-comments@~2.0.1: resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= +sumchecker@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/sumchecker/-/sumchecker-3.0.1.tgz#6377e996795abb0b6d348e9b3e1dfb24345a8e42" + integrity sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg== + dependencies: + debug "^4.1.0" + supports-color@^5.3.0: version "5.5.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" @@ -6301,6 +6769,11 @@ type-fest@^0.11.0: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1" integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ== +type-fest@^0.13.1: + version "0.13.1" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934" + integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg== + type-fest@^0.3.0: version "0.3.1" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.3.1.tgz#63d00d204e059474fe5e1b7c011112bbd1dc29e1" @@ -6492,6 +6965,11 @@ universalify@^1.0.0: resolved "https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz#b61a1da173e8435b2fe3c67d29b9adf8594bd16d" integrity sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug== +universalify@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" + integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ== + unpipe@1.0.0, unpipe@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" @@ -6829,6 +7307,14 @@ yaml@^1.7.2: resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.0.tgz#3b593add944876077d4d683fee01081bd9fff31e" integrity sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg== +yauzl@^2.10.0: + version "2.10.0" + resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" + integrity sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g== + dependencies: + buffer-crc32 "~0.2.3" + fd-slicer "~1.1.0" + yn@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/yn/-/yn-2.0.0.tgz#e5adabc8acf408f6385fc76495684c88e6af689a" |