Attachment #239826 for bug #269194

View | Details | Raw Unified | Return to bug 269194
Collapse All | Expand All




DISTVERSIONPREFIX=	v
DISTVERSION=	${ELECTRON_VER:S/-beta./.b/}
CATEGORIES=	devel
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}

PLIST_SUB=	ELECTRON_VER=${ELECTRON_VER} \
		ELECTRON_VER_MAJOR=${ELECTRON_VER_MAJOR}

OPTIONS_DEFINE=		CODECS CUPS DEBUG DIST DRIVER KERBEROS LTO
OPTIONS_DEFAULT=	CODECS CUPS DRIVER KERBEROS SNDIO
OPTIONS_EXCLUDE_aarch64=LTO
OPTIONS_GROUP=		AUDIO

SNDIO_VARS_OFF=		GN_ARGS+=use_sndio=false

# See ${WRKSRC}/electron/DEPS for CHROMIUM_VER
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

# See ${WRKSRC}/electron/DEPS for MANTLE_VER
MANTLE_VER=			78d3966b3c331292ea29ec38661b25df0a245948

YARN_TIMESTAMP=	1675054791

.include "Makefile.version"
.include <bsd.port.pre.mk>

		${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}

Lines 1-2 Link Here

(-)b/devel/electron22/Makefile.version (-1 / +1 lines)
1	ELECTRON_VER= 22.0.1	1	ELECTRON_VER= 22.1.0
2	ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//}	2	ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//}

Lines 1-12 Link Here

(-)b/devel/electron22/distinfo (-7 / +9 lines)
1	TIMESTAMP = 1674205773	1	TIMESTAMP = 1675056031
2	SHA256 (electron/chromium-108.0.5359.125.tar.xz) = 16e26bef292f99efbb72559990f6383f1d39cb20bfa38450fbcd6c7cf88b0a59	2	SHA256 (electron/chromium-108.0.5359.179.tar.xz) = 5e0e06cf8b43091347d908b651a919d5b94cdde2178d5e175dad4e2a75cf4ac8
3	SIZE (electron/chromium-108.0.5359.125.tar.xz) = 1731584944	3	SIZE (electron/chromium-108.0.5359.179.tar.xz) = 1584561116
		4	SHA256 (electron/f8b5da24d33317766d3933fb6711b0603fc4fb6f) = 63706737ca75e0e5c97885186b2a7ab019ca71d1315ee08870193bbfa7486bfc
		5	SIZE (electron/f8b5da24d33317766d3933fb6711b0603fc4fb6f) = 9900677
4	SHA256 (electron/336e775eec536b2d785cc80eff6ac39051931286) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8	6	SHA256 (electron/336e775eec536b2d785cc80eff6ac39051931286) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
5	SIZE (electron/336e775eec536b2d785cc80eff6ac39051931286) = 32624734	7	SIZE (electron/336e775eec536b2d785cc80eff6ac39051931286) = 32624734
6	SHA256 (electron/electron-yarn-cache-22.0.1.tar.xz) = 404b61b615f680868d00d05a8214103aa3e7f1779d4452cc2c9db55b782a955c	8	SHA256 (electron/electron-yarn-cache-22.1.0.tar.xz) = 8120999809490d73c9291295ffebaa49dcad2e4427720a773040f4a593e0cc50
7	SIZE (electron/electron-yarn-cache-22.0.1.tar.xz) = 36702856	9	SIZE (electron/electron-yarn-cache-22.1.0.tar.xz) = 38469072
8	SHA256 (electron/electron-electron-v22.0.1_GH0.tar.gz) = c6bdbd95549e59c7a16707906b67e2999107e5d61e398dc6429db2c83181c5e7	10	SHA256 (electron/electron-electron-v22.1.0_GH0.tar.gz) = 9bd7fb2aa96402312f97111231cf343ce806b466fba1fc3e2e1a708a0ca0cbf6
9	SIZE (electron/electron-electron-v22.0.1_GH0.tar.gz) = 10500431	11	SIZE (electron/electron-electron-v22.1.0_GH0.tar.gz) = 10510560
10	SHA256 (electron/nodejs-node-v16.17.1_GH0.tar.gz) = e63378aa6aa18b9e05486e46eaca6c6e09904366e5100d7e04c6dbd344a42f60	12	SHA256 (electron/nodejs-node-v16.17.1_GH0.tar.gz) = e63378aa6aa18b9e05486e46eaca6c6e09904366e5100d7e04c6dbd344a42f60
11	SIZE (electron/nodejs-node-v16.17.1_GH0.tar.gz) = 90485310	13	SIZE (electron/nodejs-node-v16.17.1_GH0.tar.gz) = 90485310
12	SHA256 (electron/nodejs-nan-16fa32231e2ccd89d2804b3f765319128b20c4ac_GH0.tar.gz) = 3807ae6a1e451a29f068540472f100f9718d457c60ac62f2f8469d1d57475d39	14	SHA256 (electron/nodejs-nan-16fa32231e2ccd89d2804b3f765319128b20c4ac_GH0.tar.gz) = 3807ae6a1e451a29f068540472f100f9718d457c60ac62f2f8469d1d57475d39

Lines 6-13 Link Here

(-)b/devel/electron22/files/package.json (-2 / +4 lines)
6	"devDependencies": {	6	"devDependencies": {
7	"@azure/storage-blob": "^12.9.0",	7	"@azure/storage-blob": "^12.9.0",
8	"@electron/docs-parser": "^1.0.0",	8	"@electron/docs-parser": "^1.0.0",
		9	"@electron/fiddle-core": "^1.0.4",
		10	"@electron/github-app-auth": "^1.5.0",
9	"@electron/typescript-definitions": "^8.10.0",	11	"@electron/typescript-definitions": "^8.10.0",
10	"@octokit/auth-app": "^2.10.0",
11	"@octokit/rest": "^18.0.3",	12	"@octokit/rest": "^18.0.3",
12	"@primer/octicons": "^10.0.0",	13	"@primer/octicons": "^10.0.0",
13	"@types/basic-auth": "^1.1.3",	14	"@types/basic-auth": "^1.1.3",
Lines 142-148 Link Here
142	"ts-node script/check-patch-diff.ts"	143	"ts-node script/check-patch-diff.ts"
143	],	144	],
144	"DEPS": [	145	"DEPS": [
145	"node script/gen-hunspell-filenames.js"	146	"node script/gen-hunspell-filenames.js",
		147	"node script/gen-libc++-filenames.js"
146	]	148	]
147	},	149	},
148	"resolutions": {	150	"resolutions": {




--- BUILD.gn.orig	2023-01-30 07:58:58 UTC
+++ BUILD.gn
@@ -59,7 +59,7 @@ declare_args() {
   root_extra_deps = []

     deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
   }
 
@@ -1110,7 +1118,7 @@ if (!is_ios) {
     ]
   }
 

     # WPT Webdriver tests runner
     # chrome/test/chromedriver/test/run_webdriver_tests.py
     script_test("webdriver_wpt_tests") {
@@ -1205,7 +1213,7 @@ if (!is_ios) {
       data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ]
     }
 

       data_deps +=
           [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
     }
@@ -1214,7 +1222,7 @@ if (!is_ios) {
       data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
     }
 

       data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
     }
 
@@ -1658,7 +1666,7 @@ group("chromium_builder_perf") {
       data_deps += [ "//chrome/test:performance_browser_tests" ]
     }
 




--- build/config/BUILDCONFIG.gn.orig	2023-01-30 07:58:58 UTC
+++ build/config/BUILDCONFIG.gn
@@ -139,7 +139,8 @@ declare_args() {
   is_official_build = false
 
   # Set to true when compiling with the Clang compiler.

              (current_cpu != "s390x" && current_cpu != "s390" &&
               current_cpu != "ppc64" && current_cpu != "ppc" &&
               current_cpu != "mips" && current_cpu != "mips64" &&
@@ -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"

   } else {
     assert(false, "Unsupported host_os: $host_os")
   }
@@ -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"

 } else {
   assert(false, "Unsupported target_os: $target_os")
 }
@@ -301,7 +308,11 @@ is_android = current_os == "android"
 is_chromeos = current_os == "chromeos"
 is_fuchsia = current_os == "fuchsia"
 is_ios = current_os == "ios"

Lines 1-6 Link Here

(-)b/devel/electron22/files/patch-chrome_browser_process__singleton__posix.cc (-2 / +2 lines)
1	--- chrome/browser/process_singleton_posix.cc.orig 2022-08-31 12:19:35 UTC	1	--- chrome/browser/process_singleton_posix.cc.orig 2023-01-30 07:58:59 UTC
2	+++ chrome/browser/process_singleton_posix.cc	2	+++ chrome/browser/process_singleton_posix.cc
3	@@ -351,7 +351,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo	3	@@ -357,7 +357,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo
4	if (g_disable_prompt)	4	if (g_disable_prompt)
5	return g_user_opted_unlock_in_use_profile;	5	return g_user_opted_unlock_in_use_profile;
6		6

Lines 1-6 Link Here

(-)b/devel/electron22/files/patch-chrome_test_BUILD.gn (-2 / +2 lines)
1	--- chrome/test/BUILD.gn.orig 2022-11-30 08:12:58 UTC	1	--- chrome/test/BUILD.gn.orig 2023-01-30 07:58:59 UTC
2	+++ chrome/test/BUILD.gn	2	+++ chrome/test/BUILD.gn
3	@@ -10087,7 +10087,7 @@ test("chrome_app_unittests") {	3	@@ -10094,7 +10094,7 @@ test("chrome_app_unittests") {
4	"//components/heap_profiling/in_process",	4	"//components/heap_profiling/in_process",
5	"//components/safe_browsing:buildflags",	5	"//components/safe_browsing:buildflags",
6	]	6	]

Lines 1-6 Link Here

