Date: Thu, 24 Aug 2023 23:04:21 GMT From: Hiroki Tagato <tagattie@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 8a62a1d0d0b7 - 2023Q3 - devel/electron25: update to 25.5.0 Message-ID: <202308242304.37ON4LjI058555@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2023Q3 has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=8a62a1d0d0b79ff977f3ff7fdef9d9272c42e40d commit 8a62a1d0d0b79ff977f3ff7fdef9d9272c42e40d Author: Hiroki Tagato <tagattie@FreeBSD.org> AuthorDate: 2023-08-13 11:22:06 +0000 Commit: Hiroki Tagato <tagattie@FreeBSD.org> CommitDate: 2023-08-24 23:04:11 +0000 devel/electron25: update to 25.5.0 Changelog: https://github.com/electron/electron/releases/tag/v25.5.0 Reported by: GitHub (watch releases) (cherry picked from commit d2e8fa2be25e3efce7dd6a27758e05f1889861a9) --- devel/electron25/Makefile | 6 ++--- devel/electron25/Makefile.version | 2 +- devel/electron25/distinfo | 14 +++++------ ...ell_browser_api_electron__api__safe__storage.cc | 24 +++++++++++++++--- ...lectron_shell_browser_browser__process__impl.cc | 20 +++++++++++++++ ...electron_shell_browser_browser__process__impl.h | 29 ++++++++++++++++++++++ ...shell_browser_electron__browser__main__parts.cc | 24 +++++++++--------- ...api_runtime_electron__runtime__api__delegate.cc | 4 +-- ...rowser_net_system__network__context__manager.cc | 4 +-- .../patch-electron_spec_api-safe-storage-spec.ts | 25 +++++++++++++------ ...c_fixtures_api_safe-storage_decrypt-app_main.js | 11 ++++++++ ...c_fixtures_api_safe-storage_encrypt-app_main.js | 11 ++++++++ 12 files changed, 136 insertions(+), 38 deletions(-) diff --git a/devel/electron25/Makefile b/devel/electron25/Makefile index 75ac5210a4f7..4579b9a56308 100644 --- a/devel/electron25/Makefile +++ b/devel/electron25/Makefile @@ -2,7 +2,7 @@ PORTNAME= electron DISTVERSIONPREFIX= v DISTVERSION= ${ELECTRON_VER:S/-beta./.b/} CATEGORIES= devel -MASTER_SITES= https://github.com/tagattie/FreeBSD-Electron/releases/download/v25.3.2/:chromium \ +MASTER_SITES= https://github.com/tagattie/FreeBSD-Electron/releases/download/v25.5.0/:chromium \ https://commondatastorage.googleapis.com/chromium-nodejs/:chromium_node \ https://commondatastorage.googleapis.com/chromium-fonts/:chromium_testfonts PKGNAMESUFFIX= ${ELECTRON_VER_MAJOR} @@ -207,7 +207,7 @@ SNDIO_VARS= GN_ARGS+=use_sndio=true SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false # See ${WRKSRC}/electron/DEPS for CHROMIUM_VER -CHROMIUM_VER= 114.0.5735.248 +CHROMIUM_VER= 114.0.5735.289 # See ${WRKSRC}/third_party/node/node_modules.tar.gz.sha1 for CHROMIUM_NODE_MODULES_HASH CHROMIUM_NODE_MODULES_HASH= de0af8ec3401004cd1a420ab25892880330464c8 # See ${WRKSRC}/third_party/test_fonts/test_fonts.tar.gz.sha1 for CHROMIUM_TEST_FONTS_HASH @@ -223,7 +223,7 @@ REACTIVEOBJC_VER= 74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76 # See ${WRKSRC}/electron/DEPS for MANTLE_VER MANTLE_VER= 78d3966b3c331292ea29ec38661b25df0a245948 -YARN_TIMESTAMP= 1691577929 +YARN_TIMESTAMP= 1691826400 .include "Makefile.version" .include <bsd.port.pre.mk> diff --git a/devel/electron25/Makefile.version b/devel/electron25/Makefile.version index 7e1c9f4da498..734507927776 100644 --- a/devel/electron25/Makefile.version +++ b/devel/electron25/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 25.4.0 +ELECTRON_VER= 25.5.0 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron25/distinfo b/devel/electron25/distinfo index 3012deeb8039..2b3b85e83d62 100644 --- a/devel/electron25/distinfo +++ b/devel/electron25/distinfo @@ -1,14 +1,14 @@ -TIMESTAMP = 1691578442 -SHA256 (electron/chromium-114.0.5735.248.tar.xz) = a2401bc4dcbc53662071120bfc946408ca555be9250ec9b7bd68025303940a17 -SIZE (electron/chromium-114.0.5735.248.tar.xz) = 1414185000 +TIMESTAMP = 1691826692 +SHA256 (electron/chromium-114.0.5735.289.tar.xz) = 12dee4e585dab6e7dc2117f4ee40484a947ac7a6b5a33c87dfae7cbf8b8799b0 +SIZE (electron/chromium-114.0.5735.289.tar.xz) = 1413670648 SHA256 (electron/de0af8ec3401004cd1a420ab25892880330464c8) = 401097f07b4feb3e03ce7c2412e978b32aea5334f4fbaf26f873e60e8bb92647 SIZE (electron/de0af8ec3401004cd1a420ab25892880330464c8) = 8880520 SHA256 (electron/336e775eec536b2d785cc80eff6ac39051931286) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8 SIZE (electron/336e775eec536b2d785cc80eff6ac39051931286) = 32624734 -SHA256 (electron/electron-yarn-cache-25.4.0.tar.xz) = c848dc5ee60779725404eb666fb8717b3ddef362e6d33024da0d52dbdc3361cb -SIZE (electron/electron-yarn-cache-25.4.0.tar.xz) = 41288732 -SHA256 (electron/electron-electron-v25.4.0_GH0.tar.gz) = 88389057e368ecb38788fe72a9c56c6ba11fa557b68de4513cc5a35d77c9be97 -SIZE (electron/electron-electron-v25.4.0_GH0.tar.gz) = 11281929 +SHA256 (electron/electron-yarn-cache-25.5.0.tar.xz) = 43881af099a4ca816a3a631de053d83562ba486b5eefebbfc24ce1272b5d99c4 +SIZE (electron/electron-yarn-cache-25.5.0.tar.xz) = 41288764 +SHA256 (electron/electron-electron-v25.5.0_GH0.tar.gz) = db5c9fa62c9bf817e8cd5324580f3b6fa3ef492712979ef168ab4b4485650d3f +SIZE (electron/electron-electron-v25.5.0_GH0.tar.gz) = 11282712 SHA256 (electron/nodejs-node-v18.15.0_GH0.tar.gz) = 33c4b5b77c98398a3c0d99a146f602d164e014ff3a5713697beef1a971faf573 SIZE (electron/nodejs-node-v18.15.0_GH0.tar.gz) = 111925667 SHA256 (electron/nodejs-nan-16fa32231e2ccd89d2804b3f765319128b20c4ac_GH0.tar.gz) = 3807ae6a1e451a29f068540472f100f9718d457c60ac62f2f8469d1d57475d39 diff --git a/devel/electron25/files/patch-electron_shell_browser_api_electron__api__safe__storage.cc b/devel/electron25/files/patch-electron_shell_browser_api_electron__api__safe__storage.cc index a807f5cd1aa1..278ad212e522 100644 --- a/devel/electron25/files/patch-electron_shell_browser_api_electron__api__safe__storage.cc +++ b/devel/electron25/files/patch-electron_shell_browser_api_electron__api__safe__storage.cc @@ -1,7 +1,7 @@ ---- electron/shell/browser/api/electron_api_safe_storage.cc.orig 2023-01-24 16:58:16 UTC +--- electron/shell/browser/api/electron_api_safe_storage.cc.orig 2023-08-09 14:05:20 UTC +++ electron/shell/browser/api/electron_api_safe_storage.cc -@@ -29,7 +29,7 @@ void SetElectronCryptoReady(bool ready) { - #endif +@@ -23,7 +23,7 @@ static const char* kEncryptionVersionPrefixV11 = "v11" + static bool use_password_v10 = false; bool IsEncryptionAvailable() { -#if BUILDFLAG(IS_LINUX) @@ -9,3 +9,21 @@ // Calling IsEncryptionAvailable() before the app is ready results in a crash // on Linux. // Refs: https://github.com/electron/electron/issues/32206. +@@ -42,7 +42,7 @@ void SetUsePasswordV10(bool use) { + use_password_v10 = use; + } + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + std::string GetSelectedLinuxBackend() { + if (!Browser::Get()->is_ready()) + return "unknown"; +@@ -143,7 +143,7 @@ void Initialize(v8::Local<v8::Object> exports, + dict.SetMethod("decryptString", &electron::safestorage::DecryptString); + dict.SetMethod("setUsePlainTextEncryption", + &electron::safestorage::SetUsePasswordV10); +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + dict.SetMethod("getSelectedStorageBackend", + &electron::safestorage::GetSelectedLinuxBackend); + #endif diff --git a/devel/electron25/files/patch-electron_shell_browser_browser__process__impl.cc b/devel/electron25/files/patch-electron_shell_browser_browser__process__impl.cc new file mode 100644 index 000000000000..a4fcbd458729 --- /dev/null +++ b/devel/electron25/files/patch-electron_shell_browser_browser__process__impl.cc @@ -0,0 +1,20 @@ +--- electron/shell/browser/browser_process_impl.cc.orig 2023-08-12 11:40:00 UTC ++++ electron/shell/browser/browser_process_impl.cc +@@ -304,7 +304,7 @@ const std::string& BrowserProcessImpl::GetSystemLocale + return system_locale_; + } + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void BrowserProcessImpl::SetLinuxStorageBackend( + os_crypt::SelectedLinuxBackend selected_backend) { + switch (selected_backend) { +@@ -338,7 +338,7 @@ void BrowserProcessImpl::SetLinuxStorageBackend( + 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/electron25/files/patch-electron_shell_browser_browser__process__impl.h b/devel/electron25/files/patch-electron_shell_browser_browser__process__impl.h new file mode 100644 index 000000000000..eae237154c66 --- /dev/null +++ b/devel/electron25/files/patch-electron_shell_browser_browser__process__impl.h @@ -0,0 +1,29 @@ +--- electron/shell/browser/browser_process_impl.h.orig 2023-08-12 11:41:14 UTC ++++ electron/shell/browser/browser_process_impl.h +@@ -22,7 +22,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 + +@@ -56,7 +56,7 @@ class BrowserProcessImpl : public BrowserProcess { + void SetSystemLocale(const std::string& locale); + const std::string& GetSystemLocale() const; + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void SetLinuxStorageBackend(os_crypt::SelectedLinuxBackend selected_backend); + const std::string& GetLinuxStorageBackend() const; + #endif +@@ -131,7 +131,7 @@ class BrowserProcessImpl : public BrowserProcess { + std::unique_ptr<device::GeolocationManager> geolocation_manager_; + 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 + diff --git a/devel/electron25/files/patch-electron_shell_browser_electron__browser__main__parts.cc b/devel/electron25/files/patch-electron_shell_browser_electron__browser__main__parts.cc index c9980fee3cad..26132af2723c 100644 --- a/devel/electron25/files/patch-electron_shell_browser_electron__browser__main__parts.cc +++ b/devel/electron25/files/patch-electron_shell_browser_electron__browser__main__parts.cc @@ -1,6 +1,6 @@ ---- electron/shell/browser/electron_browser_main_parts.cc.orig 2023-07-19 13:20:24 UTC +--- electron/shell/browser/electron_browser_main_parts.cc.orig 2023-08-09 14:05:20 UTC +++ electron/shell/browser/electron_browser_main_parts.cc -@@ -74,7 +74,7 @@ +@@ -76,7 +76,7 @@ #include "ui/wm/core/wm_state.h" #endif @@ -9,7 +9,7 @@ #include "base/environment.h" #include "device/bluetooth/bluetooth_adapter_factory.h" #include "device/bluetooth/dbus/dbus_bluez_manager_wrapper_linux.h" -@@ -126,7 +126,7 @@ namespace electron { +@@ -128,7 +128,7 @@ namespace electron { namespace { @@ -18,7 +18,7 @@ class LinuxUiGetterImpl : public ui::LinuxUiGetter { public: LinuxUiGetterImpl() = default; -@@ -174,7 +174,7 @@ std::u16string MediaStringProvider(media::MessageId id +@@ -176,7 +176,7 @@ std::u16string MediaStringProvider(media::MessageId id } } @@ -27,7 +27,7 @@ // GTK does not provide a way to check if current theme is dark, so we compare // the text and background luminosity to get a result. // This trick comes from FireFox. -@@ -192,7 +192,7 @@ void UpdateDarkThemeSetting() { +@@ -194,7 +194,7 @@ void UpdateDarkThemeSetting() { } // namespace @@ -36,7 +36,7 @@ class DarkThemeObserver : public ui::NativeThemeObserver { public: DarkThemeObserver() = default; -@@ -244,7 +244,7 @@ int ElectronBrowserMainParts::PreEarlyInitialization() +@@ -246,7 +246,7 @@ int ElectronBrowserMainParts::PreEarlyInitialization() #if BUILDFLAG(IS_POSIX) HandleSIGCHLD(); #endif @@ -45,7 +45,7 @@ DetectOzonePlatform(); ui::OzonePlatform::PreEarlyInitialization(); #endif -@@ -332,7 +332,7 @@ int ElectronBrowserMainParts::PreCreateThreads() { +@@ -334,7 +334,7 @@ int ElectronBrowserMainParts::PreCreateThreads() { // happen before the ResourceBundle is loaded if (locale.empty()) l10n_util::OverrideLocaleWithCocoaLocale(); @@ -54,7 +54,7 @@ // 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 -@@ -363,7 +363,7 @@ int ElectronBrowserMainParts::PreCreateThreads() { +@@ -365,7 +365,7 @@ int ElectronBrowserMainParts::PreCreateThreads() { ElectronBrowserClient::SetApplicationLocale(app_locale); fake_browser_process_->SetApplicationLocale(app_locale); @@ -63,7 +63,7 @@ // Reset to the original LC_ALL since we should not be changing it. if (!locale.empty()) { if (lc_all) -@@ -423,7 +423,7 @@ void ElectronBrowserMainParts::PostDestroyThreads() { +@@ -425,7 +425,7 @@ void ElectronBrowserMainParts::PostDestroyThreads() { } void ElectronBrowserMainParts::ToolkitInitialized() { @@ -72,7 +72,7 @@ auto* linux_ui = ui::GetDefaultLinuxUi(); CHECK(linux_ui); linux_ui_getter_ = std::make_unique<LinuxUiGetterImpl>(); -@@ -537,7 +537,7 @@ void ElectronBrowserMainParts::WillRunMainMessageLoop( +@@ -539,7 +539,7 @@ void ElectronBrowserMainParts::WillRunMainMessageLoop( } void ElectronBrowserMainParts::PostCreateMainMessageLoop() { @@ -81,7 +81,7 @@ std::string app_name = electron::Browser::Get()->GetName(); #endif #if BUILDFLAG(IS_LINUX) -@@ -547,7 +547,9 @@ void ElectronBrowserMainParts::PostCreateMainMessageLo +@@ -549,7 +549,9 @@ void ElectronBrowserMainParts::PostCreateMainMessageLo std::move(shutdown_cb), content::GetUIThreadTaskRunner({content::BrowserTaskType::kUserInput})); bluez::DBusBluezManagerWrapperLinux::Initialize(); @@ -91,7 +91,7 @@ // 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. -@@ -639,7 +641,7 @@ void ElectronBrowserMainParts::PostMainMessageLoopRun( +@@ -650,7 +652,7 @@ void ElectronBrowserMainParts::PostMainMessageLoopRun( fake_browser_process_->PostMainMessageLoopRun(); content::DevToolsAgentHost::StopRemoteDebuggingPipeHandler(); diff --git a/devel/electron25/files/patch-electron_shell_browser_extensions_api_runtime_electron__runtime__api__delegate.cc b/devel/electron25/files/patch-electron_shell_browser_extensions_api_runtime_electron__runtime__api__delegate.cc index 7487a492cfee..91481f5ae73c 100644 --- a/devel/electron25/files/patch-electron_shell_browser_extensions_api_runtime_electron__runtime__api__delegate.cc +++ b/devel/electron25/files/patch-electron_shell_browser_extensions_api_runtime_electron__runtime__api__delegate.cc @@ -1,6 +1,6 @@ ---- electron/shell/browser/extensions/api/runtime/electron_runtime_api_delegate.cc.orig 2023-05-31 14:28:29 UTC +--- electron/shell/browser/extensions/api/runtime/electron_runtime_api_delegate.cc.orig 2023-08-09 14:05:20 UTC +++ electron/shell/browser/extensions/api/runtime/electron_runtime_api_delegate.cc -@@ -52,6 +52,8 @@ bool ElectronRuntimeAPIDelegate::GetPlatformInfo(Platf +@@ -55,6 +55,8 @@ bool ElectronRuntimeAPIDelegate::GetPlatformInfo(Platf info->os = extensions::api::runtime::PlatformOs::kLinux; } else if (strcmp(os, "openbsd") == 0) { info->os = extensions::api::runtime::PlatformOs::kOpenbsd; diff --git a/devel/electron25/files/patch-electron_shell_browser_net_system__network__context__manager.cc b/devel/electron25/files/patch-electron_shell_browser_net_system__network__context__manager.cc index 134d7af87596..02c08f0f36fa 100644 --- a/devel/electron25/files/patch-electron_shell_browser_net_system__network__context__manager.cc +++ b/devel/electron25/files/patch-electron_shell_browser_net_system__network__context__manager.cc @@ -1,6 +1,6 @@ ---- electron/shell/browser/net/system_network_context_manager.cc.orig 2023-05-31 14:28:29 UTC +--- electron/shell/browser/net/system_network_context_manager.cc.orig 2023-08-09 14:05:20 UTC +++ electron/shell/browser/net/system_network_context_manager.cc -@@ -42,7 +42,7 @@ +@@ -41,7 +41,7 @@ #include "shell/common/options_switches.h" #include "url/gurl.h" diff --git a/devel/electron25/files/patch-electron_spec_api-safe-storage-spec.ts b/devel/electron25/files/patch-electron_spec_api-safe-storage-spec.ts index 024c73d6db1b..e491b37ce996 100644 --- a/devel/electron25/files/patch-electron_spec_api-safe-storage-spec.ts +++ b/devel/electron25/files/patch-electron_spec_api-safe-storage-spec.ts @@ -1,11 +1,20 @@ ---- electron/spec/api-safe-storage-spec.ts.orig 2023-01-24 16:58:16 UTC +--- electron/spec/api-safe-storage-spec.ts.orig 2023-08-09 14:05:20 UTC +++ electron/spec/api-safe-storage-spec.ts -@@ -33,7 +33,7 @@ describe('safeStorage module', () => { +@@ -26,7 +26,7 @@ describe('safeStorage module', () => { + + describe('safeStorage module', () => { + before(() => { +- if (process.platform === 'linux') { ++ if (process.platform === 'linux' || process.platform === 'freebsd') { + safeStorage.setUsePlainTextEncryption(true); + } + }); +@@ -44,7 +44,7 @@ describe('safeStorage module', () => { + }); }); - }); --ifdescribe(process.platform !== 'linux')('safeStorage module', () => { -+ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd')('safeStorage module', () => { - after(async () => { - const pathToEncryptedString = path.resolve(__dirname, 'fixtures', 'api', 'safe-storage', 'encrypted.txt'); - if (await fs.pathExists(pathToEncryptedString)) { +- ifdescribe(process.platform === 'linux')('SafeStorage.getSelectedStorageBackend()', () => { ++ ifdescribe(process.platform === 'linux' || process.platform === 'freebsd')('SafeStorage.getSelectedStorageBackend()', () => { + it('should return a valid backend', () => { + expect(safeStorage.getSelectedStorageBackend()).to.equal('basic_text'); + }); diff --git a/devel/electron25/files/patch-electron_spec_fixtures_api_safe-storage_decrypt-app_main.js b/devel/electron25/files/patch-electron_spec_fixtures_api_safe-storage_decrypt-app_main.js new file mode 100644 index 000000000000..12b51534b625 --- /dev/null +++ b/devel/electron25/files/patch-electron_spec_fixtures_api_safe-storage_decrypt-app_main.js @@ -0,0 +1,11 @@ +--- electron/spec/fixtures/api/safe-storage/decrypt-app/main.js.orig 2023-08-12 11:44:47 UTC ++++ electron/spec/fixtures/api/safe-storage/decrypt-app/main.js +@@ -6,7 +6,7 @@ const pathToEncryptedString = path.resolve(__dirname, + const readFile = fs.readFile; + + app.whenReady().then(async () => { +- if (process.platform === 'linux') { ++ if (process.platform === 'linux' || process.platform === 'freebsd') { + safeStorage.setUsePlainTextEncryption(true); + } + const encryptedString = await readFile(pathToEncryptedString); diff --git a/devel/electron25/files/patch-electron_spec_fixtures_api_safe-storage_encrypt-app_main.js b/devel/electron25/files/patch-electron_spec_fixtures_api_safe-storage_encrypt-app_main.js new file mode 100644 index 000000000000..119940f8b89f --- /dev/null +++ b/devel/electron25/files/patch-electron_spec_fixtures_api_safe-storage_encrypt-app_main.js @@ -0,0 +1,11 @@ +--- electron/spec/fixtures/api/safe-storage/encrypt-app/main.js.orig 2023-08-12 11:45:22 UTC ++++ electron/spec/fixtures/api/safe-storage/encrypt-app/main.js +@@ -6,7 +6,7 @@ const pathToEncryptedString = path.resolve(__dirname, + const writeFile = fs.writeFile; + + app.whenReady().then(async () => { +- if (process.platform === 'linux') { ++ if (process.platform === 'linux' || process.platform === 'freebsd') { + safeStorage.setUsePlainTextEncryption(true); + } + const encrypted = safeStorage.encryptString('plaintext');
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308242304.37ON4LjI058555>