diff --git a/devel/electron39/Makefile b/devel/electron39/Makefile index e07fd7ab1aa0..b0900a23bf53 100644 --- a/devel/electron39/Makefile +++ b/devel/electron39/Makefile @@ -4,7 +4,7 @@ DISTVERSION= ${ELECTRON_VER} PULSEMV= 16 PULSEV= ${PULSEMV}.1 CATEGORIES= devel -MASTER_SITES= https://github.com/tagattie/FreeBSD-Electron/releases/download/v39.2.7/:chromium \ +MASTER_SITES= https://github.com/tagattie/FreeBSD-Electron/releases/download/v39.3.0/:chromium \ https://freedesktop.org/software/pulseaudio/releases/:pulseaudio PKGNAMESUFFIX= ${ELECTRON_VER_MAJOR} DISTFILES= chromium-${CHROMIUM_VER}${EXTRACT_SUFX}.0:chromium \ @@ -223,7 +223,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= 142.0.7444.235 +CHROMIUM_VER= 142.0.7444.265 # See ${WRKSRC}/electron/DEPS for NODE_VER NODE_VER= 22.21.1 # See ${WRKSRC}/electron/DEPS for NAN_VER diff --git a/devel/electron39/Makefile.version b/devel/electron39/Makefile.version index 82ee47942982..7c8a22c2c808 100644 --- a/devel/electron39/Makefile.version +++ b/devel/electron39/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 39.2.7 +ELECTRON_VER= 39.3.0 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron39/distinfo b/devel/electron39/distinfo index 702122a76fba..79d9566056b2 100644 --- a/devel/electron39/distinfo +++ b/devel/electron39/distinfo @@ -1,18 +1,18 @@ -TIMESTAMP = 1765981413 -SHA256 (electron/chromium-142.0.7444.235.tar.xz.0) = 57419c1f8b1675a0d3f8141104e3eb8d44d302bcd3c91493019ba9698856e3a0 -SIZE (electron/chromium-142.0.7444.235.tar.xz.0) = 2000000000 -SHA256 (electron/chromium-142.0.7444.235.tar.xz.1) = 9dce1bb1bdde42ba6f3bb2f98650e5ac15ade31affddf766832a74e92e68aa76 -SIZE (electron/chromium-142.0.7444.235.tar.xz.1) = 2000000000 -SHA256 (electron/chromium-142.0.7444.235.tar.xz.2) = 3212434ed980c93b51a82f4081ba786fcc07f4ca116fd7b945f9a04541579f48 -SIZE (electron/chromium-142.0.7444.235.tar.xz.2) = 227495736 +TIMESTAMP = 1768986352 +SHA256 (electron/chromium-142.0.7444.265.tar.xz.0) = 54ca3cf92f6a207a4e1b46fe016da7d515097f999b5e53ba4201adc906ae383e +SIZE (electron/chromium-142.0.7444.265.tar.xz.0) = 2000000000 +SHA256 (electron/chromium-142.0.7444.265.tar.xz.1) = 289722408b81d862eb63f98cf47516308add8e18f5d62d2455c98942a2ebface +SIZE (electron/chromium-142.0.7444.265.tar.xz.1) = 2000000000 +SHA256 (electron/chromium-142.0.7444.265.tar.xz.2) = fcce594020d7120080cd9b4a6af385983c8980dfdd3f72405b31b11fad41ffd5 +SIZE (electron/chromium-142.0.7444.265.tar.xz.2) = 227650760 SHA256 (electron/pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92 SIZE (electron/pulseaudio-16.1.tar.gz) = 2763111 SHA256 (electron/yarn-4.12.0.tgz) = bd58d06826ce9542c4cd904fe10bab7bc718ea2cc39a45d9fbd15f2edb45761c SIZE (electron/yarn-4.12.0.tgz) = 1056794 -SHA256 (electron/electron39-39.2.7-node-modules.tar.xz) = 8d780da590b4a5d2fc9fa510d043221aa230046a551b3089a203a269dd06203f -SIZE (electron/electron39-39.2.7-node-modules.tar.xz) = 59835392 -SHA256 (electron/electron-electron-v39.2.7_GH0.tar.gz) = 2ba59dc32acaaa62182faf65822d719f7df07d77e3d6f206d52f38fa93d40069 -SIZE (electron/electron-electron-v39.2.7_GH0.tar.gz) = 16982686 +SHA256 (electron/electron39-39.3.0-node-modules.tar.xz) = d6807d9aa0650ecccdb7fc89b1bdca4fb3bbc45e70a02e5353ead188e91208a2 +SIZE (electron/electron39-39.3.0-node-modules.tar.xz) = 59815804 +SHA256 (electron/electron-electron-v39.3.0_GH0.tar.gz) = ec1ff70789e0f323b586df0d5104e20b5c127b96281aa04a67bf91b86d288e58 +SIZE (electron/electron-electron-v39.3.0_GH0.tar.gz) = 16990760 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 diff --git a/devel/electron39/files/packagejsons/package.json b/devel/electron39/files/packagejsons/package.json index 849122189fb1..8d12c4e07e08 100644 --- a/devel/electron39/files/packagejsons/package.json +++ b/devel/electron39/files/packagejsons/package.json @@ -1,5 +1,5 @@ { - "name": "electron", + "name": "@electron-ci/dev-root", "version": "0.0.0-development", "repository": "https://github.com/electron/electron", "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS", @@ -25,7 +25,6 @@ "buffer": "^6.0.3", "chalk": "^4.1.0", "check-for-leaks": "^1.2.1", - "dugite": "^2.7.1", "eslint": "^8.57.1", "eslint-config-standard": "^17.1.0", "eslint-plugin-import": "^2.32.0", @@ -147,9 +146,6 @@ "dependenciesMeta": { "abstract-socket": { "built": true - }, - "dugite": { - "built": true } } } diff --git a/devel/electron39/files/packagejsons/yarn.lock b/devel/electron39/files/packagejsons/yarn.lock index 16f5e1d62a03..1ebfe1a54dff 100644 --- a/devel/electron39/files/packagejsons/yarn.lock +++ b/devel/electron39/files/packagejsons/yarn.lock @@ -432,6 +432,70 @@ __metadata: languageName: node linkType: hard +"@electron-ci/dev-root@workspace:.": + version: 0.0.0-use.local + resolution: "@electron-ci/dev-root@workspace:." + dependencies: + "@azure/storage-blob": "npm:^12.28.0" + "@datadog/datadog-ci": "npm:^4.1.2" + "@electron/asar": "npm:^3.2.13" + "@electron/docs-parser": "npm:^2.0.0" + "@electron/fiddle-core": "npm:^1.3.4" + "@electron/github-app-auth": "npm:^3.2.0" + "@electron/lint-roller": "npm:^3.1.2" + "@electron/typescript-definitions": "npm:^9.1.2" + "@octokit/rest": "npm:^20.1.2" + "@primer/octicons": "npm:^10.0.0" + "@types/minimist": "npm:^1.2.5" + "@types/node": "npm:^22.7.7" + "@types/semver": "npm:^7.5.8" + "@types/stream-json": "npm:^1.7.8" + "@types/temp": "npm:^0.9.4" + "@typescript-eslint/eslint-plugin": "npm:^8.32.1" + "@typescript-eslint/parser": "npm:^8.7.0" + "@xmldom/xmldom": "npm:^0.8.11" + buffer: "npm:^6.0.3" + chalk: "npm:^4.1.0" + check-for-leaks: "npm:^1.2.1" + eslint: "npm:^8.57.1" + eslint-config-standard: "npm:^17.1.0" + eslint-plugin-import: "npm:^2.32.0" + eslint-plugin-markdown: "npm:^5.1.0" + eslint-plugin-mocha: "npm:^10.5.0" + eslint-plugin-n: "npm:^16.6.2" + eslint-plugin-node: "npm:^11.1.0" + eslint-plugin-promise: "npm:^6.6.0" + events: "npm:^3.2.0" + folder-hash: "npm:^4.1.1" + got: "npm:^11.8.5" + husky: "npm:^9.1.7" + lint-staged: "npm:^16.1.0" + markdownlint-cli2: "npm:^0.18.0" + minimist: "npm:^1.2.8" + node-gyp: "npm:^11.4.2" + null-loader: "npm:^4.0.1" + pre-flight: "npm:^2.0.0" + process: "npm:^0.11.10" + remark-cli: "npm:^12.0.1" + remark-preset-lint-markdown-style-guide: "npm:^6.0.1" + semver: "npm:^7.6.3" + stream-json: "npm:^1.9.1" + tap-xunit: "npm:^2.4.1" + temp: "npm:^0.9.4" + timers-browserify: "npm:1.4.2" + ts-loader: "npm:^8.0.2" + ts-node: "npm:6.2.0" + typescript: "npm:^5.6.2" + url: "npm:^0.11.4" + webpack: "npm:^5.95.0" + webpack-cli: "npm:^5.1.4" + wrapper-webpack-plugin: "npm:^2.2.0" + dependenciesMeta: + abstract-socket: + built: true + languageName: unknown + linkType: soft + "@electron-ci/echo@npm:*, @electron-ci/echo@workspace:spec/fixtures/native-addon/echo": version: 0.0.0-use.local resolution: "@electron-ci/echo@workspace:spec/fixtures/native-addon/echo" @@ -4452,16 +4516,6 @@ __metadata: languageName: node linkType: hard -"dugite@npm:^2.7.1": - version: 2.7.1 - resolution: "dugite@npm:2.7.1" - dependencies: - progress: "npm:^2.0.3" - tar: "npm:^6.1.11" - checksum: 10c0/8b7992b91abc2473e43a4900c5b100f5a4b98785b9955275c72b1a621152b5df9ff794cda50daced5ee452f4dc95b313ce9c30af5dc9e302241ef9f661a593df - languageName: node - linkType: hard - "dunder-proto@npm:^1.0.0, dunder-proto@npm:^1.0.1": version: 1.0.1 resolution: "dunder-proto@npm:1.0.1" @@ -4569,73 +4623,6 @@ __metadata: languageName: node linkType: hard -"electron@workspace:.": - version: 0.0.0-use.local - resolution: "electron@workspace:." - dependencies: - "@azure/storage-blob": "npm:^12.28.0" - "@datadog/datadog-ci": "npm:^4.1.2" - "@electron/asar": "npm:^3.2.13" - "@electron/docs-parser": "npm:^2.0.0" - "@electron/fiddle-core": "npm:^1.3.4" - "@electron/github-app-auth": "npm:^3.2.0" - "@electron/lint-roller": "npm:^3.1.2" - "@electron/typescript-definitions": "npm:^9.1.2" - "@octokit/rest": "npm:^20.1.2" - "@primer/octicons": "npm:^10.0.0" - "@types/minimist": "npm:^1.2.5" - "@types/node": "npm:^22.7.7" - "@types/semver": "npm:^7.5.8" - "@types/stream-json": "npm:^1.7.8" - "@types/temp": "npm:^0.9.4" - "@typescript-eslint/eslint-plugin": "npm:^8.32.1" - "@typescript-eslint/parser": "npm:^8.7.0" - "@xmldom/xmldom": "npm:^0.8.11" - buffer: "npm:^6.0.3" - chalk: "npm:^4.1.0" - check-for-leaks: "npm:^1.2.1" - dugite: "npm:^2.7.1" - eslint: "npm:^8.57.1" - eslint-config-standard: "npm:^17.1.0" - eslint-plugin-import: "npm:^2.32.0" - eslint-plugin-markdown: "npm:^5.1.0" - eslint-plugin-mocha: "npm:^10.5.0" - eslint-plugin-n: "npm:^16.6.2" - eslint-plugin-node: "npm:^11.1.0" - eslint-plugin-promise: "npm:^6.6.0" - events: "npm:^3.2.0" - folder-hash: "npm:^4.1.1" - got: "npm:^11.8.5" - husky: "npm:^9.1.7" - lint-staged: "npm:^16.1.0" - markdownlint-cli2: "npm:^0.18.0" - minimist: "npm:^1.2.8" - node-gyp: "npm:^11.4.2" - null-loader: "npm:^4.0.1" - pre-flight: "npm:^2.0.0" - process: "npm:^0.11.10" - remark-cli: "npm:^12.0.1" - remark-preset-lint-markdown-style-guide: "npm:^6.0.1" - semver: "npm:^7.6.3" - stream-json: "npm:^1.9.1" - tap-xunit: "npm:^2.4.1" - temp: "npm:^0.9.4" - timers-browserify: "npm:1.4.2" - ts-loader: "npm:^8.0.2" - ts-node: "npm:6.2.0" - typescript: "npm:^5.6.2" - url: "npm:^0.11.4" - webpack: "npm:^5.95.0" - webpack-cli: "npm:^5.1.4" - wrapper-webpack-plugin: "npm:^2.2.0" - dependenciesMeta: - abstract-socket: - built: true - dugite: - built: true - languageName: unknown - linkType: soft - "emoji-regex@npm:^10.2.1, emoji-regex@npm:^10.3.0": version: 10.4.0 resolution: "emoji-regex@npm:10.4.0" diff --git a/devel/electron39/files/patch-electron_shell_browser_api_electron__api__web__contents.cc b/devel/electron39/files/patch-electron_shell_browser_api_electron__api__web__contents.cc index 268252643b83..1d82e39cdf90 100644 --- a/devel/electron39/files/patch-electron_shell_browser_api_electron__api__web__contents.cc +++ b/devel/electron39/files/patch-electron_shell_browser_api_electron__api__web__contents.cc @@ -1,4 +1,4 @@ ---- electron/shell/browser/api/electron_api_web_contents.cc.orig 2025-12-03 04:41:24 UTC +--- electron/shell/browser/api/electron_api_web_contents.cc.orig 2026-01-19 18:01:42 UTC +++ electron/shell/browser/api/electron_api_web_contents.cc @@ -161,11 +161,11 @@ #include "ui/base/cocoa/defaults_utils.h" @@ -41,7 +41,7 @@ // Update font settings. static const gfx::FontRenderParams params( gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(), nullptr)); -@@ -2713,13 +2713,13 @@ void WebContents::ForcefullyCrashRenderer() { +@@ -2714,13 +2714,13 @@ void WebContents::ForcefullyCrashRenderer() { content::RenderProcessHost* rph = rwh->GetProcess(); if (rph) { @@ -57,7 +57,7 @@ CrashDumpHungChildProcess(rph->GetProcess().Handle()); #endif rph->Shutdown(content::RESULT_CODE_HUNG); -@@ -3403,7 +3403,7 @@ void WebContents::Focus() { +@@ -3404,7 +3404,7 @@ void WebContents::Focus() { void WebContents::Focus() { // Focusing on WebContents does not automatically focus the window on macOS // and Linux, do it manually to match the behavior on Windows. @@ -66,7 +66,7 @@ if (owner_window()) owner_window()->Focus(true); #endif -@@ -4294,7 +4294,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() { +@@ -4295,7 +4295,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() { } #endif diff --git a/devel/electron39/files/patch-electron_spec_version-bump-spec.ts b/devel/electron39/files/patch-electron_spec_version-bump-spec.ts index c595f00e149b..1083594ae754 100644 --- a/devel/electron39/files/patch-electron_spec_version-bump-spec.ts +++ b/devel/electron39/files/patch-electron_spec_version-bump-spec.ts @@ -1,6 +1,6 @@ ---- electron/spec/version-bump-spec.ts.orig 2024-10-09 13:53:06 UTC +--- electron/spec/version-bump-spec.ts.orig 2026-01-19 18:01:42 UTC +++ electron/spec/version-bump-spec.ts -@@ -53,7 +53,7 @@ describe('version-bumper', () => { +@@ -54,7 +54,7 @@ describe('version-bumper', () => { } describe('version-bumper', () => {