diff --git a/devel/electron33/Makefile.version b/devel/electron33/Makefile.version index 031888be1eac..a82073ea05cb 100644 --- a/devel/electron33/Makefile.version +++ b/devel/electron33/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 33.3.2 +ELECTRON_VER= 33.4.0 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron33/distinfo b/devel/electron33/distinfo index 670c082c09d5..0281e8dd80f1 100644 --- a/devel/electron33/distinfo +++ b/devel/electron33/distinfo @@ -1,25 +1,25 @@ -TIMESTAMP = 1737623300 +TIMESTAMP = 1738909368 SHA256 (electron/chromium-130.0.6723.191.tar.xz.0) = 5d75efea5a8e43b99e7fd86e20835218a2b80115e55f261e31d7c3723ebe067a SIZE (electron/chromium-130.0.6723.191.tar.xz.0) = 2000000000 SHA256 (electron/chromium-130.0.6723.191.tar.xz.1) = adf26a3c24a77e0eb119ddb3932c0ee4f9127a1b7e63c7881047d482742d716a SIZE (electron/chromium-130.0.6723.191.tar.xz.1) = 2000000000 SHA256 (electron/chromium-130.0.6723.191.tar.xz.2) = 16a8c26a52ed95dae9a5a0d69606f2847b267a2ee3fe55d319d26ea527b9db1e SIZE (electron/chromium-130.0.6723.191.tar.xz.2) = 417583932 SHA256 (electron/pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92 SIZE (electron/pulseaudio-16.1.tar.gz) = 2763111 -SHA256 (electron/electron-yarn-cache-33.3.2.tar.xz) = fbfce89a9781eba6a8dc2582fcc979f2cb4adbd95c42a09f595c7dfa45a47fdf -SIZE (electron/electron-yarn-cache-33.3.2.tar.xz) = 32181868 -SHA256 (electron/electron-electron-v33.3.2_GH0.tar.gz) = 83c810dbafcf1aefd2e77dbe7140376029daa524cd292a4e959b9ae2dba085f9 -SIZE (electron/electron-electron-v33.3.2_GH0.tar.gz) = 14703940 +SHA256 (electron/electron-yarn-cache-33.4.0.tar.xz) = fbfce89a9781eba6a8dc2582fcc979f2cb4adbd95c42a09f595c7dfa45a47fdf +SIZE (electron/electron-yarn-cache-33.4.0.tar.xz) = 32181868 +SHA256 (electron/electron-electron-v33.4.0_GH0.tar.gz) = 4e3aa5a1e31961c62f2b97c105e0a4ef1f3aeceec1f158dd35f3a04557b8dcf3 +SIZE (electron/electron-electron-v33.4.0_GH0.tar.gz) = 14706722 SHA256 (electron/nodejs-node-v20.18.1_GH0.tar.gz) = e52a6d719db786fffdc7ac3dc623023803336d8ce7a1dd61d9f68bd851d2a921 SIZE (electron/nodejs-node-v20.18.1_GH0.tar.gz) = 115585611 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 SHA256 (electron/EngFlow-reclient-configs-955335c30a752e9ef7bff375baab5e0819b6c00d_GH0.tar.gz) = c148f76220fc41a89ffeaf370c2cc175577be184688b12aa6fec5f8ac6c714c4 SIZE (electron/EngFlow-reclient-configs-955335c30a752e9ef7bff375baab5e0819b6c00d_GH0.tar.gz) = 13014 diff --git a/devel/electron33/files/patch-electron_BUILD.gn b/devel/electron33/files/patch-electron_BUILD.gn index 724597c8b031..9385e47ffb55 100644 --- a/devel/electron33/files/patch-electron_BUILD.gn +++ b/devel/electron33/files/patch-electron_BUILD.gn @@ -1,60 +1,60 @@ ---- electron/BUILD.gn.orig 2024-10-22 02:29:46 UTC +--- electron/BUILD.gn.orig 2025-02-05 15:28:01 UTC +++ electron/BUILD.gn -@@ -525,7 +525,7 @@ source_set("electron_lib") { +@@ -526,7 +526,7 @@ source_set("electron_lib") { defines += [ "GDK_DISABLE_DEPRECATION_WARNINGS" ] } - if (!is_mas_build) { + if (!is_mas_build && !is_bsd) { deps += [ "//components/crash/core/app", "//components/crash/core/browser", -@@ -618,6 +618,12 @@ source_set("electron_lib") { +@@ -619,6 +619,12 @@ source_set("electron_lib") { cflags_objcc = [ "-fobjc-weak" ] } } + if (is_bsd) { + sources -= [ + "shell/common/crash_keys.cc", + "shell/common/crash_keys.h", + ] + } if (is_linux) { libs = [ "xshmfence" ] deps += [ -@@ -1184,7 +1190,7 @@ if (is_mac) { +@@ -1185,7 +1191,7 @@ if (is_mac) { ":electron_lib", ":electron_win32_resources", ":packed_resources", - "//components/crash/core/app", + # "//components/crash/core/app", "//content:sandbox_helper_win", "//electron/buildflags", "//ui/strings", -@@ -1210,7 +1216,7 @@ if (is_mac) { +@@ -1211,7 +1217,7 @@ if (is_mac) { public_deps = [ "//tools/v8_context_snapshot:v8_context_snapshot" ] } - if (is_linux) { + if (is_linux && !is_bsd) { data_deps += [ "//components/crash/core/app:chrome_crashpad_handler" ] } -@@ -1277,7 +1283,7 @@ if (is_mac) { +@@ -1278,7 +1284,7 @@ if (is_mac) { configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ] } - if (is_linux) { + if (is_linux && !is_bsd) { deps += [ "//sandbox/linux:chrome_sandbox" ] } } -@@ -1385,7 +1391,7 @@ dist_zip("electron_dist_zip") { +@@ -1386,7 +1392,7 @@ dist_zip("electron_dist_zip") { ":electron_version_file", ":licenses", ] - if (is_linux) { + if (is_linux && !is_bsd) { data_deps += [ "//sandbox/linux:chrome_sandbox" ] } deps = data_deps diff --git a/devel/electron33/files/patch-electron_shell_browser_api_electron__api__web__contents.h b/devel/electron33/files/patch-electron_shell_browser_api_electron__api__web__contents.h index 1aa607012366..ac277a65d9cd 100644 --- a/devel/electron33/files/patch-electron_shell_browser_api_electron__api__web__contents.h +++ b/devel/electron33/files/patch-electron_shell_browser_api_electron__api__web__contents.h @@ -1,11 +1,11 @@ ---- electron/shell/browser/api/electron_api_web_contents.h.orig 2024-11-07 16:14:43 UTC +--- electron/shell/browser/api/electron_api_web_contents.h.orig 2025-02-05 15:28:01 UTC +++ electron/shell/browser/api/electron_api_web_contents.h -@@ -768,7 +768,7 @@ class WebContents final : public ExclusiveAccessContex +@@ -772,7 +772,7 @@ class WebContents final : public ExclusiveAccessContex #if defined(TOOLKIT_VIEWS) && !BUILDFLAG(IS_MAC) ui::ImageModel GetDevToolsWindowIcon() override; #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) void GetDevToolsWindowWMClass(std::string* name, std::string* class_name) override; #endif diff --git a/devel/electron33/files/patch-electron_spec_chromium-spec.ts b/devel/electron33/files/patch-electron_spec_chromium-spec.ts index a80cedcfc2b8..0541cfd9f0e7 100644 --- a/devel/electron33/files/patch-electron_spec_chromium-spec.ts +++ b/devel/electron33/files/patch-electron_spec_chromium-spec.ts @@ -1,53 +1,53 @@ ---- electron/spec/chromium-spec.ts.orig 2025-01-22 18:19:12 UTC +--- electron/spec/chromium-spec.ts.orig 2025-02-05 15:28:01 UTC +++ electron/spec/chromium-spec.ts @@ -474,13 +474,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', () => { @@ -567,7 +567,7 @@ describe('command line switches', () => { // Disable the test on linux arm and arm64 to avoid startup crash // https://github.com/electron/electron/issues/44293#issuecomment-2420077154 - ifit(process.platform !== 'linux' || (process.arch !== 'arm' && process.arch !== 'arm64'))('creates startup trace', async () => { + ifit((process.platform !== 'linux' && process.platform !== 'freebsd') || (process.arch !== 'arm' && process.arch !== 'arm64'))('creates startup trace', async () => { const rc = await startRemoteControlApp(['--trace-startup=*', `--trace-startup-file=${outputFilePath}`, '--trace-startup-duration=1', '--enable-logging']); const stderrComplete = new Promise(resolve => { let stderr = ''; @@ -2924,12 +2924,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 = ` -@@ -3326,7 +3326,7 @@ describe('navigator.clipboard.write', () => { +@@ -3473,7 +3473,7 @@ describe('paste execCommand', () => { }); }); -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;