summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Hartmann <stha09@googlemail.com>2020-04-03 19:33:37 +0200
committerMike Gilbert <floppym@gentoo.org>2020-04-03 23:15:43 -0400
commit8140a50786cd798506e58338acd07a669468fa2f (patch)
tree8e42db9740012cd576ec5548659e0f74708deb60
parentsys-fs/squashfs-tools-ng: Fix build failure (diff)
downloadgentoo-8140a50786cd798506e58338acd07a669468fa2f.tar.gz
gentoo-8140a50786cd798506e58338acd07a669468fa2f.tar.bz2
gentoo-8140a50786cd798506e58338acd07a669468fa2f.zip
www-client/chromium: dev channel bump to 83.0.4100.3
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/15217
-rw-r--r--www-client/chromium/Manifest2
-rw-r--r--www-client/chromium/chromium-83.0.4100.3.ebuild (renamed from www-client/chromium/chromium-83.0.4093.3.ebuild)5
-rw-r--r--www-client/chromium/files/chromium-82-clang-std.patch28
-rw-r--r--www-client/chromium/files/chromium-83-clang-std.patch33
-rw-r--r--www-client/chromium/files/chromium-83-gcc-include.patch25
-rw-r--r--www-client/chromium/files/chromium-83-gcc-permissive.patch32
-rw-r--r--www-client/chromium/files/chromium-83-gcc-range.patch28
7 files changed, 60 insertions, 93 deletions
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 07522a1b0fed..7b9ccc92785a 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,3 +1,3 @@
DIST chromium-80.0.3987.162.tar.xz 796961972 BLAKE2B 77357adb39f5e49a6c71ba695c9947fb6aad811fc58c5ac21355a30be8beecaa842d2de59028dec58b1805d314e13282c0f386d61ee2014c87ad50ea0dc61121 SHA512 95a6bbe291faccd1a085daec89a3cf27eb00bc62f0b3956c2668568c7cabd67ac4dc02a2aaa093bb2844d4972cd8a7978c4249b2f0ebead038a215f574f68180
DIST chromium-81.0.4044.83.tar.xz 785906212 BLAKE2B b17bb2dabd52dc8ae5a9c99b6320ea48f278273e790c2869e2d93382bae3a8101d1bcad917b0997631831b95ce33398e0501de046edd23110107d010db70f140 SHA512 aeb8a4aeb2371a9ae2fbd0be1553569338c8e699abb3bb7d614c33254a7c6adfecb7b1becfa3f3595a2f4e04eed3c429137ad7a3816ccabf7b23388f206d1ccb
-DIST chromium-83.0.4093.3.tar.xz 793608324 BLAKE2B 014eff6deacfb308eecc76a2d9a13ddf13b2eefffe044df25e2c20c3695f2c908604751ed7e794e053280fc32449381e8dfd73300201e67a9d84854f9fd851e5 SHA512 d37ae4912d3a39e4b06c91601d941ffb8a77a4b7380a603455c2839f6b8940acb8803aa32e8ae14c5033c141681ee41716a54ac2f8632240e54367a3819e091a
+DIST chromium-83.0.4100.3.tar.xz 801342020 BLAKE2B 504c4d905f7ed91050f54e19e215fc2827c7299dff75e57282895f6f550ad323070ab49a2c597abfe0e88308d31fe613e8bd5bbcbfbc1b63bbc968148f939332 SHA512 d9037a7db5adad46d562f22e5ee53016170f257678d25acb124c432dc4ed4c0eb936ff9c4e0e39653a33621208e5037924ff94a9c98730da6ef68cb29a5a0f52
diff --git a/www-client/chromium/chromium-83.0.4093.3.ebuild b/www-client/chromium/chromium-83.0.4100.3.ebuild
index 928f8ae1afb8..3170dfcdcbc1 100644
--- a/www-client/chromium/chromium-83.0.4093.3.ebuild
+++ b/www-client/chromium/chromium-83.0.4100.3.ebuild
@@ -156,10 +156,9 @@ PATCHES=(
"${FILESDIR}/chromium-82-gcc-incomplete-type.patch"
"${FILESDIR}/chromium-82-gcc-template.patch"
"${FILESDIR}/chromium-82-gcc-iterator.patch"
- "${FILESDIR}/chromium-82-clang-std.patch"
"${FILESDIR}/chromium-83-gcc-template.patch"
- "${FILESDIR}/chromium-83-gcc-range.patch"
- "${FILESDIR}/chromium-83-clang-std.patch"
+ "${FILESDIR}/chromium-83-gcc-include.patch"
+ "${FILESDIR}/chromium-83-gcc-permissive.patch"
)
pre_build_checks() {
diff --git a/www-client/chromium/files/chromium-82-clang-std.patch b/www-client/chromium/files/chromium-82-clang-std.patch
deleted file mode 100644
index b965496a29a8..000000000000
--- a/www-client/chromium/files/chromium-82-clang-std.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 25f79b67da9ca6da2089ba14ccc14333e4a108b6 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Mon, 30 Mar 2020 08:39:19 +0000
-Subject: [PATCH] libstdc++: fix namespace of nullptr_t in v8_set_return_value.h
-
-nullptr_t is defined in namespace std.
-
-Bug: 819294
-Change-Id: Ia3e8257ece1331319272ead84472eefcc7259268
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2126289
-Reviewed-by: Yuki Shiino <yukishiino@chromium.org>
-Commit-Queue: Yuki Shiino <yukishiino@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#754423}
----
-
-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 ed639ef..6c7ffa1 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
-@@ -116,7 +116,7 @@
-
- // 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-83-clang-std.patch b/www-client/chromium/files/chromium-83-clang-std.patch
deleted file mode 100644
index 023a073d87be..000000000000
--- a/www-client/chromium/files/chromium-83-clang-std.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 93ebdd809b725c7f13e8fc150b3186b3b6d80d43 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Mon, 30 Mar 2020 16:49:31 +0000
-Subject: [PATCH] libstdc++: fix namespace of nullptr_t in array_buffer_view_helpers.h
-
-nullptr_t is defined in namespace std.
-
-Bug: 819294
-Change-Id: I16fd876b84aff4f3c0ef6d4654b8ad5015e52d27
----
-
-diff --git a/third_party/blink/renderer/core/typed_arrays/array_buffer_view_helpers.h b/third_party/blink/renderer/core/typed_arrays/array_buffer_view_helpers.h
-index a6b8547..5fa03cb 100644
---- a/third_party/blink/renderer/core/typed_arrays/array_buffer_view_helpers.h
-+++ b/third_party/blink/renderer/core/typed_arrays/array_buffer_view_helpers.h
-@@ -36,7 +36,7 @@
- template <typename U, std::enable_if_t<std::is_base_of<T, U>::value, int> = 0>
- NotShared(const NotShared<U>& other) : typed_array_(other.Get()) {}
-
-- explicit NotShared(nullptr_t) {}
-+ explicit NotShared(std::nullptr_t) {}
- explicit NotShared(T* typed_array) : typed_array_(typed_array) {
- DCHECK(!typed_array || !typed_array->IsShared());
- }
-@@ -95,7 +95,7 @@
- template <typename U, std::enable_if_t<std::is_base_of<T, U>::value, int> = 0>
- MaybeShared(const MaybeShared<U>& other) : typed_array_(other.Get()) {}
-
-- explicit MaybeShared(nullptr_t) {}
-+ explicit MaybeShared(std::nullptr_t) {}
- // [AllowShared] array buffer view may be a view of non-shared array buffer,
- // so we don't check if the buffer is SharedArrayBuffer or not.
- // https://heycam.github.io/webidl/#AllowShared
diff --git a/www-client/chromium/files/chromium-83-gcc-include.patch b/www-client/chromium/files/chromium-83-gcc-include.patch
new file mode 100644
index 000000000000..466539007b05
--- /dev/null
+++ b/www-client/chromium/files/chromium-83-gcc-include.patch
@@ -0,0 +1,25 @@
+From 3681c96f54b34f60493cbbf5ec830f158e469799 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Thu, 2 Apr 2020 14:35:44 +0000
+Subject: [PATCH] IWYU: std::find is defined in algorithm
+
+---
+ extensions/browser/install/crx_install_error.cc | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/extensions/browser/install/crx_install_error.cc b/extensions/browser/install/crx_install_error.cc
+index a9765bb..bd0d3e3 100644
+--- a/extensions/browser/install/crx_install_error.cc
++++ b/extensions/browser/install/crx_install_error.cc
+@@ -4,6 +4,8 @@
+
+ #include "extensions/browser/install/crx_install_error.h"
+
++#include <algorithm>
++
+ #include "base/logging.h"
+ #include "extensions/browser/install/sandboxed_unpacker_failure_reason.h"
+
+--
+2.24.1
+
diff --git a/www-client/chromium/files/chromium-83-gcc-permissive.patch b/www-client/chromium/files/chromium-83-gcc-permissive.patch
new file mode 100644
index 000000000000..f7f19b44ba8f
--- /dev/null
+++ b/www-client/chromium/files/chromium-83-gcc-permissive.patch
@@ -0,0 +1,32 @@
+From fdf2767e8dc54727c9536a4d39d230a959e3698c Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Thu, 2 Apr 2020 16:16:14 +0000
+Subject: [PATCH] GCC: add missing apps namespace to BrowserAppLauncher
+
+GCC does not get namespace of BrowserAppLauncher right and
+fails like this:
+
+chrome/browser/apps/app_service/app_service_proxy.h:82:23: error:
+declaration of 'apps::BrowserAppLauncher&
+apps::AppServiceProxy::BrowserAppLauncher()' changes meaning of
+'BrowserAppLauncher' [-fpermissive]
+---
+ chrome/browser/apps/app_service/app_service_proxy.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/chrome/browser/apps/app_service/app_service_proxy.h b/chrome/browser/apps/app_service/app_service_proxy.h
+index 1ebadfd..83f9c71 100644
+--- a/chrome/browser/apps/app_service/app_service_proxy.h
++++ b/chrome/browser/apps/app_service/app_service_proxy.h
+@@ -79,7 +79,7 @@ class AppServiceProxy : public KeyedService,
+ apps::InstanceRegistry& InstanceRegistry();
+ #endif
+
+- BrowserAppLauncher& BrowserAppLauncher();
++ apps::BrowserAppLauncher& BrowserAppLauncher();
+
+ apps::PreferredApps& PreferredApps();
+
+--
+2.24.1
+
diff --git a/www-client/chromium/files/chromium-83-gcc-range.patch b/www-client/chromium/files/chromium-83-gcc-range.patch
deleted file mode 100644
index f8fb287894ff..000000000000
--- a/www-client/chromium/files/chromium-83-gcc-range.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 895f0d24db74516e2653672a4b5e57757eeba75a Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Sun, 29 Mar 2020 21:03:23 +0000
-Subject: [PATCH] GCC: fix out-of-range constant in status_codes.h
-
-Constant 0x99999999 is not within range of int32_t.
-
-Bug: 819294
-Change-Id: I133b9bb0f1f57a6e1d81f96f39f348b6ea1c7f11
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2126227
-Commit-Queue: Ted Meyer <tmathmeyer@chromium.org>
-Reviewed-by: Ted Meyer <tmathmeyer@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#754364}
----
-
-diff --git a/media/base/status_codes.h b/media/base/status_codes.h
-index ccac030..219defb 100644
---- a/media/base/status_codes.h
-+++ b/media/base/status_codes.h
-@@ -69,7 +69,7 @@
- kVaapiFailedAcceleratorCreation = 0x00000509,
-
- // Special codes
-- kGenericErrorPleaseRemove = 0x99999999,
-+ kGenericErrorPleaseRemove = 0x79999999,
- kCodeOnlyForTesting = std::numeric_limits<StatusCodeType>::max(),
- kMaxValue = kCodeOnlyForTesting,
- };