(-)b/devel/electron22/files/patch-components_viz_host_host__display__client.cc (-2 / +2 lines)
1	--- components/viz/host/host_display_client.cc.orig 2022-02-28 16:54:41 UTC	1	--- components/viz/host/host_display_client.cc.orig 2023-01-30 07:58:58 UTC
2	+++ components/viz/host/host_display_client.cc	2	+++ components/viz/host/host_display_client.cc
3	@@ -61,7 +61,7 @@ void HostDisplayClient::CreateLayeredWindowUpdater(	3	@@ -65,7 +65,7 @@ void HostDisplayClient::CreateLayeredWindowUpdater(
4		4
5	// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch	5	// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
6	// of lacros-chrome is complete.	6	// of lacros-chrome is complete.

Lines 1-6 Link Here

(-)b/devel/electron22/files/patch-components_viz_host_host__display__client.h (-2 / +2 lines)
1	--- components/viz/host/host_display_client.h.orig 2022-02-28 16:54:41 UTC	1	--- components/viz/host/host_display_client.h.orig 2023-01-30 07:58:58 UTC
2	+++ components/viz/host/host_display_client.h	2	+++ components/viz/host/host_display_client.h
3	@@ -48,7 +48,7 @@ class VIZ_HOST_EXPORT HostDisplayClient : public mojom	3	@@ -47,7 +47,7 @@ class VIZ_HOST_EXPORT HostDisplayClient : public mojom
4		4
5	// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch	5	// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
6	// of lacros-chrome is complete.	6	// of lacros-chrome is complete.

Lines 1-6 Link Here

(-)b/devel/electron22/files/patch-components_viz_host_renderer__settings__creation.cc (-2 / +2 lines)
1	--- components/viz/host/renderer_settings_creation.cc.orig 2022-02-28 16:54:41 UTC	1	--- components/viz/host/renderer_settings_creation.cc.orig 2023-01-30 07:58:58 UTC
2	+++ components/viz/host/renderer_settings_creation.cc	2	+++ components/viz/host/renderer_settings_creation.cc
3	@@ -52,7 +52,7 @@ RendererSettings CreateRendererSettings() {	3	@@ -55,7 +55,7 @@ RendererSettings CreateRendererSettings() {
4	renderer_settings.partial_swap_enabled =	4	renderer_settings.partial_swap_enabled =
5	!command_line->HasSwitch(switches::kUIDisablePartialSwap);	5	!command_line->HasSwitch(switches::kUIDisablePartialSwap);
6		6

Lines 1-6 Link Here

(-)b/devel/electron22/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc (-3 / +3 lines)
1	--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2022-11-30 08:12:58 UTC	1	--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2023-01-30 07:58:58 UTC
2	+++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc	2	+++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
3	@@ -98,7 +98,7 @@ RootCompositorFrameSinkImpl::Create(	3	@@ -99,7 +99,7 @@ RootCompositorFrameSinkImpl::Create(
4		4
5	// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch	5	// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
6	// of lacros-chrome is complete.	6	// of lacros-chrome is complete.
Lines 9-15 Link Here
9	// For X11, we need notify client about swap completion after resizing, so the	9	// For X11, we need notify client about swap completion after resizing, so the
10	// client can use it for synchronize with X11 WM.	10	// client can use it for synchronize with X11 WM.
11	output_surface->SetNeedsSwapSizeNotifications(true);	11	output_surface->SetNeedsSwapSizeNotifications(true);
12	@@ -577,7 +577,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw	12	@@ -578,7 +578,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw
13	display_client_->DidCompleteSwapWithSize(pixel_size);	13	display_client_->DidCompleteSwapWithSize(pixel_size);
14	// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch	14	// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
15	// of lacros-chrome is complete.	15	// of lacros-chrome is complete.




--- content/app/content_main_runner_impl.cc.orig	2023-01-30 07:58:59 UTC
+++ content/app/content_main_runner_impl.cc
@@ -136,13 +136,13 @@
 #include "base/posix/global_descriptors.h"
 #include "content/public/common/content_descriptors.h"
 

 #include "base/native_library.h"
 #include "base/rand_util.h"
 #include "content/public/common/zygote/sandbox_support_linux.h"
@@ -181,6 +181,10 @@
 #include "media/base/media_switches.h"
 #endif
 

 #if BUILDFLAG(IS_ANDROID)
 #include "base/system/sys_info.h"
 #include "content/browser/android/battery_metrics.h"
@@ -386,7 +390,7 @@ void InitializeZygoteSandboxForBrowserProcess(
 }
 #endif  // BUILDFLAG(USE_ZYGOTE_HANDLE)
 

 
 #if BUILDFLAG(ENABLE_PPAPI)
 // Loads the (native) libraries but does not initialize them (i.e., does not
@@ -422,7 +426,7 @@ void PreloadLibraryCdms() {
 }
 #endif  // BUILDFLAG(ENABLE_LIBRARY_CDMS)
 

 void PreSandboxInit() {
   // Pre-acquire resources needed by BoringSSL. See
   // https://boringssl.googlesource.com/boringssl/+/HEAD/SANDBOXING.md
@@ -445,6 +449,11 @@ void PreSandboxInit() {
   }
 #endif
 

   // 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.
@@ -627,7 +636,7 @@ int NO_STACK_PROTECTOR RunZygote(ContentMainDelegate* 
   delegate->ZygoteStarting(&zygote_fork_delegates);
   media::InitializeMediaLibrary();
 

   PreSandboxInit();
 #endif
 
@@ -821,11 +830,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
              kFieldTrialDescriptor + base::GlobalDescriptors::kBaseDescriptor);
 #endif  // !BUILDFLAG(IS_ANDROID)
 

 
 #endif  // !BUILDFLAG(IS_WIN)
 
@@ -1011,6 +1019,16 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
   }
 #endif
 

   delegate_->SandboxInitialized(process_type);
 
 #if BUILDFLAG(USE_ZYGOTE_HANDLE)
@@ -1074,7 +1092,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
           process_type);
     }
 

     // 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
@@ -1107,6 +1125,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
   content_main_params_.reset();
 
   RegisterMainThreadFactories();




--- 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"

   options->fds_to_remap = files_to_register.GetMappingWithIDAdjustment(
       base::GlobalDescriptors::kBaseDescriptor);
 
+#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()));
@@ -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;

Lines 1-6 Link Here

(-)b/devel/electron22/files/patch-content_browser_media_media__keys__listener__manager__impl.cc (-2 / +2 lines)
1	--- content/browser/media/media_keys_listener_manager_impl.cc.orig 2022-04-21 18:48:31 UTC	1	--- content/browser/media/media_keys_listener_manager_impl.cc.orig 2023-01-30 07:58:59 UTC
2	+++ content/browser/media/media_keys_listener_manager_impl.cc	2	+++ content/browser/media/media_keys_listener_manager_impl.cc
3	@@ -233,7 +233,7 @@ void MediaKeysListenerManagerImpl::StartListeningForMe	3	@@ -237,7 +237,7 @@ void MediaKeysListenerManagerImpl::StartListeningForMe
4	// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is	4	// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
5	// complete.	5	// complete.
6	#if (BUILDFLAG(IS_LINUX) \|\| BUILDFLAG(IS_CHROMEOS_LACROS)) \|\| \	6	#if (BUILDFLAG(IS_LINUX) \|\| BUILDFLAG(IS_CHROMEOS_LACROS)) \|\| \




--- 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
@@ -214,7 +214,7 @@
 #include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h"
 #endif
 

 #include <sys/resource.h>
 
 #include "components/services/font/public/mojom/font_service.mojom.h"  // nogncheck
@@ -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() {

   struct rlimit limit;
   if (getrlimit(RLIMIT_NPROC, &limit) != 0)
     return kUnknownPlatformProcessLimit;
@@ -1225,7 +1225,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public
         return;
     }
 

     if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) {
       ConnectToFontService(std::move(font_receiver));
       return;
@@ -2127,7 +2127,7 @@ void RenderProcessHostImpl::ReinitializeLogging(
 }
 #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
 

 void RenderProcessHostImpl::CreateStableVideoDecoder(
     mojo::PendingReceiver<media::stable::mojom::StableVideoDecoder> receiver) {
   if (!stable_video_decoder_factory_remote_.is_bound()) {
@@ -3278,6 +3278,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin
     switches::kDisableSpeechAPI,
     switches::kDisableThreadedCompositing,
     switches::kDisableTouchDragDrop,

     switches::kDisableV8IdleTasks,
     switches::kDisableVideoCaptureUseGpuMemoryBuffer,
     switches::kDisableWebGLImageChromium,
@@ -4751,7 +4752,7 @@ void RenderProcessHostImpl::ResetIPC() {
   coordinator_connector_receiver_.reset();
   tracing_registration_.reset();
 

Lines 1-4 Link Here

(-)b/devel/electron22/files/patch-content_browser_web__contents_web__contents__view__aura.cc (-2 / +2 lines)
1	--- content/browser/web_contents/web_contents_view_aura.cc.orig 2022-12-14 08:02:29 UTC	1	--- content/browser/web_contents/web_contents_view_aura.cc.orig 2023-01-30 07:58:58 UTC
2	+++ content/browser/web_contents/web_contents_view_aura.cc	2	+++ content/browser/web_contents/web_contents_view_aura.cc
3	@@ -176,7 +176,7 @@ class WebDragSourceAura : public content::WebContentsO	3	@@ -176,7 +176,7 @@ class WebDragSourceAura : public content::WebContentsO
4	raw_ptr<aura::Window> window_;	4	raw_ptr<aura::Window> window_;
Lines 18-24 Link Here
18	// We set the file contents before the URL because the URL also sets file	18	// We set the file contents before the URL because the URL also sets file
19	// contents (to a .URL shortcut). We want to prefer file content data over	19	// contents (to a .URL shortcut). We want to prefer file content data over
20	// a shortcut so we add it first.	20	// a shortcut so we add it first.
21	@@ -1366,7 +1366,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent*	21	@@ -1363,7 +1363,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent*
22	// Linux window managers like to handle raise-on-click themselves. If we	22	// Linux window managers like to handle raise-on-click themselves. If we
23	// raise-on-click manually, this may override user settings that prevent	23	// raise-on-click manually, this may override user settings that prevent
24	// focus-stealing.	24	// focus-stealing.

Lines 1-4 Link Here

(-)b/devel/electron22/files/patch-content_gpu_gpu__main.cc (-3 / +3 lines)
1	--- content/gpu/gpu_main.cc.orig 2022-11-30 08:12:58 UTC	1	--- content/gpu/gpu_main.cc.orig 2023-01-30 07:58:58 UTC
2	+++ content/gpu/gpu_main.cc	2	+++ content/gpu/gpu_main.cc
3	@@ -87,7 +87,7 @@	3	@@ -87,7 +87,7 @@
4	#include "sandbox/win/src/sandbox.h"	4	#include "sandbox/win/src/sandbox.h"
Lines 27-33 Link Here
27	return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs);	27	return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs);
28	#elif BUILDFLAG(IS_WIN)	28	#elif BUILDFLAG(IS_WIN)
29	return StartSandboxWindows(sandbox_info_);	29	return StartSandboxWindows(sandbox_info_);
30	@@ -268,7 +268,7 @@ int GpuMain(MainFunctionParams parameters) {	30	@@ -272,7 +272,7 @@ int GpuMain(MainFunctionParams parameters) {
31	std::make_unique<base::SingleThreadTaskExecutor>(	31	std::make_unique<base::SingleThreadTaskExecutor>(
32	gpu_preferences.message_pump_type);	32	gpu_preferences.message_pump_type);
33	}	33	}
Lines 36-42 Link Here
36	#error "Unsupported Linux platform."	36	#error "Unsupported Linux platform."
37	#elif BUILDFLAG(IS_MAC)	37	#elif BUILDFLAG(IS_MAC)
38	// Cross-process CoreAnimation requires a CFRunLoop to function at all, and	38	// Cross-process CoreAnimation requires a CFRunLoop to function at all, and
39	@@ -403,7 +403,7 @@ int GpuMain(MainFunctionParams parameters) {	39	@@ -406,7 +406,7 @@ int GpuMain(MainFunctionParams parameters) {
40		40
41	namespace {	41	namespace {
42		42

Lines 1-4 Link Here

(-)b/devel/electron22/files/patch-content_renderer_render__process__impl.cc (-4 / +4 lines)
1	--- content/renderer/render_process_impl.cc.orig 2022-11-30 08:12:58 UTC	1	--- content/renderer/render_process_impl.cc.orig 2023-01-30 07:58:59 UTC
2	+++ content/renderer/render_process_impl.cc	2	+++ content/renderer/render_process_impl.cc
3	@@ -46,7 +46,7 @@	3	@@ -46,7 +46,7 @@
4	#if BUILDFLAG(IS_WIN)	4	#if BUILDFLAG(IS_WIN)
Lines 18-26 Link Here
18	SetV8FlagIfFeature(features::kWebAssemblyCodeProtectionPku,	18	SetV8FlagIfFeature(features::kWebAssemblyCodeProtectionPku,
19	"--wasm-memory-protection-keys");	19	"--wasm-memory-protection-keys");
20	SetV8FlagIfNotFeature(features::kWebAssemblyCodeProtectionPku,	20	SetV8FlagIfNotFeature(features::kWebAssemblyCodeProtectionPku,
21	@@ -228,7 +228,7 @@ RenderProcessImpl::RenderProcessImpl()	21	@@ -231,7 +231,7 @@ RenderProcessImpl::RenderProcessImpl()
22	SetV8FlagIfNotFeature(features::kWebAssemblyDynamicTiering,	22	// Freezing flags after init conflicts with node in the renderer.
23	"--no-wasm-dynamic-tiering");	23	v8::V8::SetFlagsFromString("--no-freeze-flags-after-init");
24		24
25	-#if (BUILDFLAG(IS_LINUX) \|\| BUILDFLAG(IS_CHROMEOS)) && defined(ARCH_CPU_X86_64)	25	-#if (BUILDFLAG(IS_LINUX) \|\| BUILDFLAG(IS_CHROMEOS)) && defined(ARCH_CPU_X86_64)
26	+#if (BUILDFLAG(IS_LINUX) \|\| BUILDFLAG(IS_CHROMEOS) \|\| BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_X86_64)	26	+#if (BUILDFLAG(IS_LINUX) \|\| BUILDFLAG(IS_CHROMEOS) \|\| BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_X86_64)

Lines 1-6 Link Here

(-)b/devel/electron22/files/patch-electron_filenames.gni (-2 / +2 lines)
1	--- electron/filenames.gni.orig 2022-08-03 15:31:32 UTC	1	--- electron/filenames.gni.orig 2023-01-24 16:58:16 UTC
2	+++ electron/filenames.gni	2	+++ electron/filenames.gni
3	@@ -245,8 +245,8 @@ filenames = {	3	@@ -246,8 +246,8 @@ filenames = {
4	"shell/app/command_line_args.h",	4	"shell/app/command_line_args.h",
5	"shell/app/electron_content_client.cc",	5	"shell/app/electron_content_client.cc",
6	"shell/app/electron_content_client.h",	6	"shell/app/electron_content_client.h",

Lines 1-6 Link Here

(-)b/devel/electron22/files/patch-electron_lib_browser_api_app.ts (-2 / +2 lines)
1	--- electron/lib/browser/api/app.ts.orig 2021-11-15 23:45:07 UTC	1	--- electron/lib/browser/api/app.ts.orig 2023-01-24 16:58:16 UTC
2	+++ electron/lib/browser/api/app.ts	2	+++ electron/lib/browser/api/app.ts
3	@@ -67,7 +67,7 @@ if (process.platform === 'darwin') {	3	@@ -68,7 +68,7 @@ if (process.platform === 'darwin') {
4	app.dock!.getMenu = () => dockMenu;	4	app.dock!.getMenu = () => dockMenu;
5	}	5	}
6		6

Lines 1-6 Link Here

(-)b/devel/electron22/files/patch-electron_lib_common_api_clipboard.ts (-2 / +2 lines)
1	--- electron/lib/common/api/clipboard.ts.orig 2021-12-03 01:46:05 UTC	1	--- electron/lib/common/api/clipboard.ts.orig 2023-01-24 16:58:16 UTC
2	+++ electron/lib/common/api/clipboard.ts	2	+++ electron/lib/common/api/clipboard.ts
3	@@ -11,7 +11,7 @@ if (process.type === 'renderer') {	3	@@ -12,7 +12,7 @@ if (process.type === 'renderer') {
4	return (...args: any[]) => ipcRendererUtils.invokeSync(IPC_MESSAGES.BROWSER_CLIPBOARD_SYNC, method, ...args);	4	return (...args: any[]) => ipcRendererUtils.invokeSync(IPC_MESSAGES.BROWSER_CLIPBOARD_SYNC, method, ...args);
5	};	5	};
6		6




--- 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, '..', '..')
-  });
+  const output = spawnSync('basename', [path.resolve(__dirname, '..', '..', '..', '..')]);
   if (output.status !== 0) {
     console.error(output.stderr);
     throw new Error('Failed to get current electron version');
   }
-  return output.stdout.toString().trim().replace(/^v/g, '');
+  return output.stdout.toString().trim().replace(/^electron-/g, '');
+  return output.toString().trim().replace(/^v/g, '');
 };

Lines 1-6 Link Here

(-)b/devel/electron22/files/patch-electron_script_lib_utils.js (-2 / +2 lines)
1	--- electron/script/lib/utils.js.orig 2021-10-11 17:12:26 UTC	1	--- electron/script/lib/utils.js.orig 2023-01-24 16:58:16 UTC
2	+++ electron/script/lib/utils.js	2	+++ electron/script/lib/utils.js
3	@@ -21,7 +21,7 @@ function getElectronExec () {	3	@@ -22,7 +22,7 @@ function getElectronExec () {
4	return `out/${OUT_DIR}/Electron.app/Contents/MacOS/Electron`;	4	return `out/${OUT_DIR}/Electron.app/Contents/MacOS/Electron`;
5	case 'win32':	5	case 'win32':
6	return `out/${OUT_DIR}/electron.exe`;	6	return `out/${OUT_DIR}/electron.exe`;

Lines 1-8 Link Here

(-)b/devel/electron22/files/patch-electron_script_spec-runner.js (-4 / +4 lines)
1	--- electron/script/spec-runner.js.orig 2021-11-08 18:41:28 UTC	1	--- electron/script/spec-runner.js.orig 2023-01-24 16:58:16 UTC
2	+++ electron/script/spec-runner.js	2	+++ electron/script/spec-runner.js
3	@@ -126,7 +126,7 @@ async function runElectronTests () {	3	@@ -148,7 +148,7 @@ async function runTestUsingElectron (specDir, testName
4	async function runTestUsingElectron (specDir, testName) {	4	exe = path.resolve(BASE, utils.getElectronExec());
5	let exe = path.resolve(BASE, utils.getElectronExec());	5	}
6	const runnerArgs = [`electron/${specDir}`, ...unknownArgs.slice(2)];	6	const runnerArgs = [`electron/${specDir}`, ...unknownArgs.slice(2)];
7	- if (process.platform === 'linux') {	7	- if (process.platform === 'linux') {
8	+ if (process.platform === 'linux' \|\| process.platform === 'freebsd') {	8	+ if (process.platform === 'linux' \|\| process.platform === 'freebsd') {




--- 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,16 @@
 #include "chrome/child/v8_crashpad_support_win.h"
 #endif
 

+#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"

 #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 +162,7 @@ bool ElectronPathProvider(int key, base::FilePath* res
       create_dir = true;
       break;
     }

     case DIR_APP_DATA: {
       auto env = base::Environment::Create();
       cur = base::nix::GetXDGDirectory(
@@ -293,7 +296,7 @@ absl::optional<int> ElectronMainDelegate::BasicStartup
     base::win::PinUser32();
 #endif
 

   // Check for --no-sandbox parameter when running as root.
   if (getuid() == 0 && IsSandboxEnabled(command_line))
     LOG(FATAL) << "Running as root without --"
@@ -345,7 +348,7 @@ void ElectronMainDelegate::PreSandboxStartup() {
                                    process_type == ::switches::kZygoteProcess);
 #endif
 

   crash_reporter::InitializeCrashKeys();
 #endif
 
@@ -380,7 +383,7 @@ void ElectronMainDelegate::PreSandboxStartup() {
   }
 #endif
 




--- 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"

 void SetCrashKeyStub(const std::string& key, const std::string& value) {}
 void ClearCrashKeyStub(const std::string& key) {}
 #endif
@@ -105,7 +105,7 @@ namespace electron {
 
 v8::Local<v8::Value> GetParameters(v8::Isolate* isolate) {
   std::map<std::string, std::string> keys;

   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);




--- 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) {

   // Set the application name for audio streams shown in external
   // applications. Only affects pulseaudio currently.
   media::AudioManager::SetGlobalAppName(Browser::Get()->GetName());
@@ -1038,7 +1038,7 @@ void App::SetPath(gin_helper::ErrorThrower thrower,
 }
 
 void App::SetDesktopName(const std::string& desktop_name) {

   auto env = base::Environment::Create();
   env->SetVar("CHROME_DESKTOP", desktop_name);
 #endif
@@ -1427,7 +1427,7 @@ std::vector<gin_helper::Dictionary> App::GetAppMetrics
       pid_dict.Set("name", process_metric.second->name);
     }
 

     auto memory_info = process_metric.second->GetMemoryInfo();
 
     gin_helper::Dictionary memory_dict = gin::Dictionary::CreateEmpty(isolate);
@@ -1734,7 +1734,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuild
       .SetMethod(
           "removeAsDefaultProtocolClient",
           base::BindRepeating(&Browser::RemoveAsDefaultProtocolClient, browser))

       .SetMethod(
           "getApplicationInfoForProtocol",
           base::BindRepeating(&Browser::GetApplicationInfoForProtocol, browser))
@@ -1792,7 +1792,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuild
       .SetMethod("getJumpListSettings", &App::GetJumpListSettings)
       .SetMethod("setJumpList", &App::SetJumpList)
 #endif

Lines 1-6 Link Here

(-)b/devel/electron22/files/patch-electron_shell_browser_api_electron__api__base__window.cc (-2 / +2 lines)
1	--- electron/shell/browser/api/electron_api_base_window.cc.orig 2022-08-03 15:31:32 UTC	1	--- electron/shell/browser/api/electron_api_base_window.cc.orig 2023-01-24 16:58:16 UTC
2	+++ electron/shell/browser/api/electron_api_base_window.cc	2	+++ electron/shell/browser/api/electron_api_base_window.cc
3	@@ -1057,7 +1057,7 @@ void BaseWindow::SetIconImpl(v8::Isolate* isolate,	3	@@ -1038,7 +1038,7 @@ void BaseWindow::SetIconImpl(v8::Isolate* isolate,
4	static_cast<NativeWindowViews*>(window_.get())	4	static_cast<NativeWindowViews*>(window_.get())
5	->SetIcon(native_image->GetHICON(GetSystemMetrics(SM_CXSMICON)),	5	->SetIcon(native_image->GetHICON(GetSystemMetrics(SM_CXSMICON)),
6	native_image->GetHICON(GetSystemMetrics(SM_CXICON)));	6	native_image->GetHICON(GetSystemMetrics(SM_CXICON)));




--- 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"

 #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"
@@ -65,7 +65,7 @@ bool g_crash_reporter_initialized = false;
 
 namespace electron::api::crash_reporter {
 
-#if defined(MAS_BUILD)
+#if defined(MAS_BUILD) || BUILDFLAG(IS_BSD)
 namespace {
 
 void NoOp() {}
@@ -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");

   if (g_crash_reporter_initialized)
     return;
   g_crash_reporter_initialized = true;
@@ -182,7 +182,7 @@ void Start(const std::string& submit_url,
 
 namespace {
 

 void GetUploadedReports(
     v8::Isolate* isolate,
     base::OnceCallback<void(v8::Local<v8::Value>)> callback) {
@@ -237,13 +237,13 @@ v8::Local<v8::Value> GetUploadedReports(v8::Isolate* i
 #endif
 
 void SetUploadToServer(bool upload) {

   return false;
 #else
   return ElectronCrashReporterClient::Get()->GetCollectStatsConsent();
@@ -252,7 +252,7 @@ bool GetUploadToServer() {
 
 v8::Local<v8::Value> GetParameters(v8::Isolate* isolate) {
   std::map<std::string, std::string> keys;

   electron::crash_keys::GetCrashKeys(&keys);
 #endif
   return gin::ConvertToV8(isolate, keys);
@@ -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);




--- 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

Lines 1-6 Link Here

(-)b/devel/electron22/files/patch-electron_shell_browser_api_electron__api__power__monitor.cc (-3 / +3 lines)
1	--- electron/shell/browser/api/electron_api_power_monitor.cc.orig 2022-05-18 15:31:32 UTC	1	--- electron/shell/browser/api/electron_api_power_monitor.cc.orig 2023-01-24 16:58:16 UTC
2	+++ electron/shell/browser/api/electron_api_power_monitor.cc	2	+++ electron/shell/browser/api/electron_api_power_monitor.cc
3	@@ -79,6 +79,11 @@ void PowerMonitor::OnResume() {	3	@@ -77,6 +77,11 @@ void PowerMonitor::OnResume() {
4	Emit("resume");	4	Emit("resume");
5	}	5	}
6		6
Lines 12-18 Link Here
12	#if BUILDFLAG(IS_LINUX)	12	#if BUILDFLAG(IS_LINUX)
13	void PowerMonitor::SetListeningForShutdown(bool is_listening) {	13	void PowerMonitor::SetListeningForShutdown(bool is_listening) {
14	if (is_listening) {	14	if (is_listening) {
15	@@ -105,7 +110,7 @@ gin::ObjectTemplateBuilder PowerMonitor::GetObjectTemp	15	@@ -103,7 +108,7 @@ gin::ObjectTemplateBuilder PowerMonitor::GetObjectTemp
16	auto builder =	16	auto builder =
17	gin_helper::EventEmitterMixin<PowerMonitor>::GetObjectTemplateBuilder(	17	gin_helper::EventEmitterMixin<PowerMonitor>::GetObjectTemplateBuilder(
18	isolate);	18	isolate);

Lines 1-6 Link Here

(-)b/devel/electron22/files/patch-electron_shell_browser_api_electron__api__power__monitor.h (-2 / +2 lines)
1	--- electron/shell/browser/api/electron_api_power_monitor.h.orig 2022-05-18 15:31:32 UTC	1	--- electron/shell/browser/api/electron_api_power_monitor.h.orig 2023-01-24 16:58:16 UTC
2	+++ electron/shell/browser/api/electron_api_power_monitor.h	2	+++ electron/shell/browser/api/electron_api_power_monitor.h
3	@@ -41,7 +41,7 @@ class PowerMonitor : public gin::Wrappable<PowerMonito	3	@@ -39,7 +39,7 @@ class PowerMonitor : public gin::Wrappable<PowerMonito
4	explicit PowerMonitor(v8::Isolate* isolate);	4	explicit PowerMonitor(v8::Isolate* isolate);
5	~PowerMonitor() override;	5	~PowerMonitor() override;
6		6

Lines 1-6 Link Here

(-)b/devel/electron22/files/patch-electron_shell_browser_api_electron__api__safe__storage.cc (-2 / +2 lines)
1	--- electron/shell/browser/api/electron_api_safe_storage.cc.orig 2022-05-18 15:31:32 UTC	1	--- electron/shell/browser/api/electron_api_safe_storage.cc.orig 2023-01-24 16:58:16 UTC
2	+++ electron/shell/browser/api/electron_api_safe_storage.cc	2	+++ electron/shell/browser/api/electron_api_safe_storage.cc
3	@@ -31,7 +31,7 @@ void SetElectronCryptoReady(bool ready) {	3	@@ -29,7 +29,7 @@ void SetElectronCryptoReady(bool ready) {
4	#endif	4	#endif
5		5
6	bool IsEncryptionAvailable() {	6	bool IsEncryptionAvailable() {




--- 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
 

 #include "ui/gfx/font_render_params.h"
 #endif
 
@@ -400,7 +400,7 @@ absl::optional<base::TimeDelta> GetCursorBlinkInterval
       ui::TextInsertionCaretBlinkPeriodFromDefaults());
   if (system_value)
     return *system_value;

   if (auto* linux_ui = ui::LinuxUi::instance())
     return linux_ui->GetCursorBlinkInterval();
 #elif BUILDFLAG(IS_WIN)
@@ -853,7 +853,7 @@ void WebContents::InitWithSessionAndOptions(
   accept_languages.pop_back();
   prefs->accept_languages = accept_languages;
 

   // Update font settings.
   static const gfx::FontRenderParams params(
       gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(), nullptr));
@@ -2390,7 +2390,7 @@ void WebContents::ForcefullyCrashRenderer() {
 
   content::RenderProcessHost* rph = rwh->GetProcess();
   if (rph) {

     // A generic |CrashDumpHungChildProcess()| is not implemented for Linux.
     // Instead we send an explicit IPC to crash on the renderer's IO thread.
     rph->ForceCrash();
@@ -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.

   if (owner_window())
     owner_window()->Focus(true);
 #endif
@@ -3844,7 +3844,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() {
 }
 #endif
 

Lines 1-6 Link Here

(-)b/devel/electron22/files/patch-electron_shell_browser_api_electron__api__web__contents.h (-2 / +2 lines)
1	--- electron/shell/browser/api/electron_api_web_contents.h.orig 2022-08-03 15:31:32 UTC	1	--- electron/shell/browser/api/electron_api_web_contents.h.orig 2023-01-24 16:58:16 UTC
2	+++ electron/shell/browser/api/electron_api_web_contents.h	2	+++ electron/shell/browser/api/electron_api_web_contents.h
3	@@ -699,7 +699,7 @@ class WebContents : public ExclusiveAccessContext,	3	@@ -710,7 +710,7 @@ class WebContents : public ExclusiveAccessContext,
4	#if defined(TOOLKIT_VIEWS) && !BUILDFLAG(IS_MAC)	4	#if defined(TOOLKIT_VIEWS) && !BUILDFLAG(IS_MAC)
5	ui::ImageModel GetDevToolsWindowIcon() override;	5	ui::ImageModel GetDevToolsWindowIcon() override;
6	#endif	6	#endif

Lines 1-4 Link Here

(-)b/devel/electron22/files/patch-electron_shell_browser_browser.h (-3 / +3 lines)
1	--- electron/shell/browser/browser.h.orig 2022-08-03 15:31:32 UTC	1	--- electron/shell/browser/browser.h.orig 2023-01-24 16:58:16 UTC
2	+++ electron/shell/browser/browser.h	2	+++ electron/shell/browser/browser.h
3	@@ -101,7 +101,7 @@ class Browser : public WindowListObserver {	3	@@ -101,7 +101,7 @@ class Browser : public WindowListObserver {
4		4
Lines 9-15 Link Here
9	// get the name, icon and path for an application	9	// get the name, icon and path for an application
10	v8::Local<v8::Promise> GetApplicationInfoForProtocol(v8::Isolate* isolate,	10	v8::Local<v8::Promise> GetApplicationInfoForProtocol(v8::Isolate* isolate,
11	const GURL& url);	11	const GURL& url);
12	@@ -261,10 +261,10 @@ class Browser : public WindowListObserver {	12	@@ -263,10 +263,10 @@ class Browser : public WindowListObserver {
13	PCWSTR GetAppUserModelID();	13	PCWSTR GetAppUserModelID();
14	#endif // BUILDFLAG(IS_WIN)	14	#endif // BUILDFLAG(IS_WIN)
15		15
Lines 22-28 Link Here
22		22
23	// Tell the application to open a file.	23	// Tell the application to open a file.
24	bool OpenFile(const std::string& file_path);	24	bool OpenFile(const std::string& file_path);
25	@@ -361,7 +361,7 @@ class Browser : public WindowListObserver {	25	@@ -363,7 +363,7 @@ class Browser : public WindowListObserver {
26	base::Time last_dock_show_;	26	base::Time last_dock_show_;
27	#endif	27	#endif
28		28




--- 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"

 #include "base/environment.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "device/bluetooth/bluetooth_adapter_factory.h"
@@ -127,7 +127,7 @@ namespace electron {
 
 namespace {
 

   // Reset to the original LC_ALL since we should not be changing it.
   if (!locale.empty()) {
     if (lc_all)
@@ -424,7 +424,7 @@ void ElectronBrowserMainParts::PostDestroyThreads() {
 }
 
 void ElectronBrowserMainParts::ToolkitInitialized() {

   auto* linux_ui = ui::GetDefaultLinuxUi();
   CHECK(linux_ui);
   linux_ui_getter_ = std::make_unique<LinuxUiGetterImpl>();
@@ -536,7 +536,7 @@ void ElectronBrowserMainParts::WillRunMainMessageLoop(
 }
 
 void ElectronBrowserMainParts::PostCreateMainMessageLoop() {

+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
   std::string app_name = electron::Browser::Get()->GetName();
 #endif
 #if BUILDFLAG(IS_LINUX)
@@ -545,7 +545,9 @@ void ElectronBrowserMainParts::PostCreateMainMessageLo
   auto shutdown_cb =
       base::BindOnce(base::RunLoop::QuitCurrentWhenIdleClosureDeprecated());
   ui::OzonePlatform::GetInstance()->PostCreateMainMessageLoop(
       std::move(shutdown_cb));
   bluez::DBusBluezManagerWrapperLinux::Initialize();

   // 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.
@@ -636,7 +638,7 @@ void ElectronBrowserMainParts::PostMainMessageLoopRun(
   fake_browser_process_->PostMainMessageLoopRun();
   content::DevToolsAgentHost::StopRemoteDebuggingPipeHandler();
 




--- electron/shell/browser/electron_browser_main_parts.h.orig	2023-01-24 16:58:16 UTC
+++ electron/shell/browser/electron_browser_main_parts.h
@@ -65,7 +65,7 @@ class ViewsDelegate;
 class ViewsDelegateMac;
 #endif
 

 class DarkThemeObserver;
 #endif
 
@@ -126,7 +126,7 @@ class ElectronBrowserMainParts : public content::Brows
       const scoped_refptr<base::SingleThreadTaskRunner>& task_runner);
 #endif
 

   void DetectOzonePlatform();
 #endif
 
@@ -148,7 +148,7 @@ class ElectronBrowserMainParts : public content::Brows
   std::unique_ptr<display::Screen> screen_;
 #endif
 

+#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_;
 




--- 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"

   std::string name = Browser::Get()->GetName();
   // Set WM_WINDOW_ROLE.
   params.wm_role_name = "browser-window";
@@ -290,7 +290,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
   std::string window_type;
   options.Get(options::kType, &window_type);
 

   // 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) {
@@ -392,7 +392,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
   if (window)
     window->AddPreTargetHandler(this);
 

   // 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);
@@ -542,7 +542,7 @@ bool NativeWindowViews::IsVisible() {
 bool NativeWindowViews::IsEnabled() {
 #if BUILDFLAG(IS_WIN)
   return ::IsWindowEnabled(GetAcceleratedWidget());

 #if defined(USE_OZONE_PLATFORM_X11)
   if (IsX11())
     return !event_disabler_.get();
@@ -600,7 +600,7 @@ void NativeWindowViews::SetEnabledInternal(bool enable
 #endif
 }
 

 void NativeWindowViews::Maximize() {
   if (IsVisible()) {
     widget()->Maximize();
@@ -727,7 +727,7 @@ void NativeWindowViews::SetBounds(const gfx::Rect& bou
   }
 #endif
 

   // On Linux and Windows the minimum and maximum size should be updated with
   // window size when window is not resizable.
   if (!resizable_) {
@@ -959,7 +959,7 @@ bool NativeWindowViews::IsClosable() {
     return false;
   }
   return !(info.fState & MFS_DISABLED);

   return true;
 #endif
 }
@@ -1347,7 +1347,7 @@ void NativeWindowViews::SetProgressBar(double progress
                                        NativeWindow::ProgressState state) {
 #if BUILDFLAG(IS_WIN)
   taskbar_host_.SetProgressBar(GetAcceleratedWidget(), progress, state);

   if (unity::IsRunning()) {
     unity::SetProgressFraction(progress);
   }
@@ -1409,7 +1409,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM
 #if BUILDFLAG(IS_WIN)
   window_handle =
       reinterpret_cast<content::DesktopMediaID::Id>(accelerated_widget);

   window_handle = static_cast<uint32_t>(accelerated_widget);
 #endif
   aura::WindowTreeHost* const host =
@@ -1512,7 +1512,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC
   SendMessage(hwnd, WM_SETICON, ICON_BIG,
               reinterpret_cast<LPARAM>(app_icon_.get()));
 }

 void NativeWindowViews::SetIcon(const gfx::ImageSkia& icon) {
   auto* tree_host = views::DesktopWindowTreeHostLinux::GetHostForWidget(
       GetAcceleratedWidget());
@@ -1582,7 +1582,7 @@ bool NativeWindowViews::CanMaximize() const {
 bool NativeWindowViews::CanMinimize() const {
 #if BUILDFLAG(IS_WIN)
   return minimizable_;

   return true;
 #endif
 }
@@ -1656,7 +1656,7 @@ void NativeWindowViews::HandleKeyboardEvent(
   if (widget_destroyed_)
     return;
 

   if (event.windows_key_code == ui::VKEY_BROWSER_BACK)
     NotifyWindowExecuteAppCommand(kBrowserBackward);
   else if (event.windows_key_code == ui::VKEY_BROWSER_FORWARD)
@@ -1675,7 +1675,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e
   // Alt+Click should not toggle menu bar.
   root_view_->ResetAltState();
 

Lines 1-8 Link Here

(-)b/devel/electron22/files/patch-electron_shell_browser_net_system__network__context__manager.cc (-4 / +4 lines)
1	--- electron/shell/browser/net/system_network_context_manager.cc.orig 2022-05-18 15:31:32 UTC	1	--- electron/shell/browser/net/system_network_context_manager.cc.orig 2023-01-24 16:58:16 UTC
2	+++ electron/shell/browser/net/system_network_context_manager.cc	2	+++ electron/shell/browser/net/system_network_context_manager.cc
3	@@ -46,7 +46,7 @@	3	@@ -42,7 +42,7 @@
4	#include "components/os_crypt/keychain_password_mac.h"	4	#include "shell/common/options_switches.h"
5	#endif	5	#include "url/gurl.h"
6		6
7	-#if BUILDFLAG(IS_LINUX)	7	-#if BUILDFLAG(IS_LINUX)
8	+#if BUILDFLAG(IS_LINUX) \|\| BUILDFLAG(IS_BSD)	8	+#if BUILDFLAG(IS_LINUX) \|\| BUILDFLAG(IS_BSD)

Lines 1-4 Link Here

(-)b/devel/electron22/files/patch-electron_shell_browser_ui_views_electron__views__delegate.cc (-2 / +2 lines)
1	--- electron/shell/browser/ui/views/electron_views_delegate.cc.orig 2022-05-18 15:31:32 UTC	1	--- electron/shell/browser/ui/views/electron_views_delegate.cc.orig 2023-01-24 16:58:16 UTC
2	+++ electron/shell/browser/ui/views/electron_views_delegate.cc	2	+++ electron/shell/browser/ui/views/electron_views_delegate.cc
3	@@ -9,7 +9,7 @@	3	@@ -9,7 +9,7 @@
4	#include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"	4	#include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
Lines 8-14 Link Here
8	+#if BUILDFLAG(IS_LINUX) \|\| BUILDFLAG(IS_BSD)	8	+#if BUILDFLAG(IS_LINUX) \|\| BUILDFLAG(IS_BSD)
9	#include "base/environment.h"	9	#include "base/environment.h"
10	#include "base/nix/xdg_util.h"	10	#include "base/nix/xdg_util.h"
11	#include "ui/views/linux_ui/linux_ui.h"	11	#include "ui/linux/linux_ui.h"
12	@@ -17,7 +17,7 @@	12	@@ -17,7 +17,7 @@
13		13
14	namespace {	14	namespace {




--- 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"

 #include "ui/gtk/gtk_util.h"  // nogncheck
 #endif
 
@@ -211,7 +211,7 @@ void MenuBar::ButtonPressed(size_t id, const ui::Event
 
 void MenuBar::RefreshColorCache(const ui::NativeTheme* theme) {
   if (theme) {

     background_color_ = gtk::GetBgColor("GtkMenuBar#menubar");
     enabled_color_ =
         gtk::GetFgColor("GtkMenuBar#menubar GtkMenuItem#menuitem GtkLabel");
@@ -234,7 +234,7 @@ void MenuBar::RebuildChildren() {
 }
 
 void MenuBar::UpdateViewColors() {

   // set menubar background color
   SetBackground(views::CreateSolidBackground(background_color_));
 #endif
@@ -242,7 +242,7 @@ void MenuBar::UpdateViewColors() {
   // set child colors
   if (menu_model_ == nullptr)
     return;

Lines 1-6 Link Here

(-)b/devel/electron22/files/patch-electron_shell_common_api_electron__api__native__image.cc (-2 / +2 lines)
1	--- electron/shell/common/api/electron_api_native_image.cc.orig 2022-08-03 15:31:32 UTC	1	--- electron/shell/common/api/electron_api_native_image.cc.orig 2023-01-24 16:58:16 UTC
2	+++ electron/shell/common/api/electron_api_native_image.cc	2	+++ electron/shell/common/api/electron_api_native_image.cc
3	@@ -651,7 +651,7 @@ void Initialize(v8::Local<v8::Object> exports,	3	@@ -632,7 +632,7 @@ void Initialize(v8::Local<v8::Object> exports,
4	native_image.SetMethod("createFromDataURL", &NativeImage::CreateFromDataURL);	4	native_image.SetMethod("createFromDataURL", &NativeImage::CreateFromDataURL);
5	native_image.SetMethod("createFromNamedImage",	5	native_image.SetMethod("createFromNamedImage",
6	&NativeImage::CreateFromNamedImage);	6	&NativeImage::CreateFromNamedImage);

Lines 1-6 Link Here

(-)b/devel/electron22/files/patch-electron_shell_common_api_electron__api__native__image.h (-2 / +2 lines)
1	--- electron/shell/common/api/electron_api_native_image.h.orig 2022-06-08 15:30:58 UTC	1	--- electron/shell/common/api/electron_api_native_image.h.orig 2023-01-24 16:58:16 UTC
2	+++ electron/shell/common/api/electron_api_native_image.h	2	+++ electron/shell/common/api/electron_api_native_image.h
3	@@ -79,7 +79,7 @@ class NativeImage : public gin::Wrappable<NativeImage>	3	@@ -77,7 +77,7 @@ class NativeImage : public gin::Wrappable<NativeImage>
4	const GURL& url);	4	const GURL& url);
5	static gin::Handle<NativeImage> CreateFromNamedImage(gin::Arguments* args,	5	static gin::Handle<NativeImage> CreateFromNamedImage(gin::Arguments* args,
6	std::string name);	6	std::string name);




--- electron/shell/common/node_bindings.cc.orig	2023-01-24 16:58:16 UTC
+++ electron/shell/common/node_bindings.cc
@@ -39,7 +39,7 @@
 #include "shell/common/node_includes.h"
 #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
 
@@ -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;
 

   electron::crash_keys::SetCrashKey("electron.v8-fatal.message", message);
   electron::crash_keys::SetCrashKey("electron.v8-fatal.location", location);
 #endif
@@ -391,7 +391,7 @@ void NodeBindings::Initialize() {
   TRACE_EVENT0("electron", "NodeBindings::Initialize");
   // Open node's error reporting system for browser process.
 




--- electron/spec/api-app-spec.ts.orig	2023-01-24 16:58:16 UTC
+++ electron/spec/api-app-spec.ts
@@ -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 () {

         this.skip();
         return;
       }
@@ -457,7 +457,7 @@ describe('app module', () => {
   //   let w = null
 
   //   before(function () {

   //       this.skip()
   //     }
   //   })
@@ -580,7 +580,7 @@ describe('app module', () => {
   describe('app.badgeCount', () => {
     const platformIsNotSupported =
         (process.platform === 'win32') ||

 
     const expectedBadgeCount = 42;
 
@@ -624,7 +624,7 @@ describe('app module', () => {
     });
   });
 

     const updateExe = path.resolve(path.dirname(process.execPath), '..', 'Update.exe');
     const processStartArgs = [
       '--processStart', `"${path.basename(process.execPath)}"`,
@@ -941,7 +941,7 @@ describe('app module', () => {
     });
   });
 

     it('with properties', () => {
       it('can set accessibility support enabled', () => {
         expect(app.accessibilitySupportEnabled).to.eql(false);
@@ -1107,7 +1107,7 @@ describe('app module', () => {
     let w: BrowserWindow;
 
     before(function () {

         this.skip();
       }
       session.fromPartition('empty-certificate').setCertificateVerifyProc((req, cb) => { cb(0); });
@@ -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.

         this.skip();
       }
 
@@ -1266,7 +1266,7 @@ describe('app module', () => {
     });
   });
 

     it('returns promise rejection for a bogus protocol', async function () {
       await expect(
         app.getApplicationInfoForProtocol('bogus-protocol://')
@@ -1316,7 +1316,7 @@ describe('app module', () => {
   });
 
   // FIXME Get these specs running on Linux CI

     const iconPath = path.join(__dirname, 'fixtures/assets/icon.ico');
     const sizes = {
       small: 16,
@@ -1397,7 +1397,7 @@ describe('app module', () => {
           expect(entry.memory).to.have.property('privateBytes').that.is.greaterThan(0);
         }
 

           expect(entry.sandboxed).to.be.a('boolean');
         }
 
@@ -1423,7 +1423,7 @@ describe('app module', () => {
   });
 
   // FIXME https://github.com/electron/electron/issues/24224

     const appPath = path.join(fixturesPath, 'api', 'gpu-info.js');
 
     const getGPUInfo = async (type: string) => {
@@ -1472,7 +1472,7 @@ describe('app module', () => {
 
     it('succeeds with complete GPUInfo', async () => {
       const completeInfo = await getGPUInfo('complete');

         // For linux and macOS complete info is same as basic info
         await verifyBasicGPUInfo(completeInfo);
         const basicInfo = await getGPUInfo('basic');
@@ -1502,7 +1502,7 @@ describe('app module', () => {
     const socketPath = process.platform === 'win32' ? '\\\\.\\pipe\\electron-mixed-sandbox' : '/tmp/electron-mixed-sandbox';
 
     beforeEach(function (done) {




--- electron/spec/api-clipboard-spec.ts.orig	2023-01-24 16:58:16 UTC
+++ electron/spec/api-clipboard-spec.ts
@@ -43,7 +43,7 @@ ifdescribe(process.platform !== 'win32' || process.arc
     });
   });
 

     it('returns title and url', () => {
       clipboard.writeBookmark('a title', 'https://electronjs.org');
 
@@ -62,7 +62,7 @@ ifdescribe(process.platform !== 'win32' || process.arc
   });
 
   describe('clipboard.read()', () => {

       const type = process.platform === 'darwin' ? 'NSFilenamesPboardType' : 'FileNameW';
 
       expect(() => {
@@ -99,7 +99,7 @@ ifdescribe(process.platform !== 'win32' || process.arc
       const readImage = clipboard.readImage();
       expect(readImage.toDataURL()).to.equal(i.toDataURL());
 




--- 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 @@ import * as fs from 'fs';
 import * as uuid from 'uuid';
 
 const isWindowsOnArm = process.platform === 'win32' && process.arch === 'arm64';

     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
       }
     }

Lines 1-6 Link Here

(-)b/devel/electron22/files/patch-electron_spec_api-native-image-spec.ts (-2 / +2 lines)
1	--- electron/spec/api-native-image-spec.ts.orig 2021-01-22 23:55:24 UTC	1	--- electron/spec/api-native-image-spec.ts.orig 2023-01-24 16:58:16 UTC
2	+++ electron/spec/api-native-image-spec.ts	2	+++ electron/spec/api-native-image-spec.ts
3	@@ -491,7 +491,7 @@ describe('nativeImage module', () => {	3	@@ -423,7 +423,7 @@ describe('nativeImage module', () => {
4	});	4	});
5	});	5	});
6		6

Lines 1-5 Link Here

(-)b/devel/electron22/files/patch-electron_spec_api-net-log-spec.ts (-2 / +2 lines)
1	--- electron/spec/api-net-log-spec.ts.orig 2022-10-19 17:31:10.000000000 +0200	1	--- electron/spec/api-net-log-spec.ts.orig 2023-01-24 16:58:16 UTC
2	+++ electron/spec/api-net-log-spec.ts 2022-12-02 17:47:59.229362000 +0100	2	+++ electron/spec/api-net-log-spec.ts
3	@@ -121,7 +121,7 @@ describe('netLog module', () => {	3	@@ -121,7 +121,7 @@ describe('netLog module', () => {
4	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');	4	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');
5	});	5	});

Lines 1-6 Link Here

(-)b/devel/electron22/files/patch-electron_spec_api-power-monitor-spec.ts (-3 / +3 lines)
1	--- electron/spec/api-power-monitor-spec.ts.orig 2022-10-19 17:31:10.000000000 +0200	1	--- electron/spec/api-power-monitor-spec.ts.orig 2023-01-24 16:58:16 UTC
2	+++ electron/spec/api-power-monitor-spec.ts 2022-12-02 17:49:13.141645000 +0100	2	+++ electron/spec/api-power-monitor-spec.ts
3	@@ -14,7 +14,7 @@ describe('powerMonitor', () => {	3	@@ -14,7 +14,7 @@ import { promisify } from 'util';
4	describe('powerMonitor', () => {	4	describe('powerMonitor', () => {
5	let logindMock: any, dbusMockPowerMonitor: any, getCalls: any, emitSignal: any, reset: any;	5	let logindMock: any, dbusMockPowerMonitor: any, getCalls: any, emitSignal: any, reset: any;
6		6




--- 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()');

           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);

Lines 1-4 Link Here

(-)b/devel/electron22/files/patch-electron_spec_api-safe-storage-spec.ts (-2 / +2 lines)
1	--- electron/spec/api-safe-storage-spec.ts.orig 2022-05-18 15:31:32 UTC	1	--- electron/spec/api-safe-storage-spec.ts.orig 2023-01-24 16:58:16 UTC
2	+++ electron/spec/api-safe-storage-spec.ts	2	+++ electron/spec/api-safe-storage-spec.ts
3	@@ -33,7 +33,7 @@ describe('safeStorage module', () => {	3	@@ -33,7 +33,7 @@ describe('safeStorage module', () => {
4	});	4	});
Lines 8-11 Link Here
8	+ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd')('safeStorage module', () => {	8	+ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd')('safeStorage module', () => {
9	after(async () => {	9	after(async () => {
10	const pathToEncryptedString = path.resolve(__dirname, 'fixtures', 'api', 'safe-storage', 'encrypted.txt');	10	const pathToEncryptedString = path.resolve(__dirname, 'fixtures', 'api', 'safe-storage', 'encrypted.txt');
11	if (fs.existsSync(pathToEncryptedString)) {	11	if (await fs.pathExists(pathToEncryptedString)) {




--- 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', () => {
     });

       const display = screen.getPrimaryDisplay();
 
       expect(display).to.have.property('scaleFactor').that.is.a('number');
@@ -47,7 +47,7 @@ describe('screen module', () => {
     });
 
     it('has a size object property', function () {

       const display = screen.getPrimaryDisplay();
 
       expect(display).to.have.property('size').that.is.an('object');
@@ -57,7 +57,7 @@ describe('screen module', () => {
     });
 
     it('has a workAreaSize object property', function () {

       const display = screen.getPrimaryDisplay();
 
       expect(display).to.have.property('workAreaSize').that.is.an('object');
@@ -67,7 +67,7 @@ describe('screen module', () => {
     });
 
     it('has a bounds object property', function () {

Lines 1-6 Link Here

(-)b/devel/electron22/files/patch-electron_spec_api-shell-spec.ts (-3 / +3 lines)
1	--- electron/spec/api-shell-spec.ts.orig 2021-10-27 21:25:28 UTC	1	--- electron/spec/api-shell-spec.ts.orig 2023-01-24 16:58:16 UTC
2	+++ electron/spec/api-shell-spec.ts	2	+++ electron/spec/api-shell-spec.ts
3	@@ -23,7 +23,7 @@ describe('shell module', () => {	3	@@ -24,7 +24,7 @@ describe('shell module', () => {
4		4
5	afterEach(async () => {	5	afterEach(async () => {
6	// reset env vars to prevent side effects	6	// reset env vars to prevent side effects
Lines 9-15 Link Here
9	process.env.DE = envVars.de;	9	process.env.DE = envVars.de;
10	process.env.BROWSER = envVars.browser;	10	process.env.BROWSER = envVars.browser;
11	process.env.DISPLAY = envVars.display;	11	process.env.DISPLAY = envVars.display;
12	@@ -36,6 +36,11 @@ describe('shell module', () => {	12	@@ -37,6 +37,11 @@ describe('shell module', () => {
13	let requestReceived: Promise<any>;	13	let requestReceived: Promise<any>;
14	if (process.platform === 'linux') {	14	if (process.platform === 'linux') {
15	process.env.BROWSER = '/bin/true';	15	process.env.BROWSER = '/bin/true';

Added Link Here

(-)b/devel/electron22/files/patch-electron_spec_api-utility-process-spec.ts (+11 lines)
1	--- electron/spec/api-utility-process-spec.ts.orig 2023-01-24 16:58:16 UTC
2	+++ electron/spec/api-utility-process-spec.ts
3	@@ -308,7 +308,7 @@ describe('utilityProcess module', () => {
4	await closeWindow(w);
5	});
6
7	- ifit(process.platform === 'linux')('allows executing a setuid binary with child_process', async () => {
8	+ ifit(process.platform === 'linux' \|\| process.platform === 'freebsd')('allows executing a setuid binary with child_process', async () => {
9	const child = utilityProcess.fork(path.join(fixturesPath, 'suid.js'));
10	await emittedOnce(child, 'spawn');
11	const [data] = await emittedOnce(child, 'message');

Lines 1-6 Link Here

(-)b/devel/electron22/files/patch-electron_spec_api-web-frame-main-spec.ts (-2 / +2 lines)
1	--- electron/spec/api-web-frame-main-spec.ts.orig 2022-05-18 15:31:32 UTC	1	--- electron/spec/api-web-frame-main-spec.ts.orig 2023-01-24 16:58:16 UTC
2	+++ electron/spec/api-web-frame-main-spec.ts	2	+++ electron/spec/api-web-frame-main-spec.ts
3	@@ -204,7 +204,7 @@ describe('webFrameMain module', () => {	3	@@ -292,7 +292,7 @@ describe('webFrameMain module', () => {
4	});	4	});
5		5
6	// TODO(jkleinsc) fix this flaky test on linux	6	// TODO(jkleinsc) fix this flaky test on linux




--- 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', () => {
     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;

Added Link Here

(-)b/devel/electron22/files/patch-electron_spec_crash-spec.ts (+11 lines)
1	--- electron/spec/crash-spec.ts.orig 2023-01-24 16:58:16 UTC
2	+++ electron/spec/crash-spec.ts
3	@@ -39,7 +39,7 @@ const shouldRunCase = (crashCase: string) => {
4	}
5	// TODO(jkleinsc) fix this test on Linux on arm/arm64
6	case 'js-execute-iframe': {
7	- return (process.platform !== 'linux' \|\| (process.arch !== 'arm64' && process.arch !== 'arm'));
8	+ return ((process.platform !== 'linux' && process.platform !== 'freebsd') \|\| (process.arch !== 'arm64' && process.arch !== 'arm'));
9	}
10	default: {
11	return true;

Added Link Here

(-)b/devel/electron22/files/patch-electron_spec_node-spec.ts (+11 lines)
1	--- electron/spec/node-spec.ts.orig 2023-01-24 16:58:16 UTC
2	+++ electron/spec/node-spec.ts
3	@@ -138,7 +138,7 @@ describe('node feature', () => {
4	});
5
6	describe('child_process.exec', () => {
7	- ifit(process.platform === 'linux')('allows executing a setuid binary from non-sandboxed renderer', async () => {
8	+ ifit(process.platform === 'linux' \|\| process.platform === 'freebsd')('allows executing a setuid binary from non-sandboxed renderer', async () => {
9	// Chrome uses prctl(2) to set the NO_NEW_PRIVILEGES flag on Linux (see
10	// https://github.com/torvalds/linux/blob/40fde647cc/Documentation/userspace-api/no_new_privs.rst).
11	// We disable this for unsandboxed processes, which the renderer tests

Lines 1-6 Link Here

(-)b/devel/electron22/files/patch-electron_spec_version-bump-spec.ts (-2 / +2 lines)
1	--- electron/spec/version-bump-spec.ts.orig 2021-11-15 23:45:07 UTC	1	--- electron/spec/version-bump-spec.ts.orig 2023-01-24 16:58:16 UTC
2	+++ electron/spec/version-bump-spec.ts	2	+++ electron/spec/version-bump-spec.ts
3	@@ -186,7 +186,7 @@ describe('version-bumper', () => {	3	@@ -92,7 +92,7 @@ describe('version-bumper', () => {
4		4
5	// On macOS Circle CI we don't have a real git environment due to running	5	// On macOS Circle CI we don't have a real git environment due to running
6	// gclient sync on a linux machine. These tests therefore don't run as expected.	6	// gclient sync on a linux machine. These tests therefore don't run as expected.

Lines 1-6 Link Here

(-)b/devel/electron22/files/patch-electron_spec_webview-spec.ts (-2 / +2 lines)
1	--- electron/spec/webview-spec.ts.orig 2022-08-03 15:31:58 UTC	1	--- electron/spec/webview-spec.ts.orig 2023-01-24 16:58:16 UTC
2	+++ electron/spec/webview-spec.ts	2	+++ electron/spec/webview-spec.ts
3	@@ -482,7 +482,7 @@ describe('<webview> tag', function () {	3	@@ -526,7 +526,7 @@ describe('<webview> tag', function () {
4	});	4	});
5		5
6	// FIXME(zcbenz): Fullscreen events do not work on Linux.	6	// FIXME(zcbenz): Fullscreen events do not work on Linux.

Lines 1-6 Link Here

(-)b/devel/electron22/files/patch-media_audio_BUILD.gn (-2 / +2 lines)
1	--- media/audio/BUILD.gn.orig 2022-11-30 08:12:58 UTC	1	--- media/audio/BUILD.gn.orig 2023-01-30 07:58:58 UTC
2	+++ media/audio/BUILD.gn	2	+++ media/audio/BUILD.gn
3	@@ -259,9 +259,20 @@ source_set("audio") {	3	@@ -265,9 +265,20 @@ source_set("audio") {
4	]	4	]
5	}	5	}
6		6

Lines 1-6 Link Here

(-)b/devel/electron22/files/patch-third__party_boringssl_BUILD.gn (-2 / +2 lines)
1	--- third_party/boringssl/BUILD.gn.orig 2022-03-25 21:59:56 UTC	1	--- third_party/boringssl/BUILD.gn.orig 2023-01-30 07:58:58 UTC
2	+++ third_party/boringssl/BUILD.gn	2	+++ third_party/boringssl/BUILD.gn
3	@@ -92,7 +92,7 @@ if (is_win && !is_msan && current_cpu != "arm64") {	3	@@ -106,7 +106,7 @@ if (is_win && !is_msan && current_cpu != "arm64") {
4	public_configs = [ ":no_asm_config" ]	4	public_configs = [ ":no_asm_config" ]
5	}	5	}
6	} else if (current_cpu == "arm64") {	6	} else if (current_cpu == "arm64") {

Lines 1-4 Link Here

(-)b/devel/electron22/files/patch-third__party_zlib_BUILD.gn (-2 / +2 lines)
1	--- third_party/zlib/BUILD.gn.orig 2022-07-22 17:30:31 UTC	1	--- third_party/zlib/BUILD.gn.orig 2023-01-30 07:58:59 UTC
2	+++ third_party/zlib/BUILD.gn	2	+++ third_party/zlib/BUILD.gn
3	@@ -117,7 +117,7 @@ if (use_arm_neon_optimizations) {	3	@@ -117,7 +117,7 @@ if (use_arm_neon_optimizations) {
4	# Disabled for iPhone, as described in DDI0487C_a_armv8_arm:	4	# Disabled for iPhone, as described in DDI0487C_a_armv8_arm:
Lines 18-24 Link Here
18	include_dirs = [ "." ]	18	include_dirs = [ "." ]
19		19
20	if (!is_win && !is_clang) {	20	if (!is_win && !is_clang) {
21	@@ -401,7 +401,7 @@ static_library("minizip") {	21	@@ -405,7 +405,7 @@ static_library("minizip") {
22	]	22	]
23	}	23	}
24		24

Lines 1-6 Link Here

(-)b/devel/electron22/files/patch-ui_color_color__id.h (-2 / +2 lines)
1	--- ui/color/color_id.h.orig 2022-11-30 08:12:58 UTC	1	--- ui/color/color_id.h.orig 2023-01-30 07:58:59 UTC
2	+++ ui/color/color_id.h	2	+++ ui/color/color_id.h
3	@@ -351,7 +351,7 @@	3	@@ -356,7 +356,7 @@
4	E_CPONLY(kColorNativeColor6) \	4	E_CPONLY(kColorNativeColor6) \
5	E_CPONLY(kColorNativeBaseColor) \	5	E_CPONLY(kColorNativeBaseColor) \
6	E_CPONLY(kColorNativeSecondaryColor)	6	E_CPONLY(kColorNativeSecondaryColor)

Lines 1-6 Link Here

(-)b/devel/electron22/files/patch-ui_compositor_compositor.h (-2 / +2 lines)
1	--- ui/compositor/compositor.h.orig 2022-11-30 08:12:58 UTC	1	--- ui/compositor/compositor.h.orig 2023-01-30 07:58:58 UTC
2	+++ ui/compositor/compositor.h	2	+++ ui/compositor/compositor.h
3	@@ -420,7 +420,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe	3	@@ -434,7 +434,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe
4		4
5	// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch	5	// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
6	// of lacros-chrome is complete.	6	// of lacros-chrome is complete.

Lines 1-6 Link Here

(-)b/devel/electron22/files/patch-ui_gfx_switches.cc (-2 / +2 lines)
1	--- ui/gfx/switches.cc.orig 2022-02-28 16:54:41 UTC	1	--- ui/gfx/switches.cc.orig 2023-01-30 07:58:58 UTC
2	+++ ui/gfx/switches.cc	2	+++ ui/gfx/switches.cc
3	@@ -26,7 +26,7 @@ const char kForcePrefersReducedMotion[] = "force-prefe	3	@@ -28,7 +28,7 @@ const char kForcePrefersReducedMotion[] = "force-prefe
4	// Run in headless mode, i.e., without a UI or display server dependencies.	4	// Run in headless mode, i.e., without a UI or display server dependencies.
5	const char kHeadless[] = "headless";	5	const char kHeadless[] = "headless";
6		6

Lines 1-6 Link Here

(-)b/devel/electron22/files/patch-ui_gfx_switches.h (-2 / +2 lines)
1	--- ui/gfx/switches.h.orig 2022-02-28 16:54:41 UTC	1	--- ui/gfx/switches.h.orig 2023-01-30 07:58:58 UTC
2	+++ ui/gfx/switches.h	2	+++ ui/gfx/switches.h
3	@@ -17,7 +17,7 @@ GFX_SWITCHES_EXPORT extern const char kEnableNativeGpu	3	@@ -18,7 +18,7 @@ GFX_SWITCHES_EXPORT extern const char kEnableNativeGpu
4	GFX_SWITCHES_EXPORT extern const char kForcePrefersReducedMotion[];	4	GFX_SWITCHES_EXPORT extern const char kForcePrefersReducedMotion[];
5	GFX_SWITCHES_EXPORT extern const char kHeadless[];	5	GFX_SWITCHES_EXPORT extern const char kHeadless[];
6		6




--- ui/gtk/gtk_compat.cc.orig	2023-01-30 07:58:59 UTC
+++ ui/gtk/gtk_compat.cc
@@ -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");
+#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");
+#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);
+#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);
+#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;
 }
 

Lines 1-6 Link Here

(-)b/devel/electron22/files/patch-ui_gtk_printing_print__dialog__gtk.cc (-2 / +2 lines)
1	--- ui/gtk/printing/print_dialog_gtk.cc.orig 2022-11-30 08:12:58 UTC	1	--- ui/gtk/printing/print_dialog_gtk.cc.orig 2023-01-30 07:58:59 UTC
2	+++ ui/gtk/printing/print_dialog_gtk.cc	2	+++ ui/gtk/printing/print_dialog_gtk.cc
3	@@ -400,7 +400,7 @@ void PrintDialogGtk::ShowDialog(	3	@@ -418,7 +418,7 @@ void PrintDialogGtk::ShowDialog(
4	GtkPrintCapabilities cap = static_cast<GtkPrintCapabilities>(	4	GtkPrintCapabilities cap = static_cast<GtkPrintCapabilities>(
5	GTK_PRINT_CAPABILITY_GENERATE_PDF \| GTK_PRINT_CAPABILITY_PAGE_SET \|	5	GTK_PRINT_CAPABILITY_GENERATE_PDF \| GTK_PRINT_CAPABILITY_PAGE_SET \|
6	GTK_PRINT_CAPABILITY_COPIES \| GTK_PRINT_CAPABILITY_COLLATE \|	6	GTK_PRINT_CAPABILITY_COPIES \| GTK_PRINT_CAPABILITY_COLLATE \|

Lines 1-6 Link Here

(-)b/devel/electron22/files/patch-ui_ozone_platform_x11_ozone__platform__x11.cc (-2 / +2 lines)
1	--- ui/ozone/platform/x11/ozone_platform_x11.cc.orig 2022-11-30 08:12:58 UTC	1	--- ui/ozone/platform/x11/ozone_platform_x11.cc.orig 2023-01-30 07:58:59 UTC
2	+++ ui/ozone/platform/x11/ozone_platform_x11.cc	2	+++ ui/ozone/platform/x11/ozone_platform_x11.cc
3	@@ -195,7 +195,7 @@ class OzonePlatformX11 : public OzonePlatform,	3	@@ -196,7 +196,7 @@ class OzonePlatformX11 : public OzonePlatform,
4	properties->supports_global_application_menus = true;	4	properties->supports_global_application_menus = true;
5	properties->app_modal_dialogs_use_event_blocker = true;	5	properties->app_modal_dialogs_use_event_blocker = true;
6	properties->fetch_buffer_formats_for_gmb_on_gpu = true;	6	properties->fetch_buffer_formats_for_gmb_on_gpu = true;

Lines 1-6 Link Here

(-)b/devel/electron22/files/patch-ui_ozone_public_ozone__platform.h (-2 / +2 lines)
1	--- ui/ozone/public/ozone_platform.h.orig 2022-11-30 08:12:58 UTC	1	--- ui/ozone/public/ozone_platform.h.orig 2023-01-30 07:58:59 UTC
2	+++ ui/ozone/public/ozone_platform.h	2	+++ ui/ozone/public/ozone_platform.h
3	@@ -144,7 +144,7 @@ class COMPONENT_EXPORT(OZONE) OzonePlatform {	3	@@ -148,7 +148,7 @@ class COMPONENT_EXPORT(OZONE) OzonePlatform {
4	// back via gpu extra info.	4	// back via gpu extra info.
5	bool fetch_buffer_formats_for_gmb_on_gpu = false;	5	bool fetch_buffer_formats_for_gmb_on_gpu = false;
6		6




--- v8/BUILD.gn.orig	2023-01-30 07:58:59 UTC
+++ v8/BUILD.gn
@@ -1246,6 +1246,14 @@ config("toolchain") {
   } else if (target_os == "win") {
     defines += [ "V8_HAVE_TARGET_OS" ]
     defines += [ "V8_TARGET_OS_WIN" ]

   }
 
   # TODO(infra): Support v8_enable_prof on Windows.
@@ -5485,7 +5493,7 @@ v8_component("v8_libbase") {
     }
   }
 

     sources += [
       "src/base/debug/stack_trace_posix.cc",
       "src/base/platform/platform-linux.cc",
@@ -5496,6 +5504,18 @@ v8_component("v8_libbase") {
       "dl",
       "rt",
     ]




    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"

    "@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"

    "@nodelib/fs.scandir" "2.1.3"
    fastq "^1.6.0"

"@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/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"

  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"

    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"

    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"

    "@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"

  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"

    "@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"

    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"

    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"

    "@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"

  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"

    "@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"

    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"

  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"

  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"

    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"

    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"

  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"

  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"

  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"

    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"

  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"

    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"

  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"

  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"

  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"

    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"

  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"

  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"

  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"

  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"

  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"

  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"

  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"

  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.2.0:
  version "6.3.0"
  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==

  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"

    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"

  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"

  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"

  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"

  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"

  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"

  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"

Return to bug 269194

Lines 2-11 PORTNAME= electron Link Here

(-)b/devel/electron22/Makefile (-4 / +9 lines)
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= ${ELECTRON_VER:S/-beta./.b/}	3	DISTVERSION= ${ELECTRON_VER:S/-beta./.b/}
4	CATEGORIES= devel	4	CATEGORIES= devel
5	MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/:chromium \	5	MASTER_SITES= https://github.com/tagattie/FreeBSD-Electron/releases/download/v22.0.3/:chromium \
		6	https://commondatastorage.googleapis.com/chromium-nodejs/:chromium_node \
6	https://commondatastorage.googleapis.com/chromium-fonts/:chromium_testfonts	7	https://commondatastorage.googleapis.com/chromium-fonts/:chromium_testfonts
7	PKGNAMESUFFIX= ${ELECTRON_VER_MAJOR}	8	PKGNAMESUFFIX= ${ELECTRON_VER_MAJOR}
8	DISTFILES= chromium-${CHROMIUM_VER}${EXTRACT_SUFX}:chromium \	9	DISTFILES= chromium-${CHROMIUM_VER}${EXTRACT_SUFX}:chromium \
		10	${CHROMIUM_NODE_MODULES_HASH}:chromium_node \
9	${CHROMIUM_TEST_FONTS_HASH}:chromium_testfonts \	11	${CHROMIUM_TEST_FONTS_HASH}:chromium_testfonts \
10	electron-yarn-cache-${ELECTRON_VER}${EXTRACT_SUFX}:prefetch	12	electron-yarn-cache-${ELECTRON_VER}${EXTRACT_SUFX}:prefetch
11	DIST_SUBDIR= ${PORTNAME}	13	DIST_SUBDIR= ${PORTNAME}
Lines 131-137 GN_BOOTSTRAP_FLAGS= --no-clean --no-rebuild --skip-generate-buildfiles Link Here
131	PLIST_SUB= ELECTRON_VER=${ELECTRON_VER} \	133	PLIST_SUB= ELECTRON_VER=${ELECTRON_VER} \
132	ELECTRON_VER_MAJOR=${ELECTRON_VER_MAJOR}	134	ELECTRON_VER_MAJOR=${ELECTRON_VER_MAJOR}
133		135
134	OPTIONS_DEFINE= CODECS CUPS DEBUG DIST DRIVER KERBEROS LTO	136	OPTIONS_DEFINE= CODECS CUPS DEBUG DIST DRIVER KERBEROS LTO
135	OPTIONS_DEFAULT= CODECS CUPS DRIVER KERBEROS SNDIO	137	OPTIONS_DEFAULT= CODECS CUPS DRIVER KERBEROS SNDIO
136	OPTIONS_EXCLUDE_aarch64=LTO	138	OPTIONS_EXCLUDE_aarch64=LTO
137	OPTIONS_GROUP= AUDIO	139	OPTIONS_GROUP= AUDIO
Lines 203-209 SNDIO_VARS= GN_ARGS+=use_sndio=true Link Here
203	SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false	205	SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false
204		206
205	# See ${WRKSRC}/electron/DEPS for CHROMIUM_VER	207	# See ${WRKSRC}/electron/DEPS for CHROMIUM_VER
206	CHROMIUM_VER= 108.0.5359.125	208	CHROMIUM_VER= 108.0.5359.179
		209	# See ${WRKSRC}/third_party/node/node_modules.tar.gz.sha1 for CHROMIUM_NODE_MODULES_HASH
		210	CHROMIUM_NODE_MODULES_HASH= f8b5da24d33317766d3933fb6711b0603fc4fb6f
207	# See ${WRKSRC}/third_party/test_fonts/test_fonts.tar.gz.sha1 for CHROMIUM_TEST_FONTS_HASH	211	# See ${WRKSRC}/third_party/test_fonts/test_fonts.tar.gz.sha1 for CHROMIUM_TEST_FONTS_HASH
208	CHROMIUM_TEST_FONTS_HASH= 336e775eec536b2d785cc80eff6ac39051931286	212	CHROMIUM_TEST_FONTS_HASH= 336e775eec536b2d785cc80eff6ac39051931286
209	# See ${WRKSRC}/electron/DEPS for NODE_VER	213	# See ${WRKSRC}/electron/DEPS for NODE_VER
Lines 217-223 REACTIVEOBJC_VER= 74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76 Link Here
217	# See ${WRKSRC}/electron/DEPS for MANTLE_VER	221	# See ${WRKSRC}/electron/DEPS for MANTLE_VER
218	MANTLE_VER= 78d3966b3c331292ea29ec38661b25df0a245948	222	MANTLE_VER= 78d3966b3c331292ea29ec38661b25df0a245948
219		223
220	YARN_TIMESTAMP= 1661146515	224	YARN_TIMESTAMP= 1675054791
221		225
222	.include "Makefile.version"	226	.include "Makefile.version"
223	.include <bsd.port.pre.mk>	227	.include <bsd.port.pre.mk>
Lines 304-309 post-extract: Link Here
304	${WRKSRC}/third_party/squirrel.mac/vendor/ReactiveObjC	308	${WRKSRC}/third_party/squirrel.mac/vendor/ReactiveObjC
305	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_mantle}-${MANTLE_VER} \	309	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_mantle}-${MANTLE_VER} \
306	${WRKSRC}/third_party/squirrel.mac/vendor/Mantle	310	${WRKSRC}/third_party/squirrel.mac/vendor/Mantle
		311	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/node_modules ${WRKSRC}/third_party/node
307	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/test_fonts ${WRKSRC}/third_party/test_fonts	312	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/test_fonts ${WRKSRC}/third_party/test_fonts
308	# Install node modules for electron	313	# Install node modules for electron
309	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/yarn-offline-cache ${WRKDIR}	314	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/yarn-offline-cache ${WRKDIR}

Lines 1-4 Link Here

(-)b/devel/electron22/files/patch-BUILD.gn (-5 / +5 lines)
1	--- BUILD.gn.orig 2022-11-30 08:12:58 UTC	1	--- BUILD.gn.orig 2023-01-30 07:58:58 UTC
2	+++ BUILD.gn	2	+++ BUILD.gn
3	@@ -59,7 +59,7 @@ declare_args() {	3	@@ -59,7 +59,7 @@ declare_args() {
4	root_extra_deps = []	4	root_extra_deps = []
Lines 51-57 Link Here
51	deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]	51	deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
52	}	52	}
53		53
54	@@ -1107,7 +1115,7 @@ if (!is_ios) {	54	@@ -1110,7 +1118,7 @@ if (!is_ios) {
55	]	55	]
56	}	56	}
57		57
Lines 60-66 Link Here
60	# WPT Webdriver tests runner	60	# WPT Webdriver tests runner
61	# chrome/test/chromedriver/test/run_webdriver_tests.py	61	# chrome/test/chromedriver/test/run_webdriver_tests.py
62	script_test("webdriver_wpt_tests") {	62	script_test("webdriver_wpt_tests") {
63	@@ -1202,7 +1210,7 @@ if (!is_ios) {	63	@@ -1205,7 +1213,7 @@ if (!is_ios) {
64	data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ]	64	data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ]
65	}	65	}
66		66
Lines 69-75 Link Here
69	data_deps +=	69	data_deps +=
70	[ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]	70	[ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
71	}	71	}
72	@@ -1211,7 +1219,7 @@ if (!is_ios) {	72	@@ -1214,7 +1222,7 @@ if (!is_ios) {
73	data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]	73	data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
74	}	74	}
75		75
Lines 78-84 Link Here
78	data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]	78	data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
79	}	79	}
80		80
81	@@ -1655,7 +1663,7 @@ group("chromium_builder_perf") {	81	@@ -1658,7 +1666,7 @@ group("chromium_builder_perf") {
82	data_deps += [ "//chrome/test:performance_browser_tests" ]	82	data_deps += [ "//chrome/test:performance_browser_tests" ]
83	}	83	}
84		84

Lines 1-6 Link Here

(-)b/devel/electron22/files/patch-build_config_BUILDCONFIG.gn (-5 / +5 lines)
1	--- build/config/BUILDCONFIG.gn.orig 2022-04-21 18:48:31 UTC	1	--- build/config/BUILDCONFIG.gn.orig 2023-01-30 07:58:58 UTC
2	+++ build/config/BUILDCONFIG.gn	2	+++ build/config/BUILDCONFIG.gn
3	@@ -136,7 +136,8 @@ declare_args() {	3	@@ -139,7 +139,8 @@ declare_args() {
4	is_official_build = false	4	is_official_build = false
5		5
6	# Set to true when compiling with the Clang compiler.	6	# Set to true when compiling with the Clang compiler.
Lines 10-16 Link Here
10	(current_cpu != "s390x" && current_cpu != "s390" &&	10	(current_cpu != "s390x" && current_cpu != "s390" &&
11	current_cpu != "ppc64" && current_cpu != "ppc" &&	11	current_cpu != "ppc64" && current_cpu != "ppc" &&
12	current_cpu != "mips" && current_cpu != "mips64" &&	12	current_cpu != "mips" && current_cpu != "mips64" &&
13	@@ -220,6 +221,10 @@ if (host_toolchain == "") {	13	@@ -223,6 +224,10 @@ if (host_toolchain == "") {
14	host_toolchain = "//build/toolchain/aix:$host_cpu"	14	host_toolchain = "//build/toolchain/aix:$host_cpu"
15	} else if (host_os == "zos") {	15	} else if (host_os == "zos") {
16	host_toolchain = "//build/toolchain/zos:$host_cpu"	16	host_toolchain = "//build/toolchain/zos:$host_cpu"
Lines 21-27 Link Here
21	} else {	21	} else {
22	assert(false, "Unsupported host_os: $host_os")	22	assert(false, "Unsupported host_os: $host_os")
23	}	23	}
24	@@ -264,6 +269,8 @@ if (target_os == "android") {	24	@@ -267,6 +272,8 @@ if (target_os == "android") {
25	_default_toolchain = "//build/toolchain/aix:$target_cpu"	25	_default_toolchain = "//build/toolchain/aix:$target_cpu"
26	} else if (target_os == "zos") {	26	} else if (target_os == "zos") {
27	_default_toolchain = "//build/toolchain/zos:$target_cpu"	27	_default_toolchain = "//build/toolchain/zos:$target_cpu"
Lines 30-36 Link Here
30	} else {	30	} else {
31	assert(false, "Unsupported target_os: $target_os")	31	assert(false, "Unsupported target_os: $target_os")
32	}	32	}
33	@@ -298,7 +305,11 @@ is_android = current_os == "android"	33	@@ -301,7 +308,11 @@ is_android = current_os == "android"
34	is_chromeos = current_os == "chromeos"	34	is_chromeos = current_os == "chromeos"
35	is_fuchsia = current_os == "fuchsia"	35	is_fuchsia = current_os == "fuchsia"
36	is_ios = current_os == "ios"	36	is_ios = current_os == "ios"

Lines 1-6 Link Here

(-)b/devel/electron22/files/patch-content_app_content__main__runner__impl.cc (-11 / +11 lines)
1	--- content/app/content_main_runner_impl.cc.orig 2022-11-30 08:12:58 UTC	1	--- content/app/content_main_runner_impl.cc.orig 2023-01-30 07:58:59 UTC
2	+++ content/app/content_main_runner_impl.cc	2	+++ content/app/content_main_runner_impl.cc
3	@@ -135,13 +135,13 @@	3	@@ -136,13 +136,13 @@
4	#include "base/posix/global_descriptors.h"	4	#include "base/posix/global_descriptors.h"
5	#include "content/public/common/content_descriptors.h"	5	#include "content/public/common/content_descriptors.h"
6		6
Lines 16-22 Link Here
16	#include "base/native_library.h"	16	#include "base/native_library.h"
17	#include "base/rand_util.h"	17	#include "base/rand_util.h"
18	#include "content/public/common/zygote/sandbox_support_linux.h"	18	#include "content/public/common/zygote/sandbox_support_linux.h"
19	@@ -180,6 +180,10 @@	19	@@ -181,6 +181,10 @@
20	#include "media/base/media_switches.h"	20	#include "media/base/media_switches.h"
21	#endif	21	#endif
22		22
Lines 27-33 Link Here
27	#if BUILDFLAG(IS_ANDROID)	27	#if BUILDFLAG(IS_ANDROID)
28	#include "base/system/sys_info.h"	28	#include "base/system/sys_info.h"
29	#include "content/browser/android/battery_metrics.h"	29	#include "content/browser/android/battery_metrics.h"
30	@@ -382,7 +386,7 @@ void InitializeZygoteSandboxForBrowserProcess(	30	@@ -386,7 +390,7 @@ void InitializeZygoteSandboxForBrowserProcess(
31	}	31	}
32	#endif // BUILDFLAG(USE_ZYGOTE_HANDLE)	32	#endif // BUILDFLAG(USE_ZYGOTE_HANDLE)
33		33
Lines 36-42 Link Here
36		36
37	#if BUILDFLAG(ENABLE_PPAPI)	37	#if BUILDFLAG(ENABLE_PPAPI)
38	// Loads the (native) libraries but does not initialize them (i.e., does not	38	// Loads the (native) libraries but does not initialize them (i.e., does not
39	@@ -418,7 +422,7 @@ void PreloadLibraryCdms() {	39	@@ -422,7 +426,7 @@ void PreloadLibraryCdms() {
40	}	40	}
41	#endif // BUILDFLAG(ENABLE_LIBRARY_CDMS)	41	#endif // BUILDFLAG(ENABLE_LIBRARY_CDMS)
42		42
Lines 45-51 Link Here
45	void PreSandboxInit() {	45	void PreSandboxInit() {
46	// Pre-acquire resources needed by BoringSSL. See	46	// Pre-acquire resources needed by BoringSSL. See
47	// https://boringssl.googlesource.com/boringssl/+/HEAD/SANDBOXING.md	47	// https://boringssl.googlesource.com/boringssl/+/HEAD/SANDBOXING.md
48	@@ -441,6 +445,11 @@ void PreSandboxInit() {	48	@@ -445,6 +449,11 @@ void PreSandboxInit() {
49	}	49	}
50	#endif	50	#endif
51		51
Lines 57-63 Link Here
57	// Set the android SkFontMgr for blink. We need to ensure this is done	57	// Set the android SkFontMgr for blink. We need to ensure this is done
58	// before the sandbox is initialized to allow the font manager to access	58	// before the sandbox is initialized to allow the font manager to access
59	// font configuration files on disk.	59	// font configuration files on disk.
60	@@ -623,7 +632,7 @@ int NO_STACK_PROTECTOR RunZygote(ContentMainDelegate*	60	@@ -627,7 +636,7 @@ int NO_STACK_PROTECTOR RunZygote(ContentMainDelegate*
61	delegate->ZygoteStarting(&zygote_fork_delegates);	61	delegate->ZygoteStarting(&zygote_fork_delegates);
62	media::InitializeMediaLibrary();	62	media::InitializeMediaLibrary();
63		63
Lines 66-72 Link Here
66	PreSandboxInit();	66	PreSandboxInit();
67	#endif	67	#endif
68		68
69	@@ -817,11 +826,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam	69	@@ -821,11 +830,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
70	kFieldTrialDescriptor + base::GlobalDescriptors::kBaseDescriptor);	70	kFieldTrialDescriptor + base::GlobalDescriptors::kBaseDescriptor);
71	#endif // !BUILDFLAG(IS_ANDROID)	71	#endif // !BUILDFLAG(IS_ANDROID)
72		72
Lines 80-86 Link Here
80		80
81	#endif // !BUILDFLAG(IS_WIN)	81	#endif // !BUILDFLAG(IS_WIN)
82		82
83	@@ -1007,6 +1015,16 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam	83	@@ -1011,6 +1019,16 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
84	}	84	}
85	#endif	85	#endif
86		86
Lines 97-103 Link Here
97	delegate_->SandboxInitialized(process_type);	97	delegate_->SandboxInitialized(process_type);
98		98
99	#if BUILDFLAG(USE_ZYGOTE_HANDLE)	99	#if BUILDFLAG(USE_ZYGOTE_HANDLE)
100	@@ -1070,7 +1088,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {	100	@@ -1074,7 +1092,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
101	process_type);	101	process_type);
102	}	102	}
103		103
Lines 106-112 Link Here
106	// If dynamic Mojo Core is being used, ensure that it's loaded very early in	106	// If dynamic Mojo Core is being used, ensure that it's loaded very early in
107	// the child/zygote process, before any sandbox is initialized. The library	107	// the child/zygote process, before any sandbox is initialized. The library
108	// is not fully initialized with IPC support until a ChildProcess is later	108	// is not fully initialized with IPC support until a ChildProcess is later
109	@@ -1103,6 +1121,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {	109	@@ -1107,6 +1125,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
110	content_main_params_.reset();	110	content_main_params_.reset();
111		111
112	RegisterMainThreadFactories();	112	RegisterMainThreadFactories();

Lines 1-4 Link Here

(-)b/devel/electron22/files/patch-content_browser_child__process__launcher__helper__linux.cc (-5 / +5 lines)
1	--- content/browser/child_process_launcher_helper_linux.cc.orig 2023-01-23 08:53:25 UTC	1	--- content/browser/child_process_launcher_helper_linux.cc.orig 2023-01-30 07:58:59 UTC
2	+++ content/browser/child_process_launcher_helper_linux.cc	2	+++ content/browser/child_process_launcher_helper_linux.cc
3	@@ -20,7 +20,9 @@	3	@@ -20,7 +20,9 @@
4	#include "content/public/common/result_codes.h"	4	#include "content/public/common/result_codes.h"
Lines 14-31 Link Here
14	options->fds_to_remap = files_to_register.GetMappingWithIDAdjustment(	14	options->fds_to_remap = files_to_register.GetMappingWithIDAdjustment(
15	base::GlobalDescriptors::kBaseDescriptor);	15	base::GlobalDescriptors::kBaseDescriptor);
16		16
17	+# if !BUILDFLAG(IS_BSD)	17	+#if !BUILDFLAG(IS_BSD)
18	if (GetProcessType() == switches::kRendererProcess) {	18	if (GetProcessType() == switches::kRendererProcess) {
19	const int sandbox_fd = SandboxHostLinux::GetInstance()->GetChildSocket();	19	const int sandbox_fd = SandboxHostLinux::GetInstance()->GetChildSocket();
20	options->fds_to_remap.push_back(std::make_pair(sandbox_fd, GetSandboxFD()));	20	options->fds_to_remap.push_back(std::make_pair(sandbox_fd, GetSandboxFD()));
21	@@ -68,6 +71,7 @@ bool ChildProcessLauncherHelper::BeforeLaunchOnLaunche	21	@@ -67,6 +70,7 @@ bool ChildProcessLauncherHelper::BeforeLaunchOnLaunche
		22	if (!zygote_handle) {
22	options->allow_new_privs = true;	23	options->allow_new_privs = true;
23	}	24	}
24
25	+#endif	25	+#endif
		26
26	for (const auto& remapped_fd : file_data_->additional_remapped_fds) {	27	for (const auto& remapped_fd : file_data_->additional_remapped_fds) {
27	options->fds_to_remap.emplace_back(remapped_fd.second.get(),	28	options->fds_to_remap.emplace_back(remapped_fd.second.get(),
28	remapped_fd.first);
29	@@ -88,6 +92,7 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr	29	@@ -88,6 +92,7 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr
30	int* launch_result) {	30	int* launch_result) {
31	*is_synchronous_launch = true;	31	*is_synchronous_launch = true;

Lines 1-6 Link Here

(-)b/devel/electron22/files/patch-content_browser_gpu_gpu__process__host.cc (-3 / +3 lines)
1	--- content/browser/gpu/gpu_process_host.cc.orig 2022-11-30 08:12:58 UTC	1	--- content/browser/gpu/gpu_process_host.cc.orig 2023-01-30 07:58:58 UTC
2	+++ content/browser/gpu/gpu_process_host.cc	2	+++ content/browser/gpu/gpu_process_host.cc
3	@@ -255,6 +255,7 @@ static const char* const kSwitchNames[] = {	3	@@ -256,6 +256,7 @@ static const char* const kSwitchNames[] = {
4	switches::kEnableBackgroundThreadPool,	4	switches::kEnableBackgroundThreadPool,
5	switches::kEnableGpuRasterization,	5	switches::kEnableGpuRasterization,
6	switches::kEnableLogging,	6	switches::kEnableLogging,
Lines 8-14 Link Here
8	switches::kEnableDeJelly,	8	switches::kEnableDeJelly,
9	switches::kDeJellyScreenWidth,	9	switches::kDeJellyScreenWidth,
10	switches::kDoubleBufferCompositing,	10	switches::kDoubleBufferCompositing,
11	@@ -288,7 +289,7 @@ static const char* const kSwitchNames[] = {	11	@@ -289,7 +290,7 @@ static const char* const kSwitchNames[] = {
12	switches::kOzoneDumpFile,	12	switches::kOzoneDumpFile,
13	switches::kDisableBufferBWCompression,	13	switches::kDisableBufferBWCompression,
14	#endif	14	#endif

Lines 1-6 Link Here

(-)b/devel/electron22/files/patch-content_browser_renderer__host_render__process__host__impl.cc (-7 / +7 lines)
1	--- content/browser/renderer_host/render_process_host_impl.cc.orig 2022-11-30 08:12:58 UTC	1	--- content/browser/renderer_host/render_process_host_impl.cc.orig 2023-01-30 07:58:58 UTC
2	+++ content/browser/renderer_host/render_process_host_impl.cc	2	+++ content/browser/renderer_host/render_process_host_impl.cc
3	@@ -213,7 +213,7 @@	3	@@ -214,7 +214,7 @@
4	#include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h"	4	#include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h"
5	#endif	5	#endif
6		6
Lines 9-15 Link Here
9	#include <sys/resource.h>	9	#include <sys/resource.h>
10		10
11	#include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck	11	#include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck
12	@@ -1137,7 +1137,7 @@ static constexpr size_t kUnknownPlatformProcessLimit =	12	@@ -1138,7 +1138,7 @@ static constexpr size_t kUnknownPlatformProcessLimit =
13	// to indicate failure and std::numeric_limits<size_t>::max() to indicate	13	// to indicate failure and std::numeric_limits<size_t>::max() to indicate
14	// unlimited.	14	// unlimited.
15	size_t GetPlatformProcessLimit() {	15	size_t GetPlatformProcessLimit() {
Lines 18-24 Link Here
18	struct rlimit limit;	18	struct rlimit limit;
19	if (getrlimit(RLIMIT_NPROC, &limit) != 0)	19	if (getrlimit(RLIMIT_NPROC, &limit) != 0)
20	return kUnknownPlatformProcessLimit;	20	return kUnknownPlatformProcessLimit;
21	@@ -1224,7 +1224,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public	21	@@ -1225,7 +1225,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public
22	return;	22	return;
23	}	23	}
24		24
Lines 27-33 Link Here
27	if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) {	27	if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) {
28	ConnectToFontService(std::move(font_receiver));	28	ConnectToFontService(std::move(font_receiver));
29	return;	29	return;
30	@@ -2119,7 +2119,7 @@ void RenderProcessHostImpl::ReinitializeLogging(	30	@@ -2127,7 +2127,7 @@ void RenderProcessHostImpl::ReinitializeLogging(
31	}	31	}
32	#endif // BUILDFLAG(IS_CHROMEOS_ASH)	32	#endif // BUILDFLAG(IS_CHROMEOS_ASH)
33		33
Lines 36-42 Link Here
36	void RenderProcessHostImpl::CreateStableVideoDecoder(	36	void RenderProcessHostImpl::CreateStableVideoDecoder(
37	mojo::PendingReceiver<media::stable::mojom::StableVideoDecoder> receiver) {	37	mojo::PendingReceiver<media::stable::mojom::StableVideoDecoder> receiver) {
38	if (!stable_video_decoder_factory_remote_.is_bound()) {	38	if (!stable_video_decoder_factory_remote_.is_bound()) {
39	@@ -3269,6 +3269,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin	39	@@ -3278,6 +3278,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin
40	switches::kDisableSpeechAPI,	40	switches::kDisableSpeechAPI,
41	switches::kDisableThreadedCompositing,	41	switches::kDisableThreadedCompositing,
42	switches::kDisableTouchDragDrop,	42	switches::kDisableTouchDragDrop,
Lines 44-50 Link Here
44	switches::kDisableV8IdleTasks,	44	switches::kDisableV8IdleTasks,
45	switches::kDisableVideoCaptureUseGpuMemoryBuffer,	45	switches::kDisableVideoCaptureUseGpuMemoryBuffer,
46	switches::kDisableWebGLImageChromium,	46	switches::kDisableWebGLImageChromium,
47	@@ -4742,7 +4743,7 @@ void RenderProcessHostImpl::ResetIPC() {	47	@@ -4751,7 +4752,7 @@ void RenderProcessHostImpl::ResetIPC() {
48	coordinator_connector_receiver_.reset();	48	coordinator_connector_receiver_.reset();
49	tracing_registration_.reset();	49	tracing_registration_.reset();
50		50

Lines 1-6 Link Here

(-)b/devel/electron22/files/patch-content_browser_utility__sandbox__delegate.cc (-3 / +3 lines)
1	--- content/browser/utility_sandbox_delegate.cc.orig 2022-10-24 13:33:33 UTC	1	--- content/browser/utility_sandbox_delegate.cc.orig 2023-01-30 07:58:59 UTC
2	+++ content/browser/utility_sandbox_delegate.cc	2	+++ content/browser/utility_sandbox_delegate.cc
3	@@ -63,10 +63,10 @@ UtilitySandboxedProcessLauncherDelegate::	3	@@ -65,10 +65,10 @@ UtilitySandboxedProcessLauncherDelegate::
4	#if BUILDFLAG(ENABLE_PPAPI)	4	#if BUILDFLAG(ENABLE_PPAPI)
5	sandbox_type_ == sandbox::mojom::Sandbox::kPpapi \|\|	5	sandbox_type_ == sandbox::mojom::Sandbox::kPpapi \|\|
6	#endif	6	#endif
Lines 13-19 Link Here
13	sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoDecoding \|\|	13	sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoDecoding \|\|
14	#endif // BUILDFLAG(IS_LINUX) \|\| BUILDFLAG(IS_CHROMEOS_ASH)	14	#endif // BUILDFLAG(IS_LINUX) \|\| BUILDFLAG(IS_CHROMEOS_ASH)
15	#if BUILDFLAG(IS_CHROMEOS_ASH)	15	#if BUILDFLAG(IS_CHROMEOS_ASH)
16	@@ -109,7 +109,7 @@ ZygoteHandle UtilitySandboxedProcessLauncherDelegate::	16	@@ -117,7 +117,7 @@ ZygoteHandle UtilitySandboxedProcessLauncherDelegate::
17	// unsandboxed zygote and then apply their actual sandboxes in the forked	17	// unsandboxed zygote and then apply their actual sandboxes in the forked
18	// process upon startup.	18	// process upon startup.
19	if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork \|\|	19	if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork \|\|

Lines 1-4 Link Here

(-)b/devel/electron22/files/patch-content_renderer_renderer__blink__platform__impl.h (-3 / +3 lines)
1	--- content/renderer/renderer_blink_platform_impl.h.orig 2022-11-30 08:12:58 UTC	1	--- content/renderer/renderer_blink_platform_impl.h.orig 2023-01-30 07:58:59 UTC
2	+++ content/renderer/renderer_blink_platform_impl.h	2	+++ content/renderer/renderer_blink_platform_impl.h
3	@@ -29,7 +29,7 @@	3	@@ -29,7 +29,7 @@
4	#include "third_party/blink/public/common/user_agent/user_agent_metadata.h"	4	#include "third_party/blink/public/common/user_agent/user_agent_metadata.h"
Lines 18-24 Link Here
18	void SetThreadType(base::PlatformThreadId thread_id,	18	void SetThreadType(base::PlatformThreadId thread_id,
19	base::ThreadType) override;	19	base::ThreadType) override;
20	#endif	20	#endif
21	@@ -237,7 +237,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi	21	@@ -240,7 +240,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
22	void Collect3DContextInformation(blink::Platform::GraphicsInfo* gl_info,	22	void Collect3DContextInformation(blink::Platform::GraphicsInfo* gl_info,
23	const gpu::GPUInfo& gpu_info) const;	23	const gpu::GPUInfo& gpu_info) const;
24		24
Lines 27-33 Link Here
27	std::unique_ptr<blink::WebSandboxSupport> sandbox_support_;	27	std::unique_ptr<blink::WebSandboxSupport> sandbox_support_;
28	#endif	28	#endif
29		29
30	@@ -257,7 +257,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi	30	@@ -260,7 +260,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
31	mutable base::WaitableEvent io_thread_id_ready_event_;	31	mutable base::WaitableEvent io_thread_id_ready_event_;
32	base::PlatformThreadId io_thread_id_ = base::kInvalidThreadId;	32	base::PlatformThreadId io_thread_id_ = base::kInvalidThreadId;
33		33

Lines 1-17 Link Here

(-)b/devel/electron22/files/patch-electron_script_lib_get-version.js (-9 / +9 lines)
1	--- electron/script/lib/get-version.js.orig 2023-01-20 15:13:09.374140000 +0100	1	--- electron/script/lib/get-version.js.orig 2023-01-24 16:58:16 UTC
2	+++ electron/script/lib/get-version.js 2023-01-20 15:13:35.153332000 +0100	2	+++ electron/script/lib/get-version.js
3	@@ -11,12 +11,6 @@ module.exports.getElectronVersion = () => {	3	@@ -11,12 +11,10 @@ module.exports.getElectronVersion = () => {
4	// The only difference in the "git describe" technique is that technically a commit can "change" it's version	4	// The only difference in the "git describe" technique is that technically a commit can "change" it's version
5	// number if a tag is created / removed retroactively. i.e. the first time a commit is pushed it will be 1.2.3	5	// number if a tag is created / removed retroactively. i.e. the first time a commit is pushed it will be 1.2.3
6	// and after the tag is made rebuilding the same commit will result in it being 1.2.4	6	// and after the tag is made rebuilding the same commit will result in it being 1.2.4
7	- const output = spawnSync('git', ['describe', '--tags', '--abbrev=0'], {	7	- const output = spawnSync('git', ['describe', '--tags', '--abbrev=0'], {
8	- cwd: path.resolve(__dirname, '..', '..')	8	- cwd: path.resolve(__dirname, '..', '..')
9	- });	9	- });
10	- if (output.status !== 0) {	10	+ const output = spawnSync('basename', [path.resolve(__dirname, '..', '..', '..', '..')]);
11	- console.error(output.stderr);	11	if (output.status !== 0) {
12	- throw new Error('Failed to get current electron version');	12	console.error(output.stderr);
13	- }	13	throw new Error('Failed to get current electron version');
		14	}
14	- return output.stdout.toString().trim().replace(/^v/g, '');	15	- return output.stdout.toString().trim().replace(/^v/g, '');
15	+ const output = "22.0.1";	16	+ return output.stdout.toString().trim().replace(/^electron-/g, '');
16	+ return output.toString().trim().replace(/^v/g, '');
17	};	17	};

Lines 1-6 Link Here

(-)b/devel/electron22/files/patch-electron_shell_app_electron__main__delegate.cc (-6 / +7 lines)
1	--- electron/shell/app/electron_main_delegate.cc.orig 2022-08-03 15:31:32 UTC	1	--- electron/shell/app/electron_main_delegate.cc.orig 2023-01-24 16:58:16 UTC
2	+++ electron/shell/app/electron_main_delegate.cc	2	+++ electron/shell/app/electron_main_delegate.cc
3	@@ -56,13 +56,15 @@	3	@@ -56,13 +56,16 @@
4	#include "chrome/child/v8_crashpad_support_win.h"	4	#include "chrome/child/v8_crashpad_support_win.h"
5	#endif	5	#endif
6		6
Lines 8-13 Link Here
8	+#if BUILDFLAG(IS_LINUX) \|\| BUILDFLAG(IS_BSD)	8	+#if BUILDFLAG(IS_LINUX) \|\| BUILDFLAG(IS_BSD)
9	#include "base/nix/xdg_util.h"	9	#include "base/nix/xdg_util.h"
10	+#endif	10	+#endif
		11	+
11	+#if BUILDFLAG(IS_LINUX)	12	+#if BUILDFLAG(IS_LINUX)
12	#include "v8/include/v8-wasm-trap-handler-posix.h"	13	#include "v8/include/v8-wasm-trap-handler-posix.h"
13	#include "v8/include/v8.h"	14	#include "v8/include/v8.h"
Lines 18-24 Link Here
18	#include "components/crash/core/app/crash_switches.h" // nogncheck	19	#include "components/crash/core/app/crash_switches.h" // nogncheck
19	#include "components/crash/core/app/crashpad.h" // nogncheck	20	#include "components/crash/core/app/crashpad.h" // nogncheck
20	#include "components/crash/core/common/crash_key.h"	21	#include "components/crash/core/common/crash_key.h"
21	@@ -159,7 +161,7 @@ bool ElectronPathProvider(int key, base::FilePath* res	22	@@ -159,7 +162,7 @@ bool ElectronPathProvider(int key, base::FilePath* res
22	create_dir = true;	23	create_dir = true;
23	break;	24	break;
24	}	25	}
Lines 27-33 Link Here
27	case DIR_APP_DATA: {	28	case DIR_APP_DATA: {
28	auto env = base::Environment::Create();	29	auto env = base::Environment::Create();
29	cur = base::nix::GetXDGDirectory(	30	cur = base::nix::GetXDGDirectory(
30	@@ -293,7 +295,7 @@ absl::optional<int> ElectronMainDelegate::BasicStartup	31	@@ -293,7 +296,7 @@ absl::optional<int> ElectronMainDelegate::BasicStartup
31	base::win::PinUser32();	32	base::win::PinUser32();
32	#endif	33	#endif
33		34
Lines 36-42 Link Here
36	// Check for --no-sandbox parameter when running as root.	37	// Check for --no-sandbox parameter when running as root.
37	if (getuid() == 0 && IsSandboxEnabled(command_line))	38	if (getuid() == 0 && IsSandboxEnabled(command_line))
38	LOG(FATAL) << "Running as root without --"	39	LOG(FATAL) << "Running as root without --"
39	@@ -345,7 +347,7 @@ void ElectronMainDelegate::PreSandboxStartup() {	40	@@ -345,7 +348,7 @@ void ElectronMainDelegate::PreSandboxStartup() {
40	process_type == ::switches::kZygoteProcess);	41	process_type == ::switches::kZygoteProcess);
41	#endif	42	#endif
42		43
Lines 45-51 Link Here
45	crash_reporter::InitializeCrashKeys();	46	crash_reporter::InitializeCrashKeys();
46	#endif	47	#endif
47		48
48	@@ -380,7 +382,7 @@ void ElectronMainDelegate::PreSandboxStartup() {	49	@@ -380,7 +383,7 @@ void ElectronMainDelegate::PreSandboxStartup() {
49	}	50	}
50	#endif	51	#endif
51		52

Lines 1-4 Link Here

(-)b/devel/electron22/files/patch-electron_shell_app_node__main.cc (-20 / +2 lines)
1	--- electron/shell/app/node_main.cc.orig 2023-01-10 12:17:28 UTC	1	--- electron/shell/app/node_main.cc.orig 2023-01-24 16:58:16 UTC
2	+++ electron/shell/app/node_main.cc	2	+++ electron/shell/app/node_main.cc
3	@@ -42,7 +42,7 @@	3	@@ -42,7 +42,7 @@
4	#include "content/public/common/content_descriptors.h"	4	#include "content/public/common/content_descriptors.h"
Lines 18-24 Link Here
18	void SetCrashKeyStub(const std::string& key, const std::string& value) {}	18	void SetCrashKeyStub(const std::string& key, const std::string& value) {}
19	void ClearCrashKeyStub(const std::string& key) {}	19	void ClearCrashKeyStub(const std::string& key) {}
20	#endif	20	#endif
21	@@ -105,7 +105,7 @@ v8::Local<v8::Value> GetParameters(v8::Isolate* isolat	21	@@ -105,7 +105,7 @@ namespace electron {
22		22
23	v8::Local<v8::Value> GetParameters(v8::Isolate* isolate) {	23	v8::Local<v8::Value> GetParameters(v8::Isolate* isolate) {
24	std::map<std::string, std::string> keys;	24	std::map<std::string, std::string> keys;
Lines 27-50 Link Here
27	electron::crash_keys::GetCrashKeys(&keys);	27	electron::crash_keys::GetCrashKeys(&keys);
28	#endif	28	#endif
29	return gin::ConvertToV8(isolate, keys);	29	return gin::ConvertToV8(isolate, keys);
30	@@ -118,7 +118,7 @@ int NodeMain(int argc, char* argv[]) {
31	v8_crashpad_support::SetUp();
32	#endif
33
34	-#if BUILDFLAG(IS_LINUX)
35	+#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
36	auto os_env = base::Environment::Create();
37	std::string fd_string, pid_string;
38	if (os_env->GetVar("CRASHDUMP_SIGNAL_FD", &fd_string) &&
39	@@ -161,7 +161,7 @@ int NodeMain(int argc, char* argv[]) {
40	if (result.early_return)
41	exit(result.exit_code);
42
43	-#if BUILDFLAG(IS_LINUX)
44	+#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
45	// On Linux, initialize crashpad after Nodejs init phase so that
46	// crash and termination signal handlers can be set by the crashpad client.
47	if (!pid_string.empty()) {
48	@@ -225,7 +225,7 @@ int NodeMain(int argc, char* argv[]) {	30	@@ -225,7 +225,7 @@ int NodeMain(int argc, char* argv[]) {
49	// Setup process.crashReporter in child node processes	31	// Setup process.crashReporter in child node processes
50	gin_helper::Dictionary reporter = gin::Dictionary::CreateEmpty(isolate);	32	gin_helper::Dictionary reporter = gin::Dictionary::CreateEmpty(isolate);

Lines 1-4 Link Here

(-)b/devel/electron22/files/patch-electron_shell_browser_electron__browser__main__parts.cc (-9 / +7 lines)
1	--- electron/shell/browser/electron_browser_main_parts.cc.orig 2023-01-10 12:17:28 UTC	1	--- electron/shell/browser/electron_browser_main_parts.cc.orig 2023-01-24 16:58:16 UTC
2	+++ electron/shell/browser/electron_browser_main_parts.cc	2	+++ electron/shell/browser/electron_browser_main_parts.cc
3	@@ -73,7 +73,7 @@	3	@@ -73,7 +73,7 @@
4	#include "ui/wm/core/wm_state.h"	4	#include "ui/wm/core/wm_state.h"
Lines 9-15 Link Here
9	#include "base/environment.h"	9	#include "base/environment.h"
10	#include "base/threading/thread_task_runner_handle.h"	10	#include "base/threading/thread_task_runner_handle.h"
11	#include "device/bluetooth/bluetooth_adapter_factory.h"	11	#include "device/bluetooth/bluetooth_adapter_factory.h"
12	@@ -127,7 +127,7 @@ namespace {	12	@@ -127,7 +127,7 @@ namespace electron {
13		13
14	namespace {	14	namespace {
15		15
Lines 63-69 Link Here
63	// Reset to the original LC_ALL since we should not be changing it.	63	// Reset to the original LC_ALL since we should not be changing it.
64	if (!locale.empty()) {	64	if (!locale.empty()) {
65	if (lc_all)	65	if (lc_all)
66	@@ -423,7 +423,7 @@ void ElectronBrowserMainParts::ToolkitInitialized() {	66	@@ -424,7 +424,7 @@ void ElectronBrowserMainParts::PostDestroyThreads() {
67	}	67	}
68		68
69	void ElectronBrowserMainParts::ToolkitInitialized() {	69	void ElectronBrowserMainParts::ToolkitInitialized() {
Lines 72-78 Link Here
72	auto* linux_ui = ui::GetDefaultLinuxUi();	72	auto* linux_ui = ui::GetDefaultLinuxUi();
73	CHECK(linux_ui);	73	CHECK(linux_ui);
74	linux_ui_getter_ = std::make_unique<LinuxUiGetterImpl>();	74	linux_ui_getter_ = std::make_unique<LinuxUiGetterImpl>();
75	@@ -535,16 +535,18 @@ void ElectronBrowserMainParts::PostCreateMainMessageLo	75	@@ -536,7 +536,7 @@ void ElectronBrowserMainParts::WillRunMainMessageLoop(
76	}	76	}
77		77
78	void ElectronBrowserMainParts::PostCreateMainMessageLoop() {	78	void ElectronBrowserMainParts::PostCreateMainMessageLoop() {
Lines 80-89 Link Here
80	+#if BUILDFLAG(IS_LINUX) \|\| BUILDFLAG(IS_MAC) \|\| BUILDFLAG(IS_BSD)	80	+#if BUILDFLAG(IS_LINUX) \|\| BUILDFLAG(IS_MAC) \|\| BUILDFLAG(IS_BSD)
81	std::string app_name = electron::Browser::Get()->GetName();	81	std::string app_name = electron::Browser::Get()->GetName();
82	#endif	82	#endif
83	-#if BUILDFLAG(IS_LINUX)	83	#if BUILDFLAG(IS_LINUX)
84	+#if BUILDFLAG(IS_LINUX) \|\| BUILDFLAG(IS_BSD)	84	@@ -545,7 +545,9 @@ void ElectronBrowserMainParts::PostCreateMainMessageLo
85	auto shutdown_cb =
86	base::BindOnce(base::RunLoop::QuitCurrentWhenIdleClosureDeprecated());
87	ui::OzonePlatform::GetInstance()->PostCreateMainMessageLoop(	85	ui::OzonePlatform::GetInstance()->PostCreateMainMessageLoop(
88	std::move(shutdown_cb));	86	std::move(shutdown_cb));
89	bluez::DBusBluezManagerWrapperLinux::Initialize();	87	bluez::DBusBluezManagerWrapperLinux::Initialize();
Lines 93-99 Link Here
93	// Set up crypt config. This needs to be done before anything starts the	91	// Set up crypt config. This needs to be done before anything starts the
94	// network service, as the raw encryption key needs to be shared with the	92	// network service, as the raw encryption key needs to be shared with the
95	// network service for encrypted cookie storage.	93	// network service for encrypted cookie storage.
96	@@ -635,7 +637,7 @@ void ElectronBrowserMainParts::PostMainMessageLoopRun(	94	@@ -636,7 +638,7 @@ void ElectronBrowserMainParts::PostMainMessageLoopRun(
97	fake_browser_process_->PostMainMessageLoopRun();	95	fake_browser_process_->PostMainMessageLoopRun();
98	content::DevToolsAgentHost::StopRemoteDebuggingPipeHandler();	96	content::DevToolsAgentHost::StopRemoteDebuggingPipeHandler();
99		97

Lines 1-4 Link Here

(-)b/devel/electron22/files/patch-electron_shell_browser_native__window__views.cc (-13 / +13 lines)
1	--- electron/shell/browser/native_window_views.cc.orig 2022-08-17 15:33:00 UTC	1	--- electron/shell/browser/native_window_views.cc.orig 2023-01-24 16:58:16 UTC
2	+++ electron/shell/browser/native_window_views.cc	2	+++ electron/shell/browser/native_window_views.cc
3	@@ -43,7 +43,7 @@	3	@@ -43,7 +43,7 @@
4	#include "ui/wm/core/shadow_types.h"	4	#include "ui/wm/core/shadow_types.h"
Lines 18-24 Link Here
18	std::string name = Browser::Get()->GetName();	18	std::string name = Browser::Get()->GetName();
19	// Set WM_WINDOW_ROLE.	19	// Set WM_WINDOW_ROLE.
20	params.wm_role_name = "browser-window";	20	params.wm_role_name = "browser-window";
21	@@ -307,7 +307,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:	21	@@ -290,7 +290,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
22	std::string window_type;	22	std::string window_type;
23	options.Get(options::kType, &window_type);	23	options.Get(options::kType, &window_type);
24		24
Lines 27-33 Link Here
27	// Set _GTK_THEME_VARIANT to dark if we have "dark-theme" option set.	27	// Set _GTK_THEME_VARIANT to dark if we have "dark-theme" option set.
28	bool use_dark_theme = false;	28	bool use_dark_theme = false;
29	if (options.Get(options::kDarkTheme, &use_dark_theme) && use_dark_theme) {	29	if (options.Get(options::kDarkTheme, &use_dark_theme) && use_dark_theme) {
30	@@ -409,7 +409,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:	30	@@ -392,7 +392,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
31	if (window)	31	if (window)
32	window->AddPreTargetHandler(this);	32	window->AddPreTargetHandler(this);
33		33
Lines 36-42 Link Here
36	// On linux after the widget is initialized we might have to force set the	36	// On linux after the widget is initialized we might have to force set the
37	// bounds if the bounds are smaller than the current display	37	// bounds if the bounds are smaller than the current display
38	SetBounds(gfx::Rect(GetPosition(), bounds.size()), false);	38	SetBounds(gfx::Rect(GetPosition(), bounds.size()), false);
39	@@ -559,7 +559,7 @@ bool NativeWindowViews::IsVisible() {	39	@@ -542,7 +542,7 @@ bool NativeWindowViews::IsVisible() {
40	bool NativeWindowViews::IsEnabled() {	40	bool NativeWindowViews::IsEnabled() {
41	#if BUILDFLAG(IS_WIN)	41	#if BUILDFLAG(IS_WIN)
42	return ::IsWindowEnabled(GetAcceleratedWidget());	42	return ::IsWindowEnabled(GetAcceleratedWidget());
Lines 45-51 Link Here
45	#if defined(USE_OZONE_PLATFORM_X11)	45	#if defined(USE_OZONE_PLATFORM_X11)
46	if (IsX11())	46	if (IsX11())
47	return !event_disabler_.get();	47	return !event_disabler_.get();
48	@@ -617,7 +617,7 @@ void NativeWindowViews::SetEnabledInternal(bool enable	48	@@ -600,7 +600,7 @@ void NativeWindowViews::SetEnabledInternal(bool enable
49	#endif	49	#endif
50	}	50	}
51		51
Lines 54-60 Link Here
54	void NativeWindowViews::Maximize() {	54	void NativeWindowViews::Maximize() {
55	if (IsVisible()) {	55	if (IsVisible()) {
56	widget()->Maximize();	56	widget()->Maximize();
57	@@ -744,7 +744,7 @@ void NativeWindowViews::SetBounds(const gfx::Rect& bou	57	@@ -727,7 +727,7 @@ void NativeWindowViews::SetBounds(const gfx::Rect& bou
58	}	58	}
59	#endif	59	#endif
60		60
Lines 63-69 Link Here
63	// On Linux and Windows the minimum and maximum size should be updated with	63	// On Linux and Windows the minimum and maximum size should be updated with
64	// window size when window is not resizable.	64	// window size when window is not resizable.
65	if (!resizable_) {	65	if (!resizable_) {
66	@@ -976,7 +976,7 @@ bool NativeWindowViews::IsClosable() {	66	@@ -959,7 +959,7 @@ bool NativeWindowViews::IsClosable() {
67	return false;	67	return false;
68	}	68	}
69	return !(info.fState & MFS_DISABLED);	69	return !(info.fState & MFS_DISABLED);
Lines 72-78 Link Here
72	return true;	72	return true;
73	#endif	73	#endif
74	}	74	}
75	@@ -1364,7 +1364,7 @@ void NativeWindowViews::SetProgressBar(double progress	75	@@ -1347,7 +1347,7 @@ void NativeWindowViews::SetProgressBar(double progress
76	NativeWindow::ProgressState state) {	76	NativeWindow::ProgressState state) {
77	#if BUILDFLAG(IS_WIN)	77	#if BUILDFLAG(IS_WIN)
78	taskbar_host_.SetProgressBar(GetAcceleratedWidget(), progress, state);	78	taskbar_host_.SetProgressBar(GetAcceleratedWidget(), progress, state);
Lines 81-87 Link Here
81	if (unity::IsRunning()) {	81	if (unity::IsRunning()) {
82	unity::SetProgressFraction(progress);	82	unity::SetProgressFraction(progress);
83	}	83	}
84	@@ -1426,7 +1426,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM	84	@@ -1409,7 +1409,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM
85	#if BUILDFLAG(IS_WIN)	85	#if BUILDFLAG(IS_WIN)
86	window_handle =	86	window_handle =
87	reinterpret_cast<content::DesktopMediaID::Id>(accelerated_widget);	87	reinterpret_cast<content::DesktopMediaID::Id>(accelerated_widget);
Lines 90-96 Link Here
90	window_handle = static_cast<uint32_t>(accelerated_widget);	90	window_handle = static_cast<uint32_t>(accelerated_widget);
91	#endif	91	#endif
92	aura::WindowTreeHost* const host =	92	aura::WindowTreeHost* const host =
93	@@ -1529,7 +1529,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC	93	@@ -1512,7 +1512,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC
94	SendMessage(hwnd, WM_SETICON, ICON_BIG,	94	SendMessage(hwnd, WM_SETICON, ICON_BIG,
95	reinterpret_cast<LPARAM>(app_icon_.get()));	95	reinterpret_cast<LPARAM>(app_icon_.get()));
96	}	96	}
Lines 99-105 Link Here
99	void NativeWindowViews::SetIcon(const gfx::ImageSkia& icon) {	99	void NativeWindowViews::SetIcon(const gfx::ImageSkia& icon) {
100	auto* tree_host = views::DesktopWindowTreeHostLinux::GetHostForWidget(	100	auto* tree_host = views::DesktopWindowTreeHostLinux::GetHostForWidget(
101	GetAcceleratedWidget());	101	GetAcceleratedWidget());
102	@@ -1599,7 +1599,7 @@ bool NativeWindowViews::CanMaximize() const {	102	@@ -1582,7 +1582,7 @@ bool NativeWindowViews::CanMaximize() const {
103	bool NativeWindowViews::CanMinimize() const {	103	bool NativeWindowViews::CanMinimize() const {
104	#if BUILDFLAG(IS_WIN)	104	#if BUILDFLAG(IS_WIN)
105	return minimizable_;	105	return minimizable_;
Lines 108-114 Link Here
108	return true;	108	return true;
109	#endif	109	#endif
110	}	110	}
111	@@ -1673,7 +1673,7 @@ void NativeWindowViews::HandleKeyboardEvent(	111	@@ -1656,7 +1656,7 @@ void NativeWindowViews::HandleKeyboardEvent(
112	if (widget_destroyed_)	112	if (widget_destroyed_)
113	return;	113	return;
114		114
Lines 117-123 Link Here
117	if (event.windows_key_code == ui::VKEY_BROWSER_BACK)	117	if (event.windows_key_code == ui::VKEY_BROWSER_BACK)
118	NotifyWindowExecuteAppCommand(kBrowserBackward);	118	NotifyWindowExecuteAppCommand(kBrowserBackward);
119	else if (event.windows_key_code == ui::VKEY_BROWSER_FORWARD)	119	else if (event.windows_key_code == ui::VKEY_BROWSER_FORWARD)
120	@@ -1692,7 +1692,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e	120	@@ -1675,7 +1675,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e
121	// Alt+Click should not toggle menu bar.	121	// Alt+Click should not toggle menu bar.
122	root_view_->ResetAltState();	122	root_view_->ResetAltState();
123		123

Lines 1-4 Link Here

(-)b/devel/electron22/files/patch-electron_shell_browser_relauncher__linux.cc (-3 / +3 lines)
1	--- electron/shell/browser/relauncher_linux.cc.orig 2021-01-22 23:55:24 UTC	1	--- electron/shell/browser/relauncher_linux.cc.orig 2023-01-24 16:58:16 UTC
2	+++ electron/shell/browser/relauncher_linux.cc	2	+++ electron/shell/browser/relauncher_linux.cc
3	@@ -6,8 +6,10 @@	3	@@ -6,8 +6,10 @@
4		4
Lines 11-17 Link Here
11		11
12	#include "base/files/file_util.h"	12	#include "base/files/file_util.h"
13	#include "base/files/scoped_file.h"	13	#include "base/files/scoped_file.h"
14	@@ -26,6 +28,10 @@ void RelauncherSynchronizeWithParent() {	14	@@ -24,6 +26,10 @@ void RelauncherSynchronizeWithParent() {
15	base::ScopedFD relauncher_sync_fd(kRelauncherSyncFD);	15	base::ScopedFD relauncher_sync_fd(kRelauncherSyncFD);
16	static const auto signum = SIGUSR2;	16	static const auto signum = SIGUSR2;
17		17
Lines 22-28 Link Here
22	// send signum to current process when parent process ends.	22	// send signum to current process when parent process ends.
23	if (HANDLE_EINTR(prctl(PR_SET_PDEATHSIG, signum)) != 0) {	23	if (HANDLE_EINTR(prctl(PR_SET_PDEATHSIG, signum)) != 0) {
24	PLOG(ERROR) << "prctl";	24	PLOG(ERROR) << "prctl";
25	@@ -50,6 +56,7 @@ void RelauncherSynchronizeWithParent() {	25	@@ -48,6 +54,7 @@ void RelauncherSynchronizeWithParent() {
26		26
27	// Wait for the parent to exit	27	// Wait for the parent to exit
28	parentWaiter.Wait();	28	parentWaiter.Wait();

Lines 1-4 Link Here

(-)b/devel/electron22/files/patch-electron_shell_browser_ui_views_menu__bar.cc (-4 / +4 lines)
1	--- electron/shell/browser/ui/views/menu_bar.cc.orig 2022-06-08 15:30:58 UTC	1	--- electron/shell/browser/ui/views/menu_bar.cc.orig 2023-01-24 16:58:16 UTC
2	+++ electron/shell/browser/ui/views/menu_bar.cc	2	+++ electron/shell/browser/ui/views/menu_bar.cc
3	@@ -13,7 +13,7 @@	3	@@ -13,7 +13,7 @@
4	#include "ui/views/background.h"	4	#include "ui/views/background.h"
Lines 9-15 Link Here
9	#include "ui/gtk/gtk_util.h" // nogncheck	9	#include "ui/gtk/gtk_util.h" // nogncheck
10	#endif	10	#endif
11		11
12	@@ -210,7 +210,7 @@ void MenuBar::ButtonPressed(int id, const ui::Event& e	12	@@ -211,7 +211,7 @@ void MenuBar::ButtonPressed(size_t id, const ui::Event
13		13
14	void MenuBar::RefreshColorCache(const ui::NativeTheme* theme) {	14	void MenuBar::RefreshColorCache(const ui::NativeTheme* theme) {
15	if (theme) {	15	if (theme) {
Lines 18-24 Link Here
18	background_color_ = gtk::GetBgColor("GtkMenuBar#menubar");	18	background_color_ = gtk::GetBgColor("GtkMenuBar#menubar");
19	enabled_color_ =	19	enabled_color_ =
20	gtk::GetFgColor("GtkMenuBar#menubar GtkMenuItem#menuitem GtkLabel");	20	gtk::GetFgColor("GtkMenuBar#menubar GtkMenuItem#menuitem GtkLabel");
21	@@ -233,7 +233,7 @@ void MenuBar::RebuildChildren() {	21	@@ -234,7 +234,7 @@ void MenuBar::RebuildChildren() {
22	}	22	}
23		23
24	void MenuBar::UpdateViewColors() {	24	void MenuBar::UpdateViewColors() {
Lines 27-33 Link Here
27	// set menubar background color	27	// set menubar background color
28	SetBackground(views::CreateSolidBackground(background_color_));	28	SetBackground(views::CreateSolidBackground(background_color_));
29	#endif	29	#endif
30	@@ -241,7 +241,7 @@ void MenuBar::UpdateViewColors() {	30	@@ -242,7 +242,7 @@ void MenuBar::UpdateViewColors() {
31	// set child colors	31	// set child colors
32	if (menu_model_ == nullptr)	32	if (menu_model_ == nullptr)
33	return;	33	return;

Lines 1-15 Link Here

(-)b/devel/electron22/files/patch-electron_shell_common_node__bindings.cc (-5 / +5 lines)
1	--- electron/shell/common/node_bindings.cc.orig 2022-08-17 15:33:00 UTC	1	--- electron/shell/common/node_bindings.cc.orig 2023-01-24 16:58:16 UTC
2	+++ electron/shell/common/node_bindings.cc	2	+++ electron/shell/common/node_bindings.cc
3	@@ -38,7 +38,7 @@	3	@@ -39,7 +39,7 @@
4	#include "shell/common/node_includes.h"
5	#include "third_party/blink/renderer/bindings/core/v8/v8_initializer.h" // nogncheck	4	#include "third_party/blink/renderer/bindings/core/v8/v8_initializer.h" // nogncheck
		5	#include "third_party/electron_node/src/debug_utils.h"
6		6
7	-#if !defined(MAS_BUILD)	7	-#if !defined(MAS_BUILD)
8	+#if !defined(MAS_BUILD) && !defined(OS_BSD)	8	+#if !defined(MAS_BUILD) && !defined(OS_BSD)
9	#include "shell/common/crash_keys.h"	9	#include "shell/common/crash_keys.h"
10	#endif	10	#endif
11		11
12	@@ -143,7 +143,7 @@ bool g_is_initialized = false;	12	@@ -148,7 +148,7 @@ bool g_is_initialized = false;
13	void V8FatalErrorCallback(const char* location, const char* message) {	13	void V8FatalErrorCallback(const char* location, const char* message) {
14	LOG(ERROR) << "Fatal error in V8: " << location << " " << message;	14	LOG(ERROR) << "Fatal error in V8: " << location << " " << message;
15		15
Lines 18-24 Link Here
18	electron::crash_keys::SetCrashKey("electron.v8-fatal.message", message);	18	electron::crash_keys::SetCrashKey("electron.v8-fatal.message", message);
19	electron::crash_keys::SetCrashKey("electron.v8-fatal.location", location);	19	electron::crash_keys::SetCrashKey("electron.v8-fatal.location", location);
20	#endif	20	#endif
21	@@ -370,7 +370,7 @@ void NodeBindings::Initialize() {	21	@@ -391,7 +391,7 @@ void NodeBindings::Initialize() {
22	TRACE_EVENT0("electron", "NodeBindings::Initialize");	22	TRACE_EVENT0("electron", "NodeBindings::Initialize");
23	// Open node's error reporting system for browser process.	23	// Open node's error reporting system for browser process.
24		24

Lines 1-6 Link Here

(-)b/devel/electron22/files/patch-electron_spec_api-app-spec.ts (-14 / +28 lines)
1	--- electron/spec/api-app-spec.ts.orig 2022-08-10 15:31:37 UTC	1	--- electron/spec/api-app-spec.ts.orig 2023-01-24 16:58:16 UTC
2	+++ electron/spec/api-app-spec.ts	2	+++ electron/spec/api-app-spec.ts
3	@@ -174,7 +174,7 @@ describe('app module', () => {	3	@@ -125,11 +125,11 @@ describe('app module', () => {
		4	});
		5
		6	describe('app.getPreferredSystemLanguages()', () => {
		7	- ifit(process.platform !== 'linux')('should not be empty', () => {
		8	+ ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('should not be empty', () => {
		9	expect(app.getPreferredSystemLanguages().length).to.not.equal(0);
		10	});
		11
		12	- ifit(process.platform === 'linux')('should be empty or contain C entry', () => {
		13	+ ifit(process.platform === 'linux' \|\| process.platform === 'freebsd')('should be empty or contain C entry', () => {
		14	const languages = app.getPreferredSystemLanguages();
		15	if (languages.length) {
		16	expect(languages).to.not.include('C');
		17	@@ -193,7 +193,7 @@ describe('app module', () => {
4	});	18	});
5		19
6	it('exits gracefully', async function () {	20	it('exits gracefully', async function () {
Lines 9-15 Link Here
9	this.skip();	23	this.skip();
10	return;	24	return;
11	}	25	}
12	@@ -438,7 +438,7 @@ describe('app module', () => {	26	@@ -457,7 +457,7 @@ describe('app module', () => {
13	// let w = null	27	// let w = null
14		28
15	// before(function () {	29	// before(function () {
Lines 18-24 Link Here
18	// this.skip()	32	// this.skip()
19	// }	33	// }
20	// })	34	// })
21	@@ -561,7 +561,7 @@ describe('app module', () => {	35	@@ -580,7 +580,7 @@ describe('app module', () => {
22	describe('app.badgeCount', () => {	36	describe('app.badgeCount', () => {
23	const platformIsNotSupported =	37	const platformIsNotSupported =
24	(process.platform === 'win32') \|\|	38	(process.platform === 'win32') \|\|
Lines 27-33 Link Here
27		41
28	const expectedBadgeCount = 42;	42	const expectedBadgeCount = 42;
29		43
30	@@ -605,7 +605,7 @@ describe('app module', () => {	44	@@ -624,7 +624,7 @@ describe('app module', () => {
31	});	45	});
32	});	46	});
33		47
Lines 36-42 Link Here
36	const updateExe = path.resolve(path.dirname(process.execPath), '..', 'Update.exe');	50	const updateExe = path.resolve(path.dirname(process.execPath), '..', 'Update.exe');
37	const processStartArgs = [	51	const processStartArgs = [
38	'--processStart', `"${path.basename(process.execPath)}"`,	52	'--processStart', `"${path.basename(process.execPath)}"`,
39	@@ -922,7 +922,7 @@ describe('app module', () => {	53	@@ -941,7 +941,7 @@ describe('app module', () => {
40	});	54	});
41	});	55	});
42		56
Lines 45-51 Link Here
45	it('with properties', () => {	59	it('with properties', () => {
46	it('can set accessibility support enabled', () => {	60	it('can set accessibility support enabled', () => {
47	expect(app.accessibilitySupportEnabled).to.eql(false);	61	expect(app.accessibilitySupportEnabled).to.eql(false);
48	@@ -1088,7 +1088,7 @@ describe('app module', () => {	62	@@ -1107,7 +1107,7 @@ describe('app module', () => {
49	let w: BrowserWindow;	63	let w: BrowserWindow;
50		64
51	before(function () {	65	before(function () {
Lines 54-60 Link Here
54	this.skip();	68	this.skip();
55	}	69	}
56	session.fromPartition('empty-certificate').setCertificateVerifyProc((req, cb) => { cb(0); });	70	session.fromPartition('empty-certificate').setCertificateVerifyProc((req, cb) => { cb(0); });
57	@@ -1229,7 +1229,7 @@ describe('app module', () => {	71	@@ -1248,7 +1248,7 @@ describe('app module', () => {
58	// We can't expect particular app names here, but these protocols should	72	// We can't expect particular app names here, but these protocols should
59	// at least have _something_ registered. Except on our Linux CI	73	// at least have _something_ registered. Except on our Linux CI
60	// environment apparently.	74	// environment apparently.
Lines 63-69 Link Here
63	this.skip();	77	this.skip();
64	}	78	}
65		79
66	@@ -1247,7 +1247,7 @@ describe('app module', () => {	80	@@ -1266,7 +1266,7 @@ describe('app module', () => {
67	});	81	});
68	});	82	});
69		83
Lines 72-78 Link Here
72	it('returns promise rejection for a bogus protocol', async function () {	86	it('returns promise rejection for a bogus protocol', async function () {
73	await expect(	87	await expect(
74	app.getApplicationInfoForProtocol('bogus-protocol://')	88	app.getApplicationInfoForProtocol('bogus-protocol://')
75	@@ -1297,7 +1297,7 @@ describe('app module', () => {	89	@@ -1316,7 +1316,7 @@ describe('app module', () => {
76	});	90	});
77		91
78	// FIXME Get these specs running on Linux CI	92	// FIXME Get these specs running on Linux CI
Lines 81-87 Link Here
81	const iconPath = path.join(__dirname, 'fixtures/assets/icon.ico');	95	const iconPath = path.join(__dirname, 'fixtures/assets/icon.ico');
82	const sizes = {	96	const sizes = {
83	small: 16,	97	small: 16,
84	@@ -1378,7 +1378,7 @@ describe('app module', () => {	98	@@ -1397,7 +1397,7 @@ describe('app module', () => {
85	expect(entry.memory).to.have.property('privateBytes').that.is.greaterThan(0);	99	expect(entry.memory).to.have.property('privateBytes').that.is.greaterThan(0);
86	}	100	}
87		101
Lines 90-96 Link Here
90	expect(entry.sandboxed).to.be.a('boolean');	104	expect(entry.sandboxed).to.be.a('boolean');
91	}	105	}
92		106
93	@@ -1404,7 +1404,7 @@ describe('app module', () => {	107	@@ -1423,7 +1423,7 @@ describe('app module', () => {
94	});	108	});
95		109
96	// FIXME https://github.com/electron/electron/issues/24224	110	// FIXME https://github.com/electron/electron/issues/24224
Lines 99-105 Link Here
99	const appPath = path.join(fixturesPath, 'api', 'gpu-info.js');	113	const appPath = path.join(fixturesPath, 'api', 'gpu-info.js');
100		114
101	const getGPUInfo = async (type: string) => {	115	const getGPUInfo = async (type: string) => {
102	@@ -1453,7 +1453,7 @@ describe('app module', () => {	116	@@ -1472,7 +1472,7 @@ describe('app module', () => {
103		117
104	it('succeeds with complete GPUInfo', async () => {	118	it('succeeds with complete GPUInfo', async () => {
105	const completeInfo = await getGPUInfo('complete');	119	const completeInfo = await getGPUInfo('complete');
Lines 108-114 Link Here
108	// For linux and macOS complete info is same as basic info	122	// For linux and macOS complete info is same as basic info
109	await verifyBasicGPUInfo(completeInfo);	123	await verifyBasicGPUInfo(completeInfo);
110	const basicInfo = await getGPUInfo('basic');	124	const basicInfo = await getGPUInfo('basic');
111	@@ -1483,7 +1483,7 @@ describe('app module', () => {	125	@@ -1502,7 +1502,7 @@ describe('app module', () => {
112	const socketPath = process.platform === 'win32' ? '\\\\.\\pipe\\electron-mixed-sandbox' : '/tmp/electron-mixed-sandbox';	126	const socketPath = process.platform === 'win32' ? '\\\\.\\pipe\\electron-mixed-sandbox' : '/tmp/electron-mixed-sandbox';
113		127
114	beforeEach(function (done) {	128	beforeEach(function (done) {

Lines 1-6 Link Here

(-)b/devel/electron22/files/patch-electron_spec_api-clipboard-spec.ts (-4 / +4 lines)
1	--- electron/spec/api-clipboard-spec.ts.orig 2021-12-03 01:46:05 UTC	1	--- electron/spec/api-clipboard-spec.ts.orig 2023-01-24 16:58:16 UTC
2	+++ electron/spec/api-clipboard-spec.ts	2	+++ electron/spec/api-clipboard-spec.ts
3	@@ -44,7 +44,7 @@ ifdescribe(process.platform !== 'win32' \|\| process.arc	3	@@ -43,7 +43,7 @@ ifdescribe(process.platform !== 'win32' \|\| process.arc
4	});	4	});
5	});	5	});
6		6
Lines 9-15 Link Here
9	it('returns title and url', () => {	9	it('returns title and url', () => {
10	clipboard.writeBookmark('a title', 'https://electronjs.org');	10	clipboard.writeBookmark('a title', 'https://electronjs.org');
11		11
12	@@ -63,7 +63,7 @@ ifdescribe(process.platform !== 'win32' \|\| process.arc	12	@@ -62,7 +62,7 @@ ifdescribe(process.platform !== 'win32' \|\| process.arc
13	});	13	});
14		14
15	describe('clipboard.read()', () => {	15	describe('clipboard.read()', () => {
Lines 18-24 Link Here
18	const type = process.platform === 'darwin' ? 'NSFilenamesPboardType' : 'FileNameW';	18	const type = process.platform === 'darwin' ? 'NSFilenamesPboardType' : 'FileNameW';
19		19
20	expect(() => {	20	expect(() => {
21	@@ -100,7 +100,7 @@ ifdescribe(process.platform !== 'win32' \|\| process.arc	21	@@ -99,7 +99,7 @@ ifdescribe(process.platform !== 'win32' \|\| process.arc
22	const readImage = clipboard.readImage();	22	const readImage = clipboard.readImage();
23	expect(readImage.toDataURL()).to.equal(i.toDataURL());	23	expect(readImage.toDataURL()).to.equal(i.toDataURL());
24		24

Lines 1-6 Link Here

(-)b/devel/electron22/files/patch-electron_spec_api-crash-reporter-spec.ts (-2 / +11 lines)
1	--- electron/spec/api-crash-reporter-spec.ts.orig 2021-12-03 01:46:05 UTC	1	--- electron/spec/api-crash-reporter-spec.ts.orig 2023-01-24 16:58:16 UTC
2	+++ electron/spec/api-crash-reporter-spec.ts	2	+++ electron/spec/api-crash-reporter-spec.ts
3	@@ -12,7 +12,7 @@ const isWindowsOnArm = process.platform === 'win32' &&	3	@@ -12,7 +12,7 @@ import * as fs from 'fs';
4	import * as uuid from 'uuid';	4	import * as uuid from 'uuid';
5		5
6	const isWindowsOnArm = process.platform === 'win32' && process.arch === 'arm64';	6	const isWindowsOnArm = process.platform === 'win32' && process.arch === 'arm64';
Lines 18-23 Link Here
18	expect(fields.upload_file_minidump.length).to.be.greaterThan(0);	18	expect(fields.upload_file_minidump.length).to.be.greaterThan(0);
19	}	19	}
20	}	20	}
		21	@@ -186,7 +186,7 @@ ifdescribe(!isLinuxOnArm && !process.mas && !process.e
		22
		23	// Ensures that passing in crashpadHandlerPID flag for Linx child processes
		24	// does not affect child proocess args.
		25	- ifit(process.platform === 'linux')('ensure linux child process args are not modified', async () => {
		26	+ ifit(process.platform === 'linux' \|\| process.platform === 'freebsd')('ensure linux child process args are not modified', async () => {
		27	const { port, waitForCrash } = await startServer();
		28	let exitCode: number \| null = null;
		29	const appPath = path.join(__dirname, 'fixtures', 'apps', 'crash');
21	@@ -535,7 +535,7 @@ ifdescribe(!isLinuxOnArm && !process.mas && !process.e	30	@@ -535,7 +535,7 @@ ifdescribe(!isLinuxOnArm && !process.mas && !process.e
22	}	31	}
23	}	32	}

Lines 1-5 Link Here

(-)b/devel/electron22/files/patch-electron_spec_api-process-spec.ts (-2 / +11 lines)
1	--- electron/spec/api-process-spec.ts.orig 2022-10-19 17:31:10.000000000 +0200	1	--- electron/spec/api-process-spec.ts.orig 2023-01-24 16:58:16 UTC
2	+++ electron/spec/api-process-spec.ts 2022-12-02 17:44:33.364867000 +0100	2	+++ electron/spec/api-process-spec.ts
3	@@ -54,7 +54,7 @@ describe('process module', () => {	3	@@ -54,7 +54,7 @@ describe('process module', () => {
4	it('resolves promise successfully with valid data', async () => {	4	it('resolves promise successfully with valid data', async () => {
5	const memoryInfo = await w.webContents.executeJavaScript('process.getProcessMemoryInfo()');	5	const memoryInfo = await w.webContents.executeJavaScript('process.getProcessMemoryInfo()');
Lines 9-11 Link Here
9	expect(memoryInfo.residentSet).to.be.a('number').greaterThan(0);	9	expect(memoryInfo.residentSet).to.be.a('number').greaterThan(0);
10	}	10	}
11	expect(memoryInfo.private).to.be.a('number').greaterThan(0);	11	expect(memoryInfo.private).to.be.a('number').greaterThan(0);
		12	@@ -164,7 +164,7 @@ describe('process module', () => {
		13	it('resolves promise successfully with valid data', async () => {
		14	const memoryInfo = await process.getProcessMemoryInfo();
		15	expect(memoryInfo).to.be.an('object');
		16	- if (process.platform === 'linux' \|\| process.platform === 'win32') {
		17	+ if (process.platform === 'linux' \|\| process.platform === 'win32' \|\| process.platform === 'freebsd') {
		18	expect(memoryInfo.residentSet).to.be.a('number').greaterThan(0);
		19	}
		20	expect(memoryInfo.private).to.be.a('number').greaterThan(0);

Lines 1-4 Link Here

(-)b/devel/electron22/files/patch-electron_spec_api-screen-spec.ts (-4 / +4 lines)
1	--- electron/spec/api-screen-spec.ts.orig 2021-04-20 23:32:33 UTC	1	--- electron/spec/api-screen-spec.ts.orig 2023-01-24 16:58:16 UTC
2	+++ electron/spec/api-screen-spec.ts	2	+++ electron/spec/api-screen-spec.ts
3	@@ -29,7 +29,7 @@ describe('screen module', () => {	3	@@ -29,7 +29,7 @@ describe('screen module', () => {
4	});	4	});
Lines 9-15 Link Here
9	const display = screen.getPrimaryDisplay();	9	const display = screen.getPrimaryDisplay();
10		10
11	expect(display).to.have.property('scaleFactor').that.is.a('number');	11	expect(display).to.have.property('scaleFactor').that.is.a('number');
12	@@ -46,7 +46,7 @@ describe('screen module', () => {	12	@@ -47,7 +47,7 @@ describe('screen module', () => {
13	});	13	});
14		14
15	it('has a size object property', function () {	15	it('has a size object property', function () {
Lines 18-24 Link Here
18	const display = screen.getPrimaryDisplay();	18	const display = screen.getPrimaryDisplay();
19		19
20	expect(display).to.have.property('size').that.is.an('object');	20	expect(display).to.have.property('size').that.is.an('object');
21	@@ -56,7 +56,7 @@ describe('screen module', () => {	21	@@ -57,7 +57,7 @@ describe('screen module', () => {
22	});	22	});
23		23
24	it('has a workAreaSize object property', function () {	24	it('has a workAreaSize object property', function () {
Lines 27-33 Link Here
27	const display = screen.getPrimaryDisplay();	27	const display = screen.getPrimaryDisplay();
28		28
29	expect(display).to.have.property('workAreaSize').that.is.an('object');	29	expect(display).to.have.property('workAreaSize').that.is.an('object');
30	@@ -66,7 +66,7 @@ describe('screen module', () => {	30	@@ -67,7 +67,7 @@ describe('screen module', () => {
31	});	31	});
32		32
33	it('has a bounds object property', function () {	33	it('has a bounds object property', function () {

Lines 1-11 Link Here

(-)b/devel/electron22/files/patch-electron_spec_chromium-spec.ts (-4 / +46 lines)
1	--- electron/spec/chromium-spec.ts.orig 2022-10-19 17:31:10.000000000 +0200	1	--- electron/spec/chromium-spec.ts.orig 2023-01-24 16:58:16 UTC
2	+++ electron/spec/chromium-spec.ts 2022-12-02 17:46:26.770558000 +0100	2	+++ electron/spec/chromium-spec.ts
3	@@ -1761,7 +1761,7 @@ describe('chromium features', () => {	3	@@ -427,13 +427,13 @@ describe('command line switches', () => {
		4	it('should not set an invalid locale', async () => testLocale('asdfkl', `${currentLocale}\|${currentSystemLocale}\|${currentPreferredLanguages}`));
		5
		6	const lcAll = String(process.env.LC_ALL);
		7	- ifit(process.platform === 'linux')('current process has a valid LC_ALL env', async () => {
		8	+ ifit(process.platform === 'linux' \|\| process.platform === 'freebsd')('current process has a valid LC_ALL env', async () => {
		9	// The LC_ALL env should not be set to DOM locale string.
		10	expect(lcAll).to.not.equal(app.getLocale());
		11	});
		12	- ifit(process.platform === 'linux')('should not change LC_ALL', async () => testLocale('fr', lcAll, true));
		13	- ifit(process.platform === 'linux')('should not change LC_ALL when setting invalid locale', async () => testLocale('asdfkl', lcAll, true));
		14	- ifit(process.platform === 'linux')('should not change LC_ALL when --lang is not set', async () => testLocale('', lcAll, true));
		15	+ ifit(process.platform === 'linux' \|\| process.platform === 'freebsd')('should not change LC_ALL', async () => testLocale('fr', lcAll, true));
		16	+ ifit(process.platform === 'linux' \|\| process.platform === 'freebsd')('should not change LC_ALL when setting invalid locale', async () => testLocale('asdfkl', lcAll, true));
		17	+ ifit(process.platform === 'linux' \|\| process.platform === 'freebsd')('should not change LC_ALL when --lang is not set', async () => testLocale('', lcAll, true));
		18	});
		19
		20	describe('--remote-debugging-pipe switch', () => {
		21	@@ -2027,7 +2027,7 @@ describe('chromium features', () => {
4	});	22	});
5	});	23	});
6		24
7	- ifdescribe(process.platform !== 'win32' && process.platform !== 'linux')('webgl', () => {	25	- ifdescribe(process.platform !== 'win32' && process.platform !== 'linux')('webgl', () => {
8	+ ifdescribe(process.platform !== 'win32' && process.platform !== 'linux' && \|\| process.platform !== 'freebsd')('webgl', () => {	26	+ ifdescribe(process.platform !== 'win32' && process.platform !== 'linux' && process.platform !== 'freebsd')('webgl', () => {
9	it('can be gotten as context in canvas', async () => {	27	it('can be gotten as context in canvas', async () => {
10	const w = new BrowserWindow({ show: false });	28	const w = new BrowserWindow({ show: false });
11	w.loadURL('about:blank');	29	w.loadURL('about:blank');
		30	@@ -2242,12 +2242,12 @@ describe('font fallback', () => {
		31	expect(fonts[0].familyName).to.equal('Arial');
		32	} else if (process.platform === 'darwin') {
		33	expect(fonts[0].familyName).to.equal('Helvetica');
		34	- } else if (process.platform === 'linux') {
		35	+ } else if (process.platform === 'linux' \|\| process.platform === 'freebsd') {
		36	expect(fonts[0].familyName).to.equal('DejaVu Sans');
		37	} // I think this depends on the distro? We don't specify a default.
		38	});
		39
		40	- ifit(process.platform !== 'linux')('should fall back to Japanese font for sans-serif Japanese script', async function () {
		41	+ ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('should fall back to Japanese font for sans-serif Japanese script', async function () {
		42	const html = `
		43	<html lang="ja-JP">
		44	<head>
		45	@@ -2594,7 +2594,7 @@ describe('navigator.clipboard', () => {
		46	});
		47	});
		48
		49	-ifdescribe((process.platform !== 'linux' \|\| app.isUnityRunning()))('navigator.setAppBadge/clearAppBadge', () => {
		50	+ifdescribe(((process.platform !== 'linux' && process.platform !== 'freebsd') \|\| app.isUnityRunning()))('navigator.setAppBadge/clearAppBadge', () => {
		51	let w: BrowserWindow;
		52
		53	const expectedBadgeCount = 42;

Lines 1-6 Link Here

(-)b/devel/electron22/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc (-3 / +3 lines)
1	--- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2022-11-30 08:12:58 UTC	1	--- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2023-01-30 07:58:59 UTC
2	+++ third_party/blink/renderer/core/exported/web_view_impl.cc	2	+++ third_party/blink/renderer/core/exported/web_view_impl.cc
3	@@ -408,7 +408,7 @@ SkFontHinting RendererPreferencesToSkiaHinting(	3	@@ -409,7 +409,7 @@ SkFontHinting RendererPreferencesToSkiaHinting(
4	const blink::RendererPreferences& prefs) {	4	const blink::RendererPreferences& prefs) {
5	// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is	5	// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
6	// complete.	6	// complete.
Lines 9-15 Link Here
9	if (!prefs.should_antialias_text) {	9	if (!prefs.should_antialias_text) {
10	// When anti-aliasing is off, GTK maps all non-zero hinting settings to	10	// When anti-aliasing is off, GTK maps all non-zero hinting settings to
11	// 'Normal' hinting so we do the same. Otherwise, folks who have 'Slight'	11	// 'Normal' hinting so we do the same. Otherwise, folks who have 'Slight'
12	@@ -3278,7 +3278,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs	12	@@ -3280,7 +3280,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs
13	renderer_preferences_.use_subpixel_positioning);	13	renderer_preferences_.use_subpixel_positioning);
14	// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is	14	// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
15	// complete.	15	// complete.

Lines 1-46 Link Here

(-)b/devel/electron22/files/patch-ui_gtk_gtk__compat.cc (-11 / +18 lines)
1	--- ui/gtk/gtk_compat.cc.orig 2022-02-07 13:39:41 UTC	1	--- ui/gtk/gtk_compat.cc.orig 2023-01-30 07:58:59 UTC
2	+++ ui/gtk/gtk_compat.cc	2	+++ ui/gtk/gtk_compat.cc
3	@@ -62,22 +62,39 @@ void* GetLibGio() {	3	@@ -62,22 +62,38 @@ auto DlCast(void* symbol) {
4	}	4	}
5		5
6	void* GetLibGio() {	6	void* GetLibGio() {
7	- static void* libgio = DlOpen("libgio-2.0.so.0");
8	+#if defined(OS_BSD)	7	+#if defined(OS_BSD)
9	+ static void* libgio = DlOpen("libgio-2.0.so");	8	+ static void* libgio = DlOpen("libgio-2.0.so");
10	+#else	9	+#else
11	+ static void* libgio = DlOpen("libgio-2.0.so.0");	10	static void* libgio = DlOpen("libgio-2.0.so.0");
12	+#endif	11	+#endif
13	return libgio;	12	return libgio;
14	}	13	}
15		14
16	void* GetLibGdk3() {	15	void* GetLibGdk3() {
17	- static void* libgdk3 = DlOpen("libgdk-3.so.0");
18	+#if defined(OS_BSD)	16	+#if defined(OS_BSD)
19	+ static void* libgdk3 = DlOpen("libgdk-3.so");	17	+ static void* libgdk3 = DlOpen("libgdk-3.so");
20	+#else	18	+#else
21	+ static void* libgdk3 = DlOpen("libgdk-3.so.0");	19	static void* libgdk3 = DlOpen("libgdk-3.so.0");
22	+#endif	20	+#endif
23	return libgdk3;	21	return libgdk3;
24	}	22	}
25		23
26	void* GetLibGtk3(bool check = true) {	24	void* GetLibGtk3(bool check = true) {
27	- static void* libgtk3 = DlOpen("libgtk-3.so.0", check);
28	+#if defined(OS_BSD)	25	+#if defined(OS_BSD)
29	+ static void* libgtk3 = DlOpen("libgtk-3.so", check);	26	+ static void* libgtk3 = DlOpen("libgtk-3.so", check);
30	+#else	27	+#else
31	+ static void* libgtk3 = DlOpen("libgtk-3.so.0", check);	28	static void* libgtk3 = DlOpen("libgtk-3.so.0", check);
32	+#endif	29	+#endif
33	return libgtk3;	30	return libgtk3;
34	}	31	}
35		32
36	void* GetLibGtk4(bool check = true) {	33	void* GetLibGtk4(bool check = true) {
37	- static void* libgtk4 = DlOpen("libgtk-4.so.1", check);
38	+#if defined(OS_BSD)	34	+#if defined(OS_BSD)
39	+ static void* libgtk4 = DlOpen("libgtk-4.so", check);	35	+ static void* libgtk4 = DlOpen("libgtk-4.so", check);
40	+#else	36	+#else
41	+ static void* libgtk4 = DlOpen("libgtk-4.so.1", check);	37	static void* libgtk4 = DlOpen("libgtk-4.so.1", check);
42	+#endif	38	+#endif
43	+
44	return libgtk4;	39	return libgtk4;
45	}	40	}
46		41
		42	@@ -124,7 +140,11 @@ gfx::Insets InsetsFromGtkBorder(const GtkBorder& borde
		43	} // namespace
		44
		45	void* GetLibGdkPixbuf() {
		46	+#if defined(OS_BSD)
		47	+ static void* libgdk_pixbuf = DlOpen("libgdk_pixbuf-2.0.so");
		48	+#else
		49	static void* libgdk_pixbuf = DlOpen("libgdk_pixbuf-2.0.so.0");
		50	+#endif
		51	return libgdk_pixbuf;
		52	}
		53

Lines 1-6 Link Here

(-)b/devel/electron22/files/patch-v8_BUILD.gn (-4 / +4 lines)
1	--- v8/BUILD.gn.orig 2022-11-30 08:12:58 UTC	1	--- v8/BUILD.gn.orig 2023-01-30 07:58:59 UTC
2	+++ v8/BUILD.gn	2	+++ v8/BUILD.gn
3	@@ -1242,6 +1242,14 @@ config("toolchain") {	3	@@ -1246,6 +1246,14 @@ config("toolchain") {
4	} else if (target_os == "win") {	4	} else if (target_os == "win") {
5	defines += [ "V8_HAVE_TARGET_OS" ]	5	defines += [ "V8_HAVE_TARGET_OS" ]
6	defines += [ "V8_TARGET_OS_WIN" ]	6	defines += [ "V8_TARGET_OS_WIN" ]
Lines 15-21 Link Here
15	}	15	}
16		16
17	# TODO(infra): Support v8_enable_prof on Windows.	17	# TODO(infra): Support v8_enable_prof on Windows.
18	@@ -5481,7 +5489,7 @@ v8_component("v8_libbase") {	18	@@ -5485,7 +5493,7 @@ v8_component("v8_libbase") {
19	}	19	}
20	}	20	}
21		21
Lines 24-30 Link Here
24	sources += [	24	sources += [
25	"src/base/debug/stack_trace_posix.cc",	25	"src/base/debug/stack_trace_posix.cc",
26	"src/base/platform/platform-linux.cc",	26	"src/base/platform/platform-linux.cc",
27	@@ -5492,6 +5500,18 @@ v8_component("v8_libbase") {	27	@@ -5496,6 +5504,18 @@ v8_component("v8_libbase") {
28	"dl",	28	"dl",
29	"rt",	29	"rt",
30	]	30	]