summaryrefslogtreecommitdiff
path: root/devel/electron37
diff options
context:
space:
mode:
Diffstat (limited to 'devel/electron37')
-rw-r--r--devel/electron37/Makefile44
-rw-r--r--devel/electron37/Makefile.version2
-rw-r--r--devel/electron37/distinfo22
-rw-r--r--devel/electron37/files/patch-electron_shell_services_node_node__service.cc6
-rw-r--r--devel/electron37/files/patch-electron_spec_api-tray-spec.ts18
-rw-r--r--devel/electron37/files/patch-net_dns_BUILD.gn18
6 files changed, 69 insertions, 41 deletions
diff --git a/devel/electron37/Makefile b/devel/electron37/Makefile
index ed2a1bba8f00..45bad243e80c 100644
--- a/devel/electron37/Makefile
+++ b/devel/electron37/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/v37.3.1/:chromium \
+MASTER_SITES= https://github.com/tagattie/FreeBSD-Electron/releases/download/v37.4.0/:chromium \
https://freedesktop.org/software/pulseaudio/releases/:pulseaudio
PKGNAMESUFFIX= ${ELECTRON_VER_MAJOR}
DISTFILES= chromium-${CHROMIUM_VER}${EXTRACT_SUFX}.0:chromium \
@@ -13,8 +14,7 @@ DISTFILES= chromium-${CHROMIUM_VER}${EXTRACT_SUFX}.0:chromium \
pulseaudio-${PULSEV}.tar.gz:pulseaudio \
electron-yarn-cache-${ELECTRON_VER}${EXTRACT_SUFX}:prefetch
DIST_SUBDIR= ${PORTNAME}
-EXTRACT_ONLY= chromium-${CHROMIUM_VER}${EXTRACT_SUFX} \
- ${DISTFILES:C/:[^:]+$//:C/chromium-${CHROMIUM_VER}${EXTRACT_SUFX}\.[0-9]//}
+EXTRACT_ONLY= ${DISTFILES:C/:[^:]+$//:C/chromium-${CHROMIUM_VER}${EXTRACT_SUFX}\.[0-9]//}
MAINTAINER= tagattie@FreeBSD.org
COMMENT= Build cross-platform desktop apps with JavaScript, HTML, and CSS
@@ -217,7 +217,7 @@ PIPEWIRE_VARS_OFF= GN_ARGS+=rtc_use_pipewire=false \
GN_ARGS+=rtc_link_pipewire=false
PULSEAUDIO_VARS= GN_ARGS+=use_pulseaudio=true \
- PINCLUDES="-I${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/pulseaudio-${PULSEV}/src -DPA_MAJOR=${PULSEMV}"
+ PINCLUDES="-I${WRKSRC:H}/pulseaudio-${PULSEV}/src -DPA_MAJOR=${PULSEMV}"
PULSEAUDIO_VARS_OFF= GN_ARGS+=use_pulseaudio=false
SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio
@@ -225,7 +225,7 @@ SNDIO_VARS= GN_ARGS+=use_sndio=true
SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false
# See ${WRKSRC}/electron/DEPS for CHROMIUM_VER
-CHROMIUM_VER= 138.0.7204.235
+CHROMIUM_VER= 138.0.7204.243
# See ${WRKSRC}/electron/DEPS for NODE_VER
NODE_VER= 22.18.0
# See ${WRKSRC}/electron/DEPS for NAN_VER
@@ -326,30 +326,32 @@ pre-fetch:
fi
pre-extract:
- @if [ ! -f ${DISTDIR}/${DIST_SUBDIR}/chromium-${CHROMIUM_VER}${EXTRACT_SUFX} ]; then \
- ${CAT} ${DISTDIR}/${DIST_SUBDIR}/chromium-${CHROMIUM_VER}${EXTRACT_SUFX}.? > \
- ${DISTDIR}/${DIST_SUBDIR}/chromium-${CHROMIUM_VER}${EXTRACT_SUFX}; \
- fi
+# Chromium source tarball is splitted into multiple fragments. Concatenate them
+# into a single one and manually extract it into WRKDIR.
+ @${CAT} ${DISTDIR}/${DIST_SUBDIR}/chromium-${CHROMIUM_VER}${EXTRACT_SUFX}.? > \
+ ${WRKSRC:H}/chromium-${CHROMIUM_VER}${EXTRACT_SUFX}
+ @cd ${WRKSRC:H} && \
+ ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
+ chromium-${CHROMIUM_VER}${EXTRACT_SUFX} ${EXTRACT_AFTER_ARGS}
post-extract:
# Move extracted sources to appropriate locations
- ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/chromium-${CHROMIUM_VER} ${WRKSRC}
- ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${PORTNAME}-${ELECTRON_VER} ${WRKSRC}/electron
- ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_nan}-${NAN_VER} \
- ${WRKSRC}/third_party/nan
- ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_node}-${NODE_VER} \
+ ${MV} ${WRKSRC:H}/chromium-${CHROMIUM_VER} ${WRKSRC}
+ ${MV} ${WRKSRC:H}/${PORTNAME}-${ELECTRON_VER} ${WRKSRC}/electron
+ ${MV} ${WRKSRC:H}/${GH_PROJECT_nan}-${NAN_VER} ${WRKSRC}/third_party/nan
+ ${MV} ${WRKSRC:H}/${GH_PROJECT_node}-${NODE_VER} \
${WRKSRC}/third_party/electron_node
- ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_squirrel_mac}-${SQUIRREL_MAC_VER} \
+ ${MV} ${WRKSRC:H}/${GH_PROJECT_squirrel_mac}-${SQUIRREL_MAC_VER} \
${WRKSRC}/third_party/squirrel.mac
- ${MKDIR} ${WRKSRC}/third_party/squirrel.mac/vendor
- ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_reactiveobjc}-${REACTIVEOBJC_VER} \
+ @${MKDIR} ${WRKSRC}/third_party/squirrel.mac/vendor
+ ${MV} ${WRKSRC:H}/${GH_PROJECT_reactiveobjc}-${REACTIVEOBJC_VER} \
${WRKSRC}/third_party/squirrel.mac/vendor/ReactiveObjC
- ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_mantle}-${MANTLE_VER} \
+ ${MV} ${WRKSRC:H}/${GH_PROJECT_mantle}-${MANTLE_VER} \
${WRKSRC}/third_party/squirrel.mac/vendor/Mantle
- ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_reclient_configs}-${ENGFLOW_RECLIENT_CONFIGS_VER} \
+ ${MV} ${WRKSRC:H}/${GH_PROJECT_reclient_configs}-${ENGFLOW_RECLIENT_CONFIGS_VER} \
${WRKSRC}/third_party/engflow-reclient-configs
# Install node modules for electron
- ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/yarn-offline-cache ${WRKDIR}
+ ${MV} ${WRKSRC:H}/yarn-offline-cache ${WRKDIR}
${ECHO_CMD} 'yarn-offline-mirror "../../../yarn-offline-cache"' >> ${WRKSRC}/electron/.yarnrc
${MV} ${WRKSRC}/electron/package.json ${WRKSRC}/electron/package.json.bak
${CP} ${FILESDIR}/package.json ${WRKSRC}/electron
@@ -379,7 +381,7 @@ pre-configure:
.for _e in config.h config.asm config_components.h libavcodec libavformat libavutil
-${CP} -pR ${FFMPEG_BDIR}/${_e} ${FFMPEG_CDIR}
.endfor
- touch ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/pulseaudio-${PULSEV}/src/pulse/version.h
+ touch ${WRKSRC:H}/pulseaudio-${PULSEV}/src/pulse/version.h
@${REINPLACE_CMD} -e 's|$${LOCALBASE}|${LOCALBASE}|;s|$${MODCLANG_VERSION}|${LLVM_DEFAULT}|' \
${WRKSRC}/build/rust/rust_bindgen.gni \
${WRKSRC}/build/rust/rust_bindgen_generator.gni
diff --git a/devel/electron37/Makefile.version b/devel/electron37/Makefile.version
index d20e1f839227..316992727560 100644
--- a/devel/electron37/Makefile.version
+++ b/devel/electron37/Makefile.version
@@ -1,2 +1,2 @@
-ELECTRON_VER= 37.3.1
+ELECTRON_VER= 37.4.0
ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//}
diff --git a/devel/electron37/distinfo b/devel/electron37/distinfo
index 36570b21fec3..24e208c6a0dc 100644
--- a/devel/electron37/distinfo
+++ b/devel/electron37/distinfo
@@ -1,16 +1,16 @@
-TIMESTAMP = 1755851713
-SHA256 (electron/chromium-138.0.7204.235.tar.xz.0) = 1817cff1aea2328a81f6f3f18344d442833551ec1845c0cae2262ec38d7df408
-SIZE (electron/chromium-138.0.7204.235.tar.xz.0) = 2000000000
-SHA256 (electron/chromium-138.0.7204.235.tar.xz.1) = 775342c321ceae33766375a8844d4cf388b79929f8a5b41ef54524b3a1e64860
-SIZE (electron/chromium-138.0.7204.235.tar.xz.1) = 2000000000
-SHA256 (electron/chromium-138.0.7204.235.tar.xz.2) = bf07431e52dc0911e9252176abb0cbb8ae2ce138b725107c65738b4d79fe6ab7
-SIZE (electron/chromium-138.0.7204.235.tar.xz.2) = 273221044
+TIMESTAMP = 1756372577
+SHA256 (electron/chromium-138.0.7204.243.tar.xz.0) = 6de4153de04a391369af78bf7e6e88872f8404486ad8a587fe25ed21e6a408dd
+SIZE (electron/chromium-138.0.7204.243.tar.xz.0) = 2000000000
+SHA256 (electron/chromium-138.0.7204.243.tar.xz.1) = ae7fc8e34ad25e4be009722383d862bbee6823fbeb237edb4376f4c21a4a72a0
+SIZE (electron/chromium-138.0.7204.243.tar.xz.1) = 2000000000
+SHA256 (electron/chromium-138.0.7204.243.tar.xz.2) = 06a4639f0361fbcd6d0fac04931986886c140c24f98b6cc50febc6921cd32d0f
+SIZE (electron/chromium-138.0.7204.243.tar.xz.2) = 274022020
SHA256 (electron/pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92
SIZE (electron/pulseaudio-16.1.tar.gz) = 2763111
-SHA256 (electron/electron-yarn-cache-37.3.1.tar.xz) = 7823d2fceaf2aac5bb0b342866049b0dfdeca98a65ac00559abfaff47bdba536
-SIZE (electron/electron-yarn-cache-37.3.1.tar.xz) = 30480408
-SHA256 (electron/electron-electron-v37.3.1_GH0.tar.gz) = b63e6d1542cc7bdfc2f1996d75208a24c2fb2812b235c32db527e50a313291e0
-SIZE (electron/electron-electron-v37.3.1_GH0.tar.gz) = 15837289
+SHA256 (electron/electron-yarn-cache-37.4.0.tar.xz) = 7823d2fceaf2aac5bb0b342866049b0dfdeca98a65ac00559abfaff47bdba536
+SIZE (electron/electron-yarn-cache-37.4.0.tar.xz) = 30480408
+SHA256 (electron/electron-electron-v37.4.0_GH0.tar.gz) = 43ccbd61351999cd09314b5ac28e97c78f584f40fb85dfd09564aad92a6d37a8
+SIZE (electron/electron-electron-v37.4.0_GH0.tar.gz) = 15838013
SHA256 (electron/nodejs-node-v22.18.0_GH0.tar.gz) = f0f7022d2bcf1e286a42ccf46bf184e67e469daa83ecd9fda2326e872bab7aa0
SIZE (electron/nodejs-node-v22.18.0_GH0.tar.gz) = 123027912
SHA256 (electron/nodejs-nan-e14bdcd1f72d62bca1d541b66da43130384ec213_GH0.tar.gz) = 02edf8d5b3fef9af94d8a1355da60564a57e7f2c99cb422bce042400607ed2eb
diff --git a/devel/electron37/files/patch-electron_shell_services_node_node__service.cc b/devel/electron37/files/patch-electron_shell_services_node_node__service.cc
index a69bf043abda..c12b95169c24 100644
--- a/devel/electron37/files/patch-electron_shell_services_node_node__service.cc
+++ b/devel/electron37/files/patch-electron_shell_services_node_node__service.cc
@@ -1,6 +1,6 @@
---- electron/shell/services/node/node_service.cc.orig 2025-07-02 10:12:01 UTC
+--- electron/shell/services/node/node_service.cc.orig 2025-08-25 07:57:03 UTC
+++ electron/shell/services/node/node_service.cc
-@@ -23,7 +23,7 @@
+@@ -24,7 +24,7 @@
#include "shell/common/node_includes.h"
#include "shell/services/node/parent_port.h"
@@ -9,7 +9,7 @@
#include "shell/common/crash_keys.h"
#endif
-@@ -40,7 +40,7 @@ void V8FatalErrorCallback(const char* location, const
+@@ -41,7 +41,7 @@ void V8FatalErrorCallback(const char* location, const
g_client_remote->OnV8FatalError(location, outstream.str());
}
diff --git a/devel/electron37/files/patch-electron_spec_api-tray-spec.ts b/devel/electron37/files/patch-electron_spec_api-tray-spec.ts
index cb822fdca402..a2cc8bcf183b 100644
--- a/devel/electron37/files/patch-electron_spec_api-tray-spec.ts
+++ b/devel/electron37/files/patch-electron_spec_api-tray-spec.ts
@@ -1,5 +1,21 @@
---- electron/spec/api-tray-spec.ts.orig 2024-10-09 13:53:06 UTC
+--- electron/spec/api-tray-spec.ts.orig 2025-08-25 07:57:03 UTC
+++ electron/spec/api-tray-spec.ts
+@@ -30,13 +30,13 @@ describe('tray module', () => {
+ }).to.throw(/Failed to load image from path (.+)/);
+ });
+
+- ifit(process.platform !== 'linux')('throws a descriptive error if an invalid guid is given', () => {
++ ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('throws a descriptive error if an invalid guid is given', () => {
+ expect(() => {
+ tray = new Tray(nativeImage.createEmpty(), 'I am not a guid');
+ }).to.throw('Invalid GUID format');
+ });
+
+- ifit(process.platform !== 'linux')('accepts a valid guid', () => {
++ ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('accepts a valid guid', () => {
+ expect(() => {
+ tray = new Tray(nativeImage.createEmpty(), '0019A433-3526-48BA-A66C-676742C0FEFB');
+ }).to.not.throw();
@@ -131,7 +131,7 @@ describe('tray module', () => {
describe('tray.getBounds()', () => {
afterEach(() => { tray.destroy(); });
diff --git a/devel/electron37/files/patch-net_dns_BUILD.gn b/devel/electron37/files/patch-net_dns_BUILD.gn
index d51291a1422a..e1fd322aea84 100644
--- a/devel/electron37/files/patch-net_dns_BUILD.gn
+++ b/devel/electron37/files/patch-net_dns_BUILD.gn
@@ -1,6 +1,6 @@
---- net/dns/BUILD.gn.orig 2025-04-06 11:53:44 UTC
+--- net/dns/BUILD.gn.orig 2025-03-29 00:50:57 UTC
+++ net/dns/BUILD.gn
-@@ -140,7 +140,7 @@ source_set("dns") {
+@@ -138,7 +138,7 @@ source_set("dns") {
"dns_config_service_android.cc",
"dns_config_service_android.h",
]
@@ -9,7 +9,17 @@
sources += [
"dns_config_service_linux.cc",
"dns_config_service_linux.h",
-@@ -181,6 +181,7 @@ source_set("dns") {
+@@ -172,6 +172,9 @@ source_set("dns") {
+ }
+
+ deps = [ "//net:net_deps" ]
++ if (is_bsd) {
++ deps += [ "//services/screen_ai/buildflags" ]
++ }
+
+ public_deps = [
+ ":dns_client",
+@@ -179,6 +182,7 @@ source_set("dns") {
":host_resolver_manager",
":mdns_client",
"//net:net_public_deps",
@@ -17,7 +27,7 @@
]
allow_circular_includes_from = [
-@@ -452,9 +453,9 @@ source_set("tests") {
+@@ -447,9 +451,9 @@ source_set("tests") {
if (is_android) {
sources += [ "dns_config_service_android_unittest.cc" ]
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-03 00:22:54 +0000