Skip to content

Commit

Permalink
devel/electron24: update to 24.4.0
Browse files Browse the repository at this point in the history
Changelog: https://github.com/electron/electron/releases/tag/v24.4.0

Reported by:	GitHub (watch releases)
  • Loading branch information
tagattie committed May 28, 2023
1 parent deb5b35 commit a6f8437
Show file tree
Hide file tree
Showing 9 changed files with 49 additions and 49 deletions.
6 changes: 3 additions & 3 deletions devel/electron24/Makefile
Expand Up @@ -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/v24.3.1/:chromium \
MASTER_SITES= https://github.com/tagattie/FreeBSD-Electron/releases/download/v24.4.0/:chromium \
https://commondatastorage.googleapis.com/chromium-nodejs/:chromium_node \
https://commondatastorage.googleapis.com/chromium-fonts/:chromium_testfonts
PKGNAMESUFFIX= ${ELECTRON_VER_MAJOR}
Expand Down Expand Up @@ -205,7 +205,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= 112.0.5615.183
CHROMIUM_VER= 112.0.5615.204
# See ${WRKSRC}/third_party/node/node_modules.tar.gz.sha1 for CHROMIUM_NODE_MODULES_HASH
CHROMIUM_NODE_MODULES_HASH= a98dcca3c46a718770b2cb3430785ea4ed7e3f09
# See ${WRKSRC}/third_party/test_fonts/test_fonts.tar.gz.sha1 for CHROMIUM_TEST_FONTS_HASH
Expand All @@ -221,7 +221,7 @@ REACTIVEOBJC_VER= 74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76
# See ${WRKSRC}/electron/DEPS for MANTLE_VER
MANTLE_VER= 78d3966b3c331292ea29ec38661b25df0a245948

YARN_TIMESTAMP= 1684568582
YARN_TIMESTAMP= 1685152823

