Skip to content

Commit

Permalink
devel/electron19: update to 19.0.15
Browse files Browse the repository at this point in the history
  • Loading branch information
tagattie committed Sep 8, 2022
1 parent 15d936e commit 0f29375
Show file tree
Hide file tree
Showing 7 changed files with 37 additions and 37 deletions.
2 changes: 1 addition & 1 deletion devel/electron19/Makefile
Expand Up @@ -154,7 +154,7 @@ REACTIVEOBJC_VER= 74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76
# See ${WRKSRC}/electron/DEPS for MANTLE_VER
MANTLE_VER= 78d3966b3c331292ea29ec38661b25df0a245948

YARN_TIMESTAMP= 1661457908
YARN_TIMESTAMP= 1662535038

GN_ARGS+= clang_use_chrome_plugins=false \
enable_hangout_services_extension=true \
Expand Down
2 changes: 1 addition & 1 deletion devel/electron19/Makefile.version
@@ -1,2 +1,2 @@
ELECTRON_VER= 19.0.14
ELECTRON_VER= 19.0.15
ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//}
10 changes: 5 additions & 5 deletions devel/electron19/distinfo
@@ -1,14 +1,14 @@
TIMESTAMP = 1661459122
TIMESTAMP = 1662536492
SHA256 (electron/chromium-102.0.5005.167.tar.xz) = 0ef31269e4fd0fe5871e29bb16a3a7aaea1de7eee5d7b2c4c209eff4b196d00e
SIZE (electron/chromium-102.0.5005.167.tar.xz) = 1302429260
SHA256 (electron/df473d4b1ab26ce6b669007521f2ffb8ff99f9d7) = 38fa60c59a8398ae33f8d12c1234735a74dc3c8d0c6d4bc7a9c212c2b4b7fef8
SIZE (electron/df473d4b1ab26ce6b669007521f2ffb8ff99f9d7) = 12046529
SHA256 (electron/cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb) = ec973eccd669d417fbf2d0a4dac730744a3174268ff062db5451b55c82bc3492
SIZE (electron/cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb) = 26759650
SHA256 (electron/electron-yarn-cache-19.0.14.tar.xz) = 4c0dc47759e502c324170b0585ac724cee9fdca985765081b1405018bfd72e93
SIZE (electron/electron-yarn-cache-19.0.14.tar.xz) = 37911808
SHA256 (electron/electron-electron-v19.0.14_GH0.tar.gz) = 30b08539acd1ab8df840650b1da74abd7bd4b4b91b5907daaade056a9b0aceba
SIZE (electron/electron-electron-v19.0.14_GH0.tar.gz) = 10498155
SHA256 (electron/electron-yarn-cache-19.0.15.tar.xz) = 0b39a12041b90a98204b67f69b3452bc45debf13a4b9753d88a70b5906a34541
SIZE (electron/electron-yarn-cache-19.0.15.tar.xz) = 37910588
SHA256 (electron/electron-electron-v19.0.15_GH0.tar.gz) = 47e01fa2778c9991a4c441b5e0e4c62543f890e27250354c4a7b0f5512215703
SIZE (electron/electron-electron-v19.0.15_GH0.tar.gz) = 10505520
SHA256 (electron/nodejs-node-v16.14.2_GH0.tar.gz) = cc2331a5c35d3dda0035d9cba71c3b8e234bc68e18ffd955b385c1e97062528f
SIZE (electron/nodejs-node-v16.14.2_GH0.tar.gz) = 88432213
SHA256 (electron/nodejs-nan-65b32af46e9d7fab2e4ff657751205b3865f4920_GH0.tar.gz) = a649b75bfa9c1a0254c73d022c6e98924b9471f593bcc83832daaf68da4cae8d
Expand Down
2 changes: 1 addition & 1 deletion devel/electron19/files/package.json
@@ -1,6 +1,6 @@
{
"name": "electron",
"version": "19.0.14",
"version": "19.0.15",
"repository": "https://github.com/electron/electron",
"description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
"devDependencies": {
Expand Down
@@ -1,4 +1,4 @@
--- electron/shell/browser/native_window_views.cc.orig 2022-08-03 15:31:58 UTC
--- electron/shell/browser/native_window_views.cc.orig 2022-08-31 15:31:43 UTC
+++ electron/shell/browser/native_window_views.cc
@@ -43,7 +43,7 @@
#include "ui/wm/core/shadow_types.h"
Expand All @@ -18,7 +18,7 @@
std::string name = Browser::Get()->GetName();
// Set WM_WINDOW_ROLE.
params.wm_role_name = "browser-window";
@@ -290,7 +290,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
@@ -307,7 +307,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) {
@@ -397,7 +397,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
@@ -414,7 +414,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);
@@ -547,7 +547,7 @@ bool NativeWindowViews::IsVisible() {
@@ -564,7 +564,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();
@@ -605,7 +605,7 @@ void NativeWindowViews::SetEnabledInternal(bool enable
@@ -622,7 +622,7 @@ void NativeWindowViews::SetEnabledInternal(bool enable
#endif
}

Expand All @@ -54,7 +54,7 @@
void NativeWindowViews::Maximize() {
if (IsVisible()) {
widget()->Maximize();
@@ -732,7 +732,7 @@ void NativeWindowViews::SetBounds(const gfx::Rect& bou
@@ -749,7 +749,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_) {
@@ -964,7 +964,7 @@ bool NativeWindowViews::IsClosable() {
@@ -981,7 +981,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
@@ -1373,7 +1373,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
@@ -1435,7 +1435,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 =
@@ -1521,7 +1521,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC
@@ -1538,7 +1538,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());
@@ -1591,7 +1591,7 @@ bool NativeWindowViews::CanMaximize() const {
@@ -1608,7 +1608,7 @@ bool NativeWindowViews::CanMaximize() const {
bool NativeWindowViews::CanMinimize() const {
#if BUILDFLAG(IS_WIN)
return minimizable_;
Expand All @@ -108,7 +108,7 @@
return true;
#endif
}
@@ -1665,7 +1665,7 @@ void NativeWindowViews::HandleKeyboardEvent(
@@ -1682,7 +1682,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)
@@ -1684,7 +1684,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e
@@ -1701,7 +1701,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e
// Alt+Click should not toggle menu bar.
root_view_->ResetAltState();

Expand Down
@@ -1,15 +1,15 @@
--- electron/shell/common/node_bindings.cc.orig 2022-08-17 15:33:41 UTC
--- electron/shell/common/node_bindings.cc.orig 2022-08-31 15:31:43 UTC
+++ electron/shell/common/node_bindings.cc
@@ -38,7 +38,7 @@
#include "shell/common/node_includes.h"
@@ -39,7 +39,7 @@
#include "third_party/blink/renderer/bindings/core/v8/v8_initializer.h" // nogncheck
#include "third_party/electron_node/src/debug_utils.h"

-#if !defined(MAS_BUILD)
+#if !defined(MAS_BUILD) && !defined(OS_BSD)
#include "shell/common/crash_keys.h"
#endif

@@ -143,7 +143,7 @@ bool g_is_initialized = false;
@@ -144,7 +144,7 @@ bool g_is_initialized = false;
void V8FatalErrorCallback(const char* location, const char* message) {
LOG(ERROR) << "Fatal error in V8: " << location << " " << message;

Expand All @@ -18,7 +18,7 @@
electron::crash_keys::SetCrashKey("electron.v8-fatal.message", message);
electron::crash_keys::SetCrashKey("electron.v8-fatal.location", location);
#endif
@@ -370,7 +370,7 @@ void NodeBindings::Initialize() {
@@ -371,7 +371,7 @@ void NodeBindings::Initialize() {
TRACE_EVENT0("electron", "NodeBindings::Initialize");
// Open node's error reporting system for browser process.

Expand Down
@@ -1,4 +1,4 @@
--- electron/spec-main/api-browser-window-spec.ts.orig 2022-08-03 15:31:58 UTC
--- electron/spec-main/api-browser-window-spec.ts.orig 2022-08-31 15:31:43 UTC
+++ electron/spec-main/api-browser-window-spec.ts
@@ -58,7 +58,7 @@ describe('BrowserWindow module', () => {
}).not.to.throw();
Expand Down Expand Up @@ -54,7 +54,7 @@
it('checks normal bounds when minimized', async () => {
const bounds = w.getBounds();
const minimize = emittedOnce(w, 'minimize');
@@ -2269,7 +2269,7 @@ describe('BrowserWindow module', () => {
@@ -2274,7 +2274,7 @@ describe('BrowserWindow module', () => {
describe('BrowserWindow.setOpacity(opacity)', () => {
afterEach(closeAllWindows);

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

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

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

Expand All @@ -90,7 +90,7 @@
afterEach(closeAllWindows);
it('emits an event when window is maximized', async () => {
const w = new BrowserWindow({ show: false });
@@ -4059,7 +4059,7 @@ describe('BrowserWindow module', () => {
@@ -4064,7 +4064,7 @@ describe('BrowserWindow module', () => {
});

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

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

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

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

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

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

// Linux and arm64 platforms (WOA and macOS) do not return any capture sources
Expand All @@ -135,7 +135,7 @@
const display = screen.getPrimaryDisplay();

const backgroundWindow = new BrowserWindow({
@@ -5611,7 +5611,7 @@ describe('BrowserWindow module', () => {
@@ -5616,7 +5616,7 @@ describe('BrowserWindow module', () => {
afterEach(closeAllWindows);

// Linux/WOA doesn't return any capture sources.
Expand Down

0 comments on commit 0f29375

Please sign in to comment.