From 4407d794e79d29ee078302bbadba283cb244ecbd Mon Sep 17 00:00:00 2001 From: Hiroki Tagato Date: Wed, 17 Jun 2026 20:15:16 +0900 Subject: [PATCH] devel/electron40: Update to 40.10.4 Changelog: https://github.com/electron/electron/releases/tag/v40.10.4 Reported by: GitHub (watch releases) --- devel/electron40/Makefile.version | 2 +- devel/electron40/distinfo | 10 +- .../files/packagejsons/package.json | 2 +- devel/electron40/files/packagejsons/yarn.lock | 273 ++++-------------- .../files/patch-electron_spec_api-app-spec.ts | 43 +-- .../files/patch-media_base_video__frame.cc | 4 +- ...omeos_libyuv__image__processor__backend.cc | 6 +- .../patch-ui_base_x_x11__cursor__loader.cc | 6 +- ...aura_desktop__drag__drop__client__ozone.cc | 4 +- 9 files changed, 93 insertions(+), 257 deletions(-) diff --git a/devel/electron40/Makefile.version b/devel/electron40/Makefile.version index 468b04fee4af..6041d7ee297c 100644 --- a/devel/electron40/Makefile.version +++ b/devel/electron40/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 40.10.3 +ELECTRON_VER= 40.10.4 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron40/distinfo b/devel/electron40/distinfo index f702d9d6c75d..a3ddc2da55e1 100644 --- a/devel/electron40/distinfo +++ b/devel/electron40/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1781206037 +TIMESTAMP = 1781670037 SHA256 (electron/chromium-144.0.7559.236.tar.xz.0) = 21556e44d5f5e464a7603afc1e912127c4546d3c55d777055614b769247d2714 SIZE (electron/chromium-144.0.7559.236.tar.xz.0) = 2000000000 SHA256 (electron/chromium-144.0.7559.236.tar.xz.1) = 389e96ab80e7f3ea7a330060c51ed714f2277810b13bbd1d72bb9e6119dce3a2 @@ -9,10 +9,10 @@ SHA256 (electron/pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1 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/electron40-40.10.3-node-modules.tar.xz) = 3e0231cb2e5bf812eacdcd28c0b9c6cdff62e499b245585d5f4ad54141c85e05 -SIZE (electron/electron40-40.10.3-node-modules.tar.xz) = 68768407 -SHA256 (electron/electron-electron-v40.10.3_GH0.tar.gz) = ea992137127630ee3dfb3431e201215be6b71322ab7e629da71d72b5507b6c4e -SIZE (electron/electron-electron-v40.10.3_GH0.tar.gz) = 17436294 +SHA256 (electron/electron40-40.10.4-node-modules.tar.xz) = 37b35304d8c96fe56dc1ad11e4ad910d9a76e674262608b7fc014103ed281300 +SIZE (electron/electron40-40.10.4-node-modules.tar.xz) = 69034107 +SHA256 (electron/electron-electron-v40.10.4_GH0.tar.gz) = fa1c01d7eba06cb6be76db282dda8dabaa46c5dfc86fb973a19c7f5831c7f24b +SIZE (electron/electron-electron-v40.10.4_GH0.tar.gz) = 17494335 SHA256 (electron/nodejs-node-v24.15.0_GH0.tar.gz) = 5cfb169b21878f50876e0c6a77db1a5e40d733960232682bebb5e267246a2e80 SIZE (electron/nodejs-node-v24.15.0_GH0.tar.gz) = 126716937 SHA256 (electron/nodejs-nan-675cefebca42410733da8a454c8d9391fcebfbc2_GH0.tar.gz) = 3983c68f19ed75dd37dc228eab385093ae2533132730f253f0c3d19ff10788e3 diff --git a/devel/electron40/files/packagejsons/package.json b/devel/electron40/files/packagejsons/package.json index 44c6319f26a3..a04c72ce751e 100644 --- a/devel/electron40/files/packagejsons/package.json +++ b/devel/electron40/files/packagejsons/package.json @@ -31,7 +31,7 @@ "lint-staged": "^16.1.0", "markdownlint-cli2": "^0.18.0", "minimist": "^1.2.8", - "node-gyp": "^11.4.2", + "node-gyp": "^12.3.0", "null-loader": "^4.0.1", "oxfmt": "^0.42.0", "oxlint": "^1.57.0", diff --git a/devel/electron40/files/packagejsons/yarn.lock b/devel/electron40/files/packagejsons/yarn.lock index e09a45e2f7e7..b8247d2439ac 100644 --- a/devel/electron40/files/packagejsons/yarn.lock +++ b/devel/electron40/files/packagejsons/yarn.lock @@ -452,7 +452,7 @@ __metadata: lint-staged: "npm:^16.1.0" markdownlint-cli2: "npm:^0.18.0" minimist: "npm:^1.2.8" - node-gyp: "npm:^11.4.2" + node-gyp: "npm:^12.3.0" null-loader: "npm:^4.0.1" oxfmt: "npm:^0.42.0" oxlint: "npm:^1.57.0" @@ -1019,19 +1019,6 @@ __metadata: languageName: node linkType: hard -"@npmcli/agent@npm:^3.0.0": - version: 3.0.0 - resolution: "@npmcli/agent@npm:3.0.0" - dependencies: - agent-base: "npm:^7.1.0" - http-proxy-agent: "npm:^7.0.0" - https-proxy-agent: "npm:^7.0.1" - lru-cache: "npm:^10.0.1" - socks-proxy-agent: "npm:^8.0.3" - checksum: 10c0/efe37b982f30740ee77696a80c196912c274ecd2cb243bc6ae7053a50c733ce0f6c09fda085145f33ecf453be19654acca74b69e81eaad4c90f00ccffe2f9271 - languageName: node - linkType: hard - "@npmcli/config@npm:^8.0.0": version: 8.3.4 resolution: "@npmcli/config@npm:8.3.4" @@ -1048,15 +1035,6 @@ __metadata: languageName: node linkType: hard -"@npmcli/fs@npm:^4.0.0": - version: 4.0.0 - resolution: "@npmcli/fs@npm:4.0.0" - dependencies: - semver: "npm:^7.3.5" - checksum: 10c0/c90935d5ce670c87b6b14fab04a965a3b8137e585f8b2a6257263bd7f97756dd736cb165bb470e5156a9e718ecd99413dccc54b1138c1a46d6ec7cf325982fe5 - languageName: node - linkType: hard - "@npmcli/git@npm:^5.0.0": version: 5.0.8 resolution: "@npmcli/git@npm:5.0.8" @@ -2607,10 +2585,10 @@ __metadata: languageName: node linkType: hard -"abbrev@npm:^3.0.0": - version: 3.0.1 - resolution: "abbrev@npm:3.0.1" - checksum: 10c0/21ba8f574ea57a3106d6d35623f2c4a9111d9ee3e9a5be47baed46ec2457d2eac46e07a5c4a60186f88cb98abbe3e24f2d4cca70bc2b12f1692523e2209a9ccf +"abbrev@npm:^4.0.0": + version: 4.0.0 + resolution: "abbrev@npm:4.0.0" + checksum: 10c0/b4cc16935235e80702fc90192e349e32f8ef0ed151ef506aa78c81a7c455ec18375c4125414b99f84b2e055199d66383e787675f0bcd87da7a4dbd59f9eac1d5 languageName: node linkType: hard @@ -3379,26 +3357,6 @@ __metadata: languageName: node linkType: hard -"cacache@npm:^19.0.1": - version: 19.0.1 - resolution: "cacache@npm:19.0.1" - dependencies: - "@npmcli/fs": "npm:^4.0.0" - fs-minipass: "npm:^3.0.0" - glob: "npm:^10.2.2" - lru-cache: "npm:^10.0.1" - minipass: "npm:^7.0.3" - minipass-collect: "npm:^2.0.1" - minipass-flush: "npm:^1.0.5" - minipass-pipeline: "npm:^1.2.4" - p-map: "npm:^7.0.2" - ssri: "npm:^12.0.0" - tar: "npm:^7.4.3" - unique-filename: "npm:^4.0.0" - checksum: 10c0/01f2134e1bd7d3ab68be851df96c8d63b492b1853b67f2eecb2c37bb682d37cb70bb858a16f2f0554d3c0071be6dfe21456a1ff6fa4b7eed996570d6a25ffe9c - languageName: node - linkType: hard - "cacheable-lookup@npm:^5.0.3": version: 5.0.4 resolution: "cacheable-lookup@npm:5.0.4" @@ -4567,15 +4525,6 @@ __metadata: languageName: node linkType: hard -"encoding@npm:^0.1.13": - version: 0.1.13 - resolution: "encoding@npm:0.1.13" - dependencies: - iconv-lite: "npm:^0.6.2" - checksum: 10c0/36d938712ff00fe1f4bac88b43bcffb5930c1efa57bbcdca9d67e1d9d6c57cfb1200fb01efe0f3109b2ce99b231f90779532814a81370a1bd3274a0f58585039 - languageName: node - linkType: hard - "end-of-stream@npm:^1.1.0": version: 1.4.4 resolution: "end-of-stream@npm:1.4.4" @@ -5681,15 +5630,6 @@ __metadata: languageName: node linkType: hard -"fs-minipass@npm:^3.0.0": - version: 3.0.3 - resolution: "fs-minipass@npm:3.0.3" - dependencies: - minipass: "npm:^7.0.3" - checksum: 10c0/63e80da2ff9b621e2cb1596abcb9207f1cf82b968b116ccd7b959e3323144cce7fb141462200971c38bbf2ecca51695069db45265705bed09a7cd93ae5b89f94 - languageName: node - linkType: hard - "fs.realpath@npm:^1.0.0": version: 1.0.0 resolution: "fs.realpath@npm:1.0.0" @@ -6328,13 +6268,6 @@ __metadata: languageName: node linkType: hard -"http-cache-semantics@npm:^4.1.1": - version: 4.2.0 - resolution: "http-cache-semantics@npm:4.2.0" - checksum: 10c0/45b66a945cf13ec2d1f29432277201313babf4a01d9e52f44b31ca923434083afeca03f18417f599c9ab3d0e7b618ceb21257542338b57c54b710463b4a53e37 - languageName: node - linkType: hard - "http-errors@npm:2.0.0": version: 2.0.0 resolution: "http-errors@npm:2.0.0" @@ -6388,7 +6321,7 @@ __metadata: languageName: node linkType: hard -"https-proxy-agent@npm:^7.0.1, https-proxy-agent@npm:^7.0.6": +"https-proxy-agent@npm:^7.0.6": version: 7.0.6 resolution: "https-proxy-agent@npm:7.0.6" dependencies: @@ -6416,15 +6349,6 @@ __metadata: languageName: node linkType: hard -"iconv-lite@npm:^0.6.2": - version: 0.6.3 - resolution: "iconv-lite@npm:0.6.3" - dependencies: - safer-buffer: "npm:>= 2.1.2 < 3.0.0" - checksum: 10c0/98102bc66b33fcf5ac044099d1257ba0b7ad5e3ccd3221f34dd508ab4070edff183276221684e1e0555b145fce0850c9f7d2b60a9fcac50fbb4ea0d6e845a3b1 - languageName: node - linkType: hard - "iconv-lite@npm:^0.7.0": version: 0.7.0 resolution: "iconv-lite@npm:0.7.0" @@ -6980,6 +6904,13 @@ __metadata: languageName: node linkType: hard +"isexe@npm:^4.0.0": + version: 4.0.0 + resolution: "isexe@npm:4.0.0" + checksum: 10c0/5884815115bceac452877659a9c7726382531592f43dc29e5d48b7c4100661aed54018cb90bd36cb2eaeba521092570769167acbb95c18d39afdccbcca06c5ce + languageName: node + linkType: hard + "isobject@npm:^3.0.1": version: 3.0.1 resolution: "isobject@npm:3.0.1" @@ -7564,25 +7495,6 @@ __metadata: languageName: node linkType: hard -"make-fetch-happen@npm:^14.0.3": - version: 14.0.3 - resolution: "make-fetch-happen@npm:14.0.3" - dependencies: - "@npmcli/agent": "npm:^3.0.0" - cacache: "npm:^19.0.1" - http-cache-semantics: "npm:^4.1.1" - minipass: "npm:^7.0.2" - minipass-fetch: "npm:^4.0.0" - minipass-flush: "npm:^1.0.5" - minipass-pipeline: "npm:^1.2.4" - negotiator: "npm:^1.0.0" - proc-log: "npm:^5.0.0" - promise-retry: "npm:^2.0.1" - ssri: "npm:^12.0.0" - checksum: 10c0/c40efb5e5296e7feb8e37155bde8eb70bc57d731b1f7d90e35a092fde403d7697c56fb49334d92d330d6f1ca29a98142036d6480a12681133a0a1453164cb2f0 - languageName: node - linkType: hard - "map-stream@npm:0.0.7": version: 0.0.7 resolution: "map-stream@npm:0.0.7" @@ -8400,57 +8312,6 @@ __metadata: languageName: node linkType: hard -"minipass-collect@npm:^2.0.1": - version: 2.0.1 - resolution: "minipass-collect@npm:2.0.1" - dependencies: - minipass: "npm:^7.0.3" - checksum: 10c0/5167e73f62bb74cc5019594709c77e6a742051a647fe9499abf03c71dca75515b7959d67a764bdc4f8b361cf897fbf25e2d9869ee039203ed45240f48b9aa06e - languageName: node - linkType: hard - -"minipass-fetch@npm:^4.0.0": - version: 4.0.1 - resolution: "minipass-fetch@npm:4.0.1" - dependencies: - encoding: "npm:^0.1.13" - minipass: "npm:^7.0.3" - minipass-sized: "npm:^1.0.3" - minizlib: "npm:^3.0.1" - dependenciesMeta: - encoding: - optional: true - checksum: 10c0/a3147b2efe8e078c9bf9d024a0059339c5a09c5b1dded6900a219c218cc8b1b78510b62dae556b507304af226b18c3f1aeb1d48660283602d5b6586c399eed5c - languageName: node - linkType: hard - -"minipass-flush@npm:^1.0.5": - version: 1.0.5 - resolution: "minipass-flush@npm:1.0.5" - dependencies: - minipass: "npm:^3.0.0" - checksum: 10c0/2a51b63feb799d2bb34669205eee7c0eaf9dce01883261a5b77410c9408aa447e478efd191b4de6fc1101e796ff5892f8443ef20d9544385819093dbb32d36bd - languageName: node - linkType: hard - -"minipass-pipeline@npm:^1.2.4": - version: 1.2.4 - resolution: "minipass-pipeline@npm:1.2.4" - dependencies: - minipass: "npm:^3.0.0" - checksum: 10c0/cbda57cea20b140b797505dc2cac71581a70b3247b84480c1fed5ca5ba46c25ecc25f68bfc9e6dcb1a6e9017dab5c7ada5eab73ad4f0a49d84e35093e0c643f2 - languageName: node - linkType: hard - -"minipass-sized@npm:^1.0.3": - version: 1.0.3 - resolution: "minipass-sized@npm:1.0.3" - dependencies: - minipass: "npm:^3.0.0" - checksum: 10c0/298f124753efdc745cfe0f2bdfdd81ba25b9f4e753ca4a2066eb17c821f25d48acea607dfc997633ee5bf7b6dfffb4eee4f2051eb168663f0b99fad2fa4829cb - languageName: node - linkType: hard - "minipass@npm:^3.0.0": version: 3.3.6 resolution: "minipass@npm:3.3.6" @@ -8488,7 +8349,7 @@ __metadata: languageName: node linkType: hard -"minipass@npm:^7.0.2, minipass@npm:^7.0.3, minipass@npm:^7.0.4, minipass@npm:^7.1.2": +"minipass@npm:^7.0.4, minipass@npm:^7.1.2": version: 7.1.2 resolution: "minipass@npm:7.1.2" checksum: 10c0/b0fd20bb9fb56e5fa9a8bfac539e8915ae07430a619e4b86ff71f5fc757ef3924b23b2c4230393af1eda647ed3d75739e4e0acb250a6b1eb277cf7f8fe449557 @@ -8505,7 +8366,7 @@ __metadata: languageName: node linkType: hard -"minizlib@npm:^3.0.1, minizlib@npm:^3.1.0": +"minizlib@npm:^3.1.0": version: 3.1.0 resolution: "minizlib@npm:3.1.0" dependencies: @@ -8654,13 +8515,6 @@ __metadata: languageName: node linkType: hard -"negotiator@npm:^1.0.0": - version: 1.0.0 - resolution: "negotiator@npm:1.0.0" - checksum: 10c0/4c559dd52669ea48e1914f9d634227c561221dd54734070791f999c52ed0ff36e437b2e07d5c1f6e32909fc625fe46491c16e4a8f0572567d4dd15c3a4fda04b - languageName: node - linkType: hard - "neo-async@npm:^2.6.2": version: 2.6.2 resolution: "neo-async@npm:2.6.2" @@ -8739,23 +8593,23 @@ __metadata: languageName: node linkType: hard -"node-gyp@npm:^11.4.2, node-gyp@npm:latest": - version: 11.5.0 - resolution: "node-gyp@npm:11.5.0" +"node-gyp@npm:^12.3.0, node-gyp@npm:latest": + version: 12.3.0 + resolution: "node-gyp@npm:12.3.0" dependencies: env-paths: "npm:^2.2.0" exponential-backoff: "npm:^3.1.1" graceful-fs: "npm:^4.2.6" - make-fetch-happen: "npm:^14.0.3" - nopt: "npm:^8.0.0" - proc-log: "npm:^5.0.0" + nopt: "npm:^9.0.0" + proc-log: "npm:^6.0.0" semver: "npm:^7.3.5" - tar: "npm:^7.4.3" + tar: "npm:^7.5.4" tinyglobby: "npm:^0.2.12" - which: "npm:^5.0.0" + undici: "npm:^6.25.0" + which: "npm:^6.0.0" bin: node-gyp: bin/node-gyp.js - checksum: 10c0/31ff49586991b38287bb15c3d529dd689cfc32f992eed9e6997b9d712d5d21fe818a8b1bbfe3b76a7e33765c20210c5713212f4aa329306a615b87d8a786da3a + checksum: 10c0/9d9032b405cbe42f72a105259d9eb679376470c102df4a2dbaa51e07d59bf741dcffb85897087ea9d8318b9cabb824a8978af51508ae142f0239ae1e6a3c2329 languageName: node linkType: hard @@ -8788,14 +8642,14 @@ __metadata: languageName: node linkType: hard -"nopt@npm:^8.0.0": - version: 8.1.0 - resolution: "nopt@npm:8.1.0" +"nopt@npm:^9.0.0": + version: 9.0.0 + resolution: "nopt@npm:9.0.0" dependencies: - abbrev: "npm:^3.0.0" + abbrev: "npm:^4.0.0" bin: nopt: bin/nopt.js - checksum: 10c0/62e9ea70c7a3eb91d162d2c706b6606c041e4e7b547cbbb48f8b3695af457dd6479904d7ace600856bf923dd8d1ed0696f06195c8c20f02ac87c1da0e1d315ef + checksum: 10c0/1822eb6f9b020ef6f7a7516d7b64a8036e09666ea55ac40416c36e4b2b343122c3cff0e2f085675f53de1d2db99a2a89a60ccea1d120bcd6a5347bf6ceb4a7fd languageName: node linkType: hard @@ -9317,13 +9171,6 @@ __metadata: languageName: node linkType: hard -"p-map@npm:^7.0.2": - version: 7.0.3 - resolution: "p-map@npm:7.0.3" - checksum: 10c0/46091610da2b38ce47bcd1d8b4835a6fa4e832848a6682cf1652bc93915770f4617afc844c10a77d1b3e56d2472bb2d5622353fa3ead01a7f42b04fc8e744a5c - languageName: node - linkType: hard - "p-try@npm:^1.0.0": version: 1.0.0 resolution: "p-try@npm:1.0.0" @@ -9786,10 +9633,10 @@ __metadata: languageName: node linkType: hard -"proc-log@npm:^5.0.0": - version: 5.0.0 - resolution: "proc-log@npm:5.0.0" - checksum: 10c0/bbe5edb944b0ad63387a1d5b1911ae93e05ce8d0f60de1035b218cdcceedfe39dbd2c697853355b70f1a090f8f58fe90da487c85216bf9671f9499d1a897e9e3 +"proc-log@npm:^6.0.0": + version: 6.1.0 + resolution: "proc-log@npm:6.1.0" + checksum: 10c0/4f178d4062733ead9d71a9b1ab24ebcecdfe2250916a5b1555f04fe2eda972a0ec76fbaa8df1ad9c02707add6749219d118a4fc46dc56bdfe4dde4b47d80bb82 languageName: node linkType: hard @@ -11472,7 +11319,7 @@ __metadata: languageName: node linkType: hard -"socks-proxy-agent@npm:^8.0.3, socks-proxy-agent@npm:^8.0.5": +"socks-proxy-agent@npm:^8.0.5": version: 8.0.5 resolution: "socks-proxy-agent@npm:8.0.5" dependencies: @@ -11622,15 +11469,6 @@ __metadata: languageName: node linkType: hard -"ssri@npm:^12.0.0": - version: 12.0.0 - resolution: "ssri@npm:12.0.0" - dependencies: - minipass: "npm:^7.0.3" - checksum: 10c0/caddd5f544b2006e88fa6b0124d8d7b28208b83c72d7672d5ade44d794525d23b540f3396108c4eb9280dcb7c01f0bef50682f5b4b2c34291f7c5e211fd1417d - languageName: node - linkType: hard - "standard-engine@npm:^15.0.0": version: 15.0.0 resolution: "standard-engine@npm:15.0.0" @@ -12078,16 +11916,16 @@ __metadata: languageName: node linkType: hard -"tar@npm:^7.4.3": - version: 7.5.1 - resolution: "tar@npm:7.5.1" +"tar@npm:^7.5.4": + version: 7.5.16 + resolution: "tar@npm:7.5.16" dependencies: "@isaacs/fs-minipass": "npm:^4.0.0" chownr: "npm:^3.0.0" minipass: "npm:^7.1.2" minizlib: "npm:^3.1.0" yallist: "npm:^5.0.0" - checksum: 10c0/0dad0596a61586180981133b20c32cfd93c5863c5b7140d646714e6ea8ec84583b879e5dc3928a4d683be6e6109ad7ea3de1cf71986d5194f81b3a016c8858c9 + checksum: 10c0/4f37f3c4bd2ca2755fd736a5df1d573c1a868ec1b1e893346aeafa95ac510f9e2fd1469420bd866cc7904799e5bd4ac62b5d4f03fe27747d6e1e373b44505c5c languageName: node linkType: hard @@ -12475,6 +12313,13 @@ __metadata: languageName: node linkType: hard +"undici@npm:^6.25.0": + version: 6.26.0 + resolution: "undici@npm:6.26.0" + checksum: 10c0/cf2b4caf58c33d6582970991290cc7a6486d6e738845f25dcdd16952d708ec844815c6d30362919764fcaf30f719891289341f1ada496f003ce2700310453a47 + languageName: node + linkType: hard + "unicorn-magic@npm:^0.3.0": version: 0.3.0 resolution: "unicorn-magic@npm:0.3.0" @@ -12571,24 +12416,6 @@ __metadata: languageName: node linkType: hard -"unique-filename@npm:^4.0.0": - version: 4.0.0 - resolution: "unique-filename@npm:4.0.0" - dependencies: - unique-slug: "npm:^5.0.0" - checksum: 10c0/38ae681cceb1408ea0587b6b01e29b00eee3c84baee1e41fd5c16b9ed443b80fba90c40e0ba69627e30855570a34ba8b06702d4a35035d4b5e198bf5a64c9ddc - languageName: node - linkType: hard - -"unique-slug@npm:^5.0.0": - version: 5.0.0 - resolution: "unique-slug@npm:5.0.0" - dependencies: - imurmurhash: "npm:^0.1.4" - checksum: 10c0/d324c5a44887bd7e105ce800fcf7533d43f29c48757ac410afd42975de82cc38ea2035c0483f4de82d186691bf3208ef35c644f73aa2b1b20b8e651be5afd293 - languageName: node - linkType: hard - "unist-util-inspect@npm:^8.0.0": version: 8.1.0 resolution: "unist-util-inspect@npm:8.1.0" @@ -13108,14 +12935,14 @@ __metadata: languageName: node linkType: hard -"which@npm:^5.0.0": - version: 5.0.0 - resolution: "which@npm:5.0.0" +"which@npm:^6.0.0": + version: 6.0.1 + resolution: "which@npm:6.0.1" dependencies: - isexe: "npm:^3.1.1" + isexe: "npm:^4.0.0" bin: node-which: bin/which.js - checksum: 10c0/e556e4cd8b7dbf5df52408c9a9dd5ac6518c8c5267c8953f5b0564073c66ed5bf9503b14d876d0e9c7844d4db9725fb0dcf45d6e911e17e26ab363dc3965ae7b + checksum: 10c0/7e710e54ea36d2d6183bee2f9caa27a3b47b9baf8dee55a199b736fcf85eab3b9df7556fca3d02b50af7f3dfba5ea3a45644189836df06267df457e354da66d5 languageName: node linkType: hard diff --git a/devel/electron40/files/patch-electron_spec_api-app-spec.ts b/devel/electron40/files/patch-electron_spec_api-app-spec.ts index 371e158f18a4..39d03b5400b8 100644 --- a/devel/electron40/files/patch-electron_spec_api-app-spec.ts +++ b/devel/electron40/files/patch-electron_spec_api-app-spec.ts @@ -1,6 +1,15 @@ ---- electron/spec/api-app-spec.ts.orig 2026-05-08 13:55:13 UTC +--- electron/spec/api-app-spec.ts.orig 2026-06-15 14:42:57 UTC +++ electron/spec/api-app-spec.ts -@@ -146,11 +146,11 @@ describe('app module', () => { +@@ -133,7 +133,7 @@ describe('app module', () => { + }); + }); + +- ifdescribe(process.platform === 'linux')('app.setDesktopName(name)', () => { ++ ifdescribe(process.platform === 'linux' || process.platform === 'freebsd')('app.setDesktopName(name)', () => { + it('sets the desktop name to the CHROME_DESKTOP environment variable', () => { + const original = process.env.CHROME_DESKTOP; + defer(() => { +@@ -162,11 +162,11 @@ describe('app module', () => { }); describe('app.getPreferredSystemLanguages()', () => { @@ -14,7 +23,7 @@ const languages = app.getPreferredSystemLanguages(); if (languages.length) { expect(languages).to.not.include('C'); -@@ -229,7 +229,7 @@ describe('app module', () => { +@@ -245,7 +245,7 @@ describe('app module', () => { expect(code).to.equal(123, 'exit code should be 123, if you see this please tag @MarshallOfSound'); }); @@ -23,7 +32,7 @@ const electronPath = process.execPath; const appPath = path.join(fixturesPath, 'api', 'singleton'); appProcess = cp.spawn(electronPath, [appPath]); -@@ -400,7 +400,7 @@ describe('app module', () => { +@@ -416,7 +416,7 @@ describe('app module', () => { }); // GitHub Actions macOS-13 runners used for x64 seem to have a problem with this test. @@ -32,7 +41,7 @@ const tempFiles = [ path.join(fixturesPath, 'foo.txt'), path.join(fixturesPath, 'bar.txt'), -@@ -529,7 +529,7 @@ describe('app module', () => { +@@ -545,7 +545,7 @@ describe('app module', () => { // let w = null // before(function () { @@ -41,7 +50,7 @@ // this.skip() // } // }) -@@ -639,7 +639,7 @@ describe('app module', () => { +@@ -655,7 +655,7 @@ describe('app module', () => { describe('app.badgeCount', () => { const platformIsNotSupported = @@ -50,7 +59,7 @@ const expectedBadgeCount = 42; -@@ -686,7 +686,7 @@ describe('app module', () => { +@@ -702,7 +702,7 @@ describe('app module', () => { }); ifdescribe( @@ -59,7 +68,7 @@ )('app.get/setLoginItemSettings API', function () { const isMac = process.platform === 'darwin'; const isWin = process.platform === 'win32'; -@@ -1103,7 +1103,7 @@ describe('app module', () => { +@@ -1119,7 +1119,7 @@ describe('app module', () => { }); }); @@ -68,7 +77,7 @@ it('is mutable', () => { const values = [false, true, false]; const setters: Array<(arg: boolean) => void> = [ -@@ -1373,7 +1373,7 @@ describe('app module', () => { +@@ -1389,7 +1389,7 @@ describe('app module', () => { }); }); @@ -77,7 +86,7 @@ let w: BrowserWindow; before(function () { -@@ -1514,7 +1514,7 @@ describe('app module', () => { +@@ -1530,7 +1530,7 @@ describe('app module', () => { }); }); @@ -86,7 +95,7 @@ const protocol = 'electron-test-linux'; const desktopFileId = 'electron-test.desktop'; const protocolMimeType = `x-scheme-handler/${protocol}`; -@@ -1604,7 +1604,7 @@ describe('app module', () => { +@@ -1620,7 +1620,7 @@ describe('app module', () => { describe('getApplicationNameForProtocol()', () => { // TODO: Linux CI doesn't have registered http & https handlers @@ -95,7 +104,7 @@ 'returns application names for common protocols', function () { // We can't expect particular app names here, but these protocols should -@@ -1621,7 +1621,7 @@ describe('app module', () => { +@@ -1637,7 +1637,7 @@ describe('app module', () => { expect(app.getApplicationNameForProtocol('bogus-protocol://')).to.equal(''); }); @@ -104,7 +113,7 @@ const fixtureApp = path.join(fixturesPath, 'api', 'protocol-name'); const desktopFileId = 'mock-browser.desktop'; const mockScheme = 'mockproto'; -@@ -1748,7 +1748,7 @@ describe('app module', () => { +@@ -1764,7 +1764,7 @@ describe('app module', () => { }); }); @@ -113,7 +122,7 @@ it('returns promise rejection for a bogus protocol', async function () { await expect(app.getApplicationInfoForProtocol('bogus-protocol://')).to.eventually.be.rejectedWith( 'Unable to retrieve installation path to app' -@@ -1819,7 +1819,7 @@ describe('app module', () => { +@@ -1835,7 +1835,7 @@ describe('app module', () => { }); // FIXME Get these specs running on Linux CI @@ -122,7 +131,7 @@ const iconPath = path.join(__dirname, 'fixtures/assets/icon.ico'); const sizes = { small: 16, -@@ -1901,7 +1901,7 @@ describe('app module', () => { +@@ -1917,7 +1917,7 @@ describe('app module', () => { expect(entry.memory).to.have.property('privateBytes').that.is.greaterThan(0); } @@ -131,7 +140,7 @@ expect(entry.sandboxed).to.be.a('boolean'); } -@@ -1970,7 +1970,7 @@ describe('app module', () => { +@@ -1986,7 +1986,7 @@ describe('app module', () => { it('succeeds with complete GPUInfo', async () => { const completeInfo = await getGPUInfo('complete'); @@ -140,7 +149,7 @@ // For linux and macOS complete info is same as basic info await verifyBasicGPUInfo(completeInfo); const basicInfo = await getGPUInfo('basic'); -@@ -1994,7 +1994,7 @@ describe('app module', () => { +@@ -2010,7 +2010,7 @@ describe('app module', () => { }); }); diff --git a/devel/electron40/files/patch-media_base_video__frame.cc b/devel/electron40/files/patch-media_base_video__frame.cc index 4f1712a5ff18..94798dddd5b9 100644 --- a/devel/electron40/files/patch-media_base_video__frame.cc +++ b/devel/electron40/files/patch-media_base_video__frame.cc @@ -1,4 +1,4 @@ ---- media/base/video_frame.cc.orig 2026-01-07 00:52:53 UTC +--- media/base/video_frame.cc.orig 2026-06-17 04:34:12 UTC +++ media/base/video_frame.cc @@ -85,7 +85,7 @@ std::string VideoFrame::StorageTypeToString( return "OWNED_MEMORY"; @@ -36,7 +36,7 @@ // static scoped_refptr VideoFrame::WrapExternalDmabufs( const VideoFrameLayout& layout, -@@ -1492,7 +1492,7 @@ scoped_refptr VideoFrame::shar +@@ -1508,7 +1508,7 @@ scoped_refptr VideoFrame::shar return wrapped_frame_ ? wrapped_frame_->shared_image() : shared_image_; } diff --git a/devel/electron40/files/patch-media_gpu_chromeos_libyuv__image__processor__backend.cc b/devel/electron40/files/patch-media_gpu_chromeos_libyuv__image__processor__backend.cc index a118fc7e7b74..2ebbd16d13f3 100644 --- a/devel/electron40/files/patch-media_gpu_chromeos_libyuv__image__processor__backend.cc +++ b/devel/electron40/files/patch-media_gpu_chromeos_libyuv__image__processor__backend.cc @@ -1,4 +1,4 @@ ---- media/gpu/chromeos/libyuv_image_processor_backend.cc.orig 2025-01-27 17:37:37 UTC +--- media/gpu/chromeos/libyuv_image_processor_backend.cc.orig 2026-06-17 04:34:12 UTC +++ media/gpu/chromeos/libyuv_image_processor_backend.cc @@ -53,7 +53,7 @@ static constexpr struct { #define CONV(in, out, trans, result) \ @@ -9,7 +9,7 @@ CONV(NV12, AR24, kConversion, Supported), #endif CONV(NV12, NV12, kConversion, Supported), -@@ -412,7 +412,7 @@ int LibYUVImageProcessorBackend::DoConversion(const Fr +@@ -425,7 +425,7 @@ int LibYUVImageProcessorBackend::DoConversion(const Fr fr->GetWritableVisibleData(VideoFrame::Plane::kUV)), \ fr->stride(VideoFrame::Plane::kUV) @@ -18,7 +18,7 @@ #define ARGB_DATA(fr) \ fr->GetWritableVisibleData(VideoFrame::Plane::kARGB), \ fr->stride(VideoFrame::Plane::kARGB) -@@ -574,7 +574,7 @@ int LibYUVImageProcessorBackend::DoConversion(const Fr +@@ -587,7 +587,7 @@ int LibYUVImageProcessorBackend::DoConversion(const Fr } } diff --git a/devel/electron40/files/patch-ui_base_x_x11__cursor__loader.cc b/devel/electron40/files/patch-ui_base_x_x11__cursor__loader.cc index ccaf9003dd9a..98c4e49f5c51 100644 --- a/devel/electron40/files/patch-ui_base_x_x11__cursor__loader.cc +++ b/devel/electron40/files/patch-ui_base_x_x11__cursor__loader.cc @@ -1,4 +1,4 @@ ---- ui/base/x/x11_cursor_loader.cc.orig 2025-10-21 20:19:54 UTC +--- ui/base/x/x11_cursor_loader.cc.orig 2026-06-17 04:34:12 UTC +++ ui/base/x/x11_cursor_loader.cc @@ -37,7 +37,7 @@ #include "ui/gfx/x/connection.h" @@ -21,7 +21,7 @@ if (!lib) return ""; -@@ -224,7 +228,7 @@ scoped_refptr ReadCursorFile( +@@ -234,7 +238,7 @@ scoped_refptr ReadCursorFile( const std::string& rm_xcursor_theme) { constexpr const char kDefaultTheme[] = "default"; std::string themes[] = { @@ -30,7 +30,7 @@ // The toolkit theme has the highest priority. LinuxUi::instance() ? LinuxUi::instance()->GetCursorThemeName() : std::string(), -@@ -414,7 +418,7 @@ uint32_t XCursorLoader::GetPreferredCursorSize() const +@@ -428,7 +432,7 @@ uint32_t XCursorLoader::GetPreferredCursorSize() const return size; } diff --git a/devel/electron40/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc b/devel/electron40/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc index 7d8ea3b3e28f..20db1162712d 100644 --- a/devel/electron40/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc +++ b/devel/electron40/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc @@ -1,6 +1,6 @@ ---- ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc.orig 2025-03-24 20:50:14 UTC +--- ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc.orig 2026-06-17 04:34:12 UTC +++ ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc -@@ -203,7 +203,7 @@ DragOperation DesktopDragDropClientOzone::StartDragAnd +@@ -218,7 +218,7 @@ DragOperation DesktopDragDropClientOzone::StartDragAnd return selected_operation_; }