From owner-dev-commits-ports-main@freebsd.org Tue Apr 20 08:35:23 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A42D55EB837; Tue, 20 Apr 2021 08:35:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FPcSq4GBJz4SJ9; Tue, 20 Apr 2021 08:35:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 852C8781B; Tue, 20 Apr 2021 08:35:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13K8ZN1n059046; Tue, 20 Apr 2021 08:35:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13K8ZNRt059045; Tue, 20 Apr 2021 08:35:23 GMT (envelope-from git) Date: Tue, 20 Apr 2021 08:35:23 GMT Message-Id: <202104200835.13K8ZNRt059045@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Hiroki Tagato Subject: git: d1150f078ff2 - main - devel/electron11: update to 11.4.3 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tagattie X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d1150f078ff27cd5fc41d9285f2482acb6bf4845 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Apr 2021 08:35:23 -0000 The branch main has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=d1150f078ff27cd5fc41d9285f2482acb6bf4845 commit d1150f078ff27cd5fc41d9285f2482acb6bf4845 Author: Hiroki Tagato AuthorDate: 2021-04-19 10:48:08 +0000 Commit: Hiroki Tagato CommitDate: 2021-04-20 08:35:13 +0000 devel/electron11: update to 11.4.3 Changelog: https://github.com/electron/electron/releases/tag/v11.4.3 --- devel/electron11/Makefile | 3 +-- devel/electron11/Makefile.version | 2 +- devel/electron11/distinfo | 10 +++++----- devel/electron11/files/package.json | 2 +- .../patch-electron_shell_browser_native__window__views.cc | 8 ++++---- .../files/patch-electron_spec-main_chromium-spec.ts | 6 +++--- .../files/patch-services_network_network__context.cc | 13 ++----------- .../files/patch-third__party_zlib_cpu__features.c | 2 +- 8 files changed, 18 insertions(+), 28 deletions(-) diff --git a/devel/electron11/Makefile b/devel/electron11/Makefile index d859559bc1c5..4024486c7b06 100644 --- a/devel/electron11/Makefile +++ b/devel/electron11/Makefile @@ -1,7 +1,6 @@ PORTNAME= electron DISTVERSIONPREFIX= v DISTVERSION= ${ELECTRON_VER:S/-beta./.b/} -PORTREVISION= 1 CATEGORIES= devel java MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/:chromium_official \ https://commondatastorage.googleapis.com/chromium-nodejs/:chromium_node \ @@ -129,7 +128,7 @@ NODE_VER= 12.18.3 # See ${WRKSRC}/electron/DEPS for NAN_VER NAN_VER= 2c4ee8a32a299eada3cd6e468bbd0a473bfea96d -YARN_TIMESTAMP= 1617522362 +YARN_TIMESTAMP= 1618728633 GN_ARGS+= clang_use_chrome_plugins=false \ enable_hangout_services_extension=true \ diff --git a/devel/electron11/Makefile.version b/devel/electron11/Makefile.version index 66d2e6475e6b..2821d542dc52 100644 --- a/devel/electron11/Makefile.version +++ b/devel/electron11/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 11.4.2 +ELECTRON_VER= 11.4.3 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron11/distinfo b/devel/electron11/distinfo index b5ffef1fe850..1b12fbc46f2f 100644 --- a/devel/electron11/distinfo +++ b/devel/electron11/distinfo @@ -1,14 +1,14 @@ -TIMESTAMP = 1617522634 +TIMESTAMP = 1618729325 SHA256 (electron/chromium-87.0.4280.141.tar.xz) = 147591d7fc21e1a173701d28bbf35baddb91e64dd96ec16d8eee9a5113403375 SIZE (electron/chromium-87.0.4280.141.tar.xz) = 856467564 SHA256 (electron/a9603a3dc03fa41af9cc5c8ac28d23d1f98dfe3c) = b8b23fa102ddea8b6b4b6b9161c76636fd48b37e6bcfe955e56bfe04e31ba13b SIZE (electron/a9603a3dc03fa41af9cc5c8ac28d23d1f98dfe3c) = 8072260 SHA256 (electron/cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb) = ec973eccd669d417fbf2d0a4dac730744a3174268ff062db5451b55c82bc3492 SIZE (electron/cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb) = 26759650 -SHA256 (electron/electron-yarn-cache-11.4.2.tar.xz) = 6855781d438f4f542604faffb84f53a8405457ca4f824a45c88b708d20d19de2 -SIZE (electron/electron-yarn-cache-11.4.2.tar.xz) = 27493860 -SHA256 (electron/electron-electron-v11.4.2_GH0.tar.gz) = 807383d378243b7a11ec94c47c7384e1b5963c0b1a0abd8667f1e4525d224f60 -SIZE (electron/electron-electron-v11.4.2_GH0.tar.gz) = 6392036 +SHA256 (electron/electron-yarn-cache-11.4.3.tar.xz) = 38b30ba8ede35ff78b807496bd914502413c1f9764622c1ed662d8a68bde5439 +SIZE (electron/electron-yarn-cache-11.4.3.tar.xz) = 27493852 +SHA256 (electron/electron-electron-v11.4.3_GH0.tar.gz) = 9da9c9a19c968588e9db0a10bed785e65032c2b429ab49056891c731c4695067 +SIZE (electron/electron-electron-v11.4.3_GH0.tar.gz) = 6394367 SHA256 (electron/nodejs-node-v12.18.3_GH0.tar.gz) = 6e2730c9284906a0f34cd7c64540c891c0e363323c46e9fc005c6366ddf389c6 SIZE (electron/nodejs-node-v12.18.3_GH0.tar.gz) = 77078855 SHA256 (electron/nodejs-nan-2c4ee8a32a299eada3cd6e468bbd0a473bfea96d_GH0.tar.gz) = e4ff33afb043329429c9551d3cc983786553a310a7d61ee313485ba3ac9b2b15 diff --git a/devel/electron11/files/package.json b/devel/electron11/files/package.json index 26ee6fed432a..904972d0e499 100644 --- a/devel/electron11/files/package.json +++ b/devel/electron11/files/package.json @@ -1,6 +1,6 @@ { "name": "electron", - "version": "11.4.2", + "version": "11.4.3", "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_native__window__views.cc b/devel/electron11/files/patch-electron_shell_browser_native__window__views.cc index 3e42d3f2e795..c92d6d780cc6 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-04-02 17:02:59 UTC +--- electron/shell/browser/native_window_views.cc.orig 2021-04-13 20:38:27 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); -@@ -1386,7 +1386,7 @@ void NativeWindowViews::OnWidgetBoundsChanged(views::W +@@ -1387,7 +1387,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); -@@ -1496,7 +1496,7 @@ void NativeWindowViews::HandleKeyboardEvent( +@@ -1497,7 +1497,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) -@@ -1508,7 +1508,7 @@ void NativeWindowViews::HandleKeyboardEvent( +@@ -1509,7 +1509,7 @@ void NativeWindowViews::HandleKeyboardEvent( root_view_->HandleKeyEvent(event); } diff --git a/devel/electron11/files/patch-electron_spec-main_chromium-spec.ts b/devel/electron11/files/patch-electron_spec-main_chromium-spec.ts index 2365370206a4..0a270776284b 100644 --- a/devel/electron11/files/patch-electron_spec-main_chromium-spec.ts +++ b/devel/electron11/files/patch-electron_spec-main_chromium-spec.ts @@ -1,6 +1,6 @@ ---- electron/spec-main/chromium-spec.ts.orig 2021-01-22 23:55:24 UTC +--- electron/spec-main/chromium-spec.ts.orig 2021-04-13 20:38:27 UTC +++ electron/spec-main/chromium-spec.ts -@@ -321,13 +321,13 @@ describe('command line switches', () => { +@@ -392,13 +392,13 @@ describe('command line switches', () => { it('should not set an invalid locale', async () => testLocale('asdfkl', currentLocale)); const lcAll = String(process.env.LC_ALL); @@ -18,7 +18,7 @@ }); describe('--remote-debugging-pipe switch', () => { -@@ -1384,10 +1384,10 @@ describe('font fallback', () => { +@@ -1455,10 +1455,10 @@ describe('font fallback', () => { const fonts = await getRenderedFonts(html); expect(fonts).to.be.an('array'); expect(fonts).to.have.length(1); diff --git a/devel/electron11/files/patch-services_network_network__context.cc b/devel/electron11/files/patch-services_network_network__context.cc index d058a48f7934..463ebb40a0a7 100644 --- a/devel/electron11/files/patch-services_network_network__context.cc +++ b/devel/electron11/files/patch-services_network_network__context.cc @@ -1,15 +1,6 @@ ---- services/network/network_context.cc.orig 2021-01-25 12:36:59 UTC +--- services/network/network_context.cc.orig 2021-04-18 07:12:19 UTC +++ services/network/network_context.cc -@@ -1962,7 +1962,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestC - temp_verifier = base::WrapUnique(cert_verifier_with_trust_anchors_); - #endif // defined(OS_CHROMEOS) - if (!temp_verifier) { --#if !defined(OS_LINUX) -+#if !defined(OS_LINUX) && !defined(OS_BSD) - temp_verifier = std::make_unique( - net::CertVerifyProc::CreateSystemVerifyProc(std::move(cert_net_fetcher_))); - #else -@@ -2023,7 +2023,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestC +@@ -2012,7 +2012,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestC net::CookieCryptoDelegate* crypto_delegate = nullptr; if (params_->enable_encrypted_cookies) { diff --git a/devel/electron11/files/patch-third__party_zlib_cpu__features.c b/devel/electron11/files/patch-third__party_zlib_cpu__features.c index 511ce4c485ef..aa2535481810 100644 --- a/devel/electron11/files/patch-third__party_zlib_cpu__features.c +++ b/devel/electron11/files/patch-third__party_zlib_cpu__features.c @@ -23,7 +23,7 @@ #include #elif defined(ARMV8_OS_LINUX) #include -@@ -65,7 +65,7 @@ int ZLIB_INTERNAL x86_cpu_enable_simd = 0; +@@ -56,7 +65,7 @@ int ZLIB_INTERNAL x86_cpu_enable_simd = 0; static void _cpu_check_features(void); #endif