commit: 86e673d9139c02cc4760aed472ed0f7e0f015c04 Author: Stephan Hartmann <sultan <AT> gentoo <DOT> org> AuthorDate: Sun Nov 8 12:28:49 2020 +0000 Commit: Stephan Hartmann <sultan <AT> gentoo <DOT> org> CommitDate: Sun Nov 8 12:34:19 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86e673d9
www-client/chromium: dev channel bump to 88.0.4315.5 Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org> www-client/chromium/Manifest | 4 +-- ...0.4300.0.ebuild => chromium-88.0.4315.5.ebuild} | 8 +++-- .../chromium/files/chromium-88-ozone-deps.patch | 40 ++++++++++++++++++++++ 3 files changed, 48 insertions(+), 4 deletions(-) diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index f6bfcee7f11..6df7bd466cf 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -2,6 +2,6 @@ DIST chromium-86-patchset-7.tar.xz 7560 BLAKE2B b7efc559bebe048e7c1a8ff7e3a88f4c DIST chromium-86.0.4240.183.tar.xz 825615220 BLAKE2B 72cf9099de420b1cb2af8841a4f7c430ad137a81d0cecb3130549a8bb15e66b1c13d4ff462c6b9e2682f269e1efd24d77416071fe4785481dfd97cac0a740661 SHA512 25d46413a39c0181ee400bcc9cf9ba4a83b4b000c4dcee5a8d471f5ddf21b80b010e6887cf387722278144657fd5f77e8ca4002b9d4f738853473bc79c776cc1 DIST chromium-87-patchset-8.tar.xz 5484 BLAKE2B 732fe9b293a0956478ca8fc7a8b09a4ae7b618cffa193cc886c2a618adb33eccdc15bcf5cb4b878f970385d93c025129a6048ac3e9de62acc0021f0c5e6cabee SHA512 9fd7057341d35c23577f48fc0c95ca96d723dd11a7c24aa91de90898c0a4958b3f2c699594b5d32d59e8c587018da2be83caf1a1746656e5c24d14045b1d2c2a DIST chromium-87.0.4280.47.tar.xz 856391876 BLAKE2B 892f3083d783fec200aba60e8181162615f055af118a5b7538a277f2f411c937e0c7fbc23b3a20359396bfa97b361d6c2fb91706fcd024eefd7d29f45b800caf SHA512 5ac841c82999afa4d283bef693c9929f59b85e9f39e1e703393298427ddd70a73f1cd0c535066cf46c894092fb42ade6925ca312836aea2293f51611de350702 -DIST chromium-88-patchset-1.tar.xz 9224 BLAKE2B 0fca6f309ebfab5735f6ef468177cbfb35530336f6640938e6bfdd4f251a5b8cd6a0573be186db13e255f5ddf6862f64830b19b6112a974dfcfb4930b4cb28e9 SHA512 8bdbc15bc02400d39d7f31b00a6a0129d7cf4c08571b490ea7224ba752b4536fd2cc455cd513ca28105ca6eda0d4a8736ece3a97c7d2c57aa47137f576613c4e -DIST chromium-88.0.4300.0.tar.xz 844288696 BLAKE2B 26ce30b580d09677d65d1b85af5ac3498463315f2d23f2ad5b762a29109a2d8ebf89a556782b252e6ca7a96b7d68656d0d41be8877368ac502f7130e99b6284c SHA512 ede4fbbba98a4cdfa8ec42818441aaf30d955a48a75dd61fff4b823c47722583d63b68fcfe43baacb1767bdb52f8e9682015274de00b66791b45d7efe9ee9f5c +DIST chromium-88-patchset-2.tar.xz 6832 BLAKE2B 5ef8a3ce491c96d71ab7ed41d188dcff929c146f2c412bda1035b52fda09dc2bdeb3266eb3e1d046398deb59f440e69ee255a61ced3c2ab409e99ffd36b769e7 SHA512 e83564dfb4367867494868b53d171c276ee9d6827a60a80ac6ab06b410ed79c64c79b60b5be6e44d25987029ebed997b2779ab019d23908df8d14f2decad51be +DIST chromium-88.0.4315.5.tar.xz 845479952 BLAKE2B 78021935cbf7b3ceaedda1d1e4f355e4fe95795f5c793b46311ccc3c9dda53eb1518fe6472dc761790a9ea37a57c2f554fe442aff5d82bb133a028ff491b6099 SHA512 586fabb0759a880a010d6f80b3c5ec0f6477524b7d110cf05767cf2a8b48d81ad1e5161ebcd0e045f18006cf626413188dc6247a08b7ea57db53422b0708d4d3 DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf diff --git a/www-client/chromium/chromium-88.0.4300.0.ebuild b/www-client/chromium/chromium-88.0.4315.5.ebuild similarity index 99% rename from www-client/chromium/chromium-88.0.4300.0.ebuild rename to www-client/chromium/chromium-88.0.4315.5.ebuild index 78f6dddb0c3..c14c2f338f4 100644 --- a/www-client/chromium/chromium-88.0.4300.0.ebuild +++ b/www-client/chromium/chromium-88.0.4315.5.ebuild @@ -12,7 +12,7 @@ inherit check-reqs chromium-2 desktop flag-o-matic multilib ninja-utils pax-util DESCRIPTION="Open-source version of Google Chrome web browser" HOMEPAGE="https://chromium.org/"; -PATCHSET="1" +PATCHSET="2" PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}" SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip @@ -228,7 +228,7 @@ src_prepare() { local PATCHES=( "${WORKDIR}/patches" - "${FILESDIR}/chromium-87-ozone-deps.patch" + "${FILESDIR}/chromium-88-ozone-deps.patch" "${FILESDIR}/chromium-87-webcodecs-deps.patch" ) @@ -326,6 +326,7 @@ src_prepare() { third_party/emoji-segmenter third_party/flatbuffers third_party/freetype + third_party/fusejs third_party/libgifcodec third_party/glslang third_party/google_input_tools @@ -356,6 +357,8 @@ src_prepare() { third_party/libvpx third_party/libvpx/source/libvpx/third_party/x86inc third_party/libwebm + third_party/libx11 + third_party/libxcb-keysyms third_party/libxml/chromium third_party/libyuv third_party/llvm @@ -438,6 +441,7 @@ src_prepare() { third_party/widevine third_party/woff2 third_party/wuffs + third_party/x11proto third_party/xcbproto third_party/zxcvbn-cpp third_party/zlib/google diff --git a/www-client/chromium/files/chromium-88-ozone-deps.patch b/www-client/chromium/files/chromium-88-ozone-deps.patch new file mode 100644 index 00000000000..6274ded44ac --- /dev/null +++ b/www-client/chromium/files/chromium-88-ozone-deps.patch @@ -0,0 +1,40 @@ +From a5a6050ed551972faaaa65ebc2b4e7e1958738a1 Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann <[email protected]> +Date: Fri, 6 Nov 2020 16:17:30 +0000 +Subject: [PATCH] fix building without Ozone + +When building with use_x11=true and use_ozone=false build fails, +because features::IsUsingOzonePlatform() is not defined: + +../../content/browser/gpu/gpu_internals_ui.cc: In function +'std::unique_ptr<base::ListValue> +content::{anonymous}::GpuMemoryBufferInfo(const gfx::GpuExtraInfo&)' +../../content/browser/gpu/gpu_internals_ui.cc:397:18: error: +'IsUsingOzonePlatform' is not a member of 'features' + 397 | if (!features::IsUsingOzonePlatform()) { + | ^~~~~~~~~~~~~~~~~~~~ +--- + content/browser/gpu/gpu_internals_ui.cc | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/content/browser/gpu/gpu_internals_ui.cc b/content/browser/gpu/gpu_internals_ui.cc +index 4f07186..01dfcbf 100644 +--- a/content/browser/gpu/gpu_internals_ui.cc ++++ b/content/browser/gpu/gpu_internals_ui.cc +@@ -394,7 +394,12 @@ std::unique_ptr<base::ListValue> GpuMemoryBufferInfo( + + gpu::GpuMemoryBufferConfigurationSet native_config; + #if defined(USE_X11) +- if (!features::IsUsingOzonePlatform()) { ++#if defined(USE_OZONE) ++ const auto is_using_ozone_platform = features::IsUsingOzonePlatform(); ++#else ++ const auto is_using_ozone_platform = false; ++#endif ++ if (!is_using_ozone_platform) { + for (const auto& config : gpu_extra_info.gpu_memory_buffer_support_x11) { + native_config.emplace(config); + } +-- +2.26.2 +
