diff options
Diffstat (limited to 'devel/electron35')
-rw-r--r-- | devel/electron35/Makefile | 1 | ||||
-rw-r--r-- | devel/electron35/Makefile.version | 2 | ||||
-rw-r--r-- | devel/electron35/distinfo | 10 | ||||
-rw-r--r-- | devel/electron35/files/package.json | 1 | ||||
-rw-r--r-- | devel/electron35/files/patch-electron_BUILD.gn | 14 | ||||
-rw-r--r-- | devel/electron35/files/patch-electron_shell_app_electron__main__delegate.cc | 14 | ||||
-rw-r--r-- | devel/electron35/files/patch-electron_spec_api-web-frame-main-spec.ts | 6 | ||||
-rw-r--r-- | devel/electron35/files/yarn.lock | 23 |
8 files changed, 31 insertions, 40 deletions
diff --git a/devel/electron35/Makefile b/devel/electron35/Makefile index a2ae5821a91c..85f863b05b49 100644 --- a/devel/electron35/Makefile +++ b/devel/electron35/Makefile @@ -24,6 +24,7 @@ LICENSE= BSD3CLAUSE LGPL21 MPL11 MIT LICENSE_COMB= multi LICENSE_FILE= ${WRKSRC}/electron/LICENSE +BROKEN_i386= fetch fails: node process stalls during fetch phase and eats up all CPUs ONLY_FOR_ARCHS= aarch64 amd64 i386 FETCH_DEPENDS= yarn${NODEJS_SUFFIX}>0:www/yarn${NODEJS_SUFFIX} diff --git a/devel/electron35/Makefile.version b/devel/electron35/Makefile.version index ffd5b635b0bc..54d31bd95ed2 100644 --- a/devel/electron35/Makefile.version +++ b/devel/electron35/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 35.7.2 +ELECTRON_VER= 35.7.5 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron35/distinfo b/devel/electron35/distinfo index b813643e6cec..20e1aa401c01 100644 --- a/devel/electron35/distinfo +++ b/devel/electron35/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1752640489 +TIMESTAMP = 1755725511 SHA256 (electron/chromium-134.0.6998.205.tar.xz.0) = 2de727120892e92fa40fed6c76104ed66dace4fe66ae3be0e055c51b913009e8 SIZE (electron/chromium-134.0.6998.205.tar.xz.0) = 2000000000 SHA256 (electron/chromium-134.0.6998.205.tar.xz.1) = 58024b9e01977a769576b4c2b3056c9d894a2c13b4f0729f0b8060b3984243c9 @@ -7,10 +7,10 @@ SHA256 (electron/chromium-134.0.6998.205.tar.xz.2) = 9631efe75d07b1f36799506e59b SIZE (electron/chromium-134.0.6998.205.tar.xz.2) = 171552128 SHA256 (electron/pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92 SIZE (electron/pulseaudio-16.1.tar.gz) = 2763111 -SHA256 (electron/electron-yarn-cache-35.7.2.tar.xz) = 38504ad60c0eff66585dd51f4cf04ebcfdc1c6b14f99bf4d0e6c18e266b11196 -SIZE (electron/electron-yarn-cache-35.7.2.tar.xz) = 30489788 -SHA256 (electron/electron-electron-v35.7.2_GH0.tar.gz) = 506271a36fa8d61c80f5ddad65bdeb70e2bb56854dbb41082dd41e662acd932e -SIZE (electron/electron-electron-v35.7.2_GH0.tar.gz) = 14804144 +SHA256 (electron/electron-yarn-cache-35.7.5.tar.xz) = d582f8f50f479816b284f636a7ee9b1e4b5fe966d9f1157e6b5a5cb93d46b397 +SIZE (electron/electron-yarn-cache-35.7.5.tar.xz) = 30487296 +SHA256 (electron/electron-electron-v35.7.5_GH0.tar.gz) = 5adcbf3c671e4b1e8fc4f6a78425214a8e5c36eb89a1d06b02fbbf45ccf45f09 +SIZE (electron/electron-electron-v35.7.5_GH0.tar.gz) = 14805277 SHA256 (electron/nodejs-node-v22.16.0_GH0.tar.gz) = 00d7c2a8f315f201fe30e2f7ac5a137663ab1c79a5c6873df553aff0409ce291 SIZE (electron/nodejs-node-v22.16.0_GH0.tar.gz) = 122982623 SHA256 (electron/nodejs-nan-e14bdcd1f72d62bca1d541b66da43130384ec213_GH0.tar.gz) = 02edf8d5b3fef9af94d8a1355da60564a57e7f2c99cb422bce042400607ed2eb diff --git a/devel/electron35/files/package.json b/devel/electron35/files/package.json index 9074ade36c7b..db2706701411 100644 --- a/devel/electron35/files/package.json +++ b/devel/electron35/files/package.json @@ -18,7 +18,6 @@ "@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", diff --git a/devel/electron35/files/patch-electron_BUILD.gn b/devel/electron35/files/patch-electron_BUILD.gn index c788724fe500..07ff2439ad64 100644 --- a/devel/electron35/files/patch-electron_BUILD.gn +++ b/devel/electron35/files/patch-electron_BUILD.gn @@ -1,6 +1,6 @@ ---- electron/BUILD.gn.orig 2025-05-27 20:59:13 UTC +--- electron/BUILD.gn.orig 2025-08-19 00:41:48 UTC +++ electron/BUILD.gn -@@ -543,7 +543,7 @@ source_set("electron_lib") { +@@ -547,7 +547,7 @@ source_set("electron_lib") { defines += [ "GDK_DISABLE_DEPRECATION_WARNINGS" ] } @@ -9,7 +9,7 @@ deps += [ "//components/crash/core/app", "//components/crash/core/browser", -@@ -636,6 +636,12 @@ source_set("electron_lib") { +@@ -640,6 +640,12 @@ source_set("electron_lib") { cflags_objcc = [ "-fobjc-weak" ] } } @@ -22,7 +22,7 @@ if (is_linux) { libs = [ "xshmfence" ] deps += [ -@@ -1206,7 +1212,7 @@ if (is_mac) { +@@ -1218,7 +1224,7 @@ if (is_mac) { ":electron_lib", ":electron_win32_resources", ":packed_resources", @@ -31,7 +31,7 @@ "//content:sandbox_helper_win", "//electron/buildflags", "//third_party/electron_node:libnode", -@@ -1233,7 +1239,7 @@ if (is_mac) { +@@ -1245,7 +1251,7 @@ if (is_mac) { public_deps = [ "//tools/v8_context_snapshot:v8_context_snapshot" ] } @@ -40,7 +40,7 @@ data_deps += [ "//components/crash/core/app:chrome_crashpad_handler" ] } -@@ -1300,7 +1306,7 @@ if (is_mac) { +@@ -1312,7 +1318,7 @@ if (is_mac) { configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ] } @@ -49,7 +49,7 @@ deps += [ "//sandbox/linux:chrome_sandbox" ] } } -@@ -1408,7 +1414,7 @@ dist_zip("electron_dist_zip") { +@@ -1420,7 +1426,7 @@ dist_zip("electron_dist_zip") { ":electron_version_file", ":licenses", ] diff --git a/devel/electron35/files/patch-electron_shell_app_electron__main__delegate.cc b/devel/electron35/files/patch-electron_shell_app_electron__main__delegate.cc index 5b4708fab656..a3f7f13937bd 100644 --- a/devel/electron35/files/patch-electron_shell_app_electron__main__delegate.cc +++ b/devel/electron35/files/patch-electron_shell_app_electron__main__delegate.cc @@ -1,6 +1,6 @@ ---- electron/shell/app/electron_main_delegate.cc.orig 2025-01-29 20:10:57 UTC +--- electron/shell/app/electron_main_delegate.cc.orig 2025-08-19 00:41:48 UTC +++ electron/shell/app/electron_main_delegate.cc -@@ -59,13 +59,13 @@ +@@ -63,13 +63,13 @@ #include "chrome/child/v8_crashpad_support_win.h" #endif @@ -16,7 +16,7 @@ #include "components/crash/core/app/crash_switches.h" // nogncheck #include "components/crash/core/app/crashpad.h" // nogncheck #include "components/crash/core/common/crash_key.h" -@@ -156,7 +156,7 @@ bool ElectronPathProvider(int key, base::FilePath* res +@@ -160,7 +160,7 @@ bool ElectronPathProvider(int key, base::FilePath* res create_dir = true; break; } @@ -25,7 +25,7 @@ case DIR_APP_DATA: { auto env = base::Environment::Create(); cur = base::nix::GetXDGDirectory( -@@ -282,7 +282,7 @@ std::optional<int> ElectronMainDelegate::BasicStartupC +@@ -302,7 +302,7 @@ std::optional<int> ElectronMainDelegate::BasicStartupC base::win::PinUser32(); #endif @@ -34,7 +34,7 @@ // Check for --no-sandbox parameter when running as root. if (getuid() == 0 && IsSandboxEnabled(command_line)) LOG(FATAL) << "Running as root without --" -@@ -332,7 +332,7 @@ void ElectronMainDelegate::PreSandboxStartup() { +@@ -352,7 +352,7 @@ void ElectronMainDelegate::PreSandboxStartup() { /* is_preinit = */ IsBrowserProcess() || IsZygoteProcess()); #endif @@ -43,7 +43,7 @@ crash_reporter::InitializeCrashKeys(); #endif -@@ -367,7 +367,7 @@ void ElectronMainDelegate::PreSandboxStartup() { +@@ -387,7 +387,7 @@ void ElectronMainDelegate::PreSandboxStartup() { } #endif @@ -52,7 +52,7 @@ crash_keys::SetCrashKeysFromCommandLine(*command_line); crash_keys::SetPlatformCrashKey(); #endif -@@ -402,7 +402,7 @@ std::optional<int> ElectronMainDelegate::PreBrowserMai +@@ -422,7 +422,7 @@ std::optional<int> ElectronMainDelegate::PreBrowserMai #if BUILDFLAG(IS_MAC) RegisterAtomCrApp(); #endif diff --git a/devel/electron35/files/patch-electron_spec_api-web-frame-main-spec.ts b/devel/electron35/files/patch-electron_spec_api-web-frame-main-spec.ts index 279337ccb3c6..c8b3ce3d94f7 100644 --- a/devel/electron35/files/patch-electron_spec_api-web-frame-main-spec.ts +++ b/devel/electron35/files/patch-electron_spec_api-web-frame-main-spec.ts @@ -1,7 +1,7 @@ ---- electron/spec/api-web-frame-main-spec.ts.orig 2024-12-05 00:03:13 UTC +--- electron/spec/api-web-frame-main-spec.ts.orig 2025-07-31 13:41:06 UTC +++ electron/spec/api-web-frame-main-spec.ts -@@ -315,7 +315,7 @@ describe('webFrameMain module', () => { - }); +@@ -316,7 +316,7 @@ describe('webFrameMain module', () => { + afterEach(closeAllWindows); // TODO(jkleinsc) fix this flaky test on linux - ifit(process.platform !== 'linux')('throws upon accessing properties when disposed', async () => { diff --git a/devel/electron35/files/yarn.lock b/devel/electron35/files/yarn.lock index 9d7eeed91df3..79cd64789157 100644 --- a/devel/electron35/files/yarn.lock +++ b/devel/electron35/files/yarn.lock @@ -1063,15 +1063,6 @@ resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.18.5.tgz#eccda0b04fe024bed505881e2e532f9c119169bf" integrity sha512-wz7kjjRRj8/Lty4B+Kr0LN6Ypc/3SymeCCGSbaXp2leH0ZVg/PriNiOwNj4bD4uphI7A8NXS4b6Gl373sfO5mA== -"@types/webpack@^5.28.5": - version "5.28.5" - resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-5.28.5.tgz#0e9d9a15efa09bbda2cef41356ca4ac2031ea9a2" - integrity sha512-wR87cgvxj3p6D0Crt1r5avwqffqPXUkNlnQ1mjU93G7gCuFjufZR4I6j8cz5g1F1tTYpfOOFvly+cmIQwL9wvw== - dependencies: - "@types/node" "*" - tapable "^2.2.0" - webpack "^5" - "@types/yauzl@^2.9.1": version "2.10.0" resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.10.0.tgz#b3248295276cf8c6f153ebe6a9aba0c988cb2599" @@ -1669,17 +1660,17 @@ boolean@^3.0.1: integrity sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw== brace-expansion@^1.1.7: - version "1.1.11" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" - integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== + version "1.1.12" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.12.tgz#ab9b454466e5a8cc3a187beaad580412a9c5b843" + integrity sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg== dependencies: balanced-match "^1.0.0" concat-map "0.0.1" brace-expansion@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae" - integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA== + version "2.0.2" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.2.tgz#54fc53237a613d854c7bd37463aad17df87214e7" + integrity sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ== dependencies: balanced-match "^1.0.0" @@ -8125,7 +8116,7 @@ webpack-sources@^3.2.3: resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde" integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== -webpack@^5, webpack@^5.95.0: +webpack@^5.95.0: version "5.95.0" resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.95.0.tgz#8fd8c454fa60dad186fbe36c400a55848307b4c0" integrity sha512-2t3XstrKULz41MNMBF+cJ97TyHdyQ8HCt//pqErqDvNjU9YQBnZxIHa11VXsi7F3mb5/aO2tuDxdeTPdU7xu9Q== |