chromium,chromedriver: 140.0.7339.207 -> 141.0.7390.54 (#447766)

  name = "chromium-browser";

  packageName = "chromium";

  buildTargets = [

    "run_mksnapshot_default"

    "chrome_sandbox"

    "chrome"

  ];

      # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed):

      ./patches/no-build-timestamps.patch

    ]

    ++ lib.optionals (!chromiumVersionAtLeast "136") [

      # Fix build with Pipewire 1.4

      # Submitted upstream: https://webrtc-review.googlesource.com/c/src/+/380500

      # Got merged, started shipping with M136+.

      ./patches/webrtc-pipewire-1.4.patch

    ]

    ++ lib.optionals (packageName == "chromium") [

      # This patch is limited to chromium and ungoogled-chromium because electron-source sets

      # enable_widevine to false.

      # allowing us to use our rustc and our clang.

      ./patches/chromium-129-rust.patch

    ]

    ++ lib.optionals (chromiumVersionAtLeast "140") [

    ++ lib.optionals (versionRange "140" "141") [

      # Rebased variant of the patch above due to

      # https://chromium-review.googlesource.com/c/chromium/src/+/6665907

      ./patches/chromium-140-rust.patch

    ]

    ++ lib.optionals (!ungoogled && !chromiumVersionAtLeast "136") [

      # Note: We since use LLVM v19.1+ on unstable *and* release-24.11 for all version and as such

      # no longer need this patch. We opt to arbitrarily limit it to versions prior to M136 just

      # because that's when this revert stopped applying cleanly and defer fully dropping it for

      # the next cleanup to bundle rebuilding all of chromium and electron.

      #

      # Our rustc.llvmPackages is too old for std::hardware_destructive_interference_size

      # and std::hardware_constructive_interference_size.

      # So let's revert the change for now and hope that our rustc.llvmPackages and

      # nixpkgs-stable catch up sooner than later.

      # https://groups.google.com/a/chromium.org/g/cxx/c/cwktrFxxUY4

      # https://chromium-review.googlesource.com/c/chromium/src/+/5767325

      # Note: We exclude the changes made to the partition_allocator (PA), as the revert

      # would otherwise not apply because upstream reverted those changes to PA already

      # in https://chromium-review.googlesource.com/c/chromium/src/+/5841144

      # Note: ungoogled-chromium already reverts this as part of its patchset.

      (githubPatch {

        commit = "fc838e8cc887adbe95110045d146b9d5885bf2a9";

        hash = "sha256-NNKzIp6NYdeZaqBLWDW/qNxiDB1VFRz7msjMXuMOrZ8=";

        excludes = [ "base/allocator/partition_allocator/src/partition_alloc/*" ];

        revert = true;

      })

    ++ lib.optionals (chromiumVersionAtLeast "141") [

      # Rebased variant of the patch above due to

      # https://chromium-review.googlesource.com/c/chromium/src/+/6897026

      ./patches/chromium-141-rust.patch

    ]

    ++ lib.optionals stdenv.hostPlatform.isAarch64 [

      # Reverts decommit pooled pages which causes random crashes of tabs on systems

        hash = "sha256-PuinMLhJ2W4KPXI5K0ujw85ENTB1wG7Hv785SZ55xnY=";

      })

    ]

    ++ lib.optionals (chromiumVersionAtLeast "136") [

    ++ [

      # Modify the nodejs version check added in https://chromium-review.googlesource.com/c/chromium/src/+/6334038

      # to look for the minimal version, not the exact version (major.minor.patch). The linked CL makes a case for

      # preventing compilations of chromium with versions below their intended version, not about running the very

      # Rebased variant of the patch above for

      # electron 35 (M134) and 36 (M136)

      ./patches/chromium-134-rust-1.86-mismatched_lifetime_syntaxes.patch

    ]

    ++ lib.optionals (chromiumVersionAtLeast "141") [

      (fetchpatch {

        # Fix "invalid application of 'sizeof' to an incomplete type 'blink::CSSStyleSheet'"

        # by reverting https://chromium-review.googlesource.com/c/chromium/src/+/6892157

        name = "chromium-141-Revert-Remove-unnecessary-include-in-tree_scope.h.patch";

        url = "https://chromium.googlesource.com/chromium/src/+/0fc0e71aa1ca0419fae6d14255025543980d2cba^!?format=TEXT";

        decode = "base64 -d";

        revert = true;

        hash = "sha256-pnEus2NHpNWZ6ZSXLgdTn+it7oy1MPZPbD8SOAKLWbw=";

      })

    ];

    postPatch =

        chmod u+w build/config/gclient_args.gni

        echo 'checkout_mutter = false' >> build/config/gclient_args.gni

        echo 'checkout_glic_e2e_tests = false' >> build/config/gclient_args.gni

      ''

      + lib.optionalString (!isElectron && chromiumVersionAtLeast "140") ''

        echo 'checkout_clusterfuzz_data = false' >> build/config/gclient_args.gni

      ''

      + lib.optionalString (!isElectron) ''

        # Disable PGO because the profile data requires a newer compiler version (LLVM 14 isn't sufficient):

        chrome_pgo_phase = 0;

        clang_base_path = "${llvmCcAndBintools}";

      }

      // lib.optionalAttrs (chromiumVersionAtLeast "141") {

        # TODO: remove opt-out of https://chromium.googlesource.com/chromium/src/+/main/docs/modules.md

        use_clang_modules = false;

      }

      // {

        use_qt5 = false;

        use_qt6 = false;

      }

      // lib.optionalAttrs (chromiumVersionAtLeast "136") {

        # LLVM < v21 does not support --warning-suppression-mappings yet:

        clang_warning_suppression_file = "";

      }

      // {

        # To fix the build as we don't provide libffi_pic.a

        # (ld.lld: error: unable to find library -l:libffi_pic.a):

        use_system_libffi = true;

        # Use nixpkgs Rust compiler instead of the one shipped by Chromium.

        rust_sysroot_absolute = "${buildPackages.rustc}";

        rust_bindgen_root = "${buildPackages.rust-bindgen}";

      }

      // {

        enable_rust = true;

        # While we technically don't need the cache-invalidation rustc_version provides, rustc_version

        # is still used in some scripts (e.g. build/rust/std/find_std_rlibs.py).

    # Mute some warnings that are enabled by default. This is useful because

    # our Clang is always older than Chromium's and the build logs have a size

    # of approx. 25 MB without this option (and this saves e.g. 66 %).

    env.NIX_CFLAGS_COMPILE =

      "-Wno-unknown-warning-option"

      + lib.optionalString (chromiumVersionAtLeast "135") " -Wno-unused-command-line-argument -Wno-shadow";

    env.NIX_CFLAGS_COMPILE = "-Wno-unknown-warning-option -Wno-unused-command-line-argument -Wno-shadow";

    env.BUILD_CC = "$CC_FOR_BUILD";

    env.BUILD_CXX = "$CXX_FOR_BUILD";

    env.BUILD_AR = "$AR_FOR_BUILD";

diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn

index 516f7d85fc5718a26707d988389081cd86da49bd..f4b5284ad90591a57cb803353bbe57fd4e213159 100644

--- a/build/config/compiler/BUILD.gn

+++ b/build/config/compiler/BUILD.gn

@@ -1911,16 +1911,6 @@ config("runtime_library") {

     configs += [ "//build/config/c++:runtime_library" ]

   }

-  # Rust and C++ both provide intrinsics for LLVM to call for math operations. We

-  # want to use the C++ intrinsics, not the ones in the Rust compiler_builtins

-  # library. The Rust symbols are marked as weak, so that they can be replaced by

-  # the C++ symbols. This config ensures the C++ symbols exist and are strong in

-  # order to cause that replacement to occur by explicitly linking in clang's

-  # compiler-rt library.

-  if (is_clang && !(is_a_target_toolchain && is_cronet_build)) {

-    configs += [ "//build/config/clang:compiler_builtins" ]

-  }

-

   # TODO(crbug.com/40570904): Come up with a better name for is POSIX + Fuchsia

   # configuration.

   if (is_posix || is_fuchsia) {

--- a/third_party/webrtc/modules/video_capture/linux/pipewire_session.cc

+++ b/third_party/webrtc/modules/video_capture/linux/pipewire_session.cc

@@ -87,7 +87,7 @@ PipeWireNode::PipeWireNode(PipeWireSession* session,

       .param = OnNodeParam,

   };

-  pw_node_add_listener(proxy_, &node_listener_, &node_events, this);

+  pw_node_add_listener(reinterpret_cast<pw_node*>(proxy_), &node_listener_, &node_events, this);

 }

 // static

@@ -119,7 +119,7 @@ void PipeWireNode::OnNodeInfo(void* data, const pw_node_info* info) {

       uint32_t id = info->params[i].id;

       if (id == SPA_PARAM_EnumFormat &&

           info->params[i].flags & SPA_PARAM_INFO_READ) {

-        pw_node_enum_params(that->proxy_, 0, id, 0, UINT32_MAX, nullptr);

+        pw_node_enum_params(reinterpret_cast<pw_node*>(that->proxy_), 0, id, 0, UINT32_MAX, nullptr);

         break;

       }

     }