aboutsummaryrefslogtreecommitdiff
path: root/devel/electron38
diff options
context:
space:
mode:
Diffstat (limited to 'devel/electron38')
-rw-r--r--devel/electron38/Makefile12
-rw-r--r--devel/electron38/Makefile.version2
-rw-r--r--devel/electron38/distinfo26
-rw-r--r--devel/electron38/files/patch-build_config_rust.gni14
-rw-r--r--devel/electron38/files/patch-build_dotfile__settings.gni10
-rw-r--r--devel/electron38/files/patch-build_rust_std_BUILD.gn14
-rw-r--r--devel/electron38/files/patch-electron_shell_browser_api_electron__api__app.cc8
-rw-r--r--devel/electron38/files/patch-electron_spec_api-app-spec.ts20
-rw-r--r--devel/electron38/files/patch-third__party_crabbyavif_BUILD.gn16
9 files changed, 83 insertions, 39 deletions
diff --git a/devel/electron38/Makefile b/devel/electron38/Makefile
index d821e8142ad3..6f8eace6a112 100644
--- a/devel/electron38/Makefile
+++ b/devel/electron38/Makefile
@@ -1,10 +1,11 @@
PORTNAME= electron
DISTVERSIONPREFIX= v
DISTVERSION= ${ELECTRON_VER}
+PORTREVISION= 1
PULSEMV= 16
PULSEV= ${PULSEMV}.1
CATEGORIES= devel
-MASTER_SITES= https://github.com/tagattie/FreeBSD-Electron/releases/download/v38.3.0/:chromium \
+MASTER_SITES= https://github.com/tagattie/FreeBSD-Electron/releases/download/v38.5.0/:chromium \
https://freedesktop.org/software/pulseaudio/releases/:pulseaudio
PKGNAMESUFFIX= ${ELECTRON_VER_MAJOR}
DISTFILES= chromium-${CHROMIUM_VER}${EXTRACT_SUFX}.0:chromium \
@@ -223,9 +224,9 @@ SNDIO_VARS= GN_ARGS+=use_sndio=true
SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false
# See ${WRKSRC}/electron/DEPS for CHROMIUM_VER
-CHROMIUM_VER= 140.0.7339.240
+CHROMIUM_VER= 140.0.7339.249
# See ${WRKSRC}/electron/DEPS for NODE_VER
-NODE_VER= 22.20.0
+NODE_VER= 22.21.1
# See ${WRKSRC}/electron/DEPS for NAN_VER
NAN_VER= e14bdcd1f72d62bca1d541b66da43130384ec213
# See ${WRKSRC}/electron/DEPS for SQUIRREL_MAC_VER
@@ -290,11 +291,9 @@ MAKE_ENV+= C_INCLUDE_PATH=${LOCALBASE}/include \
CPLUS_INCLUDE_PATH=${LOCALBASE}/include
# rust
-RUSTC_VERSION!= rustc -V 2>/dev/null || true
MAKE_ENV+= RUSTC_BOOTSTRAP=1
GN_ARGS+= enable_rust=true \
- rust_sysroot_absolute="${LOCALBASE}" \
- rustc_version="${RUSTC_VERSION}"
+ rust_sysroot_absolute="${LOCALBASE}"
pre-everything::
@${ECHO_MSG}
@@ -381,6 +380,7 @@ pre-configure:
.endfor
touch ${WRKSRC:H}/pulseaudio-${PULSEV}/src/pulse/version.h
@${REINPLACE_CMD} -e 's|$${LOCALBASE}|${LOCALBASE}|;s|$${MODCLANG_VERSION}|${LLVM_DEFAULT}|' \
+ ${WRKSRC}/build/config/rust.gni \
${WRKSRC}/build/rust/rust_bindgen.gni \
${WRKSRC}/build/rust/rust_bindgen_generator.gni
diff --git a/devel/electron38/Makefile.version b/devel/electron38/Makefile.version
index 6bb42733992a..4752993fe343 100644
--- a/devel/electron38/Makefile.version
+++ b/devel/electron38/Makefile.version
@@ -1,2 +1,2 @@
-ELECTRON_VER= 38.4.0
+ELECTRON_VER= 38.6.0
ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//}
diff --git a/devel/electron38/distinfo b/devel/electron38/distinfo
index f7994759e221..1dabe699c5cc 100644
--- a/devel/electron38/distinfo
+++ b/devel/electron38/distinfo
@@ -1,18 +1,18 @@
-TIMESTAMP = 1761309052
-SHA256 (electron/chromium-140.0.7339.240.tar.xz.0) = 6f4a5a20ca144367ea2eca94239a6abaceae75a476da69a77fe56003dba226f8
-SIZE (electron/chromium-140.0.7339.240.tar.xz.0) = 2000000000
-SHA256 (electron/chromium-140.0.7339.240.tar.xz.1) = 20981168d3a0b42735617c5070134e62fcd598d099a902efc1fa79295de96044
-SIZE (electron/chromium-140.0.7339.240.tar.xz.1) = 2000000000
-SHA256 (electron/chromium-140.0.7339.240.tar.xz.2) = ae902a045d7429e57ceb135001f8ed9325b65fff9bc4dba23add9506a0e216cc
-SIZE (electron/chromium-140.0.7339.240.tar.xz.2) = 331887040
+TIMESTAMP = 1762582453
+SHA256 (electron/chromium-140.0.7339.249.tar.xz.0) = 138fc3e5eb2b5db406a7764a8e287a0d16640f83cbfb452d6e0f54de8eaf65c2
+SIZE (electron/chromium-140.0.7339.249.tar.xz.0) = 2000000000
+SHA256 (electron/chromium-140.0.7339.249.tar.xz.1) = 0b7ea85268dd4f6aacd0641a48d266eaa2eb9c79f2c528926bfcdc5aee36f1da
+SIZE (electron/chromium-140.0.7339.249.tar.xz.1) = 2000000000
+SHA256 (electron/chromium-140.0.7339.249.tar.xz.2) = 0a2a9977f5f34ac878b63e845ef8fcc52da628d952e83565cb308bc1925f69e8
+SIZE (electron/chromium-140.0.7339.249.tar.xz.2) = 331916124
SHA256 (electron/pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92
SIZE (electron/pulseaudio-16.1.tar.gz) = 2763111
-SHA256 (electron/electron-yarn-cache-38.4.0.tar.xz) = 7ed6fedc372c5bd23b38ed252c12ace0f0fbce096b5442add4501a965282eb04
-SIZE (electron/electron-yarn-cache-38.4.0.tar.xz) = 30044356
-SHA256 (electron/electron-electron-v38.4.0_GH0.tar.gz) = 48acd4fcd3a699118d44f53e6264630af070a5a78de8d14a859f8eb863c95240
-SIZE (electron/electron-electron-v38.4.0_GH0.tar.gz) = 15863761
-SHA256 (electron/nodejs-node-v22.20.0_GH0.tar.gz) = 5c2e4ecc6583c5d49f9a9a4473fc267402762fc8e8a7835465919dacd6fdd5d8
-SIZE (electron/nodejs-node-v22.20.0_GH0.tar.gz) = 129356712
+SHA256 (electron/electron-yarn-cache-38.6.0.tar.xz) = 7ed6fedc372c5bd23b38ed252c12ace0f0fbce096b5442add4501a965282eb04
+SIZE (electron/electron-yarn-cache-38.6.0.tar.xz) = 30044356
+SHA256 (electron/electron-electron-v38.6.0_GH0.tar.gz) = 49a77f3bb00c498ee2c456e126955cf17af5bd95d990de3b36d66b200f9b2b55
+SIZE (electron/electron-electron-v38.6.0_GH0.tar.gz) = 15867868
+SHA256 (electron/nodejs-node-v22.21.1_GH0.tar.gz) = 4b5ad1795fb6adfb1862df9a626bdca85185866fcd7d0313e87a347eec293fd8
+SIZE (electron/nodejs-node-v22.21.1_GH0.tar.gz) = 129440814
SHA256 (electron/nodejs-nan-e14bdcd1f72d62bca1d541b66da43130384ec213_GH0.tar.gz) = 02edf8d5b3fef9af94d8a1355da60564a57e7f2c99cb422bce042400607ed2eb
SIZE (electron/nodejs-nan-e14bdcd1f72d62bca1d541b66da43130384ec213_GH0.tar.gz) = 180646
SHA256 (electron/Squirrel-Squirrel.Mac-0e5d146ba13101a1302d59ea6e6e0b3cace4ae38_GH0.tar.gz) = f4ebb40a8d85dbb7ef02aa0571b2f8e22182c6d73b6992484a53c90047779d01
diff --git a/devel/electron38/files/patch-build_config_rust.gni b/devel/electron38/files/patch-build_config_rust.gni
index b9a27a5bae7e..9babc55bcfe1 100644
--- a/devel/electron38/files/patch-build_config_rust.gni
+++ b/devel/electron38/files/patch-build_config_rust.gni
@@ -1,6 +1,16 @@
---- build/config/rust.gni.orig 2025-08-26 20:49:50 UTC
+--- build/config/rust.gni.orig 2025-10-13 21:25:57 UTC
+++ build/config/rust.gni
-@@ -369,7 +369,11 @@ if (is_linux || is_chromeos) {
+@@ -62,7 +62,8 @@ declare_args() {
+ # set this to the output of `rustc -V`. Changing this string will cause all
+ # Rust targets to be rebuilt, which allows you to update your toolchain and
+ # not break incremental builds.
+- rustc_version = ""
++ rustc_version = exec_script("//build/gn_run_binary.py",
++ [ "${LOCALBASE}/bin/rustc", "-V" ], "trim string")
+
+ # Whether artifacts produced by the Rust compiler can participate in ThinLTO.
+ #
+@@ -369,7 +370,11 @@ if (is_linux || is_chromeos) {
}
}
diff --git a/devel/electron38/files/patch-build_dotfile__settings.gni b/devel/electron38/files/patch-build_dotfile__settings.gni
new file mode 100644
index 000000000000..25291df0cb79
--- /dev/null
+++ b/devel/electron38/files/patch-build_dotfile__settings.gni
@@ -0,0 +1,10 @@
+--- build/dotfile_settings.gni.orig 2025-10-13 21:25:57 UTC
++++ build/dotfile_settings.gni
+@@ -24,6 +24,7 @@ build_dotfile_settings = {
+ "//build/config/mac/mac_sdk.gni",
+ "//build/config/mac/rules.gni",
+ "//build/config/posix/BUILD.gn",
++ "//build/config/rust.gni",
+ "//build/config/win/BUILD.gn",
+ "//build/config/win/visual_studio_version.gni",
+ "//build/rust/analyze.gni",
diff --git a/devel/electron38/files/patch-build_rust_std_BUILD.gn b/devel/electron38/files/patch-build_rust_std_BUILD.gn
index 13c2985f1be5..6c1c09bc621b 100644
--- a/devel/electron38/files/patch-build_rust_std_BUILD.gn
+++ b/devel/electron38/files/patch-build_rust_std_BUILD.gn
@@ -1,6 +1,14 @@
---- build/rust/std/BUILD.gn.orig 2025-06-30 07:04:30 UTC
+--- build/rust/std/BUILD.gn.orig 2025-10-13 21:25:57 UTC
+++ build/rust/std/BUILD.gn
-@@ -50,13 +50,20 @@ if (toolchain_has_rust) {
+@@ -42,7 +42,6 @@ if (toolchain_has_rust) {
+ "rustc_demangle",
+ "std_detect",
+ "test",
+- "unicode_width",
+ "unwind",
+ ]
+
+@@ -50,13 +49,20 @@ if (toolchain_has_rust) {
# These are no longer present in the Windows toolchain.
stdlib_files += [
"addr2line",
@@ -22,7 +30,7 @@
}
if (toolchain_for_rust_host_build_tools) {
-@@ -76,7 +83,6 @@ if (toolchain_has_rust) {
+@@ -76,7 +82,6 @@ if (toolchain_has_rust) {
# don't need to pass to the C++ linker because they're used for specialized
# purposes.
skip_stdlib_files = [
diff --git a/devel/electron38/files/patch-electron_shell_browser_api_electron__api__app.cc b/devel/electron38/files/patch-electron_shell_browser_api_electron__api__app.cc
index 12218b5a4012..7779829716a3 100644
--- a/devel/electron38/files/patch-electron_shell_browser_api_electron__api__app.cc
+++ b/devel/electron38/files/patch-electron_shell_browser_api_electron__api__app.cc
@@ -1,4 +1,4 @@
---- electron/shell/browser/api/electron_api_app.cc.orig 2025-09-02 20:56:04 UTC
+--- electron/shell/browser/api/electron_api_app.cc.orig 2025-10-28 14:56:59 UTC
+++ electron/shell/browser/api/electron_api_app.cc
@@ -97,7 +97,7 @@
#include "shell/common/process_util.h"
@@ -45,7 +45,7 @@
// Read the xdg-activation token and set it in the command line for the
// duration of the notification in order to ensure this is propagated to an
// already running electron app instance if it exists.
-@@ -1355,7 +1355,7 @@ std::vector<gin_helper::Dictionary> App::GetAppMetrics
+@@ -1435,7 +1435,7 @@ std::vector<gin_helper::Dictionary> App::GetAppMetrics
pid_dict.Set("name", process_metric.second->name);
}
@@ -54,7 +54,7 @@
auto memory_info = process_metric.second->GetMemoryInfo();
auto memory_dict = gin_helper::Dictionary::CreateEmpty(isolate);
-@@ -1739,7 +1739,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuild
+@@ -1819,7 +1819,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuild
.SetMethod(
"removeAsDefaultProtocolClient",
base::BindRepeating(&Browser::RemoveAsDefaultProtocolClient, browser))
@@ -63,7 +63,7 @@
.SetMethod(
"getApplicationInfoForProtocol",
base::BindRepeating(&Browser::GetApplicationInfoForProtocol, browser))
-@@ -1797,7 +1797,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuild
+@@ -1877,7 +1877,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuild
.SetMethod("getJumpListSettings", &App::GetJumpListSettings)
.SetMethod("setJumpList", &App::SetJumpList)
#endif
diff --git a/devel/electron38/files/patch-electron_spec_api-app-spec.ts b/devel/electron38/files/patch-electron_spec_api-app-spec.ts
index ebcc2de849bd..2d68e21081b7 100644
--- a/devel/electron38/files/patch-electron_spec_api-app-spec.ts
+++ b/devel/electron38/files/patch-electron_spec_api-app-spec.ts
@@ -1,4 +1,4 @@
---- electron/spec/api-app-spec.ts.orig 2025-08-13 14:21:20 UTC
+--- electron/spec/api-app-spec.ts.orig 2025-10-28 14:56:59 UTC
+++ electron/spec/api-app-spec.ts
@@ -129,11 +129,11 @@ describe('app module', () => {
});
@@ -63,12 +63,12 @@
});
});
-- ifdescribe(process.platform !== 'linux')('accessibilitySupportEnabled property', () => {
-+ ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd')('accessibilitySupportEnabled property', () => {
+- ifdescribe(process.platform !== 'linux')('accessibility support functionality', () => {
++ ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd')('accessibility support functionality', () => {
it('is mutable', () => {
const values = [false, true, false];
const setters: Array<(arg: boolean) => void> = [
-@@ -1233,7 +1233,7 @@ describe('app module', () => {
+@@ -1288,7 +1288,7 @@ describe('app module', () => {
});
});
@@ -77,7 +77,7 @@
let w: BrowserWindow;
before(function () {
-@@ -1368,7 +1368,7 @@ describe('app module', () => {
+@@ -1423,7 +1423,7 @@ describe('app module', () => {
describe('getApplicationNameForProtocol()', () => {
// TODO: Linux CI doesn't have registered http & https handlers
@@ -86,7 +86,7 @@
// We can't expect particular app names here, but these protocols should
// at least have _something_ registered. Except on our Linux CI
// environment apparently.
-@@ -1386,7 +1386,7 @@ describe('app module', () => {
+@@ -1441,7 +1441,7 @@ describe('app module', () => {
});
});
@@ -95,7 +95,7 @@
it('returns promise rejection for a bogus protocol', async function () {
await expect(
app.getApplicationInfoForProtocol('bogus-protocol://')
-@@ -1436,7 +1436,7 @@ describe('app module', () => {
+@@ -1491,7 +1491,7 @@ describe('app module', () => {
});
// FIXME Get these specs running on Linux CI
@@ -104,7 +104,7 @@
const iconPath = path.join(__dirname, 'fixtures/assets/icon.ico');
const sizes = {
small: 16,
-@@ -1518,7 +1518,7 @@ describe('app module', () => {
+@@ -1573,7 +1573,7 @@ describe('app module', () => {
expect(entry.memory).to.have.property('privateBytes').that.is.greaterThan(0);
}
@@ -113,7 +113,7 @@
expect(entry.sandboxed).to.be.a('boolean');
}
-@@ -1592,7 +1592,7 @@ describe('app module', () => {
+@@ -1647,7 +1647,7 @@ describe('app module', () => {
it('succeeds with complete GPUInfo', async () => {
const completeInfo = await getGPUInfo('complete');
@@ -122,7 +122,7 @@
// For linux and macOS complete info is same as basic info
await verifyBasicGPUInfo(completeInfo);
const basicInfo = await getGPUInfo('basic');
-@@ -1616,7 +1616,7 @@ describe('app module', () => {
+@@ -1671,7 +1671,7 @@ describe('app module', () => {
});
});
diff --git a/devel/electron38/files/patch-third__party_crabbyavif_BUILD.gn b/devel/electron38/files/patch-third__party_crabbyavif_BUILD.gn
new file mode 100644
index 000000000000..e7e8a010e88f
--- /dev/null
+++ b/devel/electron38/files/patch-third__party_crabbyavif_BUILD.gn
@@ -0,0 +1,16 @@
+--- third_party/crabbyavif/BUILD.gn.orig 2025-10-13 21:25:57 UTC
++++ third_party/crabbyavif/BUILD.gn
+@@ -190,7 +190,12 @@ rust_static_library("crabbyavif") {
+ "dav1d",
+ "libyuv",
+ "capi",
+- "disable_cfi",
++
++ # TODO: crbug.com/440481923 - Un-comment this once the new rust roll
++ # (http://crrev.com/c/6874449) lands and
++ # https://github.com/webmproject/CrabbyAvif/pull/654 is rolled into
++ # chromium.
++ #"disable_cfi",
+ ]
+
+ # Required for disable_cfi feature.
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-14 09:09:55 +0000