diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2022-06-23 00:05:16 +0200 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2022-06-23 19:50:56 +0000 |
| commit | 5acbf8169b512c1afa9c78200151d591e6d50ed1 (patch) | |
| tree | 3eda4c940f9d41a139d771e53d8d2f9a50fbce47 | |
| parent | Merge pull request #178769 from NixOS/backport-178731-to-release-22.05 (diff) | |
| download | nixpkgs-origin/backport-178645-to-release-22.05.tar.gz | |
ungoogled-chromium: 102.0.5005.115 -> 103.0.5060.53origin/backport-178645-to-release-22.05
(cherry picked from commit dd9c01a9af18c8a6efbf281cfb18bfafca34c26c)
3 files changed, 8 insertions, 55 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index cfd6b122d6cc..1cfc90dd4f14 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -160,10 +160,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 - ] ++ optionals (versionRange "102" "103") [ - # https://dawn-review.googlesource.com/c/dawn/+/88582 - # Wrap get_gitHash in try-catch to prevent failures in tarball builds. - ./patches/m102-fix-dawn_version_generator-failure.patch ]; postPatch = '' diff --git a/pkgs/applications/networking/browsers/chromium/patches/m102-fix-dawn_version_generator-failure.patch b/pkgs/applications/networking/browsers/chromium/patches/m102-fix-dawn_version_generator-failure.patch deleted file mode 100644 index e9391541e435..000000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/m102-fix-dawn_version_generator-failure.patch +++ /dev/null @@ -1,43 +0,0 @@ -From e9ffd084ec1ff9f7bfc86879732953dc58256958 Mon Sep 17 00:00:00 2001 -From: Loko Kung <lokokung@google.com> -Date: Tue, 3 May 2022 00:28:53 +0000 -Subject: [PATCH] Wrap get_gitHash in try-catch to prevent failures in tarball - builds. - -Bug: chromium:1321370 -Change-Id: If39d2236d1b4d965f7bd189f6bd1cdc70436c41d -Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/88582 -Commit-Queue: Loko Kung <lokokung@google.com> -Reviewed-by: Austin Eng <enga@chromium.org> -Kokoro: Kokoro <noreply+kokoro@google.com> -(cherry picked from commit 03ddfbb81fb4127ca37ea53e70fcb34fe851e24e) ---- - third_party/dawn/generator/dawn_version_generator.py | 13 ++++++++----- - 1 file changed, 8 insertions(+), 5 deletions(-) - -diff --git a/third_party/dawn/generator/dawn_version_generator.py b/third_party/dawn/generator/dawn_version_generator.py -index 1907e88da..3c1927bee 100644 ---- a/third_party/dawn/generator/dawn_version_generator.py -+++ b/third_party/dawn/generator/dawn_version_generator.py -@@ -23,11 +23,14 @@ def get_git(): - - - def get_gitHash(dawnDir): -- result = subprocess.run([get_git(), 'rev-parse', 'HEAD'], -- stdout=subprocess.PIPE, -- cwd=dawnDir) -- if result.returncode == 0: -- return result.stdout.decode('utf-8').strip() -+ try: -+ result = subprocess.run([get_git(), "rev-parse", "HEAD"], -+ stdout=subprocess.PIPE, -+ cwd=dawnDir) -+ if result.returncode == 0: -+ return result.stdout.decode("utf-8").strip() -+ except Exception: -+ return "" - # No hash was available (possibly) because the directory was not a git checkout. Dawn should - # explicitly handle its absenece and disable features relying on the hash, i.e. caching. - return '' --- -2.36.0 diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 0516b1d65bd3..f661e64bac7f 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -45,19 +45,19 @@ } }, "ungoogled-chromium": { - "version": "102.0.5005.115", - "sha256": "1rj7vy824vn513hiivc90lnxvxyi2s0qkdmfqsdssv9v6zjl079h", - "sha256bin64": "0b32sscbjnvr98lk962i9k2srckv2s7fp9pifmsv5jlwndjhzm7y", + "version": "103.0.5060.53", + "sha256": "00di0nw6h3kb0qp2wp3ny3zsar1ayn1lyx5zr28dl1h5cwaaxjqf", + "sha256bin64": "19wxd4jl6fyjpcpy2331ckz6dgzrfj52wvdkp0kb18n0sym17fyn", "deps": { "gn": { - "version": "2022-04-14", + "version": "2022-05-11", "url": "https://gn.googlesource.com/gn", - "rev": "fd9f2036f26d83f9fcfe93042fb952e5a7fe2167", - "sha256": "0b5xs0chcv3hfhy71rycsmgxnqbm375a333hwav8929k9cbi5p9h" + "rev": "578a7fe4c3c6b0bc2ae1fd2e37f14857d09895bf", + "sha256": "03dqfrdpf5xxl64dby3qmbwpzdq2gsa8g7xl438py3a629rgxg63" }, "ungoogled-patches": { - "rev": "102.0.5005.115-1", - "sha256": "1z2xkxxviggyyksga74cqa4v73gynlgzi22ckg8yv84qxrklik6p" + "rev": "103.0.5060.53-1", + "sha256": "1g5ciwzrhg9g13gvhrwqf19djk9jhj1d6nx2f6a8d5ch1mhi2z8s" } } } |