From nobody Sat Oct 19 14:50:21 2024 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XW4Hd6kRFz5b9k7; Sat, 19 Oct 2024 14:50:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XW4Hd6Qxvz4btn; Sat, 19 Oct 2024 14:50:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729349421; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lF4NTRmhmkabMfteDcMOcRTWRRhZu5ef4H3asiiX7is=; b=wWteFJMoE/WvzJ2KlhT88aFjAQCWLT6XF2GhYghjEARx+uJN7PQVTMzJA5/rJcsOlFe/X2 UAnSw5U57yoyLkoJ3FWu0rIXG5Xl/Gpujf/xIqSYBC8Z4MvWgRVTjzOSKgEctrbvcsL572 m9SzQR0DemgSXv3A4cdVSduH1mr1uRJpESJvH+iUlvKqjqNXbxdFnfifeV4RWCKazjmrGr C+CVGe5UUFdEPPoSWs8fC64A1UWFU5SQSF6ksXT+V1OypXe3dc9e6sM4Yl0FYHWnDcxq31 mMaCDPLCgoJYk3YfFyV3lKJEhcbhXRMu6bKUEtEpyClYCVDijphSQIKEzic8Mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729349421; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lF4NTRmhmkabMfteDcMOcRTWRRhZu5ef4H3asiiX7is=; b=wJQ8kwcN+bUxlY8vxVd9QHhVEodiII0CaRzN5WT8x5yLTF7xRJPYICOCmDdSBbZSoHu80j n3hhyDktsCmOUPrPbnRucgu4wUc3z2Bu44h4CD+bZuuC43+Aw5ECSo5m8yFuvgLcW2HIM7 +thebs8iXINAa+QGUQShapKr86BO4YFg02DKFjK62tlIdiTIm8nhJ3/TpiXd6k85Ua6XBR gaBmW3r+GdenYlQLe9vQaGsyqk5f0tIh11UMF783U1ZRo0+sl/WZiSUa/4QZoT3Oo7QDHE 1hxoybhLrFyooy076v/fCiE+/ixgUTYy3rBzQ9+PMIXcHhqao/KW1PUAWv/uQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729349421; a=rsa-sha256; cv=none; b=wgsuJ/tl9a7DwQAI6V62BbjUwC40eHyjse60gWLN9R8TWJ1GGe4M1M8Se0pQFp+5hxFwFq CcxfTud2xuXOMjosR31eCc0AZCphkZbxEckzWjHUrfWSAZnR6ifzpxKFzuOxNFMa2CQOzM Y1dT659UmhSMiT9X/nTZpOz9aXqoLhJTrKBU7FVaZOK8o0idBHyH7SY2VcyU7BwdjPa/OO Dz5vX6BQ401d63g1H5hdizu8JgwyUwQ9M5Ydo4oyxxkEq740iIFf6Wetc6RON3KkCGk/LO 1ooZ+qkHVZsR2JGrWV/S1uX5HtYdJ01oAjkjZoYbwLuJXYVNUN/5P+AuzxOCoA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XW4Hd61CSzLw5; Sat, 19 Oct 2024 14:50:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49JEoLoZ078759; Sat, 19 Oct 2024 14:50:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49JEoL41078756; Sat, 19 Oct 2024 14:50:21 GMT (envelope-from git) Date: Sat, 19 Oct 2024 14:50:21 GMT Message-Id: <202410191450.49JEoL41078756@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Hiroki Tagato Subject: git: d6533e80c64b - 2024Q4 - devel/electron32: update to 32.2.0 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tagattie X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q4 X-Git-Reftype: branch X-Git-Commit: d6533e80c64b54cdbb66302303082f828a862c2e Auto-Submitted: auto-generated The branch 2024Q4 has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=d6533e80c64b54cdbb66302303082f828a862c2e commit d6533e80c64b54cdbb66302303082f828a862c2e Author: Hiroki Tagato AuthorDate: 2024-10-17 19:56:47 +0000 Commit: Hiroki Tagato CommitDate: 2024-10-19 14:50:11 +0000 devel/electron32: update to 32.2.0 Changelog: https://github.com/electron/electron/releases/tag/v32.2.0 Reported by: GitHub (watch releases) (cherry picked from commit b1efce4d2e94f6271db067df8fc0f631748dc960) --- devel/electron32/Makefile | 6 +- devel/electron32/Makefile.version | 2 +- devel/electron32/distinfo | 26 +- devel/electron32/files/package.json | 85 +- .../patch-components_webapps_browser_features.cc | 11 - .../patch-electron_default__app_default__app.ts | 4 +- .../files/patch-electron_lib_browser_api_dialog.ts | 4 +- .../files/patch-electron_lib_browser_init.ts | 4 +- .../files/patch-electron_lib_browser_rpc-server.ts | 4 +- .../files/patch-electron_script_lib_utils.js | 4 +- .../files/patch-electron_script_spec-runner.js | 4 +- ...ell_browser_api_electron__api__web__contents.cc | 4 +- ..._shell_browser_ui_inspectable__web__contents.cc | 4 +- ...hell_common_api_electron__api__native__image.cc | 4 +- .../files/patch-electron_spec_api-app-spec.ts | 28 +- .../patch-electron_spec_api-browser-window-spec.ts | 40 +- .../patch-electron_spec_api-clipboard-spec.ts | 8 +- ...patch-electron_spec_api-content-tracing-spec.ts | 4 +- .../patch-electron_spec_api-crash-reporter-spec.ts | 22 +- ...atch-electron_spec_api-desktop-capturer-spec.ts | 12 +- .../files/patch-electron_spec_api-menu-spec.ts | 4 +- .../patch-electron_spec_api-native-image-spec.ts | 4 +- .../files/patch-electron_spec_api-net-log-spec.ts | 8 +- ...tch-electron_spec_api-notification-dbus-spec.ts | 8 +- .../patch-electron_spec_api-power-monitor-spec.ts | 4 +- .../files/patch-electron_spec_api-process-spec.ts | 6 +- .../files/patch-electron_spec_api-protocol-spec.ts | 4 +- .../patch-electron_spec_api-safe-storage-spec.ts | 6 +- .../files/patch-electron_spec_api-screen-spec.ts | 8 +- .../files/patch-electron_spec_api-shell-spec.ts | 6 +- .../files/patch-electron_spec_api-subframe-spec.ts | 4 +- .../files/patch-electron_spec_api-tray-spec.ts | 4 +- ...patch-electron_spec_api-utility-process-spec.ts | 6 +- .../patch-electron_spec_api-web-frame-main-spec.ts | 4 +- .../files/patch-electron_spec_chromium-spec.ts | 8 +- .../files/patch-electron_spec_crash-spec.ts | 4 +- ...c_fixtures_api_safe-storage_decrypt-app_main.js | 4 +- ...c_fixtures_api_safe-storage_encrypt-app_main.js | 4 +- ...spec_fixtures_crash-cases_safe-storage_index.js | 4 +- ...n_spec_fixtures_native-addon_uv-dlopen_index.js | 8 +- .../files/patch-electron_spec_node-spec.ts | 4 +- .../files/patch-electron_spec_version-bump-spec.ts | 8 +- .../patch-electron_spec_visibility-state-spec.ts | 4 +- .../files/patch-electron_spec_webview-spec.ts | 4 +- ...third__party_electron__node_deps_cares_BUILD.gn | 4 +- devel/electron32/files/yarn.lock | 2687 ++++++++++++-------- 46 files changed, 1794 insertions(+), 1305 deletions(-) diff --git a/devel/electron32/Makefile b/devel/electron32/Makefile index 79feb711c73f..3cad0478c60d 100644 --- a/devel/electron32/Makefile +++ b/devel/electron32/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/v32.1.2/:chromium \ +MASTER_SITES= https://github.com/tagattie/FreeBSD-Electron/releases/download/v32.2.0/:chromium \ https://freedesktop.org/software/pulseaudio/releases/:pulseaudio PKGNAMESUFFIX= ${ELECTRON_VER_MAJOR} DISTFILES= chromium-${CHROMIUM_VER}${EXTRACT_SUFX}.0:chromium \ @@ -220,9 +220,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= 128.0.6613.162 +CHROMIUM_VER= 128.0.6613.178 # See ${WRKSRC}/electron/DEPS for NODE_VER -NODE_VER= 20.17.0 +NODE_VER= 20.18.0 # See ${WRKSRC}/electron/DEPS for NAN_VER NAN_VER= e14bdcd1f72d62bca1d541b66da43130384ec213 # See ${WRKSRC}/electron/DEPS for SQUIRREL_MAC_VER diff --git a/devel/electron32/Makefile.version b/devel/electron32/Makefile.version index 5f53892338ae..33df2f7981d9 100644 --- a/devel/electron32/Makefile.version +++ b/devel/electron32/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 32.1.2 +ELECTRON_VER= 32.2.0 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron32/distinfo b/devel/electron32/distinfo index 1bc89ec31b74..31392451edda 100644 --- a/devel/electron32/distinfo +++ b/devel/electron32/distinfo @@ -1,18 +1,18 @@ -TIMESTAMP = 1727263871 -SHA256 (electron/chromium-128.0.6613.162.tar.xz.0) = 2b349c25199eaa8e6820efb6db14bc2f3a0d8af68b26be47ab66247e3efa0096 -SIZE (electron/chromium-128.0.6613.162.tar.xz.0) = 2000000000 -SHA256 (electron/chromium-128.0.6613.162.tar.xz.1) = 70d55eb060af5470ce35a47d10e1ff0f79d995adf9854feae432c7fb282bd996 -SIZE (electron/chromium-128.0.6613.162.tar.xz.1) = 2000000000 -SHA256 (electron/chromium-128.0.6613.162.tar.xz.2) = 86a9672d1daa1f7f48d67b384852da2339a3684fdcca90b6fe0b10f67667f092 -SIZE (electron/chromium-128.0.6613.162.tar.xz.2) = 766577428 +TIMESTAMP = 1728994969 +SHA256 (electron/chromium-128.0.6613.178.tar.xz.0) = d2b58424c6f62d32a055f167943b13e23eb75ae0789579db028d037b03f91994 +SIZE (electron/chromium-128.0.6613.178.tar.xz.0) = 2000000000 +SHA256 (electron/chromium-128.0.6613.178.tar.xz.1) = 41a87ba2c0ad14885df8f72fcdc00374e1631d960918ae00fc9c71f276e08b4c +SIZE (electron/chromium-128.0.6613.178.tar.xz.1) = 2000000000 +SHA256 (electron/chromium-128.0.6613.178.tar.xz.2) = ce1d068879ed5cc12b233c04303ca51ecf4d71e7273c9d860236698c21d8fa02 +SIZE (electron/chromium-128.0.6613.178.tar.xz.2) = 766628236 SHA256 (electron/pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92 SIZE (electron/pulseaudio-16.1.tar.gz) = 2763111 -SHA256 (electron/electron-yarn-cache-32.1.2.tar.xz) = bad42b877269e05328dec2a1016a7ebe414338d7c8c81fab6d0eb3abd73a82f1 -SIZE (electron/electron-yarn-cache-32.1.2.tar.xz) = 31002508 -SHA256 (electron/electron-electron-v32.1.2_GH0.tar.gz) = 1e18c02409ef127c93b9c2b907a8c950fe91586f97d039c183de92b6005e339c -SIZE (electron/electron-electron-v32.1.2_GH0.tar.gz) = 13854640 -SHA256 (electron/nodejs-node-v20.17.0_GH0.tar.gz) = f0bdfe0e2c12524ebc24811e405926299241c11a829ef72562e14fee52eb385c -SIZE (electron/nodejs-node-v20.17.0_GH0.tar.gz) = 115353463 +SHA256 (electron/electron-yarn-cache-32.2.0.tar.xz) = 0dd35d16479c5acc3105302a1ccd76fe00cd82179e51f2e1e016908d7c2a5cf1 +SIZE (electron/electron-yarn-cache-32.2.0.tar.xz) = 32242840 +SHA256 (electron/electron-electron-v32.2.0_GH0.tar.gz) = 4f1debdd068c8c4585aacf1debd7548550eaf9c03ae62867375af4259a4d856f +SIZE (electron/electron-electron-v32.2.0_GH0.tar.gz) = 13885491 +SHA256 (electron/nodejs-node-v20.18.0_GH0.tar.gz) = 651bb82f6af18084070893559643759165ce050b5839f830d4cc098130d3ad89 +SIZE (electron/nodejs-node-v20.18.0_GH0.tar.gz) = 115526827 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/electron32/files/package.json b/devel/electron32/files/package.json index 2b5aec50c32f..923f3765815b 100644 --- a/devel/electron32/files/package.json +++ b/devel/electron32/files/package.json @@ -4,74 +4,63 @@ "repository": "https://github.com/electron/electron", "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS", "devDependencies": { - "@azure/storage-blob": "^12.9.0", - "@electron/asar": "^3.2.1", - "@electron/docs-parser": "^1.2.1", - "@electron/fiddle-core": "^1.0.4", - "@electron/github-app-auth": "^2.0.0", - "@electron/lint-roller": "^2.3.0", - "@electron/typescript-definitions": "^8.15.2", - "@octokit/rest": "^19.0.7", + "@azure/storage-blob": "^12.25.0", + "@electron/asar": "^3.2.13", + "@electron/docs-parser": "^1.2.3", + "@electron/fiddle-core": "^1.3.4", + "@electron/github-app-auth": "^2.2.1", + "@electron/lint-roller": "^2.4.0", + "@electron/typescript-definitions": "^8.15.8", + "@octokit/rest": "^20.0.2", "@primer/octicons": "^10.0.0", - "@types/basic-auth": "^1.1.3", - "@types/busboy": "^1.5.0", - "@types/chai": "^4.2.12", - "@types/chai-as-promised": "^7.1.3", - "@types/dirty-chai": "^2.0.2", - "@types/express": "^4.17.13", - "@types/minimist": "^1.2.0", - "@types/mocha": "^7.0.2", + "@types/minimist": "^1.2.5", "@types/node": "^20.9.0", - "@types/semver": "^7.3.3", - "@types/send": "^0.14.5", - "@types/split": "^1.0.0", - "@types/stream-json": "^1.5.1", - "@types/temp": "^0.8.34", - "@types/uuid": "^3.4.6", - "@types/w3c-web-serial": "^1.0.3", - "@types/webpack": "^5.28.0", - "@types/webpack-env": "^1.17.0", - "@typescript-eslint/eslint-plugin": "^5.59.7", - "@typescript-eslint/parser": "^5.59.7", + "@types/semver": "^7.5.8", + "@types/stream-json": "^1.7.7", + "@types/temp": "^0.9.4", + "@types/webpack": "^5.28.5", + "@types/webpack-env": "^1.18.5", + "@typescript-eslint/eslint-plugin": "^8.7.0", + "@typescript-eslint/parser": "^8.7.0", "buffer": "^6.0.3", + "chalk": "^4.1.0", "check-for-leaks": "^1.2.1", - "colors": "1.4.0", "dotenv-safe": "^4.0.4", - "dugite": "^2.3.0", - "eslint": "^8.41.0", - "eslint-config-standard": "^14.1.1", - "eslint-plugin-import": "^2.26.0", - "eslint-plugin-mocha": "^7.0.1", + "dugite": "^2.7.1", + "eslint": "^8.57.1", + "eslint-config-standard": "^17.1.0", + "eslint-plugin-import": "^2.30.0", + "eslint-plugin-mocha": "^10.5.0", + "eslint-plugin-n": "^16.6.2", "eslint-plugin-node": "^11.1.0", - "eslint-plugin-promise": "^4.2.1", - "eslint-plugin-standard": "^4.0.1", - "eslint-plugin-unicorn": "^46.0.1", + "eslint-plugin-promise": "^6.6.0", + "eslint-plugin-standard": "^5.0.0", + "eslint-plugin-unicorn": "^55.0.0", "events": "^3.2.0", - "express": "^4.19.2", "folder-hash": "^2.1.1", "got": "^11.8.5", "husky": "^8.0.1", "lint": "^1.1.2", "lint-staged": "^10.2.11", "markdownlint-cli2": "^0.13.0", - "minimist": "^1.2.6", - "null-loader": "^4.0.0", - "pre-flight": "^1.1.0", + "minimist": "^1.2.8", + "null-loader": "^4.0.1", + "pre-flight": "^2.0.0", "process": "^0.11.10", "remark-cli": "^10.0.0", "remark-preset-lint-markdown-style-guide": "^4.0.0", - "semver": "^7.5.2", - "shx": "^0.3.2", - "stream-json": "^1.7.1", + "semver": "^7.6.3", + "shx": "^0.3.4", + "stream-json": "^1.8.0", "tap-xunit": "^2.4.1", - "temp": "^0.8.3", + "temp": "^0.9.4", "timers-browserify": "1.4.2", "ts-loader": "^8.0.2", "ts-node": "6.2.0", - "typescript": "^5.1.2", - "url": "^0.11.0", - "webpack": "^5.76.0", - "webpack-cli": "^4.10.0", + "typescript": "^5.6.2", + "url": "^0.11.4", + "webpack": "^5.94.0", + "webpack-cli": "^5.1.4", "wrapper-webpack-plugin": "^2.2.0" }, "private": true, diff --git a/devel/electron32/files/patch-components_webapps_browser_features.cc b/devel/electron32/files/patch-components_webapps_browser_features.cc deleted file mode 100644 index 327caa3ec60f..000000000000 --- a/devel/electron32/files/patch-components_webapps_browser_features.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- components/webapps/browser/features.cc.orig 2024-08-14 20:54:58 UTC -+++ components/webapps/browser/features.cc -@@ -59,7 +59,7 @@ BASE_FEATURE(kWebAppsEnableMLModelForPromotion, - BASE_FEATURE(kWebAppsEnableMLModelForPromotion, - "WebAppsEnableMLModelForPromotion", - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_ANDROID) -+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - base::FEATURE_ENABLED_BY_DEFAULT); - #else - base::FEATURE_DISABLED_BY_DEFAULT); diff --git a/devel/electron32/files/patch-electron_default__app_default__app.ts b/devel/electron32/files/patch-electron_default__app_default__app.ts index bcba0762b54b..8af59e14c83f 100644 --- a/devel/electron32/files/patch-electron_default__app_default__app.ts +++ b/devel/electron32/files/patch-electron_default__app_default__app.ts @@ -1,6 +1,6 @@ ---- electron/default_app/default_app.ts.orig 2023-12-04 18:19:02 UTC +--- electron/default_app/default_app.ts.orig 2024-10-09 13:53:06 UTC +++ electron/default_app/default_app.ts -@@ -60,7 +60,7 @@ async function createWindow (backgroundColor?: string) +@@ -61,7 +61,7 @@ async function createWindow (backgroundColor?: string) show: false }; diff --git a/devel/electron32/files/patch-electron_lib_browser_api_dialog.ts b/devel/electron32/files/patch-electron_lib_browser_api_dialog.ts index 7c30509a8597..bf3d098a23e7 100644 --- a/devel/electron32/files/patch-electron_lib_browser_api_dialog.ts +++ b/devel/electron32/files/patch-electron_lib_browser_api_dialog.ts @@ -1,6 +1,6 @@ ---- electron/lib/browser/api/dialog.ts.orig 2023-12-04 18:19:02 UTC +--- electron/lib/browser/api/dialog.ts.orig 2024-10-09 13:53:06 UTC +++ electron/lib/browser/api/dialog.ts -@@ -40,7 +40,7 @@ const normalizeAccessKey = (text: string) => { +@@ -41,7 +41,7 @@ const normalizeAccessKey = (text: string) => { // existing single underscores with a second underscore, replace double // ampersands with a single ampersand, and replace a single ampersand with // a single underscore diff --git a/devel/electron32/files/patch-electron_lib_browser_init.ts b/devel/electron32/files/patch-electron_lib_browser_init.ts index d93e40087b1d..8d8724e4587b 100644 --- a/devel/electron32/files/patch-electron_lib_browser_init.ts +++ b/devel/electron32/files/patch-electron_lib_browser_init.ts @@ -1,6 +1,6 @@ ---- electron/lib/browser/init.ts.orig 2024-04-16 14:29:17 UTC +--- electron/lib/browser/init.ts.orig 2024-10-09 13:53:06 UTC +++ electron/lib/browser/init.ts -@@ -161,7 +161,7 @@ function currentPlatformSupportsAppIndicator () { +@@ -162,7 +162,7 @@ function currentPlatformSupportsAppIndicator () { const KNOWN_XDG_DESKTOP_VALUES = new Set(['Pantheon', 'Unity:Unity7', 'pop:GNOME']); function currentPlatformSupportsAppIndicator () { diff --git a/devel/electron32/files/patch-electron_lib_browser_rpc-server.ts b/devel/electron32/files/patch-electron_lib_browser_rpc-server.ts index 2e2fca45dfa6..013924973d54 100644 --- a/devel/electron32/files/patch-electron_lib_browser_rpc-server.ts +++ b/devel/electron32/files/patch-electron_lib_browser_rpc-server.ts @@ -1,6 +1,6 @@ ---- electron/lib/browser/rpc-server.ts.orig 2022-05-11 15:32:29 UTC +--- electron/lib/browser/rpc-server.ts.orig 2024-10-09 13:53:06 UTC +++ electron/lib/browser/rpc-server.ts -@@ -26,7 +26,7 @@ const allowedClipboardMethods = (() => { +@@ -28,7 +28,7 @@ const allowedClipboardMethods = (() => { switch (process.platform) { case 'darwin': return new Set(['readFindText', 'writeFindText']); diff --git a/devel/electron32/files/patch-electron_script_lib_utils.js b/devel/electron32/files/patch-electron_script_lib_utils.js index cefe6c3e9422..4012e5b08c1a 100644 --- a/devel/electron32/files/patch-electron_script_lib_utils.js +++ b/devel/electron32/files/patch-electron_script_lib_utils.js @@ -1,6 +1,6 @@ ---- electron/script/lib/utils.js.orig 2024-07-15 15:22:56 UTC +--- electron/script/lib/utils.js.orig 2024-10-09 13:53:06 UTC +++ electron/script/lib/utils.js -@@ -18,7 +18,7 @@ function getElectronExec () { +@@ -19,7 +19,7 @@ function getElectronExec () { return `out/${OUT_DIR}/Electron.app/Contents/MacOS/Electron`; case 'win32': return `out/${OUT_DIR}/electron.exe`; diff --git a/devel/electron32/files/patch-electron_script_spec-runner.js b/devel/electron32/files/patch-electron_script_spec-runner.js index 52b0a481e161..a8cb776a89db 100644 --- a/devel/electron32/files/patch-electron_script_spec-runner.js +++ b/devel/electron32/files/patch-electron_script_spec-runner.js @@ -1,6 +1,6 @@ ---- electron/script/spec-runner.js.orig 2024-02-21 16:26:48 UTC +--- electron/script/spec-runner.js.orig 2024-10-09 13:53:06 UTC +++ electron/script/spec-runner.js -@@ -161,7 +161,7 @@ async function runTestUsingElectron (specDir, testName +@@ -165,7 +165,7 @@ async function runTestUsingElectron (specDir, testName exe = path.resolve(BASE, utils.getElectronExec()); } const runnerArgs = [`electron/${specDir}`, ...unknownArgs.slice(2)]; diff --git a/devel/electron32/files/patch-electron_shell_browser_api_electron__api__web__contents.cc b/devel/electron32/files/patch-electron_shell_browser_api_electron__api__web__contents.cc index 52739c63da36..a2b1ee37f34b 100644 --- a/devel/electron32/files/patch-electron_shell_browser_api_electron__api__web__contents.cc +++ b/devel/electron32/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 2024-09-17 16:52:44 UTC +--- electron/shell/browser/api/electron_api_web_contents.cc.orig 2024-10-09 13:53:06 UTC +++ electron/shell/browser/api/electron_api_web_contents.cc @@ -153,11 +153,11 @@ #include "ui/base/cocoa/defaults_utils.h" @@ -50,7 +50,7 @@ if (owner_window()) owner_window()->Focus(true); #endif -@@ -4155,7 +4155,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() { +@@ -4162,7 +4162,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() { } #endif diff --git a/devel/electron32/files/patch-electron_shell_browser_ui_inspectable__web__contents.cc b/devel/electron32/files/patch-electron_shell_browser_ui_inspectable__web__contents.cc index 2b38ed5e507f..007c45f4af00 100644 --- a/devel/electron32/files/patch-electron_shell_browser_ui_inspectable__web__contents.cc +++ b/devel/electron32/files/patch-electron_shell_browser_ui_inspectable__web__contents.cc @@ -1,6 +1,6 @@ ---- electron/shell/browser/ui/inspectable_web_contents.cc.orig 2024-09-05 12:51:34 UTC +--- electron/shell/browser/ui/inspectable_web_contents.cc.orig 2024-10-09 13:53:06 UTC +++ electron/shell/browser/ui/inspectable_web_contents.cc -@@ -555,7 +555,7 @@ void InspectableWebContents::LoadCompleted() { +@@ -557,7 +557,7 @@ void InspectableWebContents::LoadCompleted() { prefs.FindString("currentDockState"); base::RemoveChars(*current_dock_state, "\"", &dock_state_); } diff --git a/devel/electron32/files/patch-electron_shell_common_api_electron__api__native__image.cc b/devel/electron32/files/patch-electron_shell_common_api_electron__api__native__image.cc index a028855cc49e..8684b5b58d01 100644 --- a/devel/electron32/files/patch-electron_shell_common_api_electron__api__native__image.cc +++ b/devel/electron32/files/patch-electron_shell_common_api_electron__api__native__image.cc @@ -1,6 +1,6 @@ ---- electron/shell/common/api/electron_api_native_image.cc.orig 2024-09-17 16:52:44 UTC +--- electron/shell/common/api/electron_api_native_image.cc.orig 2024-10-09 13:53:06 UTC +++ electron/shell/common/api/electron_api_native_image.cc -@@ -643,7 +643,7 @@ void Initialize(v8::Local exports, +@@ -641,7 +641,7 @@ void Initialize(v8::Local exports, native_image.SetMethod("createFromDataURL", &NativeImage::CreateFromDataURL); native_image.SetMethod("createFromNamedImage", &NativeImage::CreateFromNamedImage); diff --git a/devel/electron32/files/patch-electron_spec_api-app-spec.ts b/devel/electron32/files/patch-electron_spec_api-app-spec.ts index bad42d35c5a5..814150f4b959 100644 --- a/devel/electron32/files/patch-electron_spec_api-app-spec.ts +++ b/devel/electron32/files/patch-electron_spec_api-app-spec.ts @@ -1,6 +1,6 @@ ---- electron/spec/api-app-spec.ts.orig 2024-08-20 22:47:02 UTC +--- electron/spec/api-app-spec.ts.orig 2024-10-09 13:53:06 UTC +++ electron/spec/api-app-spec.ts -@@ -123,11 +123,11 @@ describe('app module', () => { +@@ -126,11 +126,11 @@ describe('app module', () => { }); describe('app.getPreferredSystemLanguages()', () => { @@ -14,7 +14,7 @@ const languages = app.getPreferredSystemLanguages(); if (languages.length) { expect(languages).to.not.include('C'); -@@ -190,7 +190,7 @@ describe('app module', () => { +@@ -193,7 +193,7 @@ describe('app module', () => { expect(code).to.equal(123, 'exit code should be 123, if you see this please tag @MarshallOfSound'); }); @@ -23,7 +23,7 @@ const electronPath = process.execPath; const appPath = path.join(fixturesPath, 'api', 'singleton'); appProcess = cp.spawn(electronPath, [appPath]); -@@ -444,7 +444,7 @@ describe('app module', () => { +@@ -447,7 +447,7 @@ describe('app module', () => { // let w = null // before(function () { @@ -32,7 +32,7 @@ // this.skip() // } // }) -@@ -551,7 +551,7 @@ describe('app module', () => { +@@ -554,7 +554,7 @@ describe('app module', () => { describe('app.badgeCount', () => { const platformIsNotSupported = (process.platform === 'win32') || @@ -41,7 +41,7 @@ const expectedBadgeCount = 42; -@@ -595,7 +595,7 @@ describe('app module', () => { +@@ -598,7 +598,7 @@ describe('app module', () => { }); }); @@ -50,7 +50,7 @@ const isMac = process.platform === 'darwin'; const isWin = process.platform === 'win32'; -@@ -975,7 +975,7 @@ describe('app module', () => { +@@ -978,7 +978,7 @@ describe('app module', () => { }); }); @@ -59,7 +59,7 @@ it('with properties', () => { it('can set accessibility support enabled', () => { expect(app.accessibilitySupportEnabled).to.eql(false); -@@ -1175,7 +1175,7 @@ describe('app module', () => { +@@ -1178,7 +1178,7 @@ describe('app module', () => { }); }); @@ -68,7 +68,7 @@ let w: BrowserWindow; before(function () { -@@ -1310,7 +1310,7 @@ describe('app module', () => { +@@ -1313,7 +1313,7 @@ describe('app module', () => { describe('getApplicationNameForProtocol()', () => { // TODO: Linux CI doesn't have registered http & https handlers @@ -77,7 +77,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. -@@ -1328,7 +1328,7 @@ describe('app module', () => { +@@ -1331,7 +1331,7 @@ describe('app module', () => { }); }); @@ -86,7 +86,7 @@ it('returns promise rejection for a bogus protocol', async function () { await expect( app.getApplicationInfoForProtocol('bogus-protocol://') -@@ -1378,7 +1378,7 @@ describe('app module', () => { +@@ -1381,7 +1381,7 @@ describe('app module', () => { }); // FIXME Get these specs running on Linux CI @@ -95,7 +95,7 @@ const iconPath = path.join(__dirname, 'fixtures/assets/icon.ico'); const sizes = { small: 16, -@@ -1460,7 +1460,7 @@ describe('app module', () => { +@@ -1463,7 +1463,7 @@ describe('app module', () => { expect(entry.memory).to.have.property('privateBytes').that.is.greaterThan(0); } @@ -104,7 +104,7 @@ expect(entry.sandboxed).to.be.a('boolean'); } -@@ -1534,7 +1534,7 @@ describe('app module', () => { +@@ -1537,7 +1537,7 @@ describe('app module', () => { it('succeeds with complete GPUInfo', async () => { const completeInfo = await getGPUInfo('complete'); @@ -113,7 +113,7 @@ // For linux and macOS complete info is same as basic info await verifyBasicGPUInfo(completeInfo); const basicInfo = await getGPUInfo('basic'); -@@ -1558,7 +1558,7 @@ describe('app module', () => { +@@ -1561,7 +1561,7 @@ describe('app module', () => { }); }); diff --git a/devel/electron32/files/patch-electron_spec_api-browser-window-spec.ts b/devel/electron32/files/patch-electron_spec_api-browser-window-spec.ts index 0815d78d0954..1c91572b0c7f 100644 --- a/devel/electron32/files/patch-electron_spec_api-browser-window-spec.ts +++ b/devel/electron32/files/patch-electron_spec_api-browser-window-spec.ts @@ -1,6 +1,6 @@ ---- electron/spec/api-browser-window-spec.ts.orig 2024-07-24 17:23:33 UTC +--- electron/spec/api-browser-window-spec.ts.orig 2024-10-09 13:53:06 UTC +++ electron/spec/api-browser-window-spec.ts -@@ -65,7 +65,7 @@ describe('BrowserWindow module', () => { +@@ -67,7 +67,7 @@ describe('BrowserWindow module', () => { }).not.to.throw(); }); @@ -9,7 +9,7 @@ const appPath = path.join(fixtures, 'apps', 'xwindow-icon'); const appProcess = childProcess.spawn(process.execPath, [appPath]); await once(appProcess, 'exit'); -@@ -1114,7 +1114,7 @@ describe('BrowserWindow module', () => { +@@ -1124,7 +1124,7 @@ describe('BrowserWindow module', () => { describe('BrowserWindow.minimize()', () => { // TODO(codebytere): Enable for Linux once maximize/minimize events work in CI. @@ -18,7 +18,7 @@ const minimize = once(w, 'minimize'); w.minimize(); await minimize; -@@ -1131,7 +1131,7 @@ describe('BrowserWindow module', () => { +@@ -1141,7 +1141,7 @@ describe('BrowserWindow module', () => { }); // TODO(dsanders11): Enable for Linux once CI plays nice with these kinds of tests @@ -27,7 +27,7 @@ const maximize = once(w, 'maximize'); const shown = once(w, 'show'); w.maximize(); -@@ -1196,7 +1196,7 @@ describe('BrowserWindow module', () => { +@@ -1206,7 +1206,7 @@ describe('BrowserWindow module', () => { expect(w.isFocused()).to.equal(true); }); @@ -36,7 +36,7 @@ const w1 = new BrowserWindow({ show: false }); const w2 = new BrowserWindow({ show: false }); const w3 = new BrowserWindow({ show: false }); -@@ -1297,7 +1297,7 @@ describe('BrowserWindow module', () => { +@@ -1307,7 +1307,7 @@ describe('BrowserWindow module', () => { expect(w.isFocused()).to.equal(false); }); @@ -45,7 +45,7 @@ const w1 = new BrowserWindow({ show: false }); const w2 = new BrowserWindow({ show: false }); const w3 = new BrowserWindow({ show: false }); -@@ -1735,7 +1735,7 @@ describe('BrowserWindow module', () => { +@@ -1745,7 +1745,7 @@ describe('BrowserWindow module', () => { }); }); @@ -54,7 +54,7 @@ it('checks normal bounds when maximized', async () => { const bounds = w.getBounds(); const maximize = once(w, 'maximize'); -@@ -1945,7 +1945,7 @@ describe('BrowserWindow module', () => { +@@ -1955,7 +1955,7 @@ describe('BrowserWindow module', () => { }); }); @@ -63,7 +63,7 @@ it('checks normal bounds when minimized', async () => { const bounds = w.getBounds(); const minimize = once(w, 'minimize'); -@@ -2892,7 +2892,7 @@ describe('BrowserWindow module', () => { +@@ -2902,7 +2902,7 @@ describe('BrowserWindow module', () => { describe('BrowserWindow.setOpacity(opacity)', () => { afterEach(closeAllWindows); @@ -72,7 +72,7 @@ it('make window with initial opacity', () => { const w = new BrowserWindow({ show: false, opacity: 0.5 }); expect(w.getOpacity()).to.equal(0.5); -@@ -2918,7 +2918,7 @@ describe('BrowserWindow module', () => { +@@ -2928,7 +2928,7 @@ describe('BrowserWindow module', () => { }); }); @@ -81,7 +81,7 @@ it('sets 1 regardless of parameter', () => { const w = new BrowserWindow({ show: false }); w.setOpacity(0); -@@ -3129,7 +3129,7 @@ describe('BrowserWindow module', () => { +@@ -3139,7 +3139,7 @@ describe('BrowserWindow module', () => { expect(overlayRectPreMax.height).to.equal(size); // 'maximize' event is not emitted on Linux in CI. @@ -90,7 +90,7 @@ const maximize = once(w, 'maximize'); w.show(); w.maximize(); -@@ -3195,7 +3195,7 @@ describe('BrowserWindow module', () => { +@@ -3205,7 +3205,7 @@ describe('BrowserWindow module', () => { expect(preMaxHeight).to.equal(size); // 'maximize' event is not emitted on Linux in CI. @@ -99,7 +99,7 @@ const maximize = once(w, 'maximize'); w.show(); w.maximize(); -@@ -3860,7 +3860,7 @@ describe('BrowserWindow module', () => { +@@ -3870,7 +3870,7 @@ describe('BrowserWindow module', () => { expect(test.nodeTimers).to.equal(true); expect(test.nodeUrl).to.equal(true); @@ -108,7 +108,7 @@ expect(test.creationTime).to.be.null('creation time'); expect(test.systemMemoryInfo).to.be.null('system memory info'); } else { -@@ -4365,7 +4365,7 @@ describe('BrowserWindow module', () => { +@@ -4375,7 +4375,7 @@ describe('BrowserWindow module', () => { }); }); @@ -117,7 +117,7 @@ afterEach(closeAllWindows); it('emits an event when window is maximized', async () => { const w = new BrowserWindow({ show: false }); -@@ -4636,7 +4636,7 @@ describe('BrowserWindow module', () => { +@@ -4646,7 +4646,7 @@ describe('BrowserWindow module', () => { // TODO(zcbenz): // This test does not run on Linux CI. See: // https://github.com/electron/electron/issues/28699 @@ -126,7 +126,7 @@ const w = new BrowserWindow({}); const maximize = once(w, 'maximize'); w.maximize(); -@@ -4653,7 +4653,7 @@ describe('BrowserWindow module', () => { +@@ -4663,7 +4663,7 @@ describe('BrowserWindow module', () => { }); // TODO(dsanders11): Enable once maximize event works on Linux again on CI @@ -135,7 +135,7 @@ afterEach(closeAllWindows); it('should show the window if it is not currently shown', async () => { const w = new BrowserWindow({ show: false }); -@@ -4690,7 +4690,7 @@ describe('BrowserWindow module', () => { +@@ -4700,7 +4700,7 @@ describe('BrowserWindow module', () => { // TODO(dsanders11): Enable once minimize event works on Linux again. // See https://github.com/electron/electron/issues/28699 @@ -144,7 +144,7 @@ const w = new BrowserWindow(); const minimize = once(w, 'minimize'); w.minimize(); -@@ -5164,7 +5164,7 @@ describe('BrowserWindow module', () => { +@@ -5174,7 +5174,7 @@ describe('BrowserWindow module', () => { }); // On Linux there is no "resizable" property of a window. @@ -153,7 +153,7 @@ const w = new BrowserWindow({ show: false }); expect(w.resizable).to.be.true('resizable'); -@@ -5303,7 +5303,7 @@ describe('BrowserWindow module', () => { +@@ -5313,7 +5313,7 @@ describe('BrowserWindow module', () => { }); }); @@ -162,7 +162,7 @@ // Not implemented on Linux. afterEach(closeAllWindows); -@@ -6468,7 +6468,7 @@ describe('BrowserWindow module', () => { +@@ -6478,7 +6478,7 @@ describe('BrowserWindow module', () => { describe('"transparent" option', () => { afterEach(closeAllWindows); diff --git a/devel/electron32/files/patch-electron_spec_api-clipboard-spec.ts b/devel/electron32/files/patch-electron_spec_api-clipboard-spec.ts index 8ae8e641d2f2..bc01dbc688ca 100644 --- a/devel/electron32/files/patch-electron_spec_api-clipboard-spec.ts +++ b/devel/electron32/files/patch-electron_spec_api-clipboard-spec.ts @@ -1,6 +1,6 @@ ---- electron/spec/api-clipboard-spec.ts.orig 2024-06-24 09:53:23 UTC +--- electron/spec/api-clipboard-spec.ts.orig 2024-10-09 13:53:06 UTC +++ electron/spec/api-clipboard-spec.ts -@@ -51,7 +51,7 @@ ifdescribe(process.platform !== 'win32' || process.arc +@@ -54,7 +54,7 @@ ifdescribe(process.platform !== 'win32' || process.arc }); }); @@ -9,7 +9,7 @@ it('returns title and url', () => { clipboard.writeBookmark('a title', 'https://electronjs.org'); -@@ -70,7 +70,7 @@ ifdescribe(process.platform !== 'win32' || process.arc +@@ -73,7 +73,7 @@ ifdescribe(process.platform !== 'win32' || process.arc }); describe('clipboard.read()', () => { @@ -18,7 +18,7 @@ const type = process.platform === 'darwin' ? 'NSFilenamesPboardType' : 'FileNameW'; expect(() => { -@@ -111,7 +111,7 @@ ifdescribe(process.platform !== 'win32' || process.arc +@@ -114,7 +114,7 @@ ifdescribe(process.platform !== 'win32' || process.arc const readImage = clipboard.readImage(); expect(readImage.toDataURL()).to.equal(i.toDataURL()); diff --git a/devel/electron32/files/patch-electron_spec_api-content-tracing-spec.ts b/devel/electron32/files/patch-electron_spec_api-content-tracing-spec.ts index 526dde3fc788..37d77d00cafe 100644 --- a/devel/electron32/files/patch-electron_spec_api-content-tracing-spec.ts +++ b/devel/electron32/files/patch-electron_spec_api-content-tracing-spec.ts @@ -1,6 +1,6 @@ ---- electron/spec/api-content-tracing-spec.ts.orig 2023-09-16 04:46:51 UTC +--- electron/spec/api-content-tracing-spec.ts.orig 2024-10-09 13:53:06 UTC +++ electron/spec/api-content-tracing-spec.ts -@@ -6,7 +6,7 @@ import { setTimeout } from 'timers/promises'; +@@ -9,7 +9,7 @@ import { ifdescribe } from './lib/spec-helpers'; import { ifdescribe } from './lib/spec-helpers'; // FIXME: The tests are skipped on linux arm/arm64 diff --git a/devel/electron32/files/patch-electron_spec_api-crash-reporter-spec.ts b/devel/electron32/files/patch-electron_spec_api-crash-reporter-spec.ts index 3f0149ee4234..8dc4077e8972 100644 --- a/devel/electron32/files/patch-electron_spec_api-crash-reporter-spec.ts +++ b/devel/electron32/files/patch-electron_spec_api-crash-reporter-spec.ts @@ -1,7 +1,7 @@ ---- electron/spec/api-crash-reporter-spec.ts.orig 2024-01-23 19:02:02 UTC +--- electron/spec/api-crash-reporter-spec.ts.orig 2024-10-09 13:53:06 UTC +++ electron/spec/api-crash-reporter-spec.ts -@@ -11,7 +11,7 @@ const isWindowsOnArm = process.platform === 'win32' && - import { setTimeout } from 'node:timers/promises'; +@@ -14,7 +14,7 @@ const isWindowsOnArm = process.platform === 'win32' && + import { ifdescribe, ifit, defer, startRemoteControlApp, repeatedly, listen } from './lib/spec-helpers'; const isWindowsOnArm = process.platform === 'win32' && process.arch === 'arm64'; -const isLinuxOnArm = process.platform === 'linux' && process.arch.includes('arm'); @@ -9,7 +9,7 @@ type CrashInfo = { prod: string -@@ -44,7 +44,7 @@ function checkCrash (expectedProcessType: string, fiel +@@ -47,7 +47,7 @@ function checkCrash (expectedProcessType: string, fiel // TODO(nornagon): minidumps are sometimes (not always) turning up empty on // 32-bit Linux. Figure out why. @@ -18,7 +18,7 @@ expect(fields.upload_file_minidump.length).to.be.greaterThan(0); } } -@@ -181,7 +181,7 @@ ifdescribe(!isLinuxOnArm && !process.mas && !process.e +@@ -184,7 +184,7 @@ ifdescribe(!isLinuxOnArm && !process.mas && !process.e // Ensures that passing in crashpadHandlerPID flag for Linx child processes // does not affect child proocess args. @@ -27,16 +27,16 @@ const { port, waitForCrash } = await startServer(); let exitCode: number | null = null; const appPath = path.join(__dirname, 'fixtures', 'apps', 'crash'); -@@ -530,7 +530,7 @@ ifdescribe(!isLinuxOnArm && !process.mas && !process.e +@@ -533,7 +533,7 @@ ifdescribe(!isLinuxOnArm && !process.mas && !process.e } } -- const processList = process.platform === 'linux' ? ['main', 'renderer', 'sandboxed-renderer'] -+ const processList = (process.platform === 'linux' || process.platform === 'freebsd') ? ['main', 'renderer', 'sandboxed-renderer'] +- const processList = process.platform === 'linux' ++ const processList = (process.platform === 'linux' || process.platform === 'freebsd') + ? ['main', 'renderer', 'sandboxed-renderer'] : ['main', 'renderer', 'sandboxed-renderer', 'node']; for (const crashingProcess of processList) { - describe(`when ${crashingProcess} crashes`, () => { -@@ -542,7 +542,7 @@ ifdescribe(!isLinuxOnArm && !process.mas && !process.e +@@ -546,7 +546,7 @@ ifdescribe(!isLinuxOnArm && !process.mas && !process.e return app.getPath('crashDumps'); }); let reportsDir = crashesDir; @@ -45,7 +45,7 @@ reportsDir = path.join(crashesDir, 'completed'); } else if (process.platform === 'win32') { reportsDir = path.join(crashesDir, 'reports'); -@@ -566,7 +566,7 @@ ifdescribe(!isLinuxOnArm && !process.mas && !process.e +@@ -570,7 +570,7 @@ ifdescribe(!isLinuxOnArm && !process.mas && !process.e expect(remoteCrashesDir).to.equal(crashesDir); let reportsDir = crashesDir; diff --git a/devel/electron32/files/patch-electron_spec_api-desktop-capturer-spec.ts b/devel/electron32/files/patch-electron_spec_api-desktop-capturer-spec.ts index cc2f69ff8c74..95fe1bf64980 100644 --- a/devel/electron32/files/patch-electron_spec_api-desktop-capturer-spec.ts +++ b/devel/electron32/files/patch-electron_spec_api-desktop-capturer-spec.ts @@ -1,6 +1,6 @@ ---- electron/spec/api-desktop-capturer-spec.ts.orig 2024-07-27 19:47:12 UTC +--- electron/spec/api-desktop-capturer-spec.ts.orig 2024-10-09 13:53:06 UTC +++ electron/spec/api-desktop-capturer-spec.ts -@@ -43,7 +43,7 @@ ifdescribe(!process.arch.includes('arm') && process.pl +@@ -45,7 +45,7 @@ ifdescribe(!process.arch.includes('arm') && process.pl }); // Linux doesn't return any window sources. @@ -9,7 +9,7 @@ const w = new BrowserWindow({ width: 200, height: 200 }); await w.loadURL('about:blank'); -@@ -55,7 +55,7 @@ ifdescribe(!process.arch.includes('arm') && process.pl +@@ -57,7 +57,7 @@ ifdescribe(!process.arch.includes('arm') && process.pl } }); @@ -18,7 +18,7 @@ const displays = screen.getAllDisplays(); const sources = await desktopCapturer.getSources({ types: ['screen'] }); expect(sources).to.be.an('array').of.length(displays.length); -@@ -100,7 +100,7 @@ ifdescribe(!process.arch.includes('arm') && process.pl +@@ -102,7 +102,7 @@ ifdescribe(!process.arch.includes('arm') && process.pl // TODO(julien.isorce): investigate why |sources| is empty on the linux // bots while it is not on my workstation, as expected, with and without // the --ci parameter. @@ -27,7 +27,7 @@ it.skip('desktopCapturer.getSources returned an empty source list'); return; } -@@ -136,7 +136,7 @@ ifdescribe(!process.arch.includes('arm') && process.pl +@@ -138,7 +138,7 @@ ifdescribe(!process.arch.includes('arm') && process.pl // TODO(julien.isorce): investigate why |sources| is empty on the linux // bots while it is not on my workstation, as expected, with and without // the --ci parameter. @@ -36,7 +36,7 @@ it.skip('desktopCapturer.getSources returned an empty source list'); return; } -@@ -205,7 +205,7 @@ ifdescribe(!process.arch.includes('arm') && process.pl +@@ -207,7 +207,7 @@ ifdescribe(!process.arch.includes('arm') && process.pl // TODO(julien.isorce): investigate why |sources| is empty on the linux // bots while it is not on my workstation, as expected, with and without // the --ci parameter. diff --git a/devel/electron32/files/patch-electron_spec_api-menu-spec.ts b/devel/electron32/files/patch-electron_spec_api-menu-spec.ts index 968e47dfb9c0..0929780b9795 100644 --- a/devel/electron32/files/patch-electron_spec_api-menu-spec.ts +++ b/devel/electron32/files/patch-electron_spec_api-menu-spec.ts @@ -1,6 +1,6 @@ ---- electron/spec/api-menu-spec.ts.orig 2023-12-04 18:19:02 UTC +--- electron/spec/api-menu-spec.ts.orig 2024-10-09 13:53:06 UTC +++ electron/spec/api-menu-spec.ts -@@ -887,7 +887,7 @@ describe('Menu module', function () { +@@ -890,7 +890,7 @@ describe('Menu module', function () { // https://github.com/electron/electron/issues/35724 // Maximizing window is enough to trigger the bug // FIXME(dsanders11): Test always passes on CI, even pre-fix diff --git a/devel/electron32/files/patch-electron_spec_api-native-image-spec.ts b/devel/electron32/files/patch-electron_spec_api-native-image-spec.ts index d6f71078550f..6ce49004e801 100644 --- a/devel/electron32/files/patch-electron_spec_api-native-image-spec.ts +++ b/devel/electron32/files/patch-electron_spec_api-native-image-spec.ts @@ -1,6 +1,6 @@ ---- electron/spec/api-native-image-spec.ts.orig 2024-06-24 09:53:23 UTC +--- electron/spec/api-native-image-spec.ts.orig 2024-10-09 13:53:06 UTC +++ electron/spec/api-native-image-spec.ts -@@ -425,7 +425,7 @@ describe('nativeImage module', () => { +@@ -428,7 +428,7 @@ describe('nativeImage module', () => { }); }); diff --git a/devel/electron32/files/patch-electron_spec_api-net-log-spec.ts b/devel/electron32/files/patch-electron_spec_api-net-log-spec.ts index b20241e2213d..5a52c3198a13 100644 --- a/devel/electron32/files/patch-electron_spec_api-net-log-spec.ts +++ b/devel/electron32/files/patch-electron_spec_api-net-log-spec.ts @@ -1,6 +1,6 @@ ---- electron/spec/api-net-log-spec.ts.orig 2023-05-31 14:28:29 UTC +--- electron/spec/api-net-log-spec.ts.orig 2024-10-09 13:53:06 UTC +++ electron/spec/api-net-log-spec.ts -@@ -118,7 +118,7 @@ describe('netLog module', () => { +@@ -121,7 +121,7 @@ describe('netLog module', () => { expect(JSON.parse(dump).events.some((x: any) => x.params && x.params.bytes && Buffer.from(x.params.bytes, 'base64').includes(unique))).to.be.true('uuid present in dump'); }); @@ -9,7 +9,7 @@ const appProcess = ChildProcess.spawn(process.execPath, [appPath], { env: { -@@ -131,7 +131,7 @@ describe('netLog module', () => { +@@ -134,7 +134,7 @@ describe('netLog module', () => { expect(fs.existsSync(dumpFile)).to.be.true('dump file exists'); }); @@ -18,7 +18,7 @@ const appProcess = ChildProcess.spawn(process.execPath, [appPath], { env: { -@@ -147,7 +147,7 @@ describe('netLog module', () => { +@@ -150,7 +150,7 @@ describe('netLog module', () => { expect(fs.existsSync(dumpFileDynamic)).to.be.true('dynamic dump file exists'); }); diff --git a/devel/electron32/files/patch-electron_spec_api-notification-dbus-spec.ts b/devel/electron32/files/patch-electron_spec_api-notification-dbus-spec.ts index fe6b085a28f6..c3a3d9254328 100644 --- a/devel/electron32/files/patch-electron_spec_api-notification-dbus-spec.ts +++ b/devel/electron32/files/patch-electron_spec_api-notification-dbus-spec.ts @@ -1,8 +1,8 @@ ---- electron/spec/api-notification-dbus-spec.ts.orig 2023-10-20 08:29:17 UTC +--- electron/spec/api-notification-dbus-spec.ts.orig 2024-10-09 13:53:06 UTC +++ electron/spec/api-notification-dbus-spec.ts -@@ -12,7 +12,7 @@ import { app } from 'electron/main'; - import { ifdescribe } from './lib/spec-helpers'; - import { promisify } from 'node:util'; +@@ -19,7 +19,7 @@ const fixturesPath = path.join(__dirname, 'fixtures'); + + const fixturesPath = path.join(__dirname, 'fixtures'); -const skip = process.platform !== 'linux' || +const skip = (process.platform !== 'linux' && process.platform !== 'freebsd') || diff --git a/devel/electron32/files/patch-electron_spec_api-power-monitor-spec.ts b/devel/electron32/files/patch-electron_spec_api-power-monitor-spec.ts index 423afdf5f6d6..7dccb7c9c5b5 100644 --- a/devel/electron32/files/patch-electron_spec_api-power-monitor-spec.ts +++ b/devel/electron32/files/patch-electron_spec_api-power-monitor-spec.ts @@ -1,6 +1,6 @@ ---- electron/spec/api-power-monitor-spec.ts.orig 2024-02-21 16:26:48 UTC +--- electron/spec/api-power-monitor-spec.ts.orig 2024-10-09 13:53:06 UTC +++ electron/spec/api-power-monitor-spec.ts -@@ -16,7 +16,7 @@ describe('powerMonitor', () => { +@@ -18,7 +18,7 @@ describe('powerMonitor', () => { describe('powerMonitor', () => { let logindMock: any, dbusMockPowerMonitor: any, getCalls: any, emitSignal: any, reset: any; diff --git a/devel/electron32/files/patch-electron_spec_api-process-spec.ts b/devel/electron32/files/patch-electron_spec_api-process-spec.ts index 1b03b11365a7..f507f90185b8 100644 --- a/devel/electron32/files/patch-electron_spec_api-process-spec.ts +++ b/devel/electron32/files/patch-electron_spec_api-process-spec.ts @@ -1,6 +1,6 @@ ---- electron/spec/api-process-spec.ts.orig 2024-08-20 22:47:02 UTC +--- electron/spec/api-process-spec.ts.orig 2024-10-09 13:53:06 UTC +++ electron/spec/api-process-spec.ts -@@ -43,7 +43,7 @@ describe('process module', () => { +@@ -46,7 +46,7 @@ describe('process module', () => { it('resolves promise successfully with valid data', async () => { const memoryInfo = await w.webContents.executeJavaScript('process.getProcessMemoryInfo()'); expect(memoryInfo).to.be.an('object'); @@ -9,7 +9,7 @@ expect(memoryInfo.residentSet).to.be.a('number').greaterThan(0); } expect(memoryInfo.private).to.be.a('number').greaterThan(0); -@@ -142,7 +142,7 @@ describe('process module', () => { +@@ -145,7 +145,7 @@ describe('process module', () => { it('resolves promise successfully with valid data', async () => { const memoryInfo = await process.getProcessMemoryInfo(); expect(memoryInfo).to.be.an('object'); diff --git a/devel/electron32/files/patch-electron_spec_api-protocol-spec.ts b/devel/electron32/files/patch-electron_spec_api-protocol-spec.ts index 51c2cc6c6bbc..b57997fddbb7 100644 --- a/devel/electron32/files/patch-electron_spec_api-protocol-spec.ts +++ b/devel/electron32/files/patch-electron_spec_api-protocol-spec.ts @@ -1,6 +1,6 @@ ---- electron/spec/api-protocol-spec.ts.orig 2024-07-27 19:47:12 UTC +--- electron/spec/api-protocol-spec.ts.orig 2024-10-09 13:53:06 UTC +++ electron/spec/api-protocol-spec.ts -@@ -1734,7 +1734,7 @@ describe('protocol module', () => { +@@ -1737,7 +1737,7 @@ describe('protocol module', () => { }); // TODO(nornagon): this test doesn't pass on Linux currently, investigate. diff --git a/devel/electron32/files/patch-electron_spec_api-safe-storage-spec.ts b/devel/electron32/files/patch-electron_spec_api-safe-storage-spec.ts index e491b37ce996..fe7d80e9f5e6 100644 --- a/devel/electron32/files/patch-electron_spec_api-safe-storage-spec.ts +++ b/devel/electron32/files/patch-electron_spec_api-safe-storage-spec.ts @@ -1,6 +1,6 @@ ---- electron/spec/api-safe-storage-spec.ts.orig 2023-08-09 14:05:20 UTC +--- electron/spec/api-safe-storage-spec.ts.orig 2024-10-09 13:53:06 UTC +++ electron/spec/api-safe-storage-spec.ts -@@ -26,7 +26,7 @@ describe('safeStorage module', () => { +@@ -29,7 +29,7 @@ describe('safeStorage module', () => { describe('safeStorage module', () => { before(() => { @@ -9,7 +9,7 @@ safeStorage.setUsePlainTextEncryption(true); } }); -@@ -44,7 +44,7 @@ describe('safeStorage module', () => { +@@ -47,7 +47,7 @@ describe('safeStorage module', () => { }); *** 4638 LINES SKIPPED ***