diff --git a/devel/electron29/Makefile.version b/devel/electron29/Makefile.version index 83db7c5b0bc3..0b85eb521f04 100644 --- a/devel/electron29/Makefile.version +++ b/devel/electron29/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 29.3.0 +ELECTRON_VER= 29.3.1 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron29/distinfo b/devel/electron29/distinfo index 448410f09d1a..92dd45925af4 100644 --- a/devel/electron29/distinfo +++ b/devel/electron29/distinfo @@ -1,23 +1,23 @@ -TIMESTAMP = 1712920299 +TIMESTAMP = 1713515785 SHA256 (electron/chromium-122.0.6261.156.tar.xz) = c29e0d546920a788d664f241739c1b9ee6f5235cfab91f8d4cf3026f42bceead SIZE (electron/chromium-122.0.6261.156.tar.xz) = 1660787092 SHA256 (electron/e0b8a95aed06c02287872a2d15c28509b9808446) = 6c964b838cc8b73e6014d6f57ae132455e3b0787449a10d4cf12b1415f2abda2 SIZE (electron/e0b8a95aed06c02287872a2d15c28509b9808446) = 9601507 SHA256 (electron/336e775eec536b2d785cc80eff6ac39051931286) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8 SIZE (electron/336e775eec536b2d785cc80eff6ac39051931286) = 32624734 -SHA256 (electron/electron-yarn-cache-29.3.0.tar.xz) = bfe45219c248d463ef8fcbdce755ad4d5deb9b757984da4760f47c20630aee84 -SIZE (electron/electron-yarn-cache-29.3.0.tar.xz) = 29229056 -SHA256 (electron/electron-electron-v29.3.0_GH0.tar.gz) = b7825b310c4c6233be536325d01632bf3c6ee0e605be128800c29f3ef4a87189 -SIZE (electron/electron-electron-v29.3.0_GH0.tar.gz) = 13358758 +SHA256 (electron/electron-yarn-cache-29.3.1.tar.xz) = bfe45219c248d463ef8fcbdce755ad4d5deb9b757984da4760f47c20630aee84 +SIZE (electron/electron-yarn-cache-29.3.1.tar.xz) = 29229056 +SHA256 (electron/electron-electron-v29.3.1_GH0.tar.gz) = 9c00c6c083387647331321685b5d61b96e52d7f031add140ef68018cf2fa68a3 +SIZE (electron/electron-electron-v29.3.1_GH0.tar.gz) = 13363862 SHA256 (electron/nodejs-node-v20.9.0_GH0.tar.gz) = 97fa9283e5472d4252794c930ad59270e4851cc523fe5469f37f65a344f5f2e2 SIZE (electron/nodejs-node-v20.9.0_GH0.tar.gz) = 114905754 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/electron29/files/patch-electron_BUILD.gn b/devel/electron29/files/patch-electron_BUILD.gn index 9d7a83aa386a..16b0627bab93 100644 --- a/devel/electron29/files/patch-electron_BUILD.gn +++ b/devel/electron29/files/patch-electron_BUILD.gn @@ -1,60 +1,60 @@ ---- electron/BUILD.gn.orig 2024-04-03 19:53:09 UTC +--- electron/BUILD.gn.orig 2024-04-15 22:35:46 UTC +++ electron/BUILD.gn @@ -527,7 +527,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", @@ -620,6 +620,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 += [ -@@ -1204,7 +1210,7 @@ if (is_mac) { +@@ -1206,7 +1212,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", -@@ -1230,7 +1236,7 @@ if (is_mac) { +@@ -1232,7 +1238,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" ] } -@@ -1297,7 +1303,7 @@ if (is_mac) { +@@ -1299,7 +1305,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" ] } } -@@ -1405,7 +1411,7 @@ dist_zip("electron_dist_zip") { +@@ -1407,7 +1413,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/electron29/files/patch-electron_shell_browser_api_electron__api__web__contents.cc b/devel/electron29/files/patch-electron_shell_browser_api_electron__api__web__contents.cc index f5ef201cfc9a..79cd265620da 100644 --- a/devel/electron29/files/patch-electron_shell_browser_api_electron__api__web__contents.cc +++ b/devel/electron29/files/patch-electron_shell_browser_api_electron__api__web__contents.cc @@ -1,61 +1,61 @@ ---- electron/shell/browser/api/electron_api_web_contents.cc.orig 2024-04-09 23:20:32 UTC +--- electron/shell/browser/api/electron_api_web_contents.cc.orig 2024-04-15 22:35:46 UTC +++ electron/shell/browser/api/electron_api_web_contents.cc -@@ -153,11 +153,11 @@ +@@ -152,11 +152,11 @@ #include "ui/base/cocoa/defaults_utils.h" #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "ui/linux/linux_ui.h" #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) #include "ui/gfx/font_render_params.h" #endif -@@ -517,7 +517,7 @@ std::optional GetCursorBlinkInterval( +@@ -516,7 +516,7 @@ std::optional GetCursorBlinkInterval( ui::TextInsertionCaretBlinkPeriodFromDefaults()); if (system_value) return *system_value; -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (auto* linux_ui = ui::LinuxUi::instance()) return linux_ui->GetCursorBlinkInterval(); #elif BUILDFLAG(IS_WIN) -@@ -965,7 +965,7 @@ void WebContents::InitWithSessionAndOptions( +@@ -874,7 +874,7 @@ void WebContents::InitWithSessionAndOptions( accept_languages.pop_back(); prefs->accept_languages = accept_languages; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) // Update font settings. static const gfx::FontRenderParams params( gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(), nullptr)); -@@ -2667,7 +2667,7 @@ void WebContents::ForcefullyCrashRenderer() { +@@ -2576,7 +2576,7 @@ void WebContents::ForcefullyCrashRenderer() { content::RenderProcessHost* rph = rwh->GetProcess(); if (rph) { -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // A generic |CrashDumpHungChildProcess()| is not implemented for Linux. // Instead we send an explicit IPC to crash on the renderer's IO thread. rph->ForceCrash(); -@@ -3347,7 +3347,7 @@ void WebContents::Focus() { +@@ -3258,7 +3258,7 @@ void WebContents::Focus() { 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 BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (owner_window()) owner_window()->Focus(true); #endif -@@ -4172,7 +4172,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() { +@@ -4083,7 +4083,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() { } #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) void WebContents::GetDevToolsWindowWMClass(std::string* name, std::string* class_name) { *class_name = Browser::Get()->GetName(); diff --git a/devel/electron29/files/patch-electron_shell_browser_printing_printing__utils.cc b/devel/electron29/files/patch-electron_shell_browser_printing_printing__utils.cc new file mode 100644 index 000000000000..887b92fbeaef --- /dev/null +++ b/devel/electron29/files/patch-electron_shell_browser_printing_printing__utils.cc @@ -0,0 +1,11 @@ +--- electron/shell/browser/printing/printing_utils.cc.orig 2024-04-19 08:41:45 UTC ++++ electron/shell/browser/printing/printing_utils.cc +@@ -20,7 +20,7 @@ + #include + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include + #endif + diff --git a/devel/electron29/files/patch-electron_spec_chromium-spec.ts b/devel/electron29/files/patch-electron_spec_chromium-spec.ts index e287a408e2a0..6c4fdb6381ed 100644 --- a/devel/electron29/files/patch-electron_spec_chromium-spec.ts +++ b/devel/electron29/files/patch-electron_spec_chromium-spec.ts @@ -1,44 +1,44 @@ ---- electron/spec/chromium-spec.ts.orig 2024-03-13 18:15:29 UTC +--- electron/spec/chromium-spec.ts.orig 2024-04-15 22:35:46 UTC +++ electron/spec/chromium-spec.ts @@ -469,13 +469,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', () => { -@@ -2667,12 +2667,12 @@ describe('font fallback', () => { +@@ -2799,12 +2799,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 = ` -@@ -3066,7 +3066,7 @@ describe('navigator.clipboard.write', () => { +@@ -3198,7 +3198,7 @@ describe('navigator.clipboard.write', () => { }); }); -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;