diff options
Diffstat (limited to 'www-client')
| -rw-r--r-- | www-client/Manifest.gz | bin | 6212 -> 6213 bytes | |||
| -rw-r--r-- | www-client/chromium/Manifest | 3 | ||||
| -rw-r--r-- | www-client/chromium/files/chromium-105-swiftshader-no-wayland.patch | 11 | ||||
| -rw-r--r-- | www-client/chromium/files/chromium-106-python3_11.patch | 11 | ||||
| -rw-r--r-- | www-client/chromium/files/chromium-106-revert-GlobalMediaControlsCastStartStop.patch | 32 |
5 files changed, 0 insertions, 57 deletions
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz Binary files differindex 9358eab64091..04b8c7662fbe 100644 --- a/www-client/Manifest.gz +++ b/www-client/Manifest.gz diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 7309e15a4bd5..da5be25bbba6 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -1,6 +1,3 @@ -AUX chromium-105-swiftshader-no-wayland.patch 401 BLAKE2B 2ebed22d234c2ab5d21515af9cecc932da39f8ae832671b447bcbe57c904a751dd0782f48b940094eb11b74e05533a96c72ecaa4a5d524c4c036361e0c91e893 SHA512 962d97e73a77e1c0e17822d4736683f25a7d48a430c9da455c1ca22014816518b8b44577af7be8155b03365dc0145b2bda418cc80766c6a189878e3660d115ad -AUX chromium-106-python3_11.patch 274 BLAKE2B ead8672e3282994444ed28660ccc99d4354b39b8026fc8906469bcc30f2f2c78916ac97be75b8b90b9654680a2ca23cc3eb794003fac42fb07db5c3ddc1211e9 SHA512 2e189ee099fd940320eea71d282565a2730bef76aa9dc6b467f2828c756359660aa1bf7a1a80aa27ace8de7fab5793b9fe76bad0c1b3383f8a1130484e391d2b -AUX chromium-106-revert-GlobalMediaControlsCastStartStop.patch 1472 BLAKE2B 2d2fd29509037d7f8a965edcb6e15f1ea76efad9f99ff7bb5620cd36a4952c21edc763ac302886b8b6314b497a4e984d872ba52e39b6758249b03474c2853ce9 SHA512 a843a404c4e9c7504fa3f116079868393bad68afcf1a63a3498dd95cb86f25a6fecf4c6e96841ff72c8a9e6f00e80cb66a480c685e7bfbd625fb7f358d23aece AUX chromium-107-system-zlib.patch 423 BLAKE2B 041cfcf5840fcf28b382f27275b3ab05751f5ae75fd404175d6f4ffaf3b029fb47fde473bcdf4bd99289f10d878f9d9725b3557ce97153abc7e4a1ee0d7959b9 SHA512 70ca4fef99b3bd8e533b6a223a6d6f4989ffba890728453434e5828565d0373319a7dfc7f272cbab9064308ab35b32cf9a7b0c34e13cf71fab0de913e73392aa AUX chromium-108-DocumentLoader-private.patch 1310 BLAKE2B 113a73429cb8cd9055bcdcb52c365800e814309f38285c36e1a691db26d2137383cfec47954b4712df0efde2b48481572f5311aedfa8f8b66caa105a23f7ce90 SHA512 218e28848a2d80c60905c0b8c032317e68707ce72f4d360a0d8cfe48aeb0e04d27f0880beadd6010da90f0204b60fcbfea746d66ce0cdbc0d7566d3c34ea6421 AUX chromium-108-EnumTable-crash.patch 2974 BLAKE2B b2d58b6b2b67b3bc2f04662749c3fd77b019356a6f9eaaad154cdae03e63f52c3bfa8bb0ed90467ac0806c58f6a2e7a351fd48c7e7a5e9b7ab317b4b8e2a75cb SHA512 3419e3dd6da21c8791d1335170547b3ac9fca593fe8eb01e17dd3eb916e6795a32848c4762051558cf98d0379592910ff9b267f05fd6b3c83d5e1c1073ba717c diff --git a/www-client/chromium/files/chromium-105-swiftshader-no-wayland.patch b/www-client/chromium/files/chromium-105-swiftshader-no-wayland.patch deleted file mode 100644 index 71326dbd8011..000000000000 --- a/www-client/chromium/files/chromium-105-swiftshader-no-wayland.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/third_party/swiftshader/src/WSI/BUILD.gn -+++ b/third_party/swiftshader/src/WSI/BUILD.gn -@@ -84,7 +84,7 @@ swiftshader_source_set("WSI") { - "../Vulkan:swiftshader_libvulkan_headers", - ] - -- if (is_linux && !use_system_libwayland) { -+ if (is_linux && !use_system_libwayland && ozone_platform_wayland) { - # Use third-party targets - deps += [ "$wayland_gn_dir:wayland_client" ] - } diff --git a/www-client/chromium/files/chromium-106-python3_11.patch b/www-client/chromium/files/chromium-106-python3_11.patch deleted file mode 100644 index 795f48547490..000000000000 --- a/www-client/chromium/files/chromium-106-python3_11.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/tools/grit/grit/util.py -+++ b/tools/grit/grit/util.py -@@ -209,7 +209,7 @@ def ReadFile(filename, encoding): - mode = 'rb' - encoding = None - else: -- mode = 'rU' -+ mode = 'r' - - with io.open(filename, mode, encoding=encoding) as f: - return f.read() diff --git a/www-client/chromium/files/chromium-106-revert-GlobalMediaControlsCastStartStop.patch b/www-client/chromium/files/chromium-106-revert-GlobalMediaControlsCastStartStop.patch deleted file mode 100644 index 5b28ff461bb1..000000000000 --- a/www-client/chromium/files/chromium-106-revert-GlobalMediaControlsCastStartStop.patch +++ /dev/null @@ -1,32 +0,0 @@ -From b58f0f2725a8c1a8a131f9984b5fd53b54119dba Mon Sep 17 00:00:00 2001 -From: Muyao Xu <muyaoxu@google.com> -Date: Thu, 20 Jan 2022 23:46:21 +0000 -Subject: [PATCH] [Zenith] Enable GlobalMediaControlsCastStartStop flag by - default - -The feature is rolled out to 100% stable through finch for M96+. -This CL enables it by default and fixes some unit tests failures. - -Bug: 1287242, 1287305 -Change-Id: I7e5c9625b77379fef253c41ef292a0dd6fc366fb -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3388416 -Reviewed-by: Takumi Fujimoto <takumif@chromium.org> -Commit-Queue: Muyao Xu <muyaoxu@google.com> -Cr-Commit-Position: refs/heads/main@{#961658} ---- - chrome/browser/media/router/media_router_feature.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browser/media/router/media_router_feature.cc -index dcb025a..f7ea08a 100644 ---- a/chrome/browser/media/router/media_router_feature.cc -+++ b/chrome/browser/media/router/media_router_feature.cc -@@ -48,7 +48,7 @@ const base::Feature kGlobalMediaControlsCastStartStop{ - "GlobalMediaControlsCastStartStop", base::FEATURE_DISABLED_BY_DEFAULT}; - #else - const base::Feature kGlobalMediaControlsCastStartStop{ -- "GlobalMediaControlsCastStartStop", base::FEATURE_ENABLED_BY_DEFAULT}; -+ "GlobalMediaControlsCastStartStop", base::FEATURE_DISABLED_BY_DEFAULT}; - #endif // BUILDFLAG(IS_CHROMEOS) - - #endif // !BUILDFLAG(IS_ANDROID) |