Skip to content

Commit f2483a7

Browse files
tagattietagattie
committed
devel/electron34: update to 34.3.2
Changelog: - https://github.com/electron/electron/releases/tag/v34.1.0 - https://github.com/electron/electron/releases/tag/v34.1.1 - https://github.com/electron/electron/releases/tag/v34.2.0 - https://github.com/electron/electron/releases/tag/v34.3.0 - https://github.com/electron/electron/releases/tag/v34.3.1 - https://github.com/electron/electron/releases/tag/v34.3.2
1 parent 903db14 commit f2483a7

21 files changed

+130
-123
lines changed

‎devel/electron34/Makefile‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,17 @@ DISTVERSION= ${ELECTRON_VER}
44
PULSEMV= 16
55
PULSEV= ${PULSEMV}.1
66
CATEGORIES= devel
7-
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/:chromium \
7+
MASTER_SITES= https://github.com/tagattie/FreeBSD-Electron/releases/download/v34.3.2/:chromium \
88
https://freedesktop.org/software/pulseaudio/releases/:pulseaudio
99
PKGNAMESUFFIX= ${ELECTRON_VER_MAJOR}
10-
DISTFILES= chromium-${CHROMIUM_VER}${EXTRACT_SUFX}:chromium \
10+
DISTFILES= chromium-${CHROMIUM_VER}${EXTRACT_SUFX}.0:chromium \
11+
chromium-${CHROMIUM_VER}${EXTRACT_SUFX}.1:chromium \
12+
chromium-${CHROMIUM_VER}${EXTRACT_SUFX}.2:chromium \
1113
pulseaudio-${PULSEV}.tar.gz:pulseaudio \
1214
electron-yarn-cache-${ELECTRON_VER}${EXTRACT_SUFX}:prefetch
1315
DIST_SUBDIR= ${PORTNAME}
16+
EXTRACT_ONLY= chromium-${CHROMIUM_VER}${EXTRACT_SUFX} \
17+
${DISTFILES:C/:[^:]+$//:C/chromium-${CHROMIUM_VER}${EXTRACT_SUFX}\.[0-9]//}
1418

1519
MAINTAINER= [email protected]
1620
COMMENT= Build cross-platform desktop apps with JavaScript, HTML, and CSS
@@ -215,9 +219,9 @@ SNDIO_VARS= GN_ARGS+=use_sndio=true
215219
SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false
216220

217221
# See ${WRKSRC}/electron/DEPS for CHROMIUM_VER
218-
CHROMIUM_VER= 132.0.6834.159
222+
CHROMIUM_VER= 132.0.6834.210
219223
# See ${WRKSRC}/electron/DEPS for NODE_VER
220-
NODE_VER= 20.18.1
224+
NODE_VER= 20.18.3
221225
# See ${WRKSRC}/electron/DEPS for NAN_VER
222226
NAN_VER= e14bdcd1f72d62bca1d541b66da43130384ec213
223227
# See ${WRKSRC}/electron/DEPS for SQUIRREL_MAC_VER
@@ -315,6 +319,12 @@ pre-fetch:
315319
${RM} -r ${WRKDIR}; \
316320
fi
317321

322+
post-fetch:
323+
@if [ ! -f ${DISTDIR}/${DIST_SUBDIR}/chromium-${CHROMIUM_VER}${EXTRACT_SUFX} ]; then \
324+
${CAT} ${DISTDIR}/${DIST_SUBDIR}/chromium-${CHROMIUM_VER}${EXTRACT_SUFX}.? > \
325+
${DISTDIR}/${DIST_SUBDIR}/chromium-${CHROMIUM_VER}${EXTRACT_SUFX}; \
326+
fi
327+
318328
post-extract:
319329
# Move extracted sources to appropriate locations
320330
${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/chromium-${CHROMIUM_VER} ${WRKSRC}

‎devel/electron34/Makefile.version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
ELECTRON_VER= 34.0.2
1+
ELECTRON_VER= 34.3.2
22
ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//}

‎devel/electron34/distinfo‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
1-
TIMESTAMP = 1738314163
2-
SHA256 (electron/chromium-132.0.6834.159.tar.xz) = 564cc8a258b16d1c6151721a2a72e43ba80642326b33aa79439bba354e686068
3-
SIZE (electron/chromium-132.0.6834.159.tar.xz) = 6862656444
1+
TIMESTAMP = 1741694502
2+
SHA256 (electron/chromium-132.0.6834.210.tar.xz.0) = ede58a1501f175aaa6c92e47793b773ed10b31a43d600375cb40727c4ae677d5
3+
SIZE (electron/chromium-132.0.6834.210.tar.xz.0) = 2000000000
4+
SHA256 (electron/chromium-132.0.6834.210.tar.xz.1) = 6d080b3948ef1d63d08b8cc1390662a439e635b881561434787b8b67ea99b08d
5+
SIZE (electron/chromium-132.0.6834.210.tar.xz.1) = 2000000000
6+
SHA256 (electron/chromium-132.0.6834.210.tar.xz.2) = 989e234492cf50454303ec6f490f9e20002aa16cd69915a3c09b6e06f668be82
7+
SIZE (electron/chromium-132.0.6834.210.tar.xz.2) = 484148560
48
SHA256 (electron/pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92
59
SIZE (electron/pulseaudio-16.1.tar.gz) = 2763111
6-
SHA256 (electron/electron-yarn-cache-34.0.2.tar.xz) = f0fa33e22a0b00e5440fbc57517f7b303d43ca07c25e43f35e28f97c2ce12c83
7-
SIZE (electron/electron-yarn-cache-34.0.2.tar.xz) = 29062184
8-
SHA256 (electron/electron-electron-v34.0.2_GH0.tar.gz) = 8d16ee50f3063e697a153a492697cccd6edbeee13b6b10106fc2141707f8489d
9-
SIZE (electron/electron-electron-v34.0.2_GH0.tar.gz) = 14693040
10-
SHA256 (electron/nodejs-node-v20.18.1_GH0.tar.gz) = e52a6d719db786fffdc7ac3dc623023803336d8ce7a1dd61d9f68bd851d2a921
11-
SIZE (electron/nodejs-node-v20.18.1_GH0.tar.gz) = 115585611
10+
SHA256 (electron/electron-yarn-cache-34.3.2.tar.xz) = f0fa33e22a0b00e5440fbc57517f7b303d43ca07c25e43f35e28f97c2ce12c83
11+
SIZE (electron/electron-yarn-cache-34.3.2.tar.xz) = 29062184
12+
SHA256 (electron/electron-electron-v34.3.2_GH0.tar.gz) = 2376ccfadd700973e62f4c7e3ef58d5e1613102aaf058e7812294e9e87c44685
13+
SIZE (electron/electron-electron-v34.3.2_GH0.tar.gz) = 14826088
14+
SHA256 (electron/nodejs-node-v20.18.3_GH0.tar.gz) = a2049a1607fbc5b9ec4336d9d04faeeb9b8efdc9ec853e8ddf7cf419be9dbb3d
15+
SIZE (electron/nodejs-node-v20.18.3_GH0.tar.gz) = 115601859
1216
SHA256 (electron/nodejs-nan-e14bdcd1f72d62bca1d541b66da43130384ec213_GH0.tar.gz) = 02edf8d5b3fef9af94d8a1355da60564a57e7f2c99cb422bce042400607ed2eb
1317
SIZE (electron/nodejs-nan-e14bdcd1f72d62bca1d541b66da43130384ec213_GH0.tar.gz) = 180646
1418
SHA256 (electron/Squirrel-Squirrel.Mac-0e5d146ba13101a1302d59ea6e6e0b3cace4ae38_GH0.tar.gz) = f4ebb40a8d85dbb7ef02aa0571b2f8e22182c6d73b6992484a53c90047779d01

‎devel/electron34/files/patch-electron_BUILD.gn‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
--- electron/BUILD.gn.orig 2025-01-29 20:10:57 UTC
1+
--- electron/BUILD.gn.orig 2025-03-10 00:01:50 UTC
22
+++ electron/BUILD.gn
3-
@@ -528,7 +528,7 @@ source_set("electron_lib") {
3+
@@ -529,7 +529,7 @@ source_set("electron_lib") {
44
defines += [ "GDK_DISABLE_DEPRECATION_WARNINGS" ]
55
}
66

@@ -9,7 +9,7 @@
99
deps += [
1010
"//components/crash/core/app",
1111
"//components/crash/core/browser",
12-
@@ -621,6 +621,12 @@ source_set("electron_lib") {
12+
@@ -622,6 +622,12 @@ source_set("electron_lib") {
1313
cflags_objcc = [ "-fobjc-weak" ]
1414
}
1515
}
@@ -22,7 +22,7 @@
2222
if (is_linux) {
2323
libs = [ "xshmfence" ]
2424
deps += [
25-
@@ -1189,7 +1195,7 @@ if (is_mac) {
25+
@@ -1190,7 +1196,7 @@ if (is_mac) {
2626
":electron_lib",
2727
":electron_win32_resources",
2828
":packed_resources",
@@ -31,7 +31,7 @@
3131
"//content:sandbox_helper_win",
3232
"//electron/buildflags",
3333
"//ui/strings",
34-
@@ -1215,7 +1221,7 @@ if (is_mac) {
34+
@@ -1216,7 +1222,7 @@ if (is_mac) {
3535
public_deps = [ "//tools/v8_context_snapshot:v8_context_snapshot" ]
3636
}
3737

@@ -40,7 +40,7 @@
4040
data_deps += [ "//components/crash/core/app:chrome_crashpad_handler" ]
4141
}
4242

43-
@@ -1282,7 +1288,7 @@ if (is_mac) {
43+
@@ -1283,7 +1289,7 @@ if (is_mac) {
4444
configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
4545
}
4646

@@ -49,7 +49,7 @@
4949
deps += [ "//sandbox/linux:chrome_sandbox" ]
5050
}
5151
}
52-
@@ -1390,7 +1396,7 @@ dist_zip("electron_dist_zip") {
52+
@@ -1391,7 +1397,7 @@ dist_zip("electron_dist_zip") {
5353
":electron_version_file",
5454
":licenses",
5555
]

‎devel/electron34/files/patch-electron_script_spec-runner.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
--- electron/script/spec-runner.js.orig 2025-01-22 18:19:12 UTC
1+
--- electron/script/spec-runner.js.orig 2025-03-10 00:01:50 UTC
22
+++ electron/script/spec-runner.js
3-
@@ -197,7 +197,7 @@ async function runTestUsingElectron (specDir, testName
3+
@@ -200,7 +200,7 @@ async function runTestUsingElectron (specDir, testName
44
exe = path.resolve(BASE, utils.getElectronExec());
55
}
66
const runnerArgs = [`electron/${specDir}`, ...unknownArgs.slice(2)];

‎devel/electron34/files/patch-electron_shell_browser_api_electron__api__base__window.cc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
--- electron/shell/browser/api/electron_api_base_window.cc.orig 2024-10-22 02:29:46 UTC
1+
--- electron/shell/browser/api/electron_api_base_window.cc.orig 2025-03-10 00:01:50 UTC
22
+++ electron/shell/browser/api/electron_api_base_window.cc
3-
@@ -42,7 +42,7 @@
3+
@@ -41,7 +41,7 @@
44
#include "shell/browser/ui/views/win_frame_view.h"
55
#include "shell/browser/ui/win/taskbar_host.h"
66
#include "ui/base/win/shell.h"
@@ -9,7 +9,7 @@
99
#include "shell/browser/ui/views/opaque_frame_view.h"
1010
#endif
1111

12-
@@ -995,7 +995,7 @@ void BaseWindow::SetIconImpl(v8::Isolate* isolate,
12+
@@ -998,7 +998,7 @@ void BaseWindow::SetIconImpl(v8::Isolate* isolate,
1313
static_cast<NativeWindowViews*>(window_.get())
1414
->SetIcon(native_image->GetHICON(GetSystemMetrics(SM_CXSMICON)),
1515
native_image->GetHICON(GetSystemMetrics(SM_CXICON)));
@@ -18,7 +18,7 @@
1818
static_cast<NativeWindowViews*>(window_.get())
1919
->SetIcon(native_image->image().AsImageSkia());
2020
#endif
21-
@@ -1052,7 +1052,7 @@ void BaseWindow::SetAppDetails(const gin_helper::Dicti
21+
@@ -1055,7 +1055,7 @@ void BaseWindow::SetAppDetails(const gin_helper::Dicti
2222
}
2323
#endif
2424

@@ -27,7 +27,7 @@
2727
void BaseWindow::SetTitleBarOverlay(const gin_helper::Dictionary& options,
2828
gin_helper::Arguments* args) {
2929
// Ensure WCO is already enabled on this window
30-
@@ -1302,7 +1302,7 @@ void BaseWindow::BuildPrototype(v8::Isolate* isolate,
30+
@@ -1306,7 +1306,7 @@ void BaseWindow::BuildPrototype(v8::Isolate* isolate,
3131
.SetMethod("setThumbnailToolTip", &BaseWindow::SetThumbnailToolTip)
3232
.SetMethod("setAppDetails", &BaseWindow::SetAppDetails)
3333
#endif

‎devel/electron34/files/patch-electron_shell_browser_api_electron__api__base__window.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
--- electron/shell/browser/api/electron_api_base_window.h.orig 2024-10-22 02:29:46 UTC
1+
--- electron/shell/browser/api/electron_api_base_window.h.orig 2025-03-10 00:01:50 UTC
22
+++ electron/shell/browser/api/electron_api_base_window.h
3-
@@ -249,7 +249,7 @@ class BaseWindow : public gin_helper::TrackableObject<
3+
@@ -250,7 +250,7 @@ class BaseWindow : public gin_helper::TrackableObject<
44
void SetAppDetails(const gin_helper::Dictionary& options);
55
#endif
66

‎devel/electron34/files/patch-electron_shell_browser_api_electron__api__web__contents.cc‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
--- electron/shell/browser/api/electron_api_web_contents.cc.orig 2025-01-29 20:10:57 UTC
1+
--- electron/shell/browser/api/electron_api_web_contents.cc.orig 2025-03-10 00:01:50 UTC
22
+++ electron/shell/browser/api/electron_api_web_contents.cc
33
@@ -156,11 +156,11 @@
44
#include "ui/base/cocoa/defaults_utils.h"
@@ -23,7 +23,7 @@
2323
#include "chrome/browser/hang_monitor/hang_crash_dump.h" // nogncheck
2424
#endif
2525

26-
@@ -519,7 +519,7 @@ std::optional<base::TimeDelta> GetCursorBlinkInterval(
26+
@@ -565,7 +565,7 @@ std::optional<base::TimeDelta> GetCursorBlinkInterval(
2727
ui::TextInsertionCaretBlinkPeriodFromDefaults());
2828
if (system_value)
2929
return *system_value;
@@ -32,7 +32,7 @@
3232
if (auto* linux_ui = ui::LinuxUi::instance())
3333
return linux_ui->GetCursorBlinkInterval();
3434
#elif BUILDFLAG(IS_WIN)
35-
@@ -889,7 +889,7 @@ void WebContents::InitWithSessionAndOptions(
35+
@@ -934,7 +934,7 @@ void WebContents::InitWithSessionAndOptions(
3636
accept_languages.pop_back();
3737
prefs->accept_languages = accept_languages;
3838

@@ -41,7 +41,7 @@
4141
// Update font settings.
4242
static const gfx::FontRenderParams params(
4343
gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(), nullptr));
44-
@@ -2675,13 +2675,13 @@ void WebContents::ForcefullyCrashRenderer() {
44+
@@ -2771,13 +2771,13 @@ void WebContents::ForcefullyCrashRenderer() {
4545

4646
content::RenderProcessHost* rph = rwh->GetProcess();
4747
if (rph) {
@@ -57,7 +57,7 @@
5757
CrashDumpHungChildProcess(rph->GetProcess().Handle());
5858
#endif
5959
rph->Shutdown(content::RESULT_CODE_HUNG);
60-
@@ -3354,7 +3354,7 @@ void WebContents::Focus() {
60+
@@ -3450,7 +3450,7 @@ void WebContents::Focus() {
6161
void WebContents::Focus() {
6262
// Focusing on WebContents does not automatically focus the window on macOS
6363
// and Linux, do it manually to match the behavior on Windows.
@@ -66,7 +66,7 @@
6666
if (owner_window())
6767
owner_window()->Focus(true);
6868
#endif
69-
@@ -4230,7 +4230,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() {
69+
@@ -4326,7 +4326,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() {
7070
}
7171
#endif
7272

‎devel/electron34/files/patch-electron_shell_browser_api_electron__api__web__contents.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
--- electron/shell/browser/api/electron_api_web_contents.h.orig 2025-01-29 20:10:57 UTC
1+
--- electron/shell/browser/api/electron_api_web_contents.h.orig 2025-03-10 00:01:50 UTC
22
+++ electron/shell/browser/api/electron_api_web_contents.h
3-
@@ -769,7 +769,7 @@ class WebContents final : public ExclusiveAccessContex
3+
@@ -776,7 +776,7 @@ class WebContents final : public ExclusiveAccessContex
44
#if defined(TOOLKIT_VIEWS) && !BUILDFLAG(IS_MAC)
55
ui::ImageModel GetDevToolsWindowIcon() override;
66
#endif

‎devel/electron34/files/patch-electron_shell_browser_electron__browser__main__parts.cc‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
--- electron/shell/browser/electron_browser_main_parts.cc.orig 2024-10-22 02:29:46 UTC
1+
--- electron/shell/browser/electron_browser_main_parts.cc.orig 2025-03-10 00:01:50 UTC
22
+++ electron/shell/browser/electron_browser_main_parts.cc
33
@@ -76,7 +76,7 @@
44
#include "ui/wm/core/wm_state.h"
@@ -27,7 +27,7 @@
2727
DetectOzonePlatform();
2828
ui::OzonePlatform::PreEarlyInitialization();
2929
#endif
30-
@@ -299,7 +299,7 @@ int ElectronBrowserMainParts::PreCreateThreads() {
30+
@@ -300,7 +300,7 @@ int ElectronBrowserMainParts::PreCreateThreads() {
3131
// happen before the ResourceBundle is loaded
3232
if (locale.empty())
3333
l10n_util::OverrideLocaleWithCocoaLocale();
@@ -36,7 +36,7 @@
3636
// l10n_util::GetApplicationLocaleInternal uses g_get_language_names(),
3737
// which keys off of getenv("LC_ALL").
3838
// We must set this env first to make ui::ResourceBundle accept the custom
39-
@@ -330,7 +330,7 @@ int ElectronBrowserMainParts::PreCreateThreads() {
39+
@@ -331,7 +331,7 @@ int ElectronBrowserMainParts::PreCreateThreads() {
4040
ElectronBrowserClient::SetApplicationLocale(app_locale);
4141
fake_browser_process_->SetApplicationLocale(app_locale);
4242

@@ -45,7 +45,7 @@
4545
// Reset to the original LC_ALL since we should not be changing it.
4646
if (!locale.empty()) {
4747
if (lc_all)
48-
@@ -390,7 +390,7 @@ void ElectronBrowserMainParts::ToolkitInitialized() {
48+
@@ -391,7 +391,7 @@ void ElectronBrowserMainParts::ToolkitInitialized() {
4949
}
5050

5151
void ElectronBrowserMainParts::ToolkitInitialized() {
@@ -54,7 +54,7 @@
5454
auto* linux_ui = ui::GetDefaultLinuxUi();
5555
CHECK(linux_ui);
5656
linux_ui_getter_ = std::make_unique<LinuxUiGetterImpl>();
57-
@@ -496,7 +496,7 @@ void ElectronBrowserMainParts::PostCreateMainMessageLo
57+
@@ -497,7 +497,7 @@ void ElectronBrowserMainParts::PostCreateMainMessageLo
5858
}
5959

6060
void ElectronBrowserMainParts::PostCreateMainMessageLoop() {
@@ -63,7 +63,7 @@
6363
std::string app_name = electron::Browser::Get()->GetName();
6464
#endif
6565
#if BUILDFLAG(IS_LINUX)
66-
@@ -508,7 +508,9 @@ void ElectronBrowserMainParts::PostCreateMainMessageLo
66+
@@ -509,7 +509,9 @@ void ElectronBrowserMainParts::PostCreateMainMessageLo
6767

6868
if (!bluez::BluezDBusManager::IsInitialized())
6969
bluez::DBusBluezManagerWrapperLinux::Initialize();
@@ -73,7 +73,7 @@
7373
// Set up crypt config. This needs to be done before anything starts the
7474
// network service, as the raw encryption key needs to be shared with the
7575
// network service for encrypted cookie storage.
76-
@@ -609,7 +611,7 @@ void ElectronBrowserMainParts::PostMainMessageLoopRun(
76+
@@ -610,7 +612,7 @@ void ElectronBrowserMainParts::PostMainMessageLoopRun(
7777
fake_browser_process_->PostMainMessageLoopRun();
7878
content::DevToolsAgentHost::StopRemoteDebuggingPipeHandler();
7979

0 commit comments

Comments
 (0)