From e366e4d64e1b1fd8d6171a5a83bf05f302a49237 Mon Sep 17 00:00:00 2001 From: Timon Date: Mon, 13 Oct 2025 06:56:56 +0200 Subject: [PATCH] Desktop: Update CEF to v140 (#3277) * update cef to v140 * fix build * update flake --- .nix/flake.lock | 12 ++--- .nix/flake.nix | 9 +--- Cargo.lock | 53 ++++++++++++------- Cargo.toml | 4 +- .../browser_process_life_span_handler.rs | 2 +- 5 files changed, 44 insertions(+), 36 deletions(-) diff --git a/.nix/flake.lock b/.nix/flake.lock index dc9b8537..cc724023 100644 --- a/.nix/flake.lock +++ b/.nix/flake.lock @@ -34,11 +34,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1754214453, - "narHash": "sha256-Q/I2xJn/j1wpkGhWkQnm20nShYnG7TI99foDBpXm1SY=", + "lastModified": 1760038930, + "narHash": "sha256-Oncbh0UmHjSlxO7ErQDM3KM0A5/Znfofj2BSzlHLeVw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5b09dc45f24cf32316283e62aec81ffee3c3e376", + "rev": "0b4defa2584313f3b781240b29d61f6f9f7e0df3", "type": "github" }, "original": { @@ -63,11 +63,11 @@ ] }, "locked": { - "lastModified": 1753238793, - "narHash": "sha256-jmQeEpgX+++MEgrcikcwoSiI7vDZWLP0gci7XiWb9uQ=", + "lastModified": 1760236527, + "narHash": "sha256-h9+WEQtUIZaZMvA1pnbZbMM+5X39OFnW92Q8hNoToD0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "0ad7ab4ca8e83febf147197e65c006dff60623ab", + "rev": "a38dd7f462825c75ce8567816ae38c2e7d826bfa", "type": "github" }, "original": { diff --git a/.nix/flake.nix b/.nix/flake.nix index 03539534..3010486b 100644 --- a/.nix/flake.nix +++ b/.nix/flake.nix @@ -75,14 +75,7 @@ ''; rustGpuPathOverride = "${rustGpuCargo}/bin:${rustGPUToolchainPkg}/bin"; - libcef = pkgs.libcef.overrideAttrs (finalAttrs: previousAttrs: { - version = "139.0.17"; - gitRevision = "6c347eb"; - chromiumVersion = "139.0.7258.31"; - srcHash = "sha256-kRMO8DP4El1qytDsAZBdHvR9AAHXce90nPdyfJailBg="; - - __intentionallyOverridingVersion = true; - + libcef = pkgs.libcef.overrideAttrs (_: _: { postInstall = '' strip $out/lib/* ''; diff --git a/Cargo.lock b/Cargo.lock index f5f9d06c..89d9ba18 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -724,20 +724,20 @@ dependencies = [ [[package]] name = "cef" -version = "139.0.1+139.0.17" +version = "140.3.1+140.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39b749cfc4124f9505b3fbe32279c0e93f30831f1ecf3c2cf85863179319cd7b" +checksum = "951391894583c255fd60b11f9a80397c9f8e1273d5b3a05531fcfa1365259059" dependencies = [ "cef-dll-sys", "libloading", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] name = "cef-dll-sys" -version = "139.0.1+139.0.17" +version = "140.3.1+140.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc42adb0adc477860b705e967d9f899be05ba3775fe4d6dc4d844a1391ffa3dd" +checksum = "208b1aa960cedcde7ac7590cb882a107caca0804242ac4060c488db233eef222" dependencies = [ "anyhow", "cmake", @@ -784,7 +784,7 @@ dependencies = [ "js-sys", "num-traits", "wasm-bindgen", - "windows-link", + "windows-link 0.1.3", ] [[package]] @@ -1245,7 +1245,7 @@ dependencies = [ "libc", "option-ext", "redox_users", - "windows-sys 0.60.2", + "windows-sys 0.59.0", ] [[package]] @@ -1297,9 +1297,9 @@ checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" [[package]] name = "download-cef" -version = "2.0.3" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de5f62da6c2850fd20cdefef7dd5389121869a88de8af3fda5a20bc849eafdd" +checksum = "d98178d9254efef0f69c1f584713d69c790ec00668cd98f783a5085fbefdbddc" dependencies = [ "bzip2", "clap", @@ -1461,7 +1461,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad" dependencies = [ "libc", - "windows-sys 0.60.2", + "windows-sys 0.59.0", ] [[package]] @@ -4372,7 +4372,7 @@ dependencies = [ "once_cell", "socket2", "tracing", - "windows-sys 0.60.2", + "windows-sys 0.59.0", ] [[package]] @@ -4821,7 +4821,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.60.2", + "windows-sys 0.59.0", ] [[package]] @@ -5585,7 +5585,7 @@ dependencies = [ "getrandom 0.3.3", "once_cell", "rustix", - "windows-sys 0.60.2", + "windows-sys 0.59.0", ] [[package]] @@ -6779,7 +6779,7 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0978bf7171b3d90bac376700cb56d606feb40f251a475a5d6634613564460b22" dependencies = [ - "windows-sys 0.60.2", + "windows-sys 0.59.0", ] [[package]] @@ -6819,7 +6819,7 @@ checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3" dependencies = [ "windows-implement 0.60.0", "windows-interface 0.59.1", - "windows-link", + "windows-link 0.1.3", "windows-result 0.3.4", "windows-strings 0.4.2", ] @@ -6874,13 +6874,19 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" +[[package]] +name = "windows-link" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" + [[package]] name = "windows-registry" version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b8a9ed28765efc97bbc954883f4e6796c33a06546ebafacbabee9696967499e" dependencies = [ - "windows-link", + "windows-link 0.1.3", "windows-result 0.3.4", "windows-strings 0.4.2", ] @@ -6900,7 +6906,7 @@ version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" dependencies = [ - "windows-link", + "windows-link 0.1.3", ] [[package]] @@ -6919,7 +6925,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57" dependencies = [ - "windows-link", + "windows-link 0.1.3", ] [[package]] @@ -6958,6 +6964,15 @@ dependencies = [ "windows-targets 0.53.3", ] +[[package]] +name = "windows-sys" +version = "0.61.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" +dependencies = [ + "windows-link 0.2.1", +] + [[package]] name = "windows-targets" version = "0.42.2" @@ -6995,7 +7010,7 @@ version = "0.53.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91" dependencies = [ - "windows-link", + "windows-link 0.1.3", "windows_aarch64_gnullvm 0.53.0", "windows_aarch64_msvc 0.53.0", "windows_i686_gnu 0.53.0", diff --git a/Cargo.toml b/Cargo.toml index 05623762..ba841a74 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -185,8 +185,8 @@ iai-callgrind = { version = "0.16" } ndarray = "0.16" strum = { version = "0.27", features = ["derive"] } dirs = "6.0" -cef = "=139.0.1" -cef-dll-sys = "=139.0.1" +cef = "140" +cef-dll-sys = "140" include_dir = "0.7" tracing-subscriber = { version = "0.3", features = ["env-filter"] } tracing = "0.1" diff --git a/desktop/src/cef/internal/browser_process_life_span_handler.rs b/desktop/src/cef/internal/browser_process_life_span_handler.rs index 9d470743..3fce0b5e 100644 --- a/desktop/src/cef/internal/browser_process_life_span_handler.rs +++ b/desktop/src/cef/internal/browser_process_life_span_handler.rs @@ -23,7 +23,7 @@ impl ImplLifeSpanHandler for BrowserProcessLifeSpanHandlerImpl { _user_gesture: ::std::os::raw::c_int, _popup_features: Option<&cef::PopupFeatures>, _window_info: Option<&mut cef::WindowInfo>, - _client: Option<&mut Option>, + _client: Option<&mut Option>, _settings: Option<&mut cef::BrowserSettings>, _extra_info: Option<&mut Option>, _no_javascript_access: Option<&mut ::std::os::raw::c_int>,