summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Hartmann <stha09@googlemail.com>2020-03-08 20:08:30 +0100
committerMike Gilbert <floppym@gentoo.org>2020-03-10 11:06:44 -0400
commitadb8703f3e0af99058b75e997984d762b1844913 (patch)
treeed9e7dbb779458049be9d23e3b59f0658282a478
parentsci-mathematics/fricas: bump to 1.3.6 (diff)
downloadgentoo-adb8703f.tar.gz
gentoo-adb8703f.tar.bz2
gentoo-adb8703f.zip
www-client/chromium: dev channel bump to 82.0.4077.0
Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Stephan Hartmann <stha09@googlemail.com> Signed-off-by: Mike Gilbert <floppym@gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/14918
-rw-r--r--www-client/chromium/Manifest2
-rw-r--r--www-client/chromium/chromium-82.0.4077.0.ebuild (renamed from www-client/chromium/chromium-82.0.4068.4.ebuild)11
-rw-r--r--www-client/chromium/files/chromium-82-clang-std.patch13
-rw-r--r--www-client/chromium/files/chromium-82-gcc-incomplete-type.patch40
-rw-r--r--www-client/chromium/files/chromium-82-gcc-noexcept.patch13
-rw-r--r--www-client/chromium/files/chromium-82-gcc-private.patch47
-rw-r--r--www-client/chromium/files/chromium-82-gcc-template.patch50
-rw-r--r--www-client/chromium/files/chromium-82-include.patch28
-rw-r--r--www-client/chromium/files/chromium-compiler-r12.patch32
9 files changed, 140 insertions, 96 deletions
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index dc2668f7b5ea..744b666496b8 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,3 +1,3 @@
DIST chromium-80.0.3987.132.tar.xz 796975056 BLAKE2B 0da35d3218f4f44c15f05693336a034876764ef228f173cd00cedc045ebc06972416779a39458863b47a1863ab8f21b5d2dc11c6ed33ee81649cd0316bf31524 SHA512 10bf0d1efdf2ead9e94de90971ec135f5370f8c949acfd75ca953aed706510cc3a1464f1ff3c40275921bb24953d8ce65d095e38cb0d56488ccc2c7fa27516d4
DIST chromium-81.0.4044.43.tar.xz 785978276 BLAKE2B 295e5a09d79db7205aea64511356f8a649ad054c4f279ab2a1dd72631b3bff2245ca6272f3eb11414eb5a612c47b988325390932d91c4e55ccc9c0883593331f SHA512 6391c9d0460646b8c241f5ec5502b801e9f500651fc73ad664215a43047ab50fa6851edeed5cbb9c1637576d8081295f4f4a67d3d7daa15769241a0055494bf6
-DIST chromium-82.0.4068.4.tar.xz 803352676 BLAKE2B 64356b7c840d6ba955d2b7aced1faf85e05f19c9c0b39e8bf86529b86bba2e162404820f5710e9962c4d5e1325086becc3aebb0fdc2683b06231a2a0e8d7a6ae SHA512 ceb3b50ad4b38e969cf27c386d696665d773e73c000a1cd1ee158bbff86ae94b09a5fbe128547ed496e258ce8bfaf9bbf28b0d229254400c86afbe49fc7e8d8b
+DIST chromium-82.0.4077.0.tar.xz 793873940 BLAKE2B 9629ca475e135e68bf99bfae5566b49c1516b2abc78f1bdfc9cb2135802c994b4bfc3860d12797abc1c89fa478ab7aa9fdb60af2f5d080cb00093a5fb42d064d SHA512 b0b039f663257617e62e5620fd19272871f3bbe33b19a6adb23882fa7bccf358d3c09495caf96e37e2670321000ecf685588df8566451364931c6a3418eca91b
diff --git a/www-client/chromium/chromium-82.0.4068.4.ebuild b/www-client/chromium/chromium-82.0.4077.0.ebuild
index a056ee3c4d4f..019d9968c0e0 100644
--- a/www-client/chromium/chromium-82.0.4068.4.ebuild
+++ b/www-client/chromium/chromium-82.0.4077.0.ebuild
@@ -109,7 +109,7 @@ BDEPEND="
: ${CHROMIUM_FORCE_CLANG=no}
if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
- BDEPEND+=" >=sys-devel/clang-7"
+ BDEPEND+=" >=sys-devel/clang-9"
fi
if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
@@ -144,10 +144,11 @@ PATCHES=(
"${FILESDIR}/chromium-78-protobuf-export.patch"
"${FILESDIR}/chromium-79-gcc-alignas.patch"
"${FILESDIR}/chromium-80-gcc-quiche.patch"
- "${FILESDIR}/chromium-80-gcc-blink.patch"
"${FILESDIR}/chromium-82-gcc-constexpr.patch"
- "${FILESDIR}/chromium-82-gcc-private.patch"
- "${FILESDIR}/chromium-82-include.patch"
+ "${FILESDIR}/chromium-82-gcc-noexcept.patch"
+ "${FILESDIR}/chromium-82-gcc-incomplete-type.patch"
+ "${FILESDIR}/chromium-82-gcc-template.patch"
+ "${FILESDIR}/chromium-82-clang-std.patch"
)
pre_build_checks() {
@@ -270,6 +271,7 @@ src_prepare() {
third_party/devscripts
third_party/devtools-frontend
third_party/devtools-frontend/src/front_end/third_party/fabricjs
+ third_party/devtools-frontend/src/front_end/third_party/lighthouse
third_party/devtools-frontend/src/front_end/third_party/wasmparser
third_party/devtools-frontend/src/third_party
third_party/dom_distiller_js
@@ -352,6 +354,7 @@ src_prepare() {
third_party/SPIRV-Tools
third_party/sqlite
third_party/swiftshader
+ third_party/swiftshader/third_party/astc-encoder
third_party/swiftshader/third_party/llvm-7.0
third_party/swiftshader/third_party/llvm-subzero
third_party/swiftshader/third_party/marl
diff --git a/www-client/chromium/files/chromium-82-clang-std.patch b/www-client/chromium/files/chromium-82-clang-std.patch
new file mode 100644
index 000000000000..1ad62fbf45d1
--- /dev/null
+++ b/www-client/chromium/files/chromium-82-clang-std.patch
@@ -0,0 +1,13 @@
+diff --git a/third_party/blink/renderer/platform/bindings/v8_set_return_value.h b/third_party/blink/renderer/platform/bindings/v8_set_return_value.h
+index 07cae22..7871f55 100644
+--- a/third_party/blink/renderer/platform/bindings/v8_set_return_value.h
++++ b/third_party/blink/renderer/platform/bindings/v8_set_return_value.h
+@@ -51,7 +51,7 @@ void V8SetReturnValue(const CallbackInfo& info, const v8::Local<S> value) {
+
+ // nullptr
+ template <typename CallbackInfo>
+-void V8SetReturnValue(const CallbackInfo& info, nullptr_t) {
++void V8SetReturnValue(const CallbackInfo& info, std::nullptr_t) {
+ info.GetReturnValue().SetNull();
+ }
+
diff --git a/www-client/chromium/files/chromium-82-gcc-incomplete-type.patch b/www-client/chromium/files/chromium-82-gcc-incomplete-type.patch
new file mode 100644
index 000000000000..9e46ad7f51b7
--- /dev/null
+++ b/www-client/chromium/files/chromium-82-gcc-incomplete-type.patch
@@ -0,0 +1,40 @@
+diff --git a/ui/accessibility/ax_tree.cc b/ui/accessibility/ax_tree.cc
+index 616d53f..26749e3 100644
+--- a/ui/accessibility/ax_tree.cc
++++ b/ui/accessibility/ax_tree.cc
+@@ -565,15 +565,6 @@ struct AXTreeUpdateState {
+ const AXTree& tree;
+ };
+
+-struct AXTree::NodeSetSizePosInSetInfo {
+- NodeSetSizePosInSetInfo() = default;
+- ~NodeSetSizePosInSetInfo() = default;
+-
+- int32_t pos_in_set = 0;
+- int32_t set_size = 0;
+- base::Optional<int> lowest_hierarchical_level;
+-};
+-
+ struct AXTree::OrderedSetContent {
+ explicit OrderedSetContent(const AXNode* ordered_set = nullptr)
+ : ordered_set_(ordered_set) {}
+diff --git a/ui/accessibility/ax_tree.h b/ui/accessibility/ax_tree.h
+index 3bbbe0c..e4288f5 100644
+--- a/ui/accessibility/ax_tree.h
++++ b/ui/accessibility/ax_tree.h
+@@ -323,7 +323,14 @@ class AX_EXPORT AXTree : public AXNode::OwnerTree {
+ bool enable_extra_mac_nodes_ = false;
+
+ // Contains pos_in_set and set_size data for an AXNode.
+- struct NodeSetSizePosInSetInfo;
++ struct NodeSetSizePosInSetInfo {
++ NodeSetSizePosInSetInfo() = default;
++ ~NodeSetSizePosInSetInfo() = default;
++
++ int32_t pos_in_set = 0;
++ int32_t set_size = 0;
++ base::Optional<int> lowest_hierarchical_level;
++ };
+
+ // Represents the content of an ordered set which includes the ordered set
+ // items and the ordered set container if it exists.
diff --git a/www-client/chromium/files/chromium-82-gcc-noexcept.patch b/www-client/chromium/files/chromium-82-gcc-noexcept.patch
new file mode 100644
index 000000000000..db66934d883e
--- /dev/null
+++ b/www-client/chromium/files/chromium-82-gcc-noexcept.patch
@@ -0,0 +1,13 @@
+diff --git a/ui/color/color_set.cc b/ui/color/color_set.cc
+index 56564d7..2798a3c 100644
+--- a/ui/color/color_set.cc
++++ b/ui/color/color_set.cc
+@@ -11,7 +11,7 @@ ColorSet::ColorSet(ColorSetId id, ColorMap&& colors)
+
+ ColorSet::ColorSet(ColorSet&&) noexcept = default;
+
+-ColorSet& ColorSet::operator=(ColorSet&&) noexcept = default;
++ColorSet& ColorSet::operator=(ColorSet&&) = default;
+
+ ColorSet::~ColorSet() = default;
+
diff --git a/www-client/chromium/files/chromium-82-gcc-private.patch b/www-client/chromium/files/chromium-82-gcc-private.patch
deleted file mode 100644
index 278f5b1d97a9..000000000000
--- a/www-client/chromium/files/chromium-82-gcc-private.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 1931db04cf4b3737adfb99edf86cbf68d740511b Mon Sep 17 00:00:00 2001
-From: Jose Dapena Paz <jdapena@igalia.com>
-Date: Thu, 20 Feb 2020 11:41:29 +0100
-Subject: [PATCH] GNU stdc++: media::MediaError default constructor should be public
-
-On building with GNU stdc++ we get this error building:
- gen/media/mojo/mojom/media_types.mojom.cc:1161:55: required from here
- /usr/include/c++/9/bits/stl_construct.h:75:7: error: ‘media::MediaError::MediaError()’ is private within this context
-
-This is because the serialization code will eventually call, in this case,
-the default constructor because of the implementation of stl_uninitialized
-that is used to create an std::vector. This is invoked from
-static bool mojo::ArrayTraits<std::vector<_Tp> >::Resize(std::vector<_Tp>&, size_t)
-and what it does is constructing a temporary vector like this:
- std::vector<T> temp(size);
-
-But this is requiring calling the default constructor of T (in this case
-MediaError) for all the elements up to size-1.
-
-Bug: 957519
-Change-Id: Ie3a28b9734f16c5155b9500003838510be0a748d
----
-
-diff --git a/media/base/media_error.h b/media/base/media_error.h
-index d3ba96c..56daaec 100644
---- a/media/base/media_error.h
-+++ b/media/base/media_error.h
-@@ -40,6 +40,9 @@
- // successful returns.
- class MEDIA_EXPORT MediaError {
- public:
-+ // Default constructor can be used for MediaError::Ok();
-+ MediaError();
-+
- // Convenience function to return |kOk|.
- // OK won't have a message, trace, or data associated with them, and DCHECK
- // if they are added.
-@@ -110,9 +113,6 @@
- }
-
- private:
-- // Default constructor can be used for MediaError::Ok();
-- MediaError();
--
- // Private helper to add the current stack frame to the error trace.
- void AddFrame(const base::Location& location);
-
diff --git a/www-client/chromium/files/chromium-82-gcc-template.patch b/www-client/chromium/files/chromium-82-gcc-template.patch
new file mode 100644
index 000000000000..90909c5692b8
--- /dev/null
+++ b/www-client/chromium/files/chromium-82-gcc-template.patch
@@ -0,0 +1,50 @@
+diff --git a/content/public/browser/web_ui.h b/content/public/browser/web_ui.h
+index 4e6aa0e..fa6f10c 100644
+--- a/content/public/browser/web_ui.h
++++ b/content/public/browser/web_ui.h
+@@ -138,22 +138,6 @@ class CONTENT_EXPORT WebUI {
+ template <typename T>
+ static T GetValue(const base::Value& value);
+
+- template <>
+- inline bool GetValue<bool>(const base::Value& value) {
+- return value.GetBool();
+- }
+-
+- template <>
+- inline int GetValue<int>(const base::Value& value) {
+- return value.GetInt();
+- }
+-
+- template <>
+- inline const std::string& GetValue<const std::string&>(
+- const base::Value& value) {
+- return value.GetString();
+- }
+-
+ template <typename Is, typename... Args>
+ struct Call;
+
+@@ -169,6 +153,22 @@ class CONTENT_EXPORT WebUI {
+ };
+ };
+
++template <>
++inline bool WebUI::GetValue<bool>(const base::Value& value) {
++ return value.GetBool();
++}
++
++template <>
++inline int WebUI::GetValue<int>(const base::Value& value) {
++ return value.GetInt();
++}
++
++template <>
++inline const std::string& WebUI::GetValue<const std::string&>(
++ const base::Value& value) {
++ return value.GetString();
++}
++
+ } // namespace content
+
+ #endif // CONTENT_PUBLIC_BROWSER_WEB_UI_H_
diff --git a/www-client/chromium/files/chromium-82-include.patch b/www-client/chromium/files/chromium-82-include.patch
deleted file mode 100644
index 9a39ae2e8d56..000000000000
--- a/www-client/chromium/files/chromium-82-include.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 046deafc60a31f485a96773dc5ea5b0eb2ed15f1 Mon Sep 17 00:00:00 2001
-From: Jose Dapena Paz <jdapena@igalia.com>
-Date: Mon, 24 Feb 2020 16:24:33 +0000
-Subject: [PATCH] IWYU: missing include for std::string in csp_source_list.h
-
-Build error in GCC:
-../../services/network/public/cpp/content_security_policy/csp_source_list.h:19:6: error: ‘string’ in namespace ‘std’ does not name a type
-
-Bug: 819294
-Change-Id: I9c8665050cae038530a79323b65932a124adf2a1
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2067074
-Commit-Queue: Lucas Gadani <lfg@chromium.org>
-Reviewed-by: Lucas Gadani <lfg@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#743946}
----
-
-diff --git a/services/network/public/cpp/content_security_policy/csp_source_list.h b/services/network/public/cpp/content_security_policy/csp_source_list.h
-index 0cd3971..6df1891 100644
---- a/services/network/public/cpp/content_security_policy/csp_source_list.h
-+++ b/services/network/public/cpp/content_security_policy/csp_source_list.h
-@@ -5,6 +5,7 @@
- #ifndef SERVICES_NETWORK_PUBLIC_CPP_CONTENT_SECURITY_POLICY_CSP_SOURCE_LIST_H_
- #define SERVICES_NETWORK_PUBLIC_CPP_CONTENT_SECURITY_POLICY_CSP_SOURCE_LIST_H_
-
-+#include <string>
- #include <vector>
-
- #include "base/component_export.h"
diff --git a/www-client/chromium/files/chromium-compiler-r12.patch b/www-client/chromium/files/chromium-compiler-r12.patch
index 833abe2828cb..3d8117e4c065 100644
--- a/www-client/chromium/files/chromium-compiler-r12.patch
+++ b/www-client/chromium/files/chromium-compiler-r12.patch
@@ -1,6 +1,6 @@
-From 137de121a36f9349ad8435fee57940facef82878 Mon Sep 17 00:00:00 2001
+From 2e9a5f0e54d8968c4fab8f1cd00c225e387f0187 Mon Sep 17 00:00:00 2001
From: Mike Gilbert <floppym@gentoo.org>
-Date: Fri, 26 Feb 2020 10:09:23 +0000
+Date: Fri, 6 Mar 2020 17:10:30 +0000
Subject: [PATCH] Disable various compiler configs
---
@@ -8,7 +8,7 @@ Subject: [PATCH] Disable various compiler configs
1 file changed, 23 insertions(+), 44 deletions(-)
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index 85bc736..a85bd12 100644
+index d4597c7..4c651ac 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -261,8 +261,6 @@ config("compiler") {
@@ -60,7 +60,7 @@ index 85bc736..a85bd12 100644
# -Wunused-local-typedefs is broken in gcc,
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63872
cflags += [ "-Wno-unused-local-typedefs" ]
-@@ -1572,7 +1556,7 @@ config("chromium_code") {
+@@ -1563,7 +1547,7 @@ config("chromium_code") {
defines = [ "_HAS_NODISCARD" ]
}
} else {
@@ -69,7 +69,7 @@ index 85bc736..a85bd12 100644
if (treat_warnings_as_errors) {
cflags += [ "-Werror" ]
-@@ -1581,10 +1565,6 @@ config("chromium_code") {
+@@ -1572,10 +1556,6 @@ config("chromium_code") {
# well.
ldflags = [ "-Werror" ]
}
@@ -80,7 +80,7 @@ index 85bc736..a85bd12 100644
# In Chromium code, we define __STDC_foo_MACROS in order to get the
# C99 macros on Mac and Linux.
-@@ -1593,15 +1573,6 @@ config("chromium_code") {
+@@ -1584,15 +1564,6 @@ config("chromium_code") {
"__STDC_FORMAT_MACROS",
]
@@ -96,7 +96,7 @@ index 85bc736..a85bd12 100644
if (is_mac) {
cflags_objc = [ "-Wobjc-missing-property-synthesis" ]
cflags_objcc = [ "-Wobjc-missing-property-synthesis" ]
-@@ -1993,7 +1964,8 @@ config("default_stack_frames") {
+@@ -1984,7 +1955,8 @@ config("default_stack_frames") {
}
# Default "optimization on" config.
@@ -106,7 +106,7 @@ index 85bc736..a85bd12 100644
if (is_win) {
# Favor size over speed, /O1 must be before the common flags.
# /O1 implies /Os and /GF.
-@@ -2016,7 +1988,8 @@ config("optimize") {
+@@ -2005,7 +1977,8 @@ config("optimize") {
}
# Turn off optimizations.
@@ -116,7 +116,7 @@ index 85bc736..a85bd12 100644
if (is_win) {
cflags = [
"/Od", # Disable optimization.
-@@ -2050,7 +2023,8 @@ config("no_optimize") {
+@@ -2039,7 +2012,8 @@ config("no_optimize") {
# Turns up the optimization level. On Windows, this implies whole program
# optimization and link-time code generation which is very expensive and should
# be used sparingly.
@@ -126,7 +126,7 @@ index 85bc736..a85bd12 100644
if (is_nacl && is_nacl_irt) {
# The NaCl IRT is a special case and always wants its own config.
# Various components do:
-@@ -2089,7 +2063,8 @@ config("optimize_max") {
+@@ -2071,7 +2045,8 @@ config("optimize_max") {
#
# TODO(crbug.com/621335) - rework how all of these configs are related
# so that we don't need this disclaimer.
@@ -136,7 +136,7 @@ index 85bc736..a85bd12 100644
if (is_nacl && is_nacl_irt) {
# The NaCl IRT is a special case and always wants its own config.
# Various components do:
-@@ -2119,7 +2094,8 @@ config("optimize_speed") {
+@@ -2096,7 +2071,8 @@ config("optimize_speed") {
}
}
@@ -146,7 +146,7 @@ index 85bc736..a85bd12 100644
cflags = [ "-O1" ] + common_optimize_on_cflags
ldflags = common_optimize_on_ldflags
visibility = [ ":default_optimization" ]
-@@ -2235,7 +2211,8 @@ config("win_pdbaltpath") {
+@@ -2212,7 +2188,8 @@ config("win_pdbaltpath") {
}
# Full symbols.
@@ -154,9 +154,9 @@ index 85bc736..a85bd12 100644
+config("symbols") { }
+config("xsymbols") {
if (is_win) {
- if (use_goma || is_clang) {
- # Note that with VC++ this requires is_win_fastlink, enforced elsewhere.
-@@ -2361,7 +2338,8 @@ config("symbols") {
+ if (is_clang) {
+ cflags = [ "/Z7" ] # Debug information in the .obj files.
+@@ -2318,7 +2295,8 @@ config("symbols") {
# Minimal symbols.
# This config guarantees to hold symbol for stack trace which are shown to user
# when crash happens in unittests running on buildbot.
@@ -166,7 +166,7 @@ index 85bc736..a85bd12 100644
if (is_win) {
# Functions, files, and line tables only.
cflags = []
-@@ -2416,7 +2394,8 @@ config("minimal_symbols") {
+@@ -2373,7 +2351,8 @@ config("minimal_symbols") {
}
# No symbols.