diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-02-05 00:01:49 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-02-05 00:01:49 +0000 |
commit | c69fbb8dc5bb4c605c13a3f53e4ef120c13d39f2 (patch) | |
tree | 1c6a8691af1611a0a8bb0289d02e34800e3ce7d9 /pkgs/applications/networking/browsers | |
parent | 4fb8a2e0124b123ef1f1695f2ebd12b320a9947f (diff) | |
parent | 3353a12519681bbfde0cc88fbf32af3eef4ce3d1 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/networking/browsers')
3 files changed, 20 insertions, 66 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 5640b993013b8..9be7d1fe7d2e1 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -161,21 +161,6 @@ let ./patches/no-build-timestamps.patch # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags: ./patches/widevine-79.patch - ] ++ lib.optionals (versionRange "97" "98") [ - # A critical Ozone/Wayland fix: - # (Note: The patch for surface_augmenter.cc doesn't apply on M97 so we extract that part.) - (fetchpatch { - # [linux/wayland] Fixed terminate caused by binding to wrong version. - url = "https://github.com/chromium/chromium/commit/dd4c3ddadbb9869f59cee201a38e9ca3b9154f4d.patch"; - excludes = [ "ui/ozone/platform/wayland/host/surface_augmenter.cc" ]; - sha256 = "sha256-lp4kxPNAkafdE9NfD3ittTCpomRpX9Hqhtt9GFf4Ntw="; - }) - ./patches/m97-ozone-wayland-fix-surface_augmenter.patch - (githubPatch { - # [linux/wayland] Fixed terminate caused by binding to wrong version. (fixup) - commit = "a84b79daa8897b822336b8f348ef4daaae07af37"; - sha256 = "sha256-2x6/rGGzTC6lKLMkVyD9RNCTsMVrtRQyr/NjSpaj2is="; - }) ]; postPatch = '' diff --git a/pkgs/applications/networking/browsers/chromium/patches/m97-ozone-wayland-fix-surface_augmenter.patch b/pkgs/applications/networking/browsers/chromium/patches/m97-ozone-wayland-fix-surface_augmenter.patch deleted file mode 100644 index e63000fabc1c0..0000000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/m97-ozone-wayland-fix-surface_augmenter.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/ui/ozone/platform/wayland/host/surface_augmenter.cc b/ui/ozone/platform/wayland/host/surface_augmenter.cc -index d971d15e71426..6e5408398bcea 100644 ---- a/ui/ozone/platform/wayland/host/surface_augmenter.cc -+++ b/ui/ozone/platform/wayland/host/surface_augmenter.cc -@@ -13,7 +13,8 @@ - namespace ui { - - namespace { --constexpr uint32_t kMaxSurfaceAugmenterVersion = 1; -+constexpr uint32_t kMinVersion = 1; -+constexpr uint32_t kMaxVersion = 1; - } - - // static -@@ -27,11 +28,13 @@ void SurfaceAugmenter::Instantiate(WaylandConnection* connection, - uint32_t version) { - DCHECK_EQ(interface, kInterfaceName); - -- if (connection->surface_augmenter_) -+ if (connection->surface_augmenter_ || -+ !wl::CanBind(interface, version, kMinVersion, kMaxVersion)) { - return; -+ } - -- auto augmenter = wl::Bind<surface_augmenter>( -- registry, name, std::min(version, kMaxSurfaceAugmenterVersion)); -+ auto augmenter = wl::Bind<surface_augmenter>(registry, name, -+ std::min(version, kMaxVersion)); - if (!augmenter) { - LOG(ERROR) << "Failed to bind surface_augmenter"; - return; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index b5f0722b16ab2..0780b13611130 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -19,45 +19,45 @@ } }, "beta": { - "version": "98.0.4758.80", - "sha256": "0wa1jhsw7qrym4x8wxmdvdvbilb8jdv0mizzib2342l61zi6cwn8", - "sha256bin64": "12a69cbv2sbrly6g477ln4pssh8n1rdg6mr6cc17iy2jhfihry0q", + "version": "99.0.4844.17", + "sha256": "18bhfy64rz4bilbzml33856azwzq4bhiisc2jlbncdnmk3x6n71s", + "sha256bin64": "1vaxcfgiww4skanny5ks431jyrnf0rgx7g850m29v8v49c3qflm8", "deps": { "gn": { - "version": "2021-12-07", + "version": "2022-01-10", "url": "https://gn.googlesource.com/gn", - "rev": "fc295f3ac7ca4fe7acc6cb5fb052d22909ef3a8f", - "sha256": "02bx3bp85kkis704gndb6jvjph7gv3ij746bq4anl30kfrkpcifh" + "rev": "80a40b07305373617eba2d5878d353532af77da3", + "sha256": "1103lf38h7412949j6nrk48m2vv2rrxacn42sjg33lg88nyv7skv" } } }, "dev": { - "version": "99.0.4844.16", - "sha256": "0xig6l1yx9glgb1a53idncnqc1imjvbszi5mrp39yvijarmx8s1f", - "sha256bin64": "18p2hqykizijb9w96dm8yxwgvpjx37vabyw6n9wc59l6wyhbjkkw", + "version": "100.0.4867.0", + "sha256": "1ay6p2aky90lf3gk3n87m4mrxyyhg4anr389kl648ijigsg6wlrd", + "sha256bin64": "11g8rlw5aahpn4cd2fl4b942g1giv05zcs10y0qrvirnwmp2i3ha", "deps": { "gn": { - "version": "2022-01-10", + "version": "2022-01-21", "url": "https://gn.googlesource.com/gn", - "rev": "80a40b07305373617eba2d5878d353532af77da3", - "sha256": "1103lf38h7412949j6nrk48m2vv2rrxacn42sjg33lg88nyv7skv" + "rev": "0725d7827575b239594fbc8fd5192873a1d62f44", + "sha256": "1dzdvcn2r5c9giknvasf3y5y4901kav7igivjvrpww66ywsj8fzr" } } }, "ungoogled-chromium": { - "version": "97.0.4692.99", - "sha256": "1fpc07zvashaqqalwn7wxnswxclrxvhjrxy1rzr6gcq5awhaw6y9", - "sha256bin64": "18afashha667rzcscq3frkp5ixa7nrirs7i3061njqi4z9ql0cs8", + "version": "98.0.4758.80", + "sha256": "0wa1jhsw7qrym4x8wxmdvdvbilb8jdv0mizzib2342l61zi6cwn8", + "sha256bin64": "0p2bh45ffgfhyh18bxw8fz4691g25s44lxxj4igk8b0bn71v1pgi", "deps": { "gn": { - "version": "2021-11-03", + "version": "2021-12-07", "url": "https://gn.googlesource.com/gn", - "rev": "90294ccdcf9334ed25a76ac9b67689468e506342", - "sha256": "0n0jml8s00ayy186jzrf207hbz70pxiq426znxwxd4gjcp60scsa" + "rev": "fc295f3ac7ca4fe7acc6cb5fb052d22909ef3a8f", + "sha256": "02bx3bp85kkis704gndb6jvjph7gv3ij746bq4anl30kfrkpcifh" }, "ungoogled-patches": { - "rev": "97.0.4692.99-1", - "sha256": "1jgxpp3wl24hq39291mgmdwcxbarxg4rpa6il53k8z3rf6gd2s4i" + "rev": "98.0.4758.80-1", + "sha256": "0a8y9yz6xyh025gk3dr0ndrdwmrslhd1ph2f8nivmqk61j7c2g8h" } } } |