.include "Makefile.version"
.include <bsd.port.pre.mk>
Expand Down
2 changes: 1 addition & 1 deletion devel/electron24/Makefile.version
@@ -1,2 +1,2 @@
ELECTRON_VER= 24.3.1
ELECTRON_VER= 24.4.0
ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//}
14 changes: 7 additions & 7 deletions devel/electron24/distinfo
@@ -1,14 +1,14 @@
TIMESTAMP = 1684581103
SHA256 (electron/chromium-112.0.5615.183.tar.xz) = b0b3d2e88fa8c393e0256b786806b09cbe0b22cc16be3d179684179c096d93a3
SIZE (electron/chromium-112.0.5615.183.tar.xz) = 1572208216
TIMESTAMP = 1685156535
SHA256 (electron/chromium-112.0.5615.204.tar.xz) = 4eb23f689df9685fc4ce38fe751023ac98aab2ca21af1ee7ebe47fa5c095a09d
SIZE (electron/chromium-112.0.5615.204.tar.xz) = 1572906744
SHA256 (electron/a98dcca3c46a718770b2cb3430785ea4ed7e3f09) = 386332ab89cbe19c427a3febcf2e93ee89a3007243da3e3e466823f50d00eba5
SIZE (electron/a98dcca3c46a718770b2cb3430785ea4ed7e3f09) = 9822544
SHA256 (electron/336e775eec536b2d785cc80eff6ac39051931286) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
SIZE (electron/336e775eec536b2d785cc80eff6ac39051931286) = 32624734
SHA256 (electron/electron-yarn-cache-24.3.1.tar.xz) = 71fe1564ffb4c4fb0c4e226073b1d32cf9358ee6a2eff1be17b3435af7eaabb7
SIZE (electron/electron-yarn-cache-24.3.1.tar.xz) = 39582604
SHA256 (electron/electron-electron-v24.3.1_GH0.tar.gz) = 9cdc7ad9017322c2227e1503b8f0be4f7674ec8a6b702700a6d0e7ad612ce198
SIZE (electron/electron-electron-v24.3.1_GH0.tar.gz) = 10454811
SHA256 (electron/electron-yarn-cache-24.4.0.tar.xz) = 809d7644b63ead4e0ba62a32fd473137e27a70d8227e01b43d74ca9596381728
SIZE (electron/electron-yarn-cache-24.4.0.tar.xz) = 39582416
SHA256 (electron/electron-electron-v24.4.0_GH0.tar.gz) = e471a4a4f3275fdbad0141e6827d815391d8000864a7bff55aeb5456fc0a8472
SIZE (electron/electron-electron-v24.4.0_GH0.tar.gz) = 10457494
SHA256 (electron/nodejs-node-v18.14.0_GH0.tar.gz) = 31bbccdff73269baebcc9f32c2ffe428f28be79841527c63e95da93e8c630829
SIZE (electron/nodejs-node-v18.14.0_GH0.tar.gz) = 113058999
SHA256 (electron/nodejs-nan-16fa32231e2ccd89d2804b3f765319128b20c4ac_GH0.tar.gz) = 3807ae6a1e451a29f068540472f100f9718d457c60ac62f2f8469d1d57475d39
Expand Down
@@ -1,6 +1,6 @@
--- electron/shell/browser/api/electron_api_base_window.cc.orig 2023-04-03 22:25:21 UTC
--- electron/shell/browser/api/electron_api_base_window.cc.orig 2023-05-22 19:19:22 UTC
+++ electron/shell/browser/api/electron_api_base_window.cc
@@ -1057,7 +1057,7 @@ void BaseWindow::SetIconImpl(v8::Isolate* isolate,
@@ -1061,7 +1061,7 @@ void BaseWindow::SetIconImpl(v8::Isolate* isolate,
static_cast<NativeWindowViews*>(window_.get())
->SetIcon(native_image->GetHICON(GetSystemMetrics(SM_CXSMICON)),
native_image->GetHICON(GetSystemMetrics(SM_CXICON)));
Expand Down
@@ -1,4 +1,4 @@
--- electron/shell/browser/api/electron_api_web_contents.cc.orig 2023-05-09 16:07:54 UTC
--- electron/shell/browser/api/electron_api_web_contents.cc.orig 2023-05-22 19:19:22 UTC
+++ electron/shell/browser/api/electron_api_web_contents.cc
@@ -151,11 +151,11 @@
#include "ui/base/cocoa/defaults_utils.h"
Expand All @@ -14,7 +14,7 @@
#include "ui/gfx/font_render_params.h"
#endif

@@ -494,7 +494,7 @@ absl::optional<base::TimeDelta> GetCursorBlinkInterval
@@ -516,7 +516,7 @@ absl::optional<base::TimeDelta> GetCursorBlinkInterval
ui::TextInsertionCaretBlinkPeriodFromDefaults());
if (system_value)
return *system_value;
Expand All @@ -23,7 +23,7 @@
if (auto* linux_ui = ui::LinuxUi::instance())
return linux_ui->GetCursorBlinkInterval();
#elif BUILDFLAG(IS_WIN)
@@ -948,7 +948,7 @@ void WebContents::InitWithSessionAndOptions(
@@ -970,7 +970,7 @@ void WebContents::InitWithSessionAndOptions(
accept_languages.pop_back();
prefs->accept_languages = accept_languages;

Expand All @@ -32,7 +32,7 @@
// Update font settings.
static const gfx::FontRenderParams params(
gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(), nullptr));
@@ -2488,7 +2488,7 @@ void WebContents::ForcefullyCrashRenderer() {
@@ -2510,7 +2510,7 @@ void WebContents::ForcefullyCrashRenderer() {

content::RenderProcessHost* rph = rwh->GetProcess();
if (rph) {
Expand All @@ -41,7 +41,7 @@
// A generic |CrashDumpHungChildProcess()| is not implemented for Linux.
// Instead we send an explicit IPC to crash on the renderer's IO thread.
rph->ForceCrash();
@@ -3131,7 +3131,7 @@ void WebContents::CopyImageAt(int x, int y) {
@@ -3153,7 +3153,7 @@ void WebContents::CopyImageAt(int x, int y) {
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.
Expand All @@ -50,7 +50,7 @@
if (owner_window())
owner_window()->Focus(true);
#endif
@@ -3937,7 +3937,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() {
@@ -3959,7 +3959,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() {
}
#endif

Expand Down
@@ -1,6 +1,6 @@
--- electron/shell/browser/native_window_views.cc.orig 2023-05-17 11:09:55 UTC
--- electron/shell/browser/native_window_views.cc.orig 2023-05-22 19:19:22 UTC
+++ electron/shell/browser/native_window_views.cc
@@ -42,7 +42,7 @@
@@ -43,7 +43,7 @@
#include "ui/wm/core/shadow_types.h"
#include "ui/wm/core/window_util.h"

Expand All @@ -9,7 +9,7 @@
#include "base/strings/string_util.h"
#include "shell/browser/browser.h"
#include "shell/browser/linux/unity_service.h"
@@ -264,7 +264,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
@@ -279,7 +279,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
params.parent = parent->GetNativeWindow();

params.native_widget = new ElectronDesktopNativeWidgetAura(this);
Expand All @@ -18,7 +18,7 @@
std::string name = Browser::Get()->GetName();
// Set WM_WINDOW_ROLE.
params.wm_role_name = "browser-window";
@@ -289,7 +289,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
@@ -304,7 +304,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
std::string window_type;
options.Get(options::kType, &window_type);

Expand All @@ -27,7 +27,7 @@
// Set _GTK_THEME_VARIANT to dark if we have "dark-theme" option set.
bool use_dark_theme = false;
if (options.Get(options::kDarkTheme, &use_dark_theme) && use_dark_theme) {
@@ -391,7 +391,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
@@ -406,7 +406,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
if (window)
window->AddPreTargetHandler(this);

Expand All @@ -36,7 +36,7 @@
// On linux after the widget is initialized we might have to force set the
// bounds if the bounds are smaller than the current display
SetBounds(gfx::Rect(GetPosition(), bounds.size()), false);
@@ -551,7 +551,7 @@ bool NativeWindowViews::IsVisible() {
@@ -566,7 +566,7 @@ bool NativeWindowViews::IsVisible() {
bool NativeWindowViews::IsEnabled() {
#if BUILDFLAG(IS_WIN)
return ::IsWindowEnabled(GetAcceleratedWidget());
Expand All @@ -45,7 +45,7 @@
#if defined(USE_OZONE_PLATFORM_X11)
if (IsX11())
return !event_disabler_.get();
@@ -609,7 +609,7 @@ void NativeWindowViews::SetEnabledInternal(bool enable
@@ -624,7 +624,7 @@ void NativeWindowViews::SetEnabledInternal(bool enable
#endif
}

Expand All @@ -54,7 +54,7 @@
void NativeWindowViews::Maximize() {
if (IsVisible()) {
widget()->Maximize();
@@ -736,7 +736,7 @@ void NativeWindowViews::SetBounds(const gfx::Rect& bou
@@ -751,7 +751,7 @@ void NativeWindowViews::SetBounds(const gfx::Rect& bou
}
#endif

Expand All @@ -63,7 +63,7 @@
// On Linux and Windows the minimum and maximum size should be updated with
// window size when window is not resizable.
if (!resizable_) {
@@ -968,7 +968,7 @@ bool NativeWindowViews::IsClosable() {
@@ -987,7 +987,7 @@ bool NativeWindowViews::IsClosable() {
return false;
}
return !(info.fState & MFS_DISABLED);
Expand All @@ -72,7 +72,7 @@
return true;
#endif
}
@@ -1356,7 +1356,7 @@ void NativeWindowViews::SetProgressBar(double progress
@@ -1375,7 +1375,7 @@ void NativeWindowViews::SetProgressBar(double progress
NativeWindow::ProgressState state) {
#if BUILDFLAG(IS_WIN)
taskbar_host_.SetProgressBar(GetAcceleratedWidget(), progress, state);
Expand All @@ -81,7 +81,7 @@
if (unity::IsRunning()) {
unity::SetProgressFraction(progress);
}
@@ -1418,7 +1418,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM
@@ -1452,7 +1452,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM
#if BUILDFLAG(IS_WIN)
window_handle =
reinterpret_cast<content::DesktopMediaID::Id>(accelerated_widget);
Expand All @@ -90,7 +90,7 @@
window_handle = static_cast<uint32_t>(accelerated_widget);
#endif
aura::WindowTreeHost* const host =
@@ -1516,7 +1516,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC
@@ -1550,7 +1550,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC
SendMessage(hwnd, WM_SETICON, ICON_BIG,
reinterpret_cast<LPARAM>(app_icon_.get()));
}
Expand All @@ -99,7 +99,7 @@
void NativeWindowViews::SetIcon(const gfx::ImageSkia& icon) {
auto* tree_host = views::DesktopWindowTreeHostLinux::GetHostForWidget(
GetAcceleratedWidget());
@@ -1586,7 +1586,7 @@ bool NativeWindowViews::CanMaximize() const {
@@ -1620,7 +1620,7 @@ bool NativeWindowViews::CanMaximize() const {
bool NativeWindowViews::CanMinimize() const {
#if BUILDFLAG(IS_WIN)
return minimizable_;
Expand All @@ -108,7 +108,7 @@
return true;
#endif
}
@@ -1638,7 +1638,7 @@ void NativeWindowViews::HandleKeyboardEvent(
@@ -1672,7 +1672,7 @@ void NativeWindowViews::HandleKeyboardEvent(
if (widget_destroyed_)
return;

Expand All @@ -117,7 +117,7 @@
if (event.windows_key_code == ui::VKEY_BROWSER_BACK)
NotifyWindowExecuteAppCommand(kBrowserBackward);
else if (event.windows_key_code == ui::VKEY_BROWSER_FORWARD)
@@ -1657,7 +1657,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e
@@ -1691,7 +1691,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e
// Alt+Click should not toggle menu bar.
root_view_->ResetAltState();

Expand Down
@@ -1,6 +1,6 @@
--- electron/shell/browser/native_window_views.h.orig 2023-02-06 19:29:11 UTC
--- electron/shell/browser/native_window_views.h.orig 2023-05-22 19:19:22 UTC
+++ electron/shell/browser/native_window_views.h
@@ -168,7 +168,7 @@ class NativeWindowViews : public NativeWindow,
@@ -169,7 +169,7 @@ class NativeWindowViews : public NativeWindow,
LPARAM l_param,
LRESULT* result);
void SetIcon(HICON small_icon, HICON app_icon);
Expand Down
@@ -1,4 +1,4 @@
--- electron/spec/api-browser-window-spec.ts.orig 2023-05-17 11:09:55 UTC
--- electron/spec/api-browser-window-spec.ts.orig 2023-05-22 19:19:22 UTC
+++ electron/spec/api-browser-window-spec.ts
@@ -59,7 +59,7 @@ describe('BrowserWindow module', () => {
}).not.to.throw();
Expand Down Expand Up @@ -63,7 +63,7 @@
it('checks normal bounds when minimized', async () => {
const bounds = w.getBounds();
const minimize = emittedOnce(w, 'minimize');
@@ -2334,7 +2334,7 @@ describe('BrowserWindow module', () => {
@@ -2351,7 +2351,7 @@ describe('BrowserWindow module', () => {
describe('BrowserWindow.setOpacity(opacity)', () => {
afterEach(closeAllWindows);

Expand All @@ -72,7 +72,7 @@
it('make window with initial opacity', () => {
const w = new BrowserWindow({ show: false, opacity: 0.5 });
expect(w.getOpacity()).to.equal(0.5);
@@ -2360,7 +2360,7 @@ describe('BrowserWindow module', () => {
@@ -2377,7 +2377,7 @@ describe('BrowserWindow module', () => {
});
});

Expand All @@ -81,7 +81,7 @@
it('sets 1 regardless of parameter', () => {
const w = new BrowserWindow({ show: false });
w.setOpacity(0);
@@ -3288,7 +3288,7 @@ describe('BrowserWindow module', () => {
@@ -3305,7 +3305,7 @@ describe('BrowserWindow module', () => {
expect(test.versions).to.deep.equal(process.versions);
expect(test.contextId).to.be.a('string');

Expand All @@ -90,7 +90,7 @@
expect(test.creationTime).to.be.null('creation time');
expect(test.systemMemoryInfo).to.be.null('system memory info');
} else {
@@ -3794,7 +3794,7 @@ describe('BrowserWindow module', () => {
@@ -3811,7 +3811,7 @@ describe('BrowserWindow module', () => {
});
});

Expand All @@ -99,7 +99,7 @@
afterEach(closeAllWindows);
it('emits an event when window is maximized', async () => {
const w = new BrowserWindow({ show: false });
@@ -4065,7 +4065,7 @@ describe('BrowserWindow module', () => {
@@ -4082,7 +4082,7 @@ describe('BrowserWindow module', () => {
// TODO(zcbenz):
// This test does not run on Linux CI. See:
// https://github.com/electron/electron/issues/28699
Expand All @@ -108,7 +108,7 @@
const w = new BrowserWindow({});
const maximize = emittedOnce(w, 'maximize');
w.maximize();
@@ -4082,7 +4082,7 @@ describe('BrowserWindow module', () => {
@@ -4099,7 +4099,7 @@ describe('BrowserWindow module', () => {
});

// TODO(dsanders11): Enable once maximize event works on Linux again on CI
Expand All @@ -117,7 +117,7 @@
afterEach(closeAllWindows);
it('should show the window if it is not currently shown', async () => {
const w = new BrowserWindow({ show: false });
@@ -4119,7 +4119,7 @@ describe('BrowserWindow module', () => {
@@ -4136,7 +4136,7 @@ describe('BrowserWindow module', () => {

// TODO(dsanders11): Enable once minimize event works on Linux again.
// See https://github.com/electron/electron/issues/28699
Expand All @@ -126,7 +126,7 @@
const w = new BrowserWindow();
const minimize = emittedOnce(w, 'minimize');
w.minimize();
@@ -4482,7 +4482,7 @@ describe('BrowserWindow module', () => {
@@ -4499,7 +4499,7 @@ describe('BrowserWindow module', () => {
});

// On Linux there is no "resizable" property of a window.
Expand All @@ -135,7 +135,7 @@
const w = new BrowserWindow({ show: false });
expect(w.resizable).to.be.true('resizable');

@@ -4574,7 +4574,7 @@ describe('BrowserWindow module', () => {
@@ -4591,7 +4591,7 @@ describe('BrowserWindow module', () => {
});
});

Expand All @@ -144,7 +144,7 @@
// Not implemented on Linux.
afterEach(closeAllWindows);

@@ -5638,7 +5638,7 @@ describe('BrowserWindow module', () => {
@@ -5655,7 +5655,7 @@ describe('BrowserWindow module', () => {
describe('"transparent" option', () => {
afterEach(closeAllWindows);

Expand Down
4 changes: 2 additions & 2 deletions devel/electron24/files/patch-v8_src_api_api.cc
@@ -1,4 +1,4 @@
--- v8/src/api/api.cc.orig 2023-04-10 14:01:56 UTC
--- v8/src/api/api.cc.orig 2023-05-27 03:09:40 UTC
+++ v8/src/api/api.cc
@@ -142,7 +142,7 @@
#include "src/wasm/wasm-serialization.h"
Expand All @@ -9,7 +9,7 @@
#include <signal.h>

#if V8_ENABLE_WEBASSEMBLY
@@ -6343,7 +6343,7 @@ bool v8::V8::Initialize(const int build_config) {
@@ -6354,7 +6354,7 @@ bool v8::V8::Initialize(const int build_config) {
return true;
}

Expand Down

0 comments on commit a6f8437

Please sign in to comment.