git: 5113fb8205a1 - main - devel/electron29: update to 29.4.3
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 29 Jun 2024 07:10:18 UTC
The branch main has been updated by tagattie:
URL: https://cgit.FreeBSD.org/ports/commit/?id=5113fb8205a17335631b10129e62f37586196189
commit 5113fb8205a17335631b10129e62f37586196189
Author: Hiroki Tagato <tagattie@FreeBSD.org>
AuthorDate: 2024-06-29 07:06:33 +0000
Commit: Hiroki Tagato <tagattie@FreeBSD.org>
CommitDate: 2024-06-29 07:10:04 +0000
devel/electron29: update to 29.4.3
Changelog: https://github.com/electron/electron/releases/tag/v29.4.3
Reported by: GitHub (watch releases)
Security: 0e73964d-053a-481a-bf1c-202948d68484
---
devel/electron29/Makefile.version | 2 +-
devel/electron29/distinfo | 10 ++++-----
...lectron_shell_browser_api_electron__api__app.cc | 10 ++++-----
.../files/patch-electron_shell_browser_browser.h | 4 ++--
...patch-electron_spec_api-utility-process-spec.ts | 4 ++--
.../files/patch-ui_base_x_x11__display__util.cc | 25 ++++++++++++----------
devel/electron29/files/yarn.lock | 6 +++---
7 files changed, 32 insertions(+), 29 deletions(-)
diff --git a/devel/electron29/Makefile.version b/devel/electron29/Makefile.version
index 9f1984329b85..863da511dfb0 100644
--- a/devel/electron29/Makefile.version
+++ b/devel/electron29/Makefile.version
@@ -1,2 +1,2 @@
-ELECTRON_VER= 29.4.2
+ELECTRON_VER= 29.4.3
ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//}
diff --git a/devel/electron29/distinfo b/devel/electron29/distinfo
index 97e53c993693..f53d4a988e97 100644
--- a/devel/electron29/distinfo
+++ b/devel/electron29/distinfo
@@ -1,14 +1,14 @@
-TIMESTAMP = 1717143173
+TIMESTAMP = 1719613771
SHA256 (electron/chromium-122.0.6261.156.tar.xz) = c29e0d546920a788d664f241739c1b9ee6f5235cfab91f8d4cf3026f42bceead
SIZE (electron/chromium-122.0.6261.156.tar.xz) = 1660787092
SHA256 (electron/e0b8a95aed06c02287872a2d15c28509b9808446) = 6c964b838cc8b73e6014d6f57ae132455e3b0787449a10d4cf12b1415f2abda2
SIZE (electron/e0b8a95aed06c02287872a2d15c28509b9808446) = 9601507
SHA256 (electron/336e775eec536b2d785cc80eff6ac39051931286) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
SIZE (electron/336e775eec536b2d785cc80eff6ac39051931286) = 32624734
-SHA256 (electron/electron-yarn-cache-29.4.2.tar.xz) = bfe45219c248d463ef8fcbdce755ad4d5deb9b757984da4760f47c20630aee84
-SIZE (electron/electron-yarn-cache-29.4.2.tar.xz) = 29229056
-SHA256 (electron/electron-electron-v29.4.2_GH0.tar.gz) = b433ab302c6fa946f038e5f922633551c9e3ef1ca932596d8c5103b52cbe51ae
-SIZE (electron/electron-electron-v29.4.2_GH0.tar.gz) = 13391947
+SHA256 (electron/electron-yarn-cache-29.4.3.tar.xz) = 7bf31c8b9c55ee317c217cd6605eb85ed015cef96246188be0ab3b2681200368
+SIZE (electron/electron-yarn-cache-29.4.3.tar.xz) = 29229388
+SHA256 (electron/electron-electron-v29.4.3_GH0.tar.gz) = a2d005bd8c4d1d5c21dcb0f1878238dcccb19b669f2374442764c2005affc45a
+SIZE (electron/electron-electron-v29.4.3_GH0.tar.gz) = 13434289
SHA256 (electron/nodejs-node-v20.9.0_GH0.tar.gz) = 97fa9283e5472d4252794c930ad59270e4851cc523fe5469f37f65a344f5f2e2
SIZE (electron/nodejs-node-v20.9.0_GH0.tar.gz) = 114905754
SHA256 (electron/nodejs-nan-e14bdcd1f72d62bca1d541b66da43130384ec213_GH0.tar.gz) = 02edf8d5b3fef9af94d8a1355da60564a57e7f2c99cb422bce042400607ed2eb
diff --git a/devel/electron29/files/patch-electron_shell_browser_api_electron__api__app.cc b/devel/electron29/files/patch-electron_shell_browser_api_electron__api__app.cc
index 424530dea2fb..d3dc672ba419 100644
--- a/devel/electron29/files/patch-electron_shell_browser_api_electron__api__app.cc
+++ b/devel/electron29/files/patch-electron_shell_browser_api_electron__api__app.cc
@@ -1,4 +1,4 @@
---- electron/shell/browser/api/electron_api_app.cc.orig 2024-02-27 20:12:14 UTC
+--- electron/shell/browser/api/electron_api_app.cc.orig 2024-06-27 17:50:20 UTC
+++ electron/shell/browser/api/electron_api_app.cc
@@ -667,7 +667,7 @@ void App::OnFinishLaunching(base::Value::Dict launch_i
}
@@ -9,7 +9,7 @@
// Set the application name for audio streams shown in external
// applications. Only affects pulseaudio currently.
media::AudioManager::SetGlobalAppName(Browser::Get()->GetName());
-@@ -998,7 +998,7 @@ void App::SetDesktopName(const std::string& desktop_na
+@@ -992,7 +992,7 @@ void App::SetDesktopName(const std::string& desktop_na
}
void App::SetDesktopName(const std::string& desktop_name) {
@@ -18,7 +18,7 @@
auto env = base::Environment::Create();
env->SetVar("CHROME_DESKTOP", desktop_name);
#endif
-@@ -1382,7 +1382,7 @@ std::vector<gin_helper::Dictionary> App::GetAppMetrics
+@@ -1376,7 +1376,7 @@ std::vector<gin_helper::Dictionary> App::GetAppMetrics
pid_dict.Set("name", process_metric.second->name);
}
@@ -27,7 +27,7 @@
auto memory_info = process_metric.second->GetMemoryInfo();
auto memory_dict = gin_helper::Dictionary::CreateEmpty(isolate);
-@@ -1765,7 +1765,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuild
+@@ -1759,7 +1759,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuild
.SetMethod(
"removeAsDefaultProtocolClient",
base::BindRepeating(&Browser::RemoveAsDefaultProtocolClient, browser))
@@ -36,7 +36,7 @@
.SetMethod(
"getApplicationInfoForProtocol",
base::BindRepeating(&Browser::GetApplicationInfoForProtocol, browser))
-@@ -1823,7 +1823,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuild
+@@ -1817,7 +1817,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuild
.SetMethod("getJumpListSettings", &App::GetJumpListSettings)
.SetMethod("setJumpList", &App::SetJumpList)
#endif
diff --git a/devel/electron29/files/patch-electron_shell_browser_browser.h b/devel/electron29/files/patch-electron_shell_browser_browser.h
index 6a80e3b6576b..525dfcd0c326 100644
--- a/devel/electron29/files/patch-electron_shell_browser_browser.h
+++ b/devel/electron29/files/patch-electron_shell_browser_browser.h
@@ -1,4 +1,4 @@
---- electron/shell/browser/browser.h.orig 2024-02-21 16:26:48 UTC
+--- electron/shell/browser/browser.h.orig 2024-06-27 17:50:20 UTC
+++ electron/shell/browser/browser.h
@@ -102,7 +102,7 @@ class Browser : public WindowListObserver {
@@ -9,7 +9,7 @@
// get the name, icon and path for an application
v8::Local<v8::Promise> GetApplicationInfoForProtocol(v8::Isolate* isolate,
const GURL& url);
-@@ -268,10 +268,10 @@ class Browser : public WindowListObserver {
+@@ -272,10 +272,10 @@ class Browser : public WindowListObserver {
PCWSTR GetAppUserModelID();
#endif // BUILDFLAG(IS_WIN)
diff --git a/devel/electron29/files/patch-electron_spec_api-utility-process-spec.ts b/devel/electron29/files/patch-electron_spec_api-utility-process-spec.ts
index fcfaf8a6916b..a4d67659a8ce 100644
--- a/devel/electron29/files/patch-electron_spec_api-utility-process-spec.ts
+++ b/devel/electron29/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-27 17:50:20 UTC
+++ electron/spec/api-utility-process-spec.ts
-@@ -400,7 +400,7 @@ describe('utilityProcess module', () => {
+@@ -418,7 +418,7 @@ describe('utilityProcess module', () => {
await closeWindow(w);
});
diff --git a/devel/electron29/files/patch-ui_base_x_x11__display__util.cc b/devel/electron29/files/patch-ui_base_x_x11__display__util.cc
index 7a5d2737a122..823d8714fc3e 100644
--- a/devel/electron29/files/patch-ui_base_x_x11__display__util.cc
+++ b/devel/electron29/files/patch-ui_base_x_x11__display__util.cc
@@ -1,4 +1,4 @@
---- ui/base/x/x11_display_util.cc.orig 2024-02-21 00:21:15 UTC
+--- ui/base/x/x11_display_util.cc.orig 2024-06-28 22:43:25 UTC
+++ ui/base/x/x11_display_util.cc
@@ -12,7 +12,6 @@
#include <unordered_set>
@@ -16,13 +16,16 @@
#include "ui/gfx/x/atom_cache.h"
#include "ui/gfx/x/connection.h"
#include "ui/gfx/x/randr.h"
-@@ -41,86 +39,42 @@ constexpr const char kRandrEdidProperty[] = "EDID";
+@@ -41,89 +39,42 @@ constexpr const char kRandrEdidProperty[] = "EDID";
constexpr const char kRandrEdidProperty[] = "EDID";
-std::map<x11::RandR::Output, size_t> GetMonitors(
- const x11::Response<x11::RandR::GetMonitorsReply>& reply) {
- std::map<x11::RandR::Output, size_t> output_to_monitor;
+- if (!reply) {
+- return output_to_monitor;
+- }
- for (size_t monitor = 0; monitor < reply->monitors.size(); monitor++) {
- for (x11::RandR::Output output : reply->monitors[monitor].outputs) {
- output_to_monitor[output] = monitor;
@@ -124,7 +127,7 @@
};
// If the work area entirely contains exactly one display, assume it's meant
-@@ -202,9 +156,14 @@ int DefaultBitsPerComponent() {
+@@ -205,9 +156,14 @@ int DefaultBitsPerComponent() {
return visual.bits_per_rgb_value;
}
@@ -142,7 +145,7 @@
std::vector<uint8_t> edid;
if (response && response->format == 8 && response->type != x11::Atom::None) {
edid = std::move(response->data);
-@@ -256,8 +215,7 @@ std::vector<display::Display> GetFallbackDisplayList(
+@@ -259,8 +215,7 @@ std::vector<display::Display> GetFallbackDisplayList(
std::vector<display::Display> GetFallbackDisplayList(
float scale,
size_t* primary_display_index_out) {
@@ -152,7 +155,7 @@
gfx::Size physical_size(screen.width_in_millimeters,
screen.height_in_millimeters);
-@@ -283,10 +241,7 @@ std::vector<display::Display> GetFallbackDisplayList(
+@@ -286,10 +241,7 @@ std::vector<display::Display> GetFallbackDisplayList(
std::vector<display::Display> displays{gfx_display};
*primary_display_index_out = 0;
@@ -164,7 +167,7 @@
return displays;
}
-@@ -301,17 +256,7 @@ std::vector<display::Display> BuildDisplaysFromXRandRI
+@@ -305,17 +257,7 @@ std::vector<display::Display> BuildDisplaysFromXRandRI
auto& randr = connection->randr();
auto x_root_window = ui::GetX11RootWindow();
std::vector<display::Display> displays;
@@ -183,7 +186,7 @@
if (!resources) {
LOG(ERROR) << "XRandR returned no displays; falling back to root window";
return GetFallbackDisplayList(primary_scale, primary_display_index_out);
-@@ -320,65 +265,21 @@ std::vector<display::Display> BuildDisplaysFromXRandRI
+@@ -324,65 +266,21 @@ std::vector<display::Display> BuildDisplaysFromXRandRI
const int depth = connection->default_screen().root_depth;
const int bits_per_component = DefaultBitsPerComponent();
@@ -213,7 +216,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);
- }
@@ -254,7 +257,7 @@
if (!output_info) {
continue;
}
-@@ -393,16 +294,15 @@ std::vector<display::Display> BuildDisplaysFromXRandRI
+@@ -397,16 +295,15 @@ std::vector<display::Display> BuildDisplaysFromXRandRI
continue;
}
@@ -276,7 +279,7 @@
auto output_32 = static_cast<uint32_t>(output_id);
int64_t display_id =
output_32 > 0xff ? 0 : edid_parser.GetIndexBasedDisplayId(output_32);
-@@ -457,9 +357,8 @@ std::vector<display::Display> BuildDisplaysFromXRandRI
+@@ -468,9 +365,8 @@ std::vector<display::Display> BuildDisplaysFromXRandRI
}
if (!display::HasForceDisplayColorProfile()) {
@@ -288,7 +291,7 @@
gfx::ColorSpace color_space = icc_profile.GetPrimariesOnlyColorSpace();
// Most folks do not have an ICC profile set up, but we still want to
-@@ -504,24 +403,63 @@ std::vector<display::Display> BuildDisplaysFromXRandRI
+@@ -515,24 +411,63 @@ std::vector<display::Display> BuildDisplaysFromXRandRI
ConvertDisplayBoundsToDips(&displays, *primary_display_index_out);
}
diff --git a/devel/electron29/files/yarn.lock b/devel/electron29/files/yarn.lock
index 12711fc4f638..2556f713b6d8 100644
--- a/devel/electron29/files/yarn.lock
+++ b/devel/electron29/files/yarn.lock
@@ -220,9 +220,9 @@
vscode-uri "^3.0.7"
"@electron/typescript-definitions@^8.15.2":
- version "8.15.2"
- resolved "https://registry.yarnpkg.com/@electron/typescript-definitions/-/typescript-definitions-8.15.2.tgz#1152e3d3731d236b50a3dee5a108176ce43fd703"
- integrity sha512-6vlWnnNfZrg9QFOGgoLaQZ/nTCg+Y1laz02pUsRRmCJIpJZOY3HnWnIuav7e8g5IIwHMVc8JSohR+YRgiRk/eA==
+ version "8.15.6"
+ resolved "https://registry.yarnpkg.com/@electron/typescript-definitions/-/typescript-definitions-8.15.6.tgz#a578ee3de6e6dcfdb5765da58f303900a34b2d06"
+ integrity sha512-9YR2jG7AdRLvZMhQLgTljZzkoaKNP1wbQq+/qjBCCCCCbUpECvMRk1/UeuZErZEmddhSYanQZgXiftF1T072uQ==
dependencies:
"@types/node" "^11.13.7"
chalk "^2.4.2"