From nobody Sat Apr 29 11:48:15 2023 X-Original-To: dev-commits-ports-main@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 4Q7nmH2q6kz48tQt; Sat, 29 Apr 2023 11:48:15 +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 4Q7nmH24ZKz3yBn; Sat, 29 Apr 2023 11:48:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682768895; 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=Bn22dhUCaTyqlFmeeVIqY+hlAlODlhudH4YYN/A+JQE=; b=pMCtY9eXV4ooJU40i/mDr/dhjUxL/4AYyTKhhanCyotXU07PgWsM3BAKgCaeE6Njpipd46 AbIKGlh7CQZMIiJD25gRS7tYmLFETY/tPIrYe7xPC+ERnuwHNgZqYzElRj9HrrICRmaTfl j7pgfA53N4m2EMgAdDrvd+PenK1BKm3jRDqz7yKWtGi1RtHum0nD1oxTV8ajB7eNFIVE4R 80bjGC2MpAthp6kFOG4Ce53LV3uTDoNawQm5zkg9+rrflCxXBUGarV1dAl302y0L5hsNxA LPulATGGNzG4Uz2V6EvxDQNls/09rjlMhsjQBC1XICkvMlCjBxLhN6gMjiqt9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682768895; 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=Bn22dhUCaTyqlFmeeVIqY+hlAlODlhudH4YYN/A+JQE=; b=yfvReJpxUGSMaZSVPb68jgUSOyZtXdsXgZmEKGrLhXb2TNLMuXwpOUig+7hw4y4ybZvIGm zYNPmRkM+SYMTkDzuFkG+bnQS/XPb97MwSbv2uwNYNpzw9mINrCUWOHQkn/ApIMwGVS4Ll SnftKLtyEZB09HqracOZc1lhpC4bgPxvZIpqPyAfFN7oDXESuX9TjudssSie/qthrR3YD3 Nrgff/IDw17k1F3/plgeN7r+MwLravlQps8R2MvmRDNUOE6aL/Wz9IRPnW3Tdhgo57un9z MMfK7th6Zjaj2oyYSxGCWozGyuNR9pFsa6bZOfy85YnSK9HncOMLnc6IWhPVww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682768895; a=rsa-sha256; cv=none; b=hxBlw892eEuJYIKCsDBw80t8zhvKfCHA5C59mWzcR+YKIz8z3S7QfykMZWDiE+35yGDOqm Ok/H/GoGgeOc/ERc+JtzxjyAqv7iuz4Ia2+8nwwVg0Vs8/ajbsqQOAykSaNdWIq+g9lqbU 8DPznHicmvvFYGzn2AOlJUQh68vRkNaQFmZ0l0wHYnA3Z5Urfdw/tRxC8t+iCMtXKcK62p TQ/ebtK9vDrJYWzw1CXhMvrSk+K7tvPXPoqAuDw9nuOr+AkmvUG71utycdIBW6Bf9QpLYN hSBiLclxfjk399LHhwGP6aUwcN5wu3T9rFX+2gHKQ2CBgUGeg/RUEkV2W5W18w== 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 4Q7nmH15YPzgLx; Sat, 29 Apr 2023 11:48:15 +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 33TBmFcE076002; Sat, 29 Apr 2023 11:48:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33TBmFIV076001; Sat, 29 Apr 2023 11:48:15 GMT (envelope-from git) Date: Sat, 29 Apr 2023 11:48:15 GMT Message-Id: <202304291148.33TBmFIV076001@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: a1680ef0e0a1 - main - devel/electron22: update to 22.3.7 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: a1680ef0e0a1ba73e05e8ff02fcad37ac7606f0a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=a1680ef0e0a1ba73e05e8ff02fcad37ac7606f0a commit a1680ef0e0a1ba73e05e8ff02fcad37ac7606f0a Author: Hiroki Tagato AuthorDate: 2023-04-29 11:46:49 +0000 Commit: Hiroki Tagato CommitDate: 2023-04-29 11:48:08 +0000 devel/electron22: update to 22.3.7 Changelog: https://github.com/electron/electron/releases/tag/v22.3.7 Reported by: GitHub (watch releases) --- devel/electron22/Makefile | 3 +-- devel/electron22/Makefile.version | 2 +- devel/electron22/distinfo | 10 +++++----- .../patch-electron_shell_browser_ui_views_menu__bar.cc | 8 ++++---- .../patch-electron_shell_browser_ui_views_menu__bar.h | 4 ++-- .../files/patch-electron_spec_api-browser-window-spec.ts | 14 +++++++------- .../patch-third__party_angle_src_libANGLE_formatutils.cpp | 4 ++-- 7 files changed, 22 insertions(+), 23 deletions(-) diff --git a/devel/electron22/Makefile b/devel/electron22/Makefile index 5d5767fb718a..849e05479a74 100644 --- a/devel/electron22/Makefile +++ b/devel/electron22/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/v22.2.0/:chromium \ https://commondatastorage.googleapis.com/chromium-nodejs/:chromium_node \ @@ -222,7 +221,7 @@ REACTIVEOBJC_VER= 74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76 # See ${WRKSRC}/electron/DEPS for MANTLE_VER MANTLE_VER= 78d3966b3c331292ea29ec38661b25df0a245948 -YARN_TIMESTAMP= 1681568942 +YARN_TIMESTAMP= 1682663940 .include "Makefile.version" .include # required for COMPILER_VERSION diff --git a/devel/electron22/Makefile.version b/devel/electron22/Makefile.version index 37de820c4fe7..629fd61eab16 100644 --- a/devel/electron22/Makefile.version +++ b/devel/electron22/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 22.3.6 +ELECTRON_VER= 22.3.7 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron22/distinfo b/devel/electron22/distinfo index d65639a77cd7..4ddfcdfdd4f6 100644 --- a/devel/electron22/distinfo +++ b/devel/electron22/distinfo @@ -1,14 +1,14 @@ -TIMESTAMP = 1681569109 +TIMESTAMP = 1682664964 SHA256 (electron/chromium-108.0.5359.215.tar.xz) = aba0730b347269efda217affe804f6fced296aa02f810c8c9a6fd7d46cd7bf9a SIZE (electron/chromium-108.0.5359.215.tar.xz) = 1584734880 SHA256 (electron/f8b5da24d33317766d3933fb6711b0603fc4fb6f) = 63706737ca75e0e5c97885186b2a7ab019ca71d1315ee08870193bbfa7486bfc SIZE (electron/f8b5da24d33317766d3933fb6711b0603fc4fb6f) = 9900677 SHA256 (electron/336e775eec536b2d785cc80eff6ac39051931286) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8 SIZE (electron/336e775eec536b2d785cc80eff6ac39051931286) = 32624734 -SHA256 (electron/electron-yarn-cache-22.3.6.tar.xz) = 21cd90eea32dc0902831f9c5680b0cadc6388e9e9d44fcdf21bf65450e4b2979 -SIZE (electron/electron-yarn-cache-22.3.6.tar.xz) = 38901104 -SHA256 (electron/electron-electron-v22.3.6_GH0.tar.gz) = 58018da98189a0a0c35a4e89db2e3dd4f6af9ab923297dbf63e3e5ade8dd74dc -SIZE (electron/electron-electron-v22.3.6_GH0.tar.gz) = 10574442 +SHA256 (electron/electron-yarn-cache-22.3.7.tar.xz) = 7103735f1e82d32af8cc57f258f13e0af8e69732d47a42aeca27a97933c7038d +SIZE (electron/electron-yarn-cache-22.3.7.tar.xz) = 38905036 +SHA256 (electron/electron-electron-v22.3.7_GH0.tar.gz) = 8ac137bc3c82342547bbea55da9f841a3441c5b8b0a42291fb88794c058bb3f0 +SIZE (electron/electron-electron-v22.3.7_GH0.tar.gz) = 10592235 SHA256 (electron/nodejs-node-v16.17.1_GH0.tar.gz) = e63378aa6aa18b9e05486e46eaca6c6e09904366e5100d7e04c6dbd344a42f60 SIZE (electron/nodejs-node-v16.17.1_GH0.tar.gz) = 90485310 SHA256 (electron/nodejs-nan-16fa32231e2ccd89d2804b3f765319128b20c4ac_GH0.tar.gz) = 3807ae6a1e451a29f068540472f100f9718d457c60ac62f2f8469d1d57475d39 diff --git a/devel/electron22/files/patch-electron_shell_browser_ui_views_menu__bar.cc b/devel/electron22/files/patch-electron_shell_browser_ui_views_menu__bar.cc index 382b3b8541c9..8d75e4f39110 100644 --- a/devel/electron22/files/patch-electron_shell_browser_ui_views_menu__bar.cc +++ b/devel/electron22/files/patch-electron_shell_browser_ui_views_menu__bar.cc @@ -1,4 +1,4 @@ ---- electron/shell/browser/ui/views/menu_bar.cc.orig 2023-01-24 16:58:16 UTC +--- electron/shell/browser/ui/views/menu_bar.cc.orig 2023-04-26 08:11:51 UTC +++ electron/shell/browser/ui/views/menu_bar.cc @@ -13,7 +13,7 @@ #include "ui/views/background.h" @@ -9,7 +9,7 @@ #include "ui/gtk/gtk_util.h" // nogncheck #endif -@@ -211,7 +211,7 @@ void MenuBar::ButtonPressed(size_t id, const ui::Event +@@ -218,7 +218,7 @@ void MenuBar::ViewHierarchyChanged( void MenuBar::RefreshColorCache(const ui::NativeTheme* theme) { if (theme) { @@ -18,7 +18,7 @@ background_color_ = gtk::GetBgColor("GtkMenuBar#menubar"); enabled_color_ = gtk::GetFgColor("GtkMenuBar#menubar GtkMenuItem#menuitem GtkLabel"); -@@ -234,7 +234,7 @@ void MenuBar::RebuildChildren() { +@@ -243,7 +243,7 @@ void MenuBar::RebuildChildren() { } void MenuBar::UpdateViewColors() { @@ -27,7 +27,7 @@ // set menubar background color SetBackground(views::CreateSolidBackground(background_color_)); #endif -@@ -242,7 +242,7 @@ void MenuBar::UpdateViewColors() { +@@ -251,7 +251,7 @@ void MenuBar::UpdateViewColors() { // set child colors if (menu_model_ == nullptr) return; diff --git a/devel/electron22/files/patch-electron_shell_browser_ui_views_menu__bar.h b/devel/electron22/files/patch-electron_shell_browser_ui_views_menu__bar.h index af98f7bbd56b..57a5906f1ac6 100644 --- a/devel/electron22/files/patch-electron_shell_browser_ui_views_menu__bar.h +++ b/devel/electron22/files/patch-electron_shell_browser_ui_views_menu__bar.h @@ -1,6 +1,6 @@ ---- electron/shell/browser/ui/views/menu_bar.h.orig 2022-05-18 15:31:32 UTC +--- electron/shell/browser/ui/views/menu_bar.h.orig 2023-04-26 08:11:51 UTC +++ electron/shell/browser/ui/views/menu_bar.h -@@ -79,7 +79,7 @@ class MenuBar : public views::AccessiblePaneView, +@@ -82,7 +82,7 @@ class MenuBar : public views::AccessiblePaneView, View* FindAccelChild(char16_t key); SkColor background_color_; diff --git a/devel/electron22/files/patch-electron_spec_api-browser-window-spec.ts b/devel/electron22/files/patch-electron_spec_api-browser-window-spec.ts index cd599979236d..25aebdf69587 100644 --- a/devel/electron22/files/patch-electron_spec_api-browser-window-spec.ts +++ b/devel/electron22/files/patch-electron_spec_api-browser-window-spec.ts @@ -1,4 +1,4 @@ ---- electron/spec/api-browser-window-spec.ts.orig 2023-03-02 11:49:02 UTC +--- electron/spec/api-browser-window-spec.ts.orig 2023-04-26 08:11:51 UTC +++ electron/spec/api-browser-window-spec.ts @@ -58,7 +58,7 @@ describe('BrowserWindow module', () => { }).not.to.throw(); @@ -81,7 +81,7 @@ expect(test.creationTime).to.be.null('creation time'); expect(test.systemMemoryInfo).to.be.null('system memory info'); } else { -@@ -3721,7 +3721,7 @@ describe('BrowserWindow module', () => { +@@ -3737,7 +3737,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 }); -@@ -3981,7 +3981,7 @@ describe('BrowserWindow module', () => { +@@ -3997,7 +3997,7 @@ describe('BrowserWindow module', () => { // TODO(zcbenz): // This test does not run on Linux CI. See: // https://github.com/electron/electron/issues/28699 @@ -99,7 +99,7 @@ const w = new BrowserWindow({}); const maximize = emittedOnce(w, 'maximize'); w.maximize(); -@@ -3998,7 +3998,7 @@ describe('BrowserWindow module', () => { +@@ -4014,7 +4014,7 @@ describe('BrowserWindow module', () => { }); // TODO(dsanders11): Enable once maximize event works on Linux again on CI @@ -108,7 +108,7 @@ afterEach(closeAllWindows); it('should show the window if it is not currently shown', async () => { const w = new BrowserWindow({ show: false }); -@@ -4035,7 +4035,7 @@ describe('BrowserWindow module', () => { +@@ -4051,7 +4051,7 @@ describe('BrowserWindow module', () => { // TODO(dsanders11): Enable once minimize event works on Linux again. // See https://github.com/electron/electron/issues/28699 @@ -117,7 +117,7 @@ const w = new BrowserWindow(); const minimize = emittedOnce(w, 'minimize'); w.minimize(); -@@ -4398,7 +4398,7 @@ describe('BrowserWindow module', () => { +@@ -4414,7 +4414,7 @@ describe('BrowserWindow module', () => { }); // On Linux there is no "resizable" property of a window. @@ -126,7 +126,7 @@ const w = new BrowserWindow({ show: false }); expect(w.resizable).to.be.true('resizable'); -@@ -4490,7 +4490,7 @@ describe('BrowserWindow module', () => { +@@ -4506,7 +4506,7 @@ describe('BrowserWindow module', () => { }); }); diff --git a/devel/electron22/files/patch-third__party_angle_src_libANGLE_formatutils.cpp b/devel/electron22/files/patch-third__party_angle_src_libANGLE_formatutils.cpp index 0515d9b55035..b59a949c8207 100644 --- a/devel/electron22/files/patch-third__party_angle_src_libANGLE_formatutils.cpp +++ b/devel/electron22/files/patch-third__party_angle_src_libANGLE_formatutils.cpp @@ -1,6 +1,6 @@ ---- third_party/angle/src/libANGLE/formatutils.cpp.orig 2022-11-30 08:12:58 UTC +--- third_party/angle/src/libANGLE/formatutils.cpp.orig 2023-04-28 07:14:34 UTC +++ third_party/angle/src/libANGLE/formatutils.cpp -@@ -1466,7 +1466,7 @@ static InternalFormatInfoMap BuildInternalFormatInfoMa +@@ -1481,7 +1481,7 @@ static InternalFormatInfoMap BuildInternalFormatInfoMa AddYUVFormat(&map, GL_G8_B8R8_2PLANE_420_UNORM_ANGLE, true, 8, 8, 8, 0, 0, GL_G8_B8R8_2PLANE_420_UNORM_ANGLE, GL_UNSIGNED_BYTE, GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::yuvInternalFormatANGLE>, RequireExt<&Extensions::yuvInternalFormatANGLE>, RequireExt<&Extensions::yuvInternalFormatANGLE>, NeverSupported, NeverSupported); AddYUVFormat(&map, GL_G8_B8_R8_3PLANE_420_UNORM_ANGLE, true, 8, 8, 8, 0, 0, GL_G8_B8_R8_3PLANE_420_UNORM_ANGLE, GL_UNSIGNED_BYTE, GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::yuvInternalFormatANGLE>, RequireExt<&Extensions::yuvInternalFormatANGLE>, RequireExt<&Extensions::yuvInternalFormatANGLE>, NeverSupported, NeverSupported);