diff --git a/devel/electron29/Makefile.version b/devel/electron29/Makefile.version index 29bb076bc64a..8b3ad8b2ef5b 100644 --- a/devel/electron29/Makefile.version +++ b/devel/electron29/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 29.3.3 +ELECTRON_VER= 29.4.0 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron29/distinfo b/devel/electron29/distinfo index 6a7815cf3b92..bca03c0ef228 100644 --- a/devel/electron29/distinfo +++ b/devel/electron29/distinfo @@ -1,23 +1,23 @@ -TIMESTAMP = 1715244981 +TIMESTAMP = 1715933122 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.3.tar.xz) = bfe45219c248d463ef8fcbdce755ad4d5deb9b757984da4760f47c20630aee84 -SIZE (electron/electron-yarn-cache-29.3.3.tar.xz) = 29229056 -SHA256 (electron/electron-electron-v29.3.3_GH0.tar.gz) = 9c0e68071214cf090d56ad37661954276b48425855927b235a0ffd35eda96a69 -SIZE (electron/electron-electron-v29.3.3_GH0.tar.gz) = 13376843 +SHA256 (electron/electron-yarn-cache-29.4.0.tar.xz) = bfe45219c248d463ef8fcbdce755ad4d5deb9b757984da4760f47c20630aee84 +SIZE (electron/electron-yarn-cache-29.4.0.tar.xz) = 29229056 +SHA256 (electron/electron-electron-v29.4.0_GH0.tar.gz) = 63b32f6d23eda5fb859a3490ff46374ec6cae3c6012de1475613c589946609b9 +SIZE (electron/electron-electron-v29.4.0_GH0.tar.gz) = 13384325 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 16b0627bab93..9613ecef67dc 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-15 22:35:46 UTC +--- electron/BUILD.gn.orig 2024-05-14 20:28:24 UTC +++ electron/BUILD.gn -@@ -527,7 +527,7 @@ source_set("electron_lib") { +@@ -520,7 +520,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") { +@@ -613,6 +613,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 += [ -@@ -1206,7 +1212,7 @@ if (is_mac) { +@@ -1199,7 +1205,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", -@@ -1232,7 +1238,7 @@ if (is_mac) { +@@ -1225,7 +1231,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" ] } -@@ -1299,7 +1305,7 @@ if (is_mac) { +@@ -1292,7 +1298,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" ] } } -@@ -1407,7 +1413,7 @@ dist_zip("electron_dist_zip") { +@@ -1400,7 +1406,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_electron__browser__main__parts.cc b/devel/electron29/files/patch-electron_shell_browser_electron__browser__main__parts.cc index c314057fec3c..d6f394596a7e 100644 --- a/devel/electron29/files/patch-electron_shell_browser_electron__browser__main__parts.cc +++ b/devel/electron29/files/patch-electron_shell_browser_electron__browser__main__parts.cc @@ -1,84 +1,84 @@ ---- electron/shell/browser/electron_browser_main_parts.cc.orig 2024-01-10 12:21:58 UTC +--- electron/shell/browser/electron_browser_main_parts.cc.orig 2024-05-14 20:28:24 UTC +++ electron/shell/browser/electron_browser_main_parts.cc @@ -77,7 +77,7 @@ #include "ui/wm/core/wm_state.h" #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "base/environment.h" #include "chrome/browser/ui/views/dark_mode_manager_linux.h" #include "device/bluetooth/bluetooth_adapter_factory.h" @@ -129,7 +129,7 @@ namespace { namespace { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) class LinuxUiGetterImpl : public ui::LinuxUiGetter { public: LinuxUiGetterImpl() = default; @@ -212,7 +212,7 @@ int ElectronBrowserMainParts::PreEarlyInitialization() #if BUILDFLAG(IS_POSIX) HandleSIGCHLD(); #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) DetectOzonePlatform(); ui::OzonePlatform::PreEarlyInitialization(); #endif @@ -302,7 +302,7 @@ int ElectronBrowserMainParts::PreCreateThreads() { // happen before the ResourceBundle is loaded if (locale.empty()) l10n_util::OverrideLocaleWithCocoaLocale(); -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // l10n_util::GetApplicationLocaleInternal uses g_get_language_names(), // which keys off of getenv("LC_ALL"). // We must set this env first to make ui::ResourceBundle accept the custom @@ -333,7 +333,7 @@ int ElectronBrowserMainParts::PreCreateThreads() { ElectronBrowserClient::SetApplicationLocale(app_locale); fake_browser_process_->SetApplicationLocale(app_locale); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Reset to the original LC_ALL since we should not be changing it. if (!locale.empty()) { if (lc_all) @@ -393,7 +393,7 @@ void ElectronBrowserMainParts::ToolkitInitialized() { } void ElectronBrowserMainParts::ToolkitInitialized() { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) auto* linux_ui = ui::GetDefaultLinuxUi(); CHECK(linux_ui); linux_ui_getter_ = std::make_unique(); -@@ -500,7 +500,7 @@ void ElectronBrowserMainParts::PostCreateMainMessageLo +@@ -494,7 +494,7 @@ void ElectronBrowserMainParts::PostCreateMainMessageLo } void ElectronBrowserMainParts::PostCreateMainMessageLoop() { -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) std::string app_name = electron::Browser::Get()->GetName(); #endif #if BUILDFLAG(IS_LINUX) -@@ -511,7 +511,9 @@ void ElectronBrowserMainParts::PostCreateMainMessageLo +@@ -505,7 +505,9 @@ void ElectronBrowserMainParts::PostCreateMainMessageLo content::GetUIThreadTaskRunner({content::BrowserTaskType::kUserInput})); if (!bluez::BluezDBusManager::IsInitialized()) bluez::DBusBluezManagerWrapperLinux::Initialize(); +#endif +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // 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. -@@ -610,7 +612,7 @@ void ElectronBrowserMainParts::PostMainMessageLoopRun( +@@ -604,7 +606,7 @@ void ElectronBrowserMainParts::PostMainMessageLoopRun( fake_browser_process_->PostMainMessageLoopRun(); content::DevToolsAgentHost::StopRemoteDebuggingPipeHandler(); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) ui::OzonePlatform::GetInstance()->PostMainMessageLoopRun(); #endif } diff --git a/devel/electron29/files/patch-ui_gtk_gtk__compat.cc b/devel/electron29/files/patch-ui_gtk_gtk__compat.cc index 17397a1ce5bd..d814e4a2c53f 100644 --- a/devel/electron29/files/patch-ui_gtk_gtk__compat.cc +++ b/devel/electron29/files/patch-ui_gtk_gtk__compat.cc @@ -1,53 +1,53 @@ ---- ui/gtk/gtk_compat.cc.orig 2023-10-25 09:13:45 UTC +--- ui/gtk/gtk_compat.cc.orig 2024-05-17 08:12:16 UTC +++ ui/gtk/gtk_compat.cc -@@ -62,22 +62,38 @@ auto DlCast(void* symbol) { +@@ -62,22 +62,38 @@ void* GetLibGio() { } void* GetLibGio() { +#if BUILDFLAG(IS_BSD) + static void* libgio = DlOpen("libgio-2.0.so"); +#else static void* libgio = DlOpen("libgio-2.0.so.0"); +#endif return libgio; } void* GetLibGdk3() { +#if BUILDFLAG(IS_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) { +#if BUILDFLAG(IS_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) { +#if BUILDFLAG(IS_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 +@@ -130,7 +146,11 @@ void* GetLibGdkPixbuf() { } // namespace void* GetLibGdkPixbuf() { +#if BUILDFLAG(IS_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; }