Date: Sun, 23 May 2021 08:10:48 GMT From: Hiroki Tagato <tagattie@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: bf60875aa177 - main - devel/electron12: Update to 12.0.9 Message-ID: <202105230810.14N8AmZj006545@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=bf60875aa177925e004655f01d551669251b2fc3 commit bf60875aa177925e004655f01d551669251b2fc3 Author: Hiroki Tagato <tagattie@FreeBSD.org> AuthorDate: 2021-05-23 08:06:58 +0000 Commit: Hiroki Tagato <tagattie@FreeBSD.org> CommitDate: 2021-05-23 08:06:58 +0000 devel/electron12: Update to 12.0.9 Changelog: - https://github.com/electron/electron/releases/tag/v12.0.8 - https://github.com/electron/electron/releases/tag/v12.0.9 --- devel/electron12/Makefile | 2 +- devel/electron12/Makefile.version | 2 +- devel/electron12/distinfo | 10 +++---- devel/electron12/files/package.json | 2 +- ...ell_browser_api_electron__api__web__contents.cc | 8 +++--- ...hell_browser_api_electron__api__web__contents.h | 4 +-- ...tron_shell_browser_electron__browser__client.cc | 4 +-- ...electron_shell_browser_native__window__views.cc | 32 +++++++++++----------- ...-electron_shell_browser_native__window__views.h | 6 ++-- .../patch-electron_spec-main_chromium-spec.ts | 6 ++-- 10 files changed, 38 insertions(+), 38 deletions(-) diff --git a/devel/electron12/Makefile b/devel/electron12/Makefile index 7f524e31ae07..e9de6ba17e97 100644 --- a/devel/electron12/Makefile +++ b/devel/electron12/Makefile @@ -123,7 +123,7 @@ NODE_VER= 14.16.0 # See ${WRKSRC}/electron/DEPS for NAN_VER NAN_VER= 2c4ee8a32a299eada3cd6e468bbd0a473bfea96d -YARN_TIMESTAMP= 1620459581 +YARN_TIMESTAMP= 1621487762 GN_ARGS+= clang_use_chrome_plugins=false \ enable_hangout_services_extension=true \ diff --git a/devel/electron12/Makefile.version b/devel/electron12/Makefile.version index 6d4ae3f3b0d4..5fcb64dc06ab 100644 --- a/devel/electron12/Makefile.version +++ b/devel/electron12/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 12.0.7 +ELECTRON_VER= 12.0.9 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron12/distinfo b/devel/electron12/distinfo index d4d7a3cb4648..1ac75fbe82d8 100644 --- a/devel/electron12/distinfo +++ b/devel/electron12/distinfo @@ -1,12 +1,12 @@ -TIMESTAMP = 1620460454 +TIMESTAMP = 1621488488 SHA256 (electron/chromium-89.0.4389.128.tar.xz) = 1a75ea6aeb98f2d3b6feae1fbf5692679e93d5b7631bc7c762dd873499deda5b SIZE (electron/chromium-89.0.4389.128.tar.xz) = 890850492 SHA256 (electron/cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb) = ec973eccd669d417fbf2d0a4dac730744a3174268ff062db5451b55c82bc3492 SIZE (electron/cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb) = 26759650 -SHA256 (electron/electron-yarn-cache-12.0.7.tar.xz) = 03bde46e775e771238c38b64b0ca88feddbe332cd495bac9adf73d317cf40c20 -SIZE (electron/electron-yarn-cache-12.0.7.tar.xz) = 33907768 -SHA256 (electron/electron-electron-v12.0.7_GH0.tar.gz) = 59deac4ab3d050f88bbfe22408afc10775f49083b3f0c04a8775296c5a026b8f -SIZE (electron/electron-electron-v12.0.7_GH0.tar.gz) = 9990283 +SHA256 (electron/electron-yarn-cache-12.0.9.tar.xz) = 1ff7d74d4523d886375f9c695f47dcaa5e5754fd719a6547fbd276f440c3298c +SIZE (electron/electron-yarn-cache-12.0.9.tar.xz) = 33907800 +SHA256 (electron/electron-electron-v12.0.9_GH0.tar.gz) = 1b4073baa3e93bb410591688b7ca6e59201ae9c8cf18f05e5a05ecfd7ffebfc8 +SIZE (electron/electron-electron-v12.0.9_GH0.tar.gz) = 9995422 SHA256 (electron/nodejs-node-v14.16.0_GH0.tar.gz) = bcdf869b0743405515ee897b1047b5e851a717e426b4974d26537c9b10dfd53a SIZE (electron/nodejs-node-v14.16.0_GH0.tar.gz) = 87850748 SHA256 (electron/nodejs-nan-2c4ee8a32a299eada3cd6e468bbd0a473bfea96d_GH0.tar.gz) = e4ff33afb043329429c9551d3cc983786553a310a7d61ee313485ba3ac9b2b15 diff --git a/devel/electron12/files/package.json b/devel/electron12/files/package.json index a7026366ed2e..d343bf4941a9 100644 --- a/devel/electron12/files/package.json +++ b/devel/electron12/files/package.json @@ -1,6 +1,6 @@ { "name": "electron", - "version": "12.0.7", + "version": "12.0.9", "repository": "https://github.com/electron/electron", "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS", "devDependencies": { diff --git a/devel/electron12/files/patch-electron_shell_browser_api_electron__api__web__contents.cc b/devel/electron12/files/patch-electron_shell_browser_api_electron__api__web__contents.cc index e7cd26aa69c1..2600da81a196 100644 --- a/devel/electron12/files/patch-electron_shell_browser_api_electron__api__web__contents.cc +++ b/devel/electron12/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-04-20 23:32:33 UTC +--- electron/shell/browser/api/electron_api_web_contents.cc.orig 2021-05-19 20:52:49 UTC +++ electron/shell/browser/api/electron_api_web_contents.cc @@ -145,11 +145,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)); -@@ -2102,7 +2102,7 @@ void WebContents::ForcefullyCrashRenderer() { +@@ -2123,7 +2123,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(); -@@ -2668,7 +2668,7 @@ void WebContents::CopyImageAt(int x, int y) { +@@ -2689,7 +2689,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. @@ -50,7 +50,7 @@ if (owner_window()) owner_window()->Focus(true); #endif -@@ -3455,7 +3455,7 @@ gfx::ImageSkia WebContents::GetDevToolsWindowIcon() { +@@ -3472,7 +3472,7 @@ gfx::ImageSkia WebContents::GetDevToolsWindowIcon() { } #endif diff --git a/devel/electron12/files/patch-electron_shell_browser_api_electron__api__web__contents.h b/devel/electron12/files/patch-electron_shell_browser_api_electron__api__web__contents.h index 685943a16d78..ac6b81db2d0c 100644 --- a/devel/electron12/files/patch-electron_shell_browser_api_electron__api__web__contents.h +++ b/devel/electron12/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 2021-04-22 15:13:27 UTC +--- electron/shell/browser/api/electron_api_web_contents.h.orig 2021-05-19 20:52:49 UTC +++ electron/shell/browser/api/electron_api_web_contents.h -@@ -669,7 +669,7 @@ class WebContents : public gin::Wrappable<WebContents> +@@ -670,7 +670,7 @@ class WebContents : public gin::Wrappable<WebContents> #if defined(TOOLKIT_VIEWS) && !defined(OS_MAC) gfx::ImageSkia GetDevToolsWindowIcon() override; #endif diff --git a/devel/electron12/files/patch-electron_shell_browser_electron__browser__client.cc b/devel/electron12/files/patch-electron_shell_browser_electron__browser__client.cc index b5f1da38f90b..fef1f3621234 100644 --- a/devel/electron12/files/patch-electron_shell_browser_electron__browser__client.cc +++ b/devel/electron12/files/patch-electron_shell_browser_electron__browser__client.cc @@ -1,6 +1,6 @@ ---- electron/shell/browser/electron_browser_client.cc.orig 2021-04-20 23:32:33 UTC +--- electron/shell/browser/electron_browser_client.cc.orig 2021-05-17 18:04:51 UTC +++ electron/shell/browser/electron_browser_client.cc -@@ -169,7 +169,7 @@ +@@ -171,7 +171,7 @@ #include "content/public/common/child_process_host.h" #endif diff --git a/devel/electron12/files/patch-electron_shell_browser_native__window__views.cc b/devel/electron12/files/patch-electron_shell_browser_native__window__views.cc index 3aaa28f24ed0..411ff4d112c9 100644 --- a/devel/electron12/files/patch-electron_shell_browser_native__window__views.cc +++ b/devel/electron12/files/patch-electron_shell_browser_native__window__views.cc @@ -1,4 +1,4 @@ ---- electron/shell/browser/native_window_views.cc.orig 2021-04-30 18:57:27 UTC +--- electron/shell/browser/native_window_views.cc.orig 2021-05-19 20:52:49 UTC +++ electron/shell/browser/native_window_views.cc @@ -44,7 +44,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" -@@ -203,7 +203,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper: +@@ -207,7 +207,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"; -@@ -233,7 +233,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper: +@@ -237,7 +237,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper: } #endif @@ -27,7 +27,7 @@ if (parent) SetParentWindow(parent); #endif -@@ -328,7 +328,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper: +@@ -332,7 +332,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper: last_window_state_ = ui::SHOW_STATE_NORMAL; #endif @@ -36,7 +36,7 @@ // Listen to move events. aura::Window* window = GetNativeWindow(); if (window) -@@ -348,7 +348,7 @@ NativeWindowViews::~NativeWindowViews() { +@@ -352,7 +352,7 @@ NativeWindowViews::~NativeWindowViews() { SetForwardMouseMessages(false); #endif @@ -45,7 +45,7 @@ aura::Window* window = GetNativeWindow(); if (window) window->RemovePreTargetHandler(this); -@@ -463,7 +463,7 @@ bool NativeWindowViews::IsVisible() { +@@ -467,7 +467,7 @@ bool NativeWindowViews::IsVisible() { bool NativeWindowViews::IsEnabled() { #if defined(OS_WIN) return ::IsWindowEnabled(GetAcceleratedWidget()); @@ -54,7 +54,7 @@ #if defined(USE_X11) if (!features::IsUsingOzonePlatform()) { return !event_disabler_.get(); -@@ -522,7 +522,7 @@ void NativeWindowViews::SetEnabledInternal(bool enable +@@ -526,7 +526,7 @@ void NativeWindowViews::SetEnabledInternal(bool enable #endif } @@ -63,7 +63,7 @@ void NativeWindowViews::Maximize() { if (IsVisible()) widget()->Maximize(); -@@ -638,7 +638,7 @@ bool NativeWindowViews::IsFullscreen() const { +@@ -642,7 +642,7 @@ bool NativeWindowViews::IsFullscreen() const { } void NativeWindowViews::SetBounds(const gfx::Rect& bounds, bool animate) { @@ -72,7 +72,7 @@ // On Linux and Windows the minimum and maximum size should be updated with // window size when window is not resizable. if (!resizable_) { -@@ -855,7 +855,7 @@ bool NativeWindowViews::IsClosable() { +@@ -859,7 +859,7 @@ bool NativeWindowViews::IsClosable() { return false; } return !(info.fState & MFS_DISABLED); @@ -81,7 +81,7 @@ return true; #endif } -@@ -1231,7 +1231,7 @@ void NativeWindowViews::SetProgressBar(double progress +@@ -1235,7 +1235,7 @@ void NativeWindowViews::SetProgressBar(double progress NativeWindow::ProgressState state) { #if defined(OS_WIN) taskbar_host_.SetProgressBar(GetAcceleratedWidget(), progress, state); @@ -90,7 +90,7 @@ if (unity::IsRunning()) { unity::SetProgressFraction(progress); } -@@ -1291,7 +1291,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM +@@ -1295,7 +1295,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM #if defined(OS_WIN) window_handle = reinterpret_cast<content::DesktopMediaID::Id>(accelerated_widget); @@ -99,7 +99,7 @@ window_handle = static_cast<uint32_t>(accelerated_widget); #endif aura::WindowTreeHost* const host = -@@ -1394,7 +1394,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC +@@ -1398,7 +1398,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC SendMessage(hwnd, WM_SETICON, ICON_BIG, reinterpret_cast<LPARAM>(app_icon_.get())); } @@ -108,7 +108,7 @@ void NativeWindowViews::SetIcon(const gfx::ImageSkia& icon) { auto* tree_host = views::DesktopWindowTreeHostLinux::GetHostForWidget( GetAcceleratedWidget()); -@@ -1444,7 +1444,7 @@ void NativeWindowViews::OnWidgetBoundsChanged(views::W +@@ -1448,7 +1448,7 @@ void NativeWindowViews::OnWidgetBoundsChanged(views::W } void NativeWindowViews::OnWidgetDestroying(views::Widget* widget) { @@ -117,7 +117,7 @@ aura::Window* window = GetNativeWindow(); if (window) window->RemovePreTargetHandler(this); -@@ -1482,7 +1482,7 @@ bool NativeWindowViews::CanMaximize() const { +@@ -1486,7 +1486,7 @@ bool NativeWindowViews::CanMaximize() const { bool NativeWindowViews::CanMinimize() const { #if defined(OS_WIN) return minimizable_; @@ -126,7 +126,7 @@ return true; #endif } -@@ -1554,7 +1554,7 @@ void NativeWindowViews::HandleKeyboardEvent( +@@ -1558,7 +1558,7 @@ void NativeWindowViews::HandleKeyboardEvent( if (widget_destroyed_) return; @@ -135,7 +135,7 @@ if (event.windows_key_code == ui::VKEY_BROWSER_BACK) NotifyWindowExecuteAppCommand(kBrowserBackward); else if (event.windows_key_code == ui::VKEY_BROWSER_FORWARD) -@@ -1566,7 +1566,7 @@ void NativeWindowViews::HandleKeyboardEvent( +@@ -1570,7 +1570,7 @@ void NativeWindowViews::HandleKeyboardEvent( root_view_->HandleKeyEvent(event); } diff --git a/devel/electron12/files/patch-electron_shell_browser_native__window__views.h b/devel/electron12/files/patch-electron_shell_browser_native__window__views.h index 52d981d93c52..aeb0716937e4 100644 --- a/devel/electron12/files/patch-electron_shell_browser_native__window__views.h +++ b/devel/electron12/files/patch-electron_shell_browser_native__window__views.h @@ -1,6 +1,6 @@ ---- electron/shell/browser/native_window_views.h.orig 2021-04-20 23:32:33 UTC +--- electron/shell/browser/native_window_views.h.orig 2021-05-19 20:52:49 UTC +++ electron/shell/browser/native_window_views.h -@@ -159,7 +159,7 @@ class NativeWindowViews : public NativeWindow, +@@ -163,7 +163,7 @@ class NativeWindowViews : public NativeWindow, LPARAM l_param, LRESULT* result); void SetIcon(HICON small_icon, HICON app_icon); @@ -9,7 +9,7 @@ void SetIcon(const gfx::ImageSkia& icon); #endif -@@ -219,7 +219,7 @@ class NativeWindowViews : public NativeWindow, +@@ -223,7 +223,7 @@ class NativeWindowViews : public NativeWindow, content::WebContents*, const content::NativeWebKeyboardEvent& event) override; diff --git a/devel/electron12/files/patch-electron_spec-main_chromium-spec.ts b/devel/electron12/files/patch-electron_spec-main_chromium-spec.ts index 3b533d761069..042c11ba4f41 100644 --- a/devel/electron12/files/patch-electron_spec-main_chromium-spec.ts +++ b/devel/electron12/files/patch-electron_spec-main_chromium-spec.ts @@ -1,4 +1,4 @@ ---- electron/spec-main/chromium-spec.ts.orig 2021-04-20 23:32:33 UTC +--- electron/spec-main/chromium-spec.ts.orig 2021-05-19 20:52:49 UTC +++ electron/spec-main/chromium-spec.ts @@ -397,13 +397,13 @@ describe('command line switches', () => { it('should not set an invalid locale', async () => testLocale('asdfkl', currentLocale)); @@ -18,7 +18,7 @@ }); describe('--remote-debugging-pipe switch', () => { -@@ -1453,12 +1453,12 @@ describe('font fallback', () => { +@@ -1478,12 +1478,12 @@ describe('font fallback', () => { expect(fonts[0].familyName).to.equal('Arial'); } else if (process.platform === 'darwin') { expect(fonts[0].familyName).to.equal('Helvetica'); @@ -33,7 +33,7 @@ const html = ` <html lang="ja-JP"> <head> -@@ -1659,7 +1659,7 @@ describe('navigator.clipboard', () => { +@@ -1683,7 +1683,7 @@ describe('navigator.clipboard', () => { }); });
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105230810.14N8AmZj006545>