diff --git a/devel/electron28/Makefile.version b/devel/electron28/Makefile.version index b61f8abc422f..5111451f0476 100644 --- a/devel/electron28/Makefile.version +++ b/devel/electron28/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 28.2.10 +ELECTRON_VER= 28.3.0 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron28/distinfo b/devel/electron28/distinfo index 21d958561d2d..09571e71df4e 100644 --- a/devel/electron28/distinfo +++ b/devel/electron28/distinfo @@ -1,21 +1,21 @@ -TIMESTAMP = 1712360808 +TIMESTAMP = 1712911782 SHA256 (electron/chromium-120.0.6099.291.tar.xz) = edb20651392a67dbefced6489d2228a2b7d18ec2bbba4e5bbe355b34ba87fe49 SIZE (electron/chromium-120.0.6099.291.tar.xz) = 1578614892 SHA256 (electron/bb991b26ccca36a9b3912b51dec5b70e5dea9aea) = 8ada8e0554ecd02f649047f8f15a438590c67505b9f2e6a58fd973fe02c4ca52 SIZE (electron/bb991b26ccca36a9b3912b51dec5b70e5dea9aea) = 9782997 SHA256 (electron/336e775eec536b2d785cc80eff6ac39051931286) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8 SIZE (electron/336e775eec536b2d785cc80eff6ac39051931286) = 32624734 -SHA256 (electron/electron-yarn-cache-28.2.10.tar.xz) = ee4117440555d6be62f706646bb1b3c6737cc5b741b8e72377136c72a3474518 -SIZE (electron/electron-yarn-cache-28.2.10.tar.xz) = 29073696 -SHA256 (electron/electron-electron-v28.2.10_GH0.tar.gz) = 1ac5bccc590eec1ea3262f6a48e6656c326cfddadc71a41401c7e3fdfbf50d4f -SIZE (electron/electron-electron-v28.2.10_GH0.tar.gz) = 11501177 +SHA256 (electron/electron-yarn-cache-28.3.0.tar.xz) = ee4117440555d6be62f706646bb1b3c6737cc5b741b8e72377136c72a3474518 +SIZE (electron/electron-yarn-cache-28.3.0.tar.xz) = 29073696 +SHA256 (electron/electron-electron-v28.3.0_GH0.tar.gz) = 9ace77482b0f3f5a173cbc363785486eaea3e1b2604b22c1150751ce0addcef3 +SIZE (electron/electron-electron-v28.3.0_GH0.tar.gz) = 11504153 SHA256 (electron/nodejs-node-v18.18.2_GH0.tar.gz) = b1c20070ec2cfc930572e8d3c3f1de4be8bc7e2259956031db00709b7775a0da SIZE (electron/nodejs-node-v18.18.2_GH0.tar.gz) = 112758381 SHA256 (electron/nodejs-nan-e14bdcd1f72d62bca1d541b66da43130384ec213_GH0.tar.gz) = 02edf8d5b3fef9af94d8a1355da60564a57e7f2c99cb422bce042400607ed2eb SIZE (electron/nodejs-nan-e14bdcd1f72d62bca1d541b66da43130384ec213_GH0.tar.gz) = 180646 SHA256 (electron/Squirrel-Squirrel.Mac-0e5d146ba13101a1302d59ea6e6e0b3cace4ae38_GH0.tar.gz) = f4ebb40a8d85dbb7ef02aa0571b2f8e22182c6d73b6992484a53c90047779d01 SIZE (electron/Squirrel-Squirrel.Mac-0e5d146ba13101a1302d59ea6e6e0b3cace4ae38_GH0.tar.gz) = 2112918 SHA256 (electron/ReactiveCocoa-ReactiveObjC-74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76_GH0.tar.gz) = 88e65f116c7a06fccedb43970fba63080a57a4e5dc29147d2cdfe1ee58dd0546 SIZE (electron/ReactiveCocoa-ReactiveObjC-74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76_GH0.tar.gz) = 1136238 SHA256 (electron/Mantle-Mantle-78d3966b3c331292ea29ec38661b25df0a245948_GH0.tar.gz) = a365df6d83e0be3cc000b70bd39734d80c28f0d9983ebe44698337a2ca464bb1 SIZE (electron/Mantle-Mantle-78d3966b3c331292ea29ec38661b25df0a245948_GH0.tar.gz) = 62962 diff --git a/devel/electron28/files/patch-electron_shell_browser_api_electron__api__app.cc b/devel/electron28/files/patch-electron_shell_browser_api_electron__api__app.cc index 4802b32c0feb..211bf662b7f7 100644 --- a/devel/electron28/files/patch-electron_shell_browser_api_electron__api__app.cc +++ b/devel/electron28/files/patch-electron_shell_browser_api_electron__api__app.cc @@ -1,47 +1,47 @@ ---- electron/shell/browser/api/electron_api_app.cc.orig 2024-02-21 08:43:43 UTC +--- electron/shell/browser/api/electron_api_app.cc.orig 2024-04-09 23:57:48 UTC +++ electron/shell/browser/api/electron_api_app.cc -@@ -657,7 +657,7 @@ void App::OnFinishLaunching(base::Value::Dict launch_i +@@ -660,7 +660,7 @@ void App::OnFinishLaunching(base::Value::Dict launch_i } void App::OnFinishLaunching(base::Value::Dict launch_info) { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Set the application name for audio streams shown in external // applications. Only affects pulseaudio currently. media::AudioManager::SetGlobalAppName(Browser::Get()->GetName()); -@@ -992,7 +992,7 @@ void App::SetDesktopName(const std::string& desktop_na +@@ -995,7 +995,7 @@ void App::SetDesktopName(const std::string& desktop_na } void App::SetDesktopName(const std::string& desktop_name) { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) auto env = base::Environment::Create(); env->SetVar("CHROME_DESKTOP", desktop_name); #endif -@@ -1376,7 +1376,7 @@ std::vector App::GetAppMetrics +@@ -1379,7 +1379,7 @@ std::vector App::GetAppMetrics pid_dict.Set("name", process_metric.second->name); } -#if !BUILDFLAG(IS_LINUX) +#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) auto memory_info = process_metric.second->GetMemoryInfo(); auto memory_dict = gin_helper::Dictionary::CreateEmpty(isolate); -@@ -1667,7 +1667,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuild +@@ -1762,7 +1762,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuild .SetMethod( "removeAsDefaultProtocolClient", base::BindRepeating(&Browser::RemoveAsDefaultProtocolClient, browser)) -#if !BUILDFLAG(IS_LINUX) +#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) .SetMethod( "getApplicationInfoForProtocol", base::BindRepeating(&Browser::GetApplicationInfoForProtocol, browser)) -@@ -1725,7 +1725,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuild +@@ -1820,7 +1820,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuild .SetMethod("getJumpListSettings", &App::GetJumpListSettings) .SetMethod("setJumpList", &App::SetJumpList) #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) .SetMethod("isUnityRunning", base::BindRepeating(&Browser::IsUnityRunning, browser)) #endif diff --git a/devel/electron28/files/patch-electron_shell_browser_browser__process__impl.cc b/devel/electron28/files/patch-electron_shell_browser_browser__process__impl.cc index a6ce405ad703..32e2d5a9b0e5 100644 --- a/devel/electron28/files/patch-electron_shell_browser_browser__process__impl.cc +++ b/devel/electron28/files/patch-electron_shell_browser_browser__process__impl.cc @@ -1,20 +1,20 @@ ---- electron/shell/browser/browser_process_impl.cc.orig 2023-12-04 18:19:02 UTC +--- electron/shell/browser/browser_process_impl.cc.orig 2024-04-09 23:57:48 UTC +++ electron/shell/browser/browser_process_impl.cc -@@ -316,7 +316,7 @@ const std::string& BrowserProcessImpl::GetSystemLocale - return system_locale_; +@@ -325,7 +325,7 @@ electron::ResolveProxyHelper* BrowserProcessImpl::GetR + return resolve_proxy_helper_.get(); } -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) void BrowserProcessImpl::SetLinuxStorageBackend( os_crypt::SelectedLinuxBackend selected_backend) { switch (selected_backend) { -@@ -344,7 +344,7 @@ const std::string& BrowserProcessImpl::GetLinuxStorage +@@ -353,7 +353,7 @@ const std::string& BrowserProcessImpl::GetLinuxStorage const std::string& BrowserProcessImpl::GetLinuxStorageBackend() const { return selected_linux_storage_backend_; } -#endif // BUILDFLAG(IS_LINUX) +#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) void BrowserProcessImpl::SetApplicationLocale(const std::string& locale) { locale_ = locale; diff --git a/devel/electron28/files/patch-electron_shell_browser_browser__process__impl.h b/devel/electron28/files/patch-electron_shell_browser_browser__process__impl.h index d0fc74533b8c..5f668bc04790 100644 --- a/devel/electron28/files/patch-electron_shell_browser_browser__process__impl.h +++ b/devel/electron28/files/patch-electron_shell_browser_browser__process__impl.h @@ -1,29 +1,29 @@ ---- electron/shell/browser/browser_process_impl.h.orig 2023-12-04 18:19:02 UTC +--- electron/shell/browser/browser_process_impl.h.orig 2024-04-09 23:57:48 UTC +++ electron/shell/browser/browser_process_impl.h @@ -23,7 +23,7 @@ #include "services/network/public/cpp/shared_url_loader_factory.h" #include "shell/browser/net/system_network_context_manager.h" -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "components/os_crypt/sync/key_storage_util_linux.h" #endif -@@ -57,7 +57,7 @@ class BrowserProcessImpl : public BrowserProcess { - void SetSystemLocale(const std::string& locale); +@@ -61,7 +61,7 @@ class BrowserProcessImpl : public BrowserProcess { const std::string& GetSystemLocale() const; + electron::ResolveProxyHelper* GetResolveProxyHelper(); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) void SetLinuxStorageBackend(os_crypt::SelectedLinuxBackend selected_backend); const std::string& GetLinuxStorageBackend() const; #endif -@@ -132,7 +132,7 @@ class BrowserProcessImpl : public BrowserProcess { +@@ -140,7 +140,7 @@ class BrowserProcessImpl : public BrowserProcess { std::unique_ptr local_state_; std::string locale_; std::string system_locale_; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) std::string selected_linux_storage_backend_; #endif embedder_support::OriginTrialsSettingsStorage origin_trials_settings_storage_; diff --git a/devel/electron28/files/patch-electron_spec_api-app-spec.ts b/devel/electron28/files/patch-electron_spec_api-app-spec.ts index 875c92c9ef53..1c9b270f240c 100644 --- a/devel/electron28/files/patch-electron_spec_api-app-spec.ts +++ b/devel/electron28/files/patch-electron_spec_api-app-spec.ts @@ -1,133 +1,133 @@ ---- electron/spec/api-app-spec.ts.orig 2023-12-04 18:19:02 UTC +--- electron/spec/api-app-spec.ts.orig 2024-04-09 23:57:48 UTC +++ electron/spec/api-app-spec.ts -@@ -122,11 +122,11 @@ describe('app module', () => { +@@ -123,11 +123,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'); -@@ -189,7 +189,7 @@ describe('app module', () => { +@@ -190,7 +190,7 @@ describe('app module', () => { expect(code).to.equal(123, 'exit code should be 123, if you see this please tag @MarshallOfSound'); }); - ifit(['darwin', 'linux'].includes(process.platform))('exits gracefully', async function () { + ifit(['darwin', 'linux', 'freebsd'].includes(process.platform))('exits gracefully', async function () { const electronPath = process.execPath; const appPath = path.join(fixturesPath, 'api', 'singleton'); appProcess = cp.spawn(electronPath, [appPath]); -@@ -443,7 +443,7 @@ describe('app module', () => { +@@ -444,7 +444,7 @@ describe('app module', () => { // let w = null // before(function () { - // if (process.platform !== 'linux') { + // if (process.platform !== 'linux' && process.platform !== 'freebsd') { // this.skip() // } // }) -@@ -571,7 +571,7 @@ describe('app module', () => { +@@ -572,7 +572,7 @@ describe('app module', () => { describe('app.badgeCount', () => { const platformIsNotSupported = (process.platform === 'win32') || - (process.platform === 'linux' && !app.isUnityRunning()); + ((process.platform === 'linux' || process.platform === 'freebsd') && !app.isUnityRunning()); const expectedBadgeCount = 42; -@@ -615,7 +615,7 @@ describe('app module', () => { +@@ -616,7 +616,7 @@ describe('app module', () => { }); }); - ifdescribe(process.platform !== 'linux' && !process.mas)('app.get/setLoginItemSettings API', function () { + ifdescribe((process.platform !== 'linux' && process.platform !== 'freebsd') && !process.mas)('app.get/setLoginItemSettings API', function () { const updateExe = path.resolve(path.dirname(process.execPath), '..', 'Update.exe'); const processStartArgs = [ '--processStart', `"${path.basename(process.execPath)}"`, -@@ -930,7 +930,7 @@ describe('app module', () => { +@@ -931,7 +931,7 @@ describe('app module', () => { }); }); - ifdescribe(process.platform !== 'linux')('accessibilitySupportEnabled property', () => { + ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd')('accessibilitySupportEnabled property', () => { it('with properties', () => { it('can set accessibility support enabled', () => { expect(app.accessibilitySupportEnabled).to.eql(false); -@@ -1092,7 +1092,7 @@ describe('app module', () => { +@@ -1093,7 +1093,7 @@ describe('app module', () => { }); }); - ifdescribe(process.platform !== 'linux')('select-client-certificate event', () => { + ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd')('select-client-certificate event', () => { let w: BrowserWindow; before(function () { -@@ -1227,7 +1227,7 @@ describe('app module', () => { +@@ -1228,7 +1228,7 @@ describe('app module', () => { describe('getApplicationNameForProtocol()', () => { // TODO: Linux CI doesn't have registered http & https handlers - ifit(!(process.env.CI && process.platform === 'linux'))('returns application names for common protocols', function () { + ifit(!(process.env.CI && (process.platform === 'linux' || process.platform === 'freebsd')))('returns application names for common protocols', function () { // We can't expect particular app names here, but these protocols should // at least have _something_ registered. Except on our Linux CI // environment apparently. -@@ -1245,7 +1245,7 @@ describe('app module', () => { +@@ -1246,7 +1246,7 @@ describe('app module', () => { }); }); - ifdescribe(process.platform !== 'linux')('getApplicationInfoForProtocol()', () => { + ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd')('getApplicationInfoForProtocol()', () => { it('returns promise rejection for a bogus protocol', async function () { await expect( app.getApplicationInfoForProtocol('bogus-protocol://') -@@ -1295,7 +1295,7 @@ describe('app module', () => { +@@ -1296,7 +1296,7 @@ describe('app module', () => { }); // FIXME Get these specs running on Linux CI - ifdescribe(process.platform !== 'linux')('getFileIcon() API', () => { + ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd')('getFileIcon() API', () => { const iconPath = path.join(__dirname, 'fixtures/assets/icon.ico'); const sizes = { small: 16, -@@ -1376,7 +1376,7 @@ describe('app module', () => { +@@ -1377,7 +1377,7 @@ describe('app module', () => { expect(entry.memory).to.have.property('privateBytes').that.is.greaterThan(0); } - if (process.platform !== 'linux') { + if (process.platform !== 'linux' && process.platform !== 'freebsd') { expect(entry.sandboxed).to.be.a('boolean'); } -@@ -1402,7 +1402,7 @@ describe('app module', () => { +@@ -1403,7 +1403,7 @@ describe('app module', () => { }); // FIXME https://github.com/electron/electron/issues/24224 - ifdescribe(process.platform !== 'linux')('getGPUInfo() API', () => { + ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd')('getGPUInfo() API', () => { const appPath = path.join(fixturesPath, 'api', 'gpu-info.js'); const getGPUInfo = async (type: string) => { -@@ -1451,7 +1451,7 @@ describe('app module', () => { +@@ -1452,7 +1452,7 @@ describe('app module', () => { it('succeeds with complete GPUInfo', async () => { const completeInfo = await getGPUInfo('complete'); - if (process.platform === 'linux') { + if (process.platform === 'linux' || process.platform === 'freebsd') { // For linux and macOS complete info is same as basic info await verifyBasicGPUInfo(completeInfo); const basicInfo = await getGPUInfo('basic'); -@@ -1475,7 +1475,7 @@ describe('app module', () => { +@@ -1476,7 +1476,7 @@ describe('app module', () => { }); }); - ifdescribe(!(process.platform === 'linux' && (process.arch === 'arm64' || process.arch === 'arm')))('sandbox options', () => { + ifdescribe(!((process.platform === 'linux' || process.platform === 'freebsd') && (process.arch === 'arm64' || process.arch === 'arm')))('sandbox options', () => { // Our ARM tests are run on VSTS rather than CircleCI, and the Docker // setup on VSTS disallows syscalls that Chrome requires for setting up // sandboxing.