From nobody Wed Nov 29 07:16:05 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sg9bV0Zn1z52G9W; Wed, 29 Nov 2023 07:16:06 +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 4Sg9bV078Tz3L6v; Wed, 29 Nov 2023 07:16:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701242166; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r0TNmAeYYKAXrskmkCz27zHlrNw+JG8Up6aUgQZHUxA=; b=Ueh0JNbuNDXD90wamxWRB9hbADwQ7wWvuoZ3kXUuNLe0DPkPMQiPB7FV+K4N+x88pHLUSe 5TD47iWmNwlYessfNDawykGQ0oQ+yNVe7gadhrOB9X25lNJ/dL/+/q/zk61MtM7f/blsE/ mnqQH/R0UuLVLKqr37iMYg+mGBiHajDV+MS8Dp57AVmZwGfvYBz2Gwc0tfB8c0Tqj0pl76 0KLcCqpZMLkiqtM5mvOrsyRuwtWvf/+3wCO8UEc+kOYD6EVT7QMDEy+RMvFwoslJpQN933 TzNimfCbTRlPJcLuLWgk/6PSJmNUzW4BI5lcqVGW6o0PhTYjbOAHhqe+pMZmkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701242166; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r0TNmAeYYKAXrskmkCz27zHlrNw+JG8Up6aUgQZHUxA=; b=iip7Nifr/bEE1p4Z6RxSGEyhkGJjLAG9Ch1UZ01sE6jU97MjPHpM3GBQRYD5DWjSF1m3Rf lBrDSib38h0SnrZhvDyTpZqZD9B6a11RnZxjwPGC+gLjX70dN2BVxFr15oDuUfLPiPXZOK PPk136kOdXBRxh3HtbUHvCTJrHvkXDxNtYC8JUU+G+Cu5GnX+P7gqVWHLL9ibpVAFypx+H xk/JXrTGT+FlJP+BZnwAKuE8T+hfwZYlpLuIfhGvJjXwzaNJJ6KIEW7tgsaDnCtEpaNQK4 fP8SfM2ERQnfPrCapKLavwy6nt7bZoJGBDMuSYwq2XrdqYeT50lwetZN/DiGNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701242166; a=rsa-sha256; cv=none; b=nw9hS3q0QxfFlTsvHFzggvN2xpyfFCTIxcscHEYWscnbP3zVx52khoaa1auUMe9CBKOqjq 8mAFNjR2EPeGNG6hf9s2ssJQC2X/9Qfic7wBSyv9cMqzVmxWd0AgkWgsKSOvRHCf3WmJJc uQtBA+Czgj6t+Fjgef01oMFhppLLjD6FueeGLBx5PNZUF4OcqWSgDVyTo/VCU7RV6/D5gx 1IUSxyY/98UevwLnryFWnPIAhTrD2L5ciekRytdWjx++SsNT9UpOlk2I4dJKrSGu3FsGSe nfMEj3CrlGp59EUopCUw9kgIMd3hhr5H8YGHPB0ZrDwAj+BHmi8RS1z4g4dXlg== 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 4Sg9bT66SXzwxg; Wed, 29 Nov 2023 07:16:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AT7G5fH000523; Wed, 29 Nov 2023 07:16:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AT7G5UF000520; Wed, 29 Nov 2023 07:16:05 GMT (envelope-from git) Date: Wed, 29 Nov 2023 07:16:05 GMT Message-Id: <202311290716.3AT7G5UF000520@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: 8a00b2d38036 - main - devel/electron26: update to 26.6.1 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org 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: 8a00b2d38036e69517cd6e282702cada6ee0a2ea Auto-Submitted: auto-generated The branch main has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=8a00b2d38036e69517cd6e282702cada6ee0a2ea commit 8a00b2d38036e69517cd6e282702cada6ee0a2ea Author: Hiroki Tagato AuthorDate: 2023-11-29 07:14:11 +0000 Commit: Hiroki Tagato CommitDate: 2023-11-29 07:15:53 +0000 devel/electron26: update to 26.6.1 Changelog: https://github.com/electron/electron/releases/tag/v26.6.1 Reported by: GitHub (watch releases) Security: 147353a3-c33b-46d1-b751-e72c0d7f29df --- devel/electron26/Makefile | 3 +-- devel/electron26/Makefile.version | 2 +- devel/electron26/distinfo | 10 +++++----- ...h-electron_shell_browser_native__window__views.cc | 20 ++++++++++---------- .../patch-electron_spec_api-browser-window-spec.ts | 6 +++--- 5 files changed, 20 insertions(+), 21 deletions(-) diff --git a/devel/electron26/Makefile b/devel/electron26/Makefile index ae572599d5bb..32baa073e50c 100644 --- a/devel/electron26/Makefile +++ b/devel/electron26/Makefile @@ -1,7 +1,6 @@ PORTNAME= electron DISTVERSIONPREFIX= v DISTVERSION= ${ELECTRON_VER:S/-beta./.b/} -PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= https://github.com/tagattie/FreeBSD-Electron/releases/download/v26.3.0/:chromium \ https://commondatastorage.googleapis.com/chromium-nodejs/:chromium_node \ @@ -233,7 +232,7 @@ REACTIVEOBJC_VER= 74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76 # See ${WRKSRC}/electron/DEPS for MANTLE_VER MANTLE_VER= 78d3966b3c331292ea29ec38661b25df0a245948 -YARN_TIMESTAMP= 1700174942 +YARN_TIMESTAMP= 1700868402 .include "Makefile.version" .include diff --git a/devel/electron26/Makefile.version b/devel/electron26/Makefile.version index 472616b1f1e9..55940be3ea66 100644 --- a/devel/electron26/Makefile.version +++ b/devel/electron26/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 26.6.0 +ELECTRON_VER= 26.6.1 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron26/distinfo b/devel/electron26/distinfo index 4bab5c53c512..6efbca3cd6ed 100644 --- a/devel/electron26/distinfo +++ b/devel/electron26/distinfo @@ -1,14 +1,14 @@ -TIMESTAMP = 1700176393 +TIMESTAMP = 1700879207 SHA256 (electron/chromium-116.0.5845.228.tar.xz) = ccf3d7f2e17fd2fcda6ebaef576787b2aaba7a6b2b4e3103b92260ac26fbc6a1 SIZE (electron/chromium-116.0.5845.228.tar.xz) = 1447024772 SHA256 (electron/937cea04689b7b8dcf3cb9adbb12c79d1d6c38bb) = f7f7f38661b107fc1d91b7918f36362d9180e87f34e3027562eb5db8735746fe SIZE (electron/937cea04689b7b8dcf3cb9adbb12c79d1d6c38bb) = 8881070 SHA256 (electron/336e775eec536b2d785cc80eff6ac39051931286) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8 SIZE (electron/336e775eec536b2d785cc80eff6ac39051931286) = 32624734 -SHA256 (electron/electron-yarn-cache-26.6.0.tar.xz) = 94aee3430b3d09bd1ce9b736b854c9eafc9241ed90bd4e4243ce0d800ebbae73 -SIZE (electron/electron-yarn-cache-26.6.0.tar.xz) = 32343972 -SHA256 (electron/electron-electron-v26.6.0_GH0.tar.gz) = 173648e05b26a487e4c1ba10f092bdb5105488811764421d24ce9039522adfe9 -SIZE (electron/electron-electron-v26.6.0_GH0.tar.gz) = 11350193 +SHA256 (electron/electron-yarn-cache-26.6.1.tar.xz) = 539ad3aaadff9863913145c2efbffaae0503bd3522f6e4da709c4a3d599c134d +SIZE (electron/electron-yarn-cache-26.6.1.tar.xz) = 32344588 +SHA256 (electron/electron-electron-v26.6.1_GH0.tar.gz) = 54a834e21bba0788f6f25d0da4985f4c514411d4d67f7593de4a9d6bea311802 +SIZE (electron/electron-electron-v26.6.1_GH0.tar.gz) = 11356259 SHA256 (electron/nodejs-node-v18.16.1_GH0.tar.gz) = 750b09907a0b7054bda042bfc26879b9ccb84f9f436182a820ea188b654ce77b SIZE (electron/nodejs-node-v18.16.1_GH0.tar.gz) = 112039326 SHA256 (electron/nodejs-nan-16fa32231e2ccd89d2804b3f765319128b20c4ac_GH0.tar.gz) = 3807ae6a1e451a29f068540472f100f9718d457c60ac62f2f8469d1d57475d39 diff --git a/devel/electron26/files/patch-electron_shell_browser_native__window__views.cc b/devel/electron26/files/patch-electron_shell_browser_native__window__views.cc index be5bf4079b1c..500814f54814 100644 --- a/devel/electron26/files/patch-electron_shell_browser_native__window__views.cc +++ b/devel/electron26/files/patch-electron_shell_browser_native__window__views.cc @@ -1,4 +1,4 @@ ---- electron/shell/browser/native_window_views.cc.orig 2023-08-23 13:54:54 UTC +--- electron/shell/browser/native_window_views.cc.orig 2023-11-22 15:26:59 UTC +++ electron/shell/browser/native_window_views.cc @@ -43,7 +43,7 @@ #include "ui/wm/core/shadow_types.h" @@ -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); -@@ -568,7 +568,7 @@ bool NativeWindowViews::IsVisible() { +@@ -568,7 +568,7 @@ bool NativeWindowViews::IsEnabled() { bool NativeWindowViews::IsEnabled() { #if BUILDFLAG(IS_WIN) return ::IsWindowEnabled(GetAcceleratedWidget()); @@ -54,7 +54,7 @@ void NativeWindowViews::Maximize() { if (IsVisible()) { widget()->Maximize(); -@@ -757,7 +757,7 @@ void NativeWindowViews::SetBounds(const gfx::Rect& bou +@@ -766,7 +766,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_) { -@@ -993,7 +993,7 @@ bool NativeWindowViews::IsClosable() { +@@ -1003,7 +1003,7 @@ bool NativeWindowViews::IsClosable() { return false; } return !(info.fState & MFS_DISABLED); @@ -72,7 +72,7 @@ return true; #endif } -@@ -1381,7 +1381,7 @@ void NativeWindowViews::SetProgressBar(double progress +@@ -1391,7 +1391,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); } -@@ -1457,7 +1457,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM +@@ -1467,7 +1467,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM #if BUILDFLAG(IS_WIN) window_handle = reinterpret_cast(accelerated_widget); @@ -90,7 +90,7 @@ window_handle = static_cast(accelerated_widget); #endif aura::WindowTreeHost* const host = -@@ -1555,7 +1555,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC +@@ -1565,7 +1565,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC SendMessage(hwnd, WM_SETICON, ICON_BIG, reinterpret_cast(app_icon_.get())); } @@ -99,7 +99,7 @@ void NativeWindowViews::SetIcon(const gfx::ImageSkia& icon) { auto* tree_host = views::DesktopWindowTreeHostLinux::GetHostForWidget( GetAcceleratedWidget()); -@@ -1625,7 +1625,7 @@ bool NativeWindowViews::CanMaximize() const { +@@ -1651,7 +1651,7 @@ bool NativeWindowViews::CanMinimize() const { bool NativeWindowViews::CanMinimize() const { #if BUILDFLAG(IS_WIN) return minimizable_; @@ -108,7 +108,7 @@ return true; #endif } -@@ -1677,7 +1677,7 @@ void NativeWindowViews::HandleKeyboardEvent( +@@ -1703,7 +1703,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) -@@ -1696,7 +1696,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e +@@ -1722,7 +1722,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e // Alt+Click should not toggle menu bar. root_view_.ResetAltState(); diff --git a/devel/electron26/files/patch-electron_spec_api-browser-window-spec.ts b/devel/electron26/files/patch-electron_spec_api-browser-window-spec.ts index ba5dd0c7df0c..fa9cccf7c0f2 100644 --- a/devel/electron26/files/patch-electron_spec_api-browser-window-spec.ts +++ b/devel/electron26/files/patch-electron_spec_api-browser-window-spec.ts @@ -1,4 +1,4 @@ ---- electron/spec/api-browser-window-spec.ts.orig 2023-11-07 13:23:25 UTC +--- electron/spec/api-browser-window-spec.ts.orig 2023-11-22 15:26:59 UTC +++ electron/spec/api-browser-window-spec.ts @@ -65,7 +65,7 @@ describe('BrowserWindow module', () => { }).not.to.throw(); @@ -135,7 +135,7 @@ const w = new BrowserWindow({ show: false }); expect(w.resizable).to.be.true('resizable'); -@@ -5140,7 +5140,7 @@ describe('BrowserWindow module', () => { +@@ -5189,7 +5189,7 @@ describe('BrowserWindow module', () => { }); }); @@ -144,7 +144,7 @@ // Not implemented on Linux. afterEach(closeAllWindows); -@@ -6294,7 +6294,7 @@ describe('BrowserWindow module', () => { +@@ -6343,7 +6343,7 @@ describe('BrowserWindow module', () => { describe('"transparent" option', () => { afterEach(closeAllWindows);