summaryrefslogtreecommitdiff
path: root/devel/electron11/files
diff options
context:
space:
mode:
Diffstat (limited to 'devel/electron11/files')
-rw-r--r--devel/electron11/files/package.json2
-rw-r--r--devel/electron11/files/patch-electron_shell_browser_api_electron__api__web__contents.cc6
-rw-r--r--devel/electron11/files/patch-electron_shell_browser_electron__browser__main__parts.cc6
-rw-r--r--devel/electron11/files/patch-electron_shell_browser_native__window__views.cc8
-rw-r--r--devel/electron11/files/patch-electron_spec-main_api-browser-window-spec.ts12
5 files changed, 17 insertions, 17 deletions
diff --git a/devel/electron11/files/package.json b/devel/electron11/files/package.json
index a5a3e08eb21e..26ee6fed432a 100644
--- a/devel/electron11/files/package.json
+++ b/devel/electron11/files/package.json
@@ -1,6 +1,6 @@
{
"name": "electron",
- "version": "11.3.0",
+ "version": "11.4.2",
"repository": "https://github.com/electron/electron",
"description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
"devDependencies": {
diff --git a/devel/electron11/files/patch-electron_shell_browser_api_electron__api__web__contents.cc b/devel/electron11/files/patch-electron_shell_browser_api_electron__api__web__contents.cc
index 72a154172f22..5528abb6a826 100644
--- a/devel/electron11/files/patch-electron_shell_browser_api_electron__api__web__contents.cc
+++ b/devel/electron11/files/patch-electron_shell_browser_api_electron__api__web__contents.cc
@@ -1,4 +1,4 @@
---- electron/shell/browser/api/electron_api_web_contents.cc.orig 2021-02-19 19:40:19 UTC
+--- electron/shell/browser/api/electron_api_web_contents.cc.orig 2021-03-23 15:10:33 UTC
+++ electron/shell/browser/api/electron_api_web_contents.cc
@@ -123,11 +123,11 @@
#include "ui/base/cocoa/defaults_utils.h"
@@ -32,7 +32,7 @@
// Update font settings.
static const base::NoDestructor<gfx::FontRenderParams> params(
gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(), nullptr));
-@@ -1817,7 +1817,7 @@ void WebContents::ForcefullyCrashRenderer() {
+@@ -1816,7 +1816,7 @@ void WebContents::ForcefullyCrashRenderer() {
content::RenderProcessHost* rph = rwh->GetProcess();
if (rph) {
@@ -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();
-@@ -2396,7 +2396,7 @@ void WebContents::CopyImageAt(int x, int y) {
+@@ -2395,7 +2395,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.
diff --git a/devel/electron11/files/patch-electron_shell_browser_electron__browser__main__parts.cc b/devel/electron11/files/patch-electron_shell_browser_electron__browser__main__parts.cc
index 77b22f15296f..670ad64f9f8e 100644
--- a/devel/electron11/files/patch-electron_shell_browser_electron__browser__main__parts.cc
+++ b/devel/electron11/files/patch-electron_shell_browser_electron__browser__main__parts.cc
@@ -1,6 +1,6 @@
---- electron/shell/browser/electron_browser_main_parts.cc.orig 2021-02-19 19:40:19 UTC
+--- electron/shell/browser/electron_browser_main_parts.cc.orig 2021-04-02 17:02:59 UTC
+++ electron/shell/browser/electron_browser_main_parts.cc
-@@ -359,7 +359,7 @@ int ElectronBrowserMainParts::PreCreateThreads() {
+@@ -362,7 +362,7 @@ int ElectronBrowserMainParts::PreCreateThreads() {
// happen before the ResourceBundle is loaded
if (locale.empty())
l10n_util::OverrideLocaleWithCocoaLocale();
@@ -9,7 +9,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
-@@ -382,7 +382,7 @@ int ElectronBrowserMainParts::PreCreateThreads() {
+@@ -385,7 +385,7 @@ int ElectronBrowserMainParts::PreCreateThreads() {
ElectronBrowserClient::SetApplicationLocale(app_locale);
fake_browser_process_->SetApplicationLocale(app_locale);
diff --git a/devel/electron11/files/patch-electron_shell_browser_native__window__views.cc b/devel/electron11/files/patch-electron_shell_browser_native__window__views.cc
index f9b69c77aba0..3e42d3f2e795 100644
--- a/devel/electron11/files/patch-electron_shell_browser_native__window__views.cc
+++ b/devel/electron11/files/patch-electron_shell_browser_native__window__views.cc
@@ -1,4 +1,4 @@
---- electron/shell/browser/native_window_views.cc.orig 2021-02-19 19:40:19 UTC
+--- electron/shell/browser/native_window_views.cc.orig 2021-04-02 17:02:59 UTC
+++ electron/shell/browser/native_window_views.cc
@@ -306,7 +306,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
last_window_state_ = ui::SHOW_STATE_NORMAL;
@@ -18,7 +18,7 @@
aura::Window* window = GetNativeWindow();
if (window)
window->RemovePreTargetHandler(this);
-@@ -1375,7 +1375,7 @@ void NativeWindowViews::OnWidgetBoundsChanged(views::W
+@@ -1386,7 +1386,7 @@ void NativeWindowViews::OnWidgetBoundsChanged(views::W
}
void NativeWindowViews::OnWidgetDestroying(views::Widget* widget) {
@@ -27,7 +27,7 @@
aura::Window* window = GetNativeWindow();
if (window)
window->RemovePreTargetHandler(this);
-@@ -1485,7 +1485,7 @@ void NativeWindowViews::HandleKeyboardEvent(
+@@ -1496,7 +1496,7 @@ void NativeWindowViews::HandleKeyboardEvent(
if (widget_destroyed_)
return;
@@ -36,7 +36,7 @@
if (event.windows_key_code == ui::VKEY_BROWSER_BACK)
NotifyWindowExecuteAppCommand(kBrowserBackward);
else if (event.windows_key_code == ui::VKEY_BROWSER_FORWARD)
-@@ -1497,7 +1497,7 @@ void NativeWindowViews::HandleKeyboardEvent(
+@@ -1508,7 +1508,7 @@ void NativeWindowViews::HandleKeyboardEvent(
root_view_->HandleKeyEvent(event);
}
diff --git a/devel/electron11/files/patch-electron_spec-main_api-browser-window-spec.ts b/devel/electron11/files/patch-electron_spec-main_api-browser-window-spec.ts
index 1f5546775da2..4ad63a7e9971 100644
--- a/devel/electron11/files/patch-electron_spec-main_api-browser-window-spec.ts
+++ b/devel/electron11/files/patch-electron_spec-main_api-browser-window-spec.ts
@@ -1,4 +1,4 @@
---- electron/spec-main/api-browser-window-spec.ts.orig 2021-02-02 17:38:53 UTC
+--- electron/spec-main/api-browser-window-spec.ts.orig 2021-03-23 15:10:33 UTC
+++ electron/spec-main/api-browser-window-spec.ts
@@ -57,7 +57,7 @@ describe('BrowserWindow module', () => {
}).not.to.throw();
@@ -27,7 +27,7 @@
it('checks normal bounds when minimized', async () => {
const bounds = w.getBounds();
const minimize = emittedOnce(w, 'minimize');
-@@ -1669,7 +1669,7 @@ describe('BrowserWindow module', () => {
+@@ -1685,7 +1685,7 @@ describe('BrowserWindow module', () => {
describe('BrowserWindow.setOpacity(opacity)', () => {
afterEach(closeAllWindows);
@@ -36,7 +36,7 @@
it('make window with initial opacity', () => {
const w = new BrowserWindow({ show: false, opacity: 0.5 });
expect(w.getOpacity()).to.equal(0.5);
-@@ -1695,7 +1695,7 @@ describe('BrowserWindow module', () => {
+@@ -1711,7 +1711,7 @@ describe('BrowserWindow module', () => {
});
});
@@ -45,7 +45,7 @@
it('sets 1 regardless of parameter', () => {
const w = new BrowserWindow({ show: false });
w.setOpacity(0);
-@@ -2531,7 +2531,7 @@ describe('BrowserWindow module', () => {
+@@ -2547,7 +2547,7 @@ describe('BrowserWindow module', () => {
expect(test.version).to.equal(process.version);
expect(test.versions).to.deep.equal(process.versions);
@@ -54,7 +54,7 @@
expect(test.creationTime).to.be.null('creation time');
expect(test.systemMemoryInfo).to.be.null('system memory info');
} else {
-@@ -3057,7 +3057,7 @@ describe('BrowserWindow module', () => {
+@@ -3073,7 +3073,7 @@ describe('BrowserWindow module', () => {
});
});
@@ -63,7 +63,7 @@
afterEach(closeAllWindows);
it('emits an event when window is maximized', async () => {
const w = new BrowserWindow({ show: false });
-@@ -3635,7 +3635,7 @@ describe('BrowserWindow module', () => {
+@@ -3651,7 +3651,7 @@ describe('BrowserWindow module', () => {
});
});