git: 77d6803a5641 - main - devel/electron30: update to 30.1.2
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 24 Jun 2024 14:38:42 UTC
The branch main has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=77d6803a5641c35026ff8aadf947179a95d6e524 commit 77d6803a5641c35026ff8aadf947179a95d6e524 Author: Hiroki Tagato <tagattie@FreeBSD.org> AuthorDate: 2024-06-24 14:37:28 +0000 Commit: Hiroki Tagato <tagattie@FreeBSD.org> CommitDate: 2024-06-24 14:38:35 +0000 devel/electron30: update to 30.1.2 Changelog: https://github.com/electron/electron/releases/tag/v30.1.2 Reported by: GitHub (watch releases) --- devel/electron30/Makefile | 1 - devel/electron30/Makefile.version | 2 +- devel/electron30/distinfo | 10 +++++----- .../files/patch-electron_spec_api-utility-process-spec.ts | 4 ++-- .../electron30/files/patch-ui_base_x_x11__display__util.cc | 14 +++++++------- 5 files changed, 15 insertions(+), 16 deletions(-) diff --git a/devel/electron30/Makefile b/devel/electron30/Makefile index f12a4f415275..f2cc8a789c57 100644 --- a/devel/electron30/Makefile +++ b/devel/electron30/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/v30.1.1/:chromium \ https://commondatastorage.googleapis.com/chromium-nodejs/:chromium_node \ diff --git a/devel/electron30/Makefile.version b/devel/electron30/Makefile.version index 00169e9e8531..9826f7b9496c 100644 --- a/devel/electron30/Makefile.version +++ b/devel/electron30/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 30.1.1 +ELECTRON_VER= 30.1.2 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron30/distinfo b/devel/electron30/distinfo index c1c02b6f190e..adca7b880442 100644 --- a/devel/electron30/distinfo +++ b/devel/electron30/distinfo @@ -1,14 +1,14 @@ -TIMESTAMP = 1718267333 +TIMESTAMP = 1719227841 SHA256 (electron/chromium-124.0.6367.243.tar.xz) = 53ed2f29769fe105ae884e37fd9fd9d9756931cf1d6d16c6a252f5982b8496cb SIZE (electron/chromium-124.0.6367.243.tar.xz) = 1633060772 SHA256 (electron/97a0b3c4c39cf05de1eafb6ffdec0fddd643f0a2) = dcfaea4d353d1df3d4ac2d245ea7e32ad177d4bea1351f363714c9c22ca5c4f8 SIZE (electron/97a0b3c4c39cf05de1eafb6ffdec0fddd643f0a2) = 9761601 SHA256 (electron/336e775eec536b2d785cc80eff6ac39051931286) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8 SIZE (electron/336e775eec536b2d785cc80eff6ac39051931286) = 32624734 -SHA256 (electron/electron-yarn-cache-30.1.1.tar.xz) = 7bf31c8b9c55ee317c217cd6605eb85ed015cef96246188be0ab3b2681200368 -SIZE (electron/electron-yarn-cache-30.1.1.tar.xz) = 29229388 -SHA256 (electron/electron-electron-v30.1.1_GH0.tar.gz) = 6ddee025d5b530dd3fe0c5e6a96046a3a8ae9488209a8f9c6412092cad5dbfe7 -SIZE (electron/electron-electron-v30.1.1_GH0.tar.gz) = 13351289 +SHA256 (electron/electron-yarn-cache-30.1.2.tar.xz) = 7bf31c8b9c55ee317c217cd6605eb85ed015cef96246188be0ab3b2681200368 +SIZE (electron/electron-yarn-cache-30.1.2.tar.xz) = 29229388 +SHA256 (electron/electron-electron-v30.1.2_GH0.tar.gz) = bb072f7e438da61f9844246fa7d7afce0e9c1121732cce915c2f1c632e33efbd +SIZE (electron/electron-electron-v30.1.2_GH0.tar.gz) = 13351488 SHA256 (electron/nodejs-node-v20.14.0_GH0.tar.gz) = 69c7e7cdd95580e74d7f8dbe8a408652db09a9099c4f97c196d056279e7f523c SIZE (electron/nodejs-node-v20.14.0_GH0.tar.gz) = 115425089 SHA256 (electron/nodejs-nan-e14bdcd1f72d62bca1d541b66da43130384ec213_GH0.tar.gz) = 02edf8d5b3fef9af94d8a1355da60564a57e7f2c99cb422bce042400607ed2eb diff --git a/devel/electron30/files/patch-electron_spec_api-utility-process-spec.ts b/devel/electron30/files/patch-electron_spec_api-utility-process-spec.ts index fcfaf8a6916b..721e60ea6c8d 100644 --- a/devel/electron30/files/patch-electron_spec_api-utility-process-spec.ts +++ b/devel/electron30/files/patch-electron_spec_api-utility-process-spec.ts @@ -1,6 +1,6 @@ ---- electron/spec/api-utility-process-spec.ts.orig 2024-01-23 19:02:02 UTC +--- electron/spec/api-utility-process-spec.ts.orig 2024-06-19 14:24:29 UTC +++ electron/spec/api-utility-process-spec.ts -@@ -400,7 +400,7 @@ describe('utilityProcess module', () => { +@@ -411,7 +411,7 @@ describe('utilityProcess module', () => { await closeWindow(w); }); diff --git a/devel/electron30/files/patch-ui_base_x_x11__display__util.cc b/devel/electron30/files/patch-ui_base_x_x11__display__util.cc index 765d959c3b52..ac263fec387b 100644 --- a/devel/electron30/files/patch-ui_base_x_x11__display__util.cc +++ b/devel/electron30/files/patch-ui_base_x_x11__display__util.cc @@ -1,4 +1,4 @@ ---- ui/base/x/x11_display_util.cc.orig 2024-04-15 20:34:29 UTC +--- ui/base/x/x11_display_util.cc.orig 2024-06-24 11:27:31 UTC +++ ui/base/x/x11_display_util.cc @@ -14,7 +14,6 @@ @@ -166,7 +166,7 @@ return displays; } -@@ -307,16 +260,7 @@ std::vector<display::Display> BuildDisplaysFromXRandRI +@@ -308,16 +261,7 @@ std::vector<display::Display> BuildDisplaysFromXRandRI auto x_root_window = ui::GetX11RootWindow(); std::vector<display::Display> displays; @@ -184,7 +184,7 @@ if (!resources) { LOG(ERROR) << "XRandR returned no displays; falling back to root window"; return GetFallbackDisplayList(primary_scale, primary_display_index_out); -@@ -325,65 +269,21 @@ std::vector<display::Display> BuildDisplaysFromXRandRI +@@ -326,65 +270,21 @@ std::vector<display::Display> BuildDisplaysFromXRandRI const int depth = connection->default_screen().root_depth; const int bits_per_component = DefaultBitsPerComponent(); @@ -214,7 +214,7 @@ - connection->Flush(); - - std::vector<x11::Future<x11::GetPropertyReply>> icc_futures{n_iccs}; -- if (!base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kHeadless)) { +- if (!command_line->HasSwitch(switches::kHeadless)) { - for (size_t monitor = 0; monitor < n_iccs; ++monitor) { - icc_futures[monitor] = GetIccProfileFuture(connection, monitor); - } @@ -255,7 +255,7 @@ if (!output_info) { continue; } -@@ -398,16 +298,15 @@ std::vector<display::Display> BuildDisplaysFromXRandRI +@@ -399,16 +299,15 @@ std::vector<display::Display> BuildDisplaysFromXRandRI continue; } @@ -277,7 +277,7 @@ auto output_32 = static_cast<uint32_t>(output_id); int64_t display_id = output_32 > 0xff ? 0 : edid_parser.GetIndexBasedDisplayId(output_32); -@@ -462,9 +361,8 @@ std::vector<display::Display> BuildDisplaysFromXRandRI +@@ -470,9 +369,8 @@ std::vector<display::Display> BuildDisplaysFromXRandRI } if (!display::HasForceDisplayColorProfile()) { @@ -289,7 +289,7 @@ gfx::ColorSpace color_space = icc_profile.GetPrimariesOnlyColorSpace(); // Most folks do not have an ICC profile set up, but we still want to -@@ -509,24 +407,63 @@ std::vector<display::Display> BuildDisplaysFromXRandRI +@@ -517,24 +415,63 @@ std::vector<display::Display> BuildDisplaysFromXRandRI ConvertDisplayBoundsToDips(&displays, *primary_display_index_out); }