git: e65065326363 - main - devel/electron19: update to 19.0.9
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 24 Jul 2022 06:04:11 UTC
The branch main has been updated by tagattie:
URL: https://cgit.FreeBSD.org/ports/commit/?id=e650653263635c622946516be0cce7ba54d04290
commit e650653263635c622946516be0cce7ba54d04290
Author: Hiroki Tagato <tagattie@FreeBSD.org>
AuthorDate: 2022-07-24 06:02:47 +0000
Commit: Hiroki Tagato <tagattie@FreeBSD.org>
CommitDate: 2022-07-24 06:04:03 +0000
devel/electron19: update to 19.0.9
Changelog: https://github.com/electron/electron/releases/tag/v19.0.9
---
devel/electron19/Makefile | 6 ++---
devel/electron19/Makefile.version | 2 +-
devel/electron19/distinfo | 14 +++++------
devel/electron19/files/package.json | 2 +-
devel/electron19/files/patch-BUILD.gn | 4 ++--
...ell_browser_api_electron__api__web__contents.cc | 6 ++---
...hell_browser_api_electron__api__web__contents.h | 4 ++--
...electron_shell_browser_native__window__views.cc | 28 +++++++++++-----------
...h-electron_spec-main_api-browser-window-spec.ts | 18 +++++++-------
...tch-electron_spec-main_api-web-contents-spec.ts | 11 ---------
...h-ui_ozone_platform_x11_ozone__platform__x11.cc | 4 ++--
11 files changed, 44 insertions(+), 55 deletions(-)
diff --git a/devel/electron19/Makefile b/devel/electron19/Makefile
index b43a53ce8746..010dbfe77300 100644
--- a/devel/electron19/Makefile
+++ b/devel/electron19/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/v19.0.8/:chromium \
+MASTER_SITES= https://github.com/tagattie/FreeBSD-Electron/releases/download/v19.0.9/:chromium \
https://commondatastorage.googleapis.com/chromium-nodejs/:chromium_node \
https://commondatastorage.googleapis.com/chromium-fonts/:chromium_testfonts
PKGNAMESUFFIX= ${ELECTRON_VER_MAJOR}
@@ -137,7 +137,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= 102.0.5005.148
+CHROMIUM_VER= 102.0.5005.167
# See ${WRKSRC}/third_party/node/node_modules.tar.gz.sha1 for CHROMIUM_NODE_MODULES_HASH
CHROMIUM_NODE_MODULES_HASH= df473d4b1ab26ce6b669007521f2ffb8ff99f9d7
# See ${WRKSRC}/third_party/test_fonts/test_fonts.tar.gz.sha1 for CHROMIUM_TEST_FONTS_HASH
@@ -153,7 +153,7 @@ REACTIVEOBJC_VER= 74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76
# See ${WRKSRC}/electron/DEPS for MANTLE_VER
MANTLE_VER= 78d3966b3c331292ea29ec38661b25df0a245948
-YARN_TIMESTAMP= 1657174247
+YARN_TIMESTAMP= 1658465136
GN_ARGS+= clang_use_chrome_plugins=false \
enable_hangout_services_extension=true \
diff --git a/devel/electron19/Makefile.version b/devel/electron19/Makefile.version
index 5ee88b025435..e011a8ac7449 100644
--- a/devel/electron19/Makefile.version
+++ b/devel/electron19/Makefile.version
@@ -1,2 +1,2 @@
-ELECTRON_VER= 19.0.8
+ELECTRON_VER= 19.0.9
ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//}
diff --git a/devel/electron19/distinfo b/devel/electron19/distinfo
index ea65380fd2c2..84e268eb4cfa 100644
--- a/devel/electron19/distinfo
+++ b/devel/electron19/distinfo
@@ -1,14 +1,14 @@
-TIMESTAMP = 1657183571
-SHA256 (electron/chromium-102.0.5005.148.tar.xz) = 1ec12e399fb5f0794a48b982e8ea17d65401c4c224922b92f9af9d15c5e25e2f
-SIZE (electron/chromium-102.0.5005.148.tar.xz) = 1302541952
+TIMESTAMP = 1658480260
+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.8.tar.xz) = 23a715ebe8c338d3fe9c3ae85db9f12693c4ccfacf6287d0d3efccd3735bdb15
-SIZE (electron/electron-yarn-cache-19.0.8.tar.xz) = 37910616
-SHA256 (electron/electron-electron-v19.0.8_GH0.tar.gz) = d8ee01db95dfe24aa89a67424498b67102a4977ff9a3ccbfbc3f36801fdba7d5
-SIZE (electron/electron-electron-v19.0.8_GH0.tar.gz) = 10464491
+SHA256 (electron/electron-yarn-cache-19.0.9.tar.xz) = b3cf5287f0ba748ebb80a67f91f003134d73501ab2bd27354cae8c32ccd33d96
+SIZE (electron/electron-yarn-cache-19.0.9.tar.xz) = 37911700
+SHA256 (electron/electron-electron-v19.0.9_GH0.tar.gz) = f16850774fca094414a6f7bf1a34aa8f5f5d56cef7fdc016fc35daef59264456
+SIZE (electron/electron-electron-v19.0.9_GH0.tar.gz) = 10467537
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
diff --git a/devel/electron19/files/package.json b/devel/electron19/files/package.json
index 2e18d9224cd0..4a986a021b4a 100644
--- a/devel/electron19/files/package.json
+++ b/devel/electron19/files/package.json
@@ -1,6 +1,6 @@
{
"name": "electron",
- "version": "19.0.8",
+ "version": "19.0.9",
"repository": "https://github.com/electron/electron",
"description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
"devDependencies": {
diff --git a/devel/electron19/files/patch-BUILD.gn b/devel/electron19/files/patch-BUILD.gn
index e7adbf06a0f8..60821bef1ec9 100644
--- a/devel/electron19/files/patch-BUILD.gn
+++ b/devel/electron19/files/patch-BUILD.gn
@@ -1,4 +1,4 @@
---- BUILD.gn.orig 2022-05-25 04:00:41 UTC
+--- BUILD.gn.orig 2022-07-22 06:18:29 UTC
+++ BUILD.gn
@@ -54,7 +54,7 @@ declare_args() {
root_extra_deps = []
@@ -69,7 +69,7 @@
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
-@@ -1565,7 +1573,7 @@ group("chromium_builder_perf") {
+@@ -1567,7 +1575,7 @@ group("chromium_builder_perf") {
if (is_win) {
data_deps += [ "//chrome/installer/mini_installer:mini_installer" ]
diff --git a/devel/electron19/files/patch-electron_shell_browser_api_electron__api__web__contents.cc b/devel/electron19/files/patch-electron_shell_browser_api_electron__api__web__contents.cc
index 6c6a48b70a37..718656b1e329 100644
--- a/devel/electron19/files/patch-electron_shell_browser_api_electron__api__web__contents.cc
+++ b/devel/electron19/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 2022-06-30 15:53:29 UTC
+--- electron/shell/browser/api/electron_api_web_contents.cc.orig 2022-07-21 18:53:47 UTC
+++ electron/shell/browser/api/electron_api_web_contents.cc
@@ -150,11 +150,11 @@
#include "ui/base/cocoa/defaults_utils.h"
@@ -23,7 +23,7 @@
if (auto* linux_ui = views::LinuxUI::instance())
return linux_ui->GetCursorBlinkInterval();
#elif BUILDFLAG(IS_WIN)
-@@ -834,7 +834,7 @@ void WebContents::InitWithSessionAndOptions(
+@@ -849,7 +849,7 @@ void WebContents::InitWithSessionAndOptions(
accept_languages.pop_back();
prefs->accept_languages = accept_languages;
@@ -32,7 +32,7 @@
// Update font settings.
static const gfx::FontRenderParams params(
gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(), nullptr));
-@@ -2360,7 +2360,7 @@ void WebContents::ForcefullyCrashRenderer() {
+@@ -2375,7 +2375,7 @@ void WebContents::ForcefullyCrashRenderer() {
content::RenderProcessHost* rph = rwh->GetProcess();
if (rph) {
diff --git a/devel/electron19/files/patch-electron_shell_browser_api_electron__api__web__contents.h b/devel/electron19/files/patch-electron_shell_browser_api_electron__api__web__contents.h
index 3ee867d2d3e8..0c71ff203bd3 100644
--- a/devel/electron19/files/patch-electron_shell_browser_api_electron__api__web__contents.h
+++ b/devel/electron19/files/patch-electron_shell_browser_api_electron__api__web__contents.h
@@ -1,6 +1,6 @@
---- electron/shell/browser/api/electron_api_web_contents.h.orig 2022-05-18 15:31:32 UTC
+--- electron/shell/browser/api/electron_api_web_contents.h.orig 2022-07-21 18:53:47 UTC
+++ electron/shell/browser/api/electron_api_web_contents.h
-@@ -720,7 +720,7 @@ class WebContents : public ExclusiveAccessContext,
+@@ -719,7 +719,7 @@ class WebContents : public ExclusiveAccessContext,
#if defined(TOOLKIT_VIEWS) && !BUILDFLAG(IS_MAC)
ui::ImageModel GetDevToolsWindowIcon() override;
#endif
diff --git a/devel/electron19/files/patch-electron_shell_browser_native__window__views.cc b/devel/electron19/files/patch-electron_shell_browser_native__window__views.cc
index a54bb6e73baf..e809d6dd1a07 100644
--- a/devel/electron19/files/patch-electron_shell_browser_native__window__views.cc
+++ b/devel/electron19/files/patch-electron_shell_browser_native__window__views.cc
@@ -1,4 +1,4 @@
---- electron/shell/browser/native_window_views.cc.orig 2022-06-30 15:53:29 UTC
+--- electron/shell/browser/native_window_views.cc.orig 2022-07-21 18:53:47 UTC
+++ electron/shell/browser/native_window_views.cc
@@ -43,7 +43,7 @@
#include "ui/wm/core/shadow_types.h"
@@ -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:
+@@ -265,7 +265,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
params.parent = parent->GetNativeWindow();
params.native_widget = new ElectronDesktopNativeWidgetAura(this);
@@ -18,7 +18,7 @@
std::string name = Browser::Get()->GetName();
// Set WM_WINDOW_ROLE.
params.wm_role_name = "browser-window";
-@@ -287,7 +287,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
+@@ -290,7 +290,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
std::string window_type;
options.Get(options::kType, &window_type);
@@ -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) {
-@@ -394,7 +394,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
+@@ -397,7 +397,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
if (window)
window->AddPreTargetHandler(this);
@@ -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);
-@@ -537,7 +537,7 @@ bool NativeWindowViews::IsVisible() {
+@@ -547,7 +547,7 @@ bool NativeWindowViews::IsVisible() {
bool NativeWindowViews::IsEnabled() {
#if BUILDFLAG(IS_WIN)
return ::IsWindowEnabled(GetAcceleratedWidget());
@@ -45,7 +45,7 @@
#if defined(USE_OZONE_PLATFORM_X11)
if (IsX11())
return !event_disabler_.get();
-@@ -595,7 +595,7 @@ void NativeWindowViews::SetEnabledInternal(bool enable
+@@ -605,7 +605,7 @@ void NativeWindowViews::SetEnabledInternal(bool enable
#endif
}
@@ -54,7 +54,7 @@
void NativeWindowViews::Maximize() {
if (IsVisible()) {
widget()->Maximize();
-@@ -723,7 +723,7 @@ void NativeWindowViews::SetBounds(const gfx::Rect& bou
+@@ -733,7 +733,7 @@ void NativeWindowViews::SetBounds(const gfx::Rect& bou
}
#endif
@@ -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_) {
-@@ -955,7 +955,7 @@ bool NativeWindowViews::IsClosable() {
+@@ -965,7 +965,7 @@ bool NativeWindowViews::IsClosable() {
return false;
}
return !(info.fState & MFS_DISABLED);
@@ -72,7 +72,7 @@
return true;
#endif
}
-@@ -1347,7 +1347,7 @@ void NativeWindowViews::SetProgressBar(double progress
+@@ -1357,7 +1357,7 @@ void NativeWindowViews::SetProgressBar(double progress
NativeWindow::ProgressState state) {
#if BUILDFLAG(IS_WIN)
taskbar_host_.SetProgressBar(GetAcceleratedWidget(), progress, state);
@@ -81,7 +81,7 @@
if (unity::IsRunning()) {
unity::SetProgressFraction(progress);
}
-@@ -1409,7 +1409,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM
+@@ -1419,7 +1419,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM
#if BUILDFLAG(IS_WIN)
window_handle =
reinterpret_cast<content::DesktopMediaID::Id>(accelerated_widget);
@@ -90,7 +90,7 @@
window_handle = static_cast<uint32_t>(accelerated_widget);
#endif
aura::WindowTreeHost* const host =
-@@ -1512,7 +1512,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC
+@@ -1522,7 +1522,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC
SendMessage(hwnd, WM_SETICON, ICON_BIG,
reinterpret_cast<LPARAM>(app_icon_.get()));
}
@@ -99,7 +99,7 @@
void NativeWindowViews::SetIcon(const gfx::ImageSkia& icon) {
auto* tree_host = views::DesktopWindowTreeHostLinux::GetHostForWidget(
GetAcceleratedWidget());
-@@ -1582,7 +1582,7 @@ bool NativeWindowViews::CanMaximize() const {
+@@ -1592,7 +1592,7 @@ bool NativeWindowViews::CanMaximize() const {
bool NativeWindowViews::CanMinimize() const {
#if BUILDFLAG(IS_WIN)
return minimizable_;
@@ -108,7 +108,7 @@
return true;
#endif
}
-@@ -1656,7 +1656,7 @@ void NativeWindowViews::HandleKeyboardEvent(
+@@ -1666,7 +1666,7 @@ void NativeWindowViews::HandleKeyboardEvent(
if (widget_destroyed_)
return;
@@ -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)
-@@ -1675,7 +1675,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e
+@@ -1685,7 +1685,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e
// Alt+Click should not toggle menu bar.
root_view_->ResetAltState();
diff --git a/devel/electron19/files/patch-electron_spec-main_api-browser-window-spec.ts b/devel/electron19/files/patch-electron_spec-main_api-browser-window-spec.ts
index 3b6ca027b3a4..64dc19292aac 100644
--- a/devel/electron19/files/patch-electron_spec-main_api-browser-window-spec.ts
+++ b/devel/electron19/files/patch-electron_spec-main_api-browser-window-spec.ts
@@ -1,4 +1,4 @@
---- electron/spec-main/api-browser-window-spec.ts.orig 2022-06-22 15:31:07 UTC
+--- electron/spec-main/api-browser-window-spec.ts.orig 2022-07-21 18:53:47 UTC
+++ electron/spec-main/api-browser-window-spec.ts
@@ -58,7 +58,7 @@ describe('BrowserWindow module', () => {
}).not.to.throw();
@@ -72,7 +72,7 @@
it('sets 1 regardless of parameter', () => {
const w = new BrowserWindow({ show: false });
w.setOpacity(0);
-@@ -3192,7 +3192,7 @@ describe('BrowserWindow module', () => {
+@@ -3227,7 +3227,7 @@ describe('BrowserWindow module', () => {
expect(test.versions).to.deep.equal(process.versions);
expect(test.contextId).to.be.a('string');
@@ -81,7 +81,7 @@
expect(test.creationTime).to.be.null('creation time');
expect(test.systemMemoryInfo).to.be.null('system memory info');
} else {
-@@ -3765,7 +3765,7 @@ describe('BrowserWindow module', () => {
+@@ -3800,7 +3800,7 @@ describe('BrowserWindow module', () => {
});
});
@@ -90,7 +90,7 @@
afterEach(closeAllWindows);
it('emits an event when window is maximized', async () => {
const w = new BrowserWindow({ show: false });
-@@ -4024,7 +4024,7 @@ describe('BrowserWindow module', () => {
+@@ -4059,7 +4059,7 @@ describe('BrowserWindow module', () => {
});
// TODO(dsanders11): Enable once maximize event works on Linux again on CI
@@ -99,7 +99,7 @@
afterEach(closeAllWindows);
it('should show the window if it is not currently shown', async () => {
const w = new BrowserWindow({ show: false });
-@@ -4061,7 +4061,7 @@ describe('BrowserWindow module', () => {
+@@ -4096,7 +4096,7 @@ describe('BrowserWindow module', () => {
// TODO(dsanders11): Enable once minimize event works on Linux again.
// See https://github.com/electron/electron/issues/28699
@@ -108,7 +108,7 @@
const w = new BrowserWindow();
const minimize = emittedOnce(w, 'minimize');
w.minimize();
-@@ -4416,7 +4416,7 @@ describe('BrowserWindow module', () => {
+@@ -4451,7 +4451,7 @@ describe('BrowserWindow module', () => {
});
// On Linux there is no "resizable" property of a window.
@@ -117,7 +117,7 @@
const w = new BrowserWindow({ show: false });
expect(w.resizable).to.be.true('resizable');
-@@ -4508,7 +4508,7 @@ describe('BrowserWindow module', () => {
+@@ -4543,7 +4543,7 @@ describe('BrowserWindow module', () => {
});
});
@@ -126,7 +126,7 @@
// Not implemented on Linux.
afterEach(closeAllWindows);
-@@ -5432,7 +5432,7 @@ describe('BrowserWindow module', () => {
+@@ -5483,7 +5483,7 @@ describe('BrowserWindow module', () => {
});
// Linux and arm64 platforms (WOA and macOS) do not return any capture sources
@@ -135,7 +135,7 @@
const display = screen.getPrimaryDisplay();
const backgroundWindow = new BrowserWindow({
-@@ -5474,7 +5474,7 @@ describe('BrowserWindow module', () => {
+@@ -5525,7 +5525,7 @@ describe('BrowserWindow module', () => {
afterEach(closeAllWindows);
// Linux/WOA doesn't return any capture sources.
diff --git a/devel/electron19/files/patch-electron_spec-main_api-web-contents-spec.ts b/devel/electron19/files/patch-electron_spec-main_api-web-contents-spec.ts
deleted file mode 100644
index 910f54106aae..000000000000
--- a/devel/electron19/files/patch-electron_spec-main_api-web-contents-spec.ts
+++ /dev/null
@@ -1,11 +0,0 @@
---- electron/spec-main/api-web-contents-spec.ts.orig 2021-11-08 18:41:28 UTC
-+++ electron/spec-main/api-web-contents-spec.ts
-@@ -179,7 +179,7 @@ describe('webContents module', () => {
- }).to.throw('webContents.print(): Invalid optional callback provided.');
- });
-
-- ifit(process.platform !== 'linux')('throws when an invalid deviceName is passed', () => {
-+ ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('throws when an invalid deviceName is passed', () => {
- expect(() => {
- w.webContents.print({ deviceName: 'i-am-a-nonexistent-printer' }, () => {});
- }).to.throw('webContents.print(): Invalid deviceName provided.');
diff --git a/devel/electron19/files/patch-ui_ozone_platform_x11_ozone__platform__x11.cc b/devel/electron19/files/patch-ui_ozone_platform_x11_ozone__platform__x11.cc
index 14d51d0d28ff..efd71f209f6b 100644
--- a/devel/electron19/files/patch-ui_ozone_platform_x11_ozone__platform__x11.cc
+++ b/devel/electron19/files/patch-ui_ozone_platform_x11_ozone__platform__x11.cc
@@ -1,6 +1,6 @@
---- ui/ozone/platform/x11/ozone_platform_x11.cc.orig 2022-05-20 04:30:53 UTC
+--- ui/ozone/platform/x11/ozone_platform_x11.cc.orig 2022-07-23 02:46:20 UTC
+++ ui/ozone/platform/x11/ozone_platform_x11.cc
-@@ -205,7 +205,7 @@ class OzonePlatformX11 : public OzonePlatform,
+@@ -204,7 +204,7 @@ class OzonePlatformX11 : public OzonePlatform,
properties->supports_global_application_menus = true;
properties->app_modal_dialogs_use_event_blocker = true;
properties->fetch_buffer_formats_for_gmb_on_gpu = true;