summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Hartmann <sultan@gentoo.org>2021-02-20 12:41:55 +0100
committerStephan Hartmann <sultan@gentoo.org>2021-02-20 12:42:35 +0100
commit5fc137628e6b5afd416d1fa336be13c1210c2afc (patch)
tree39877ddea89d227712a3fbf080a2661cdd0e8aa6 /www-client
parentapp-eselect/eselect-repository: keyworded 8 for hppa (diff)
downloadgentoo-5fc137628e6b5afd416d1fa336be13c1210c2afc.tar.gz
gentoo-5fc137628e6b5afd416d1fa336be13c1210c2afc.tar.bz2
gentoo-5fc137628e6b5afd416d1fa336be13c1210c2afc.zip
www-client/chromium: dev channel bump to 90.0.4421.5
Bug: https://bugs.gentoo.org/768000 Closes: https://bugs.gentoo.org/770214 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Stephan Hartmann <sultan@gentoo.org>
Diffstat (limited to 'www-client')
-rw-r--r--www-client/chromium/Manifest4
-rw-r--r--www-client/chromium/chromium-90.0.4421.5.ebuild (renamed from www-client/chromium/chromium-90.0.4412.3.ebuild)18
-rw-r--r--www-client/chromium/files/chromium-90-unbundle-zlib.patch27
3 files changed, 12 insertions, 37 deletions
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index ff48d304f9af..fecb8677f171 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -2,6 +2,6 @@ DIST chromium-88-patchset-3.tar.xz 8396 BLAKE2B 4c978f1a6efef3f71e3dd6340c392b74
DIST chromium-88.0.4324.182.tar.xz 857221352 BLAKE2B 7263294154232533f18d0bc8eeaa7097c3578f8e585ce953c9e6990ec7c9ffbfbd0e69f89c4852c09197aab592877350f54590cf4f0bbec9481886f3fc34548a SHA512 ce8d507645e937107847199b55287ec5522e778851367a19c4cfa4ff5fae18e7c7ea999aa7b0ad0758fab68a003f201bf38ae51e3642388705de2ada9be87730
DIST chromium-89-patchset-6.tar.xz 4308 BLAKE2B 22e2db8b5e287925f8b550075e48ad381ccf7ef54e23d8f4e4aedff7fd6cfee8f9e70eff1edb8c867c256ee5ec881ef9379e18278b84b47ff08dcc00f5801667 SHA512 aa5d902c1959f50eb9a0d773a77bf12e5a955d796ee8b18f6e2143573dd73beec62109940e55a858fd9927753dba1d3bf9c1bd940b18a616e7b70b801e93f041
DIST chromium-89.0.4389.58.tar.xz 890700788 BLAKE2B c8310497671ba1e528d31412e51f7dbbcd2a91a4a1537bd6fdd6acabffa4daad59df0fd9aed1ee92d6e07787f856f32b1f04af311bbb6d9e8c44214e330291fe SHA512 617db2e37cf668faf294167aba81be447e3a50c94c0bc8efa9b18964d18ef57c9dac26aae337f79f01773b69ec39c60117eb10fd102016da1f06de65a1979edc
-DIST chromium-90-patchset-3.tar.xz 5344 BLAKE2B 19b9d69d5d4aecc18e1a3867fd0c53d01dd873fd533b83fbd8c25d435976dd2176975ccf5d4ebb04f84b6c1c0a009315ef4344fbf575b8ae6942ddfb12d1e1e1 SHA512 97d756b4b4270c7631ca42792e869815c22a786ebba36c2668b99298bcd60f24fd89b52d2491ade07341c20f2bdac933b46b299e52bfe9e45cb57bf056ee050c
-DIST chromium-90.0.4412.3.tar.xz 920864492 BLAKE2B a0d5e6ddc552611231c7ba8fd81da4d2e01e59695eccce33c040ffdd37fa360008cf8c8095f10622902a5e25297db4c10b5c463fdca5e5c46d390db4268f3d17 SHA512 bf168dd2a817823bd9ec7b7c925cddd783366460011782884f02ef15952546d6edef6bb2f08813bfd8be2e64c787e80c2cd449032b9eaf19d2ea7a6eb2294da8
+DIST chromium-90-patchset-4.tar.xz 3080 BLAKE2B 3a13c5c9bfb938cbe6d3480b267ef025c19bedb0a9a9d1cd2f9f25285538d75eaddbeba39cbd6c5983357ede446fdf75ffa513abe7e86657b9412205c0333a7f SHA512 bb1d3172403d4352be328b86d12fbdc478bab9a82deff0be87d893145d0ee10badca065992f86c4466baae6b426beb90778a01e9243044bf4cca52eb30fa0282
+DIST chromium-90.0.4421.5.tar.xz 916802704 BLAKE2B 7241e156b2fd851ffcfb364b889b9ee1271baaca9877ff9edd51555ff35bc2b95134fbb92c23d86ae93883d12989c222d22b10bdd335e8ec333bcb9677904e9e SHA512 90b4f1d5fc32f0235716daae11644a258c520c1fdeef75ec719d446f04879bbc6382303c86aed11e36f430fa97d70485dc148132885f005edea43f9ed77598e7
DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf
diff --git a/www-client/chromium/chromium-90.0.4412.3.ebuild b/www-client/chromium/chromium-90.0.4421.5.ebuild
index 613e64db8a5c..f46a78d193e4 100644
--- a/www-client/chromium/chromium-90.0.4412.3.ebuild
+++ b/www-client/chromium/chromium-90.0.4421.5.ebuild
@@ -13,7 +13,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="3"
+PATCHSET="4"
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
@@ -127,12 +127,12 @@ BDEPEND="
: ${CHROMIUM_FORCE_LIBCXX=no}
if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
- BDEPEND+=" >=sys-devel/clang-10"
+ BDEPEND+=" >=sys-devel/clang-12"
fi
if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
- RDEPEND+=" >=sys-libs/libcxx-10"
- DEPEND+=" >=sys-libs/libcxx-10"
+ RDEPEND+=" >=sys-libs/libcxx-12"
+ DEPEND+=" >=sys-libs/libcxx-12"
else
COMMON_DEPEND="
app-arch/snappy:=
@@ -189,15 +189,16 @@ pre_build_checks() {
die "Component build with tcmalloc requires FEATURES=-usersandbox."
fi
if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] || tc-is-clang; then
- if use component-build; then
- die "Component build with clang requires fuzzer headers."
+ CPP="${CHOST}-clang++ -E"
+ if ! ver_test "$(clang-major-version)" -ge 12; then
+ die "At least clang 12 is required"
fi
fi
fi
# Check build requirements, bug #541816 and bug #471810 .
CHECKREQS_MEMORY="3G"
- CHECKREQS_DISK_BUILD="7G"
+ CHECKREQS_DISK_BUILD="8G"
if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then
if use custom-cflags || use component-build; then
CHECKREQS_DISK_BUILD="25G"
@@ -231,7 +232,7 @@ src_prepare() {
local PATCHES=(
"${WORKDIR}/patches"
- "${FILESDIR}/chromium-90-unbundle-zlib.patch"
+ "${FILESDIR}/chromium-89-EnumTable-crash.patch"
"${FILESDIR}/chromium-shim_headers.patch"
)
@@ -346,6 +347,7 @@ src_prepare() {
third_party/libaom/source/libaom/third_party/vector
third_party/libaom/source/libaom/third_party/x86inc
third_party/libavif
+ third_party/libgav1
third_party/libjingle
third_party/libphonenumber
third_party/libsecret
diff --git a/www-client/chromium/files/chromium-90-unbundle-zlib.patch b/www-client/chromium/files/chromium-90-unbundle-zlib.patch
deleted file mode 100644
index ad3847515adb..000000000000
--- a/www-client/chromium/files/chromium-90-unbundle-zlib.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 9b04353f502d3fa371231742817b07cb0c41f80c Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Mon, 8 Feb 2021 11:15:39 +0000
-Subject: [PATCH] profiling_host: depend on zlib instead of headers only
-
-There is no zlib_common_headers target for unbundled zlib
-and in the end code links against zlib static library anyways.
----
- chrome/browser/profiling_host/BUILD.gn | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/chrome/browser/profiling_host/BUILD.gn b/chrome/browser/profiling_host/BUILD.gn
-index a68ac82..1ec9d66 100644
---- a/chrome/browser/profiling_host/BUILD.gn
-+++ b/chrome/browser/profiling_host/BUILD.gn
-@@ -24,7 +24,7 @@ static_library("profiling_host") {
- "//components/version_info",
- "//content/public/browser",
- "//content/public/common",
-- "//third_party/zlib:zlib_common_headers",
-+ "//third_party/zlib:zlib",
-
- # Added to support the dependency on //chrome/browser/metrics
- # TODO(darin): We should instead have a way to express that dependency here.
---
-2.26.2
-