summaryrefslogtreecommitdiff
path: root/www-client/chromium
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-08-02 19:14:55 +0100
committerV3n3RiX <venerix@redcorelinux.org>2019-08-02 19:14:55 +0100
commitb24bd25253fe093f722ab576d29fdc41d04cb1ee (patch)
tree0fcf2afd9f852c4d4c291cf8afaa2c244d598105 /www-client/chromium
parent121ed4eec41fbf03e1998d09eede1bf449da63b9 (diff)
gentoo resync : 02.08.2019
Diffstat (limited to 'www-client/chromium')
-rw-r--r--www-client/chromium/Manifest8
-rw-r--r--www-client/chromium/chromium-75.0.3770.142.ebuild6
-rw-r--r--www-client/chromium/chromium-76.0.3809.87.ebuild (renamed from www-client/chromium/chromium-76.0.3809.71.ebuild)11
-rw-r--r--www-client/chromium/files/chromium-75-pure-virtual.patch50
-rw-r--r--www-client/chromium/files/chromium-76-arm64-skia.patch41
5 files changed, 54 insertions, 62 deletions
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 550cda7cf473..b619fa95d6da 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -3,8 +3,8 @@ AUX chromium-75-gcc-angle-fix.patch 966 BLAKE2B ed6f30327809409e300848f11eb86ff5
AUX chromium-75-llvm8.patch 708 BLAKE2B 578fa797f5a347623e43e94d4ff160c676f3b51f8c4e32acc5782db2e4c33f7b8ef9d6084855152f97246805d24fc297769a32290daca58d8dfe96fa1ab61156 SHA512 9cabb7bf205f3288de3ecc2fbe6852bc89be1a24aeb0b520c005f432e8c2755c64d7f1d1e77b570153063125bfc1ecf1d4825a72dd8ff08ac61fd89fca36d10e
AUX chromium-75-noexcept.patch 4016 BLAKE2B a47b7c3edcb9a6a7d27f725db4f887cc27e4ceb1ba49f880132827451056a271ff15ff2a724ba038b1f8823533665a4de6e6c7bb692d2d77c0120ddbad8f3306 SHA512 1fed7ab083697f3310333908e9b78aea950716230655cac825f1f426ce294bdd033b7f10d8b48b6ddcac93fb727a51038970cf63044938edef2958e70d40c252
AUX chromium-75-post-task-crash.patch 2534 BLAKE2B 8aa9b49808ab824fc953507246dbd522975697bc336030305477b416503471fedac267f1f467fc36a4229b8bd05aa58fad62af199295f486ad28d1b3cf01338c SHA512 8443464b9f2b00b5459c869ffa4582895d9e1b201fe59d9fb676f602acaa022c17019a076ec788956a74c6fb04304d55caf0554520e0d23af6ff554ddd5b8d06
-AUX chromium-75-pure-virtual.patch 2358 BLAKE2B e591bdeb128877e2d0ee1e873033220efd4c75f4130bf1cda940cd2596c7ccec92d8f39e6b57b55fc72c4a9c58ff3ca634b9cb66064b5e4eed6906ef24c97071 SHA512 0401d9c105a1e8d13018a1d06e15e163c4db40810188a8f2623808e5ef2c220b5a9da520e20ffac8a91220ee13f51f391a82401b8d1de47476557e30d853cb65
AUX chromium-75-unique_ptr.patch 1487 BLAKE2B 64b25c50a3e869607c72d7e745fb464536875672105da69690057fe1e36423a0c28e33ac50e34e058ec22ca89f292e9be9b175f3f19bacda70bff594b8b92905 SHA512 30e7c3e3f11285c605d66fc2154b726ecbdf1d17f353bf19c8c50b31f28e9948b797276cf45c465d7371353c7ddbdcea467a407cf0a89dda959f6d74dd0b5a85
+AUX chromium-76-arm64-skia.patch 1747 BLAKE2B 7f01fb83d1d7d71fcc98a6e144b1f83a72c15c3d98e1619b2c850000d5c7f9c5aa50bb343ec5da8ce7accb9a2752dff1993d04e83b1ce7c28924735bca730926 SHA512 76944f24374f2a751ae547501dbd3aa3e6c07c09b31d5a3911009db09aec2742aab6e46d3615122db83a5e2fbd1a9d98736671c081ba2734549e4002a86a1608
AUX chromium-76-gcc-ambiguous-nodestructor.patch 1697 BLAKE2B 80b49601d4ed8b2c315cd6586829d0dc6ad984955837b52908446ddaddaf5f682feb160e81b68c33eaf29d51564d481e1911352b2a043f9fbf92a9c6bfe37ee7 SHA512 c61cdb814541eacc3b78a950b5c9cac312f00e06748beb1dc7f1ab64089ed6e5189981538c0b992eec2dd9444e44fdd7067323fd9cc9a11fd2c5d90593000a56
AUX chromium-76-gcc-blink-constexpr.patch 1329 BLAKE2B f1edcd6d8ef86ebc9659838a30d2ab1ae886494f4c8fa8cc5cdd71ac22fc78bbd0aa4bf68a7111e050e28271a951affaaea088eff71ce059e76c930bffbf9a8a SHA512 adc40210cb1b5a863e61ae08d6b62bf9e294159b75572a6e9de1615a641293e5b2931a4c92f07d15a4ae1e557c98cf7c5ef5ff6f476325fb1bca5e28396e9aa0
AUX chromium-76-gcc-blink-namespace1.patch 4188 BLAKE2B 31db4c911676c8982d897bc10ad9544b166b224259612c2cca9420c347f45d99d430faf9678df3dff493f0af10bf8104c2b8e20b1e92f8729def89bbb68c9327 SHA512 dda3ccd155e6929604f67a40386dd9cec3c2cd0697b3a62d579f696142d1bccc6ad9d414765a028ea630473944a33b9a63beb5eb49b4b0ec666473cc674fef38
@@ -26,7 +26,7 @@ AUX chromium-launcher-r3.sh 1199 BLAKE2B 85f57b380cdc25bd000cf57d3c129b67f6e55d9
AUX chromium-widevine-r4.patch 1155 BLAKE2B 7ba02c4b80883fa7ae5c46d95072798683bdc5c9d65b3cab40e6a3c21b29ce7eb9c45493ec10e522341033a80132818f946569ee774c662daafa4e09fbc2a988 SHA512 8f78c0e22f14f81f1903a77b315c7818603caaadbb5d517a3184a11e9553b99fd42d5a1d2ff19b3d79c03352b2e279a5102afa2fa66f276da2d9c42988a94366
AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739
DIST chromium-75.0.3770.142.tar.xz 709968204 BLAKE2B 0e3456127796e7580c50edc0dc16c6989108837a380c96704c96bbd14b042f6d7059dc082a099a7f7752b3b3c6c072e9e9ecc89f3528b914f13a4a923a4488dd SHA512 89534fafe06281cf8ac328f7a17c192f4a03cbc8e6b410626ea2e7993231b4ba195b4190a3f183fad63a03602df7b763a776f10802b1330c737f0249bf17a792
-DIST chromium-76.0.3809.71.tar.xz 728834276 BLAKE2B 1814e4979cdf5f71ac3d4940baccf09810bdf032aafd386c6c71ffaa6117f6b135d67f9848d791acfb051e419eb06a177f950151abad85f73fff074dc78dbce5 SHA512 f148b143970fe9cc9d1e08736e09cb9fcc7fb3699226b783787019924cac54749820e24ac67c27eaa972842e61266138b2111bd34cc8986359b57e177a8433e7
-EBUILD chromium-75.0.3770.142.ebuild 21557 BLAKE2B 824c2b9ea1763aeb973b63dc4465fbb4dbf271d4698e680b15e2f49cbec145f1abc255acf94ba158b5b7f43da46ef5589e1ad20f5764674fb06b49255eedaad9 SHA512 82d6e9278d7aa406d6375b24a7b4ce792cc9fa359a3af9fa76c1a9ec0992ad6c3686a3b19406b2bf44632c49292d07c9f11d17feb5f72f4fe50e6a464c1d1383
-EBUILD chromium-76.0.3809.71.ebuild 22069 BLAKE2B 8e53f4b52a216dd85237498aa136e8465f582bdd0ca70ac3e5f70191d38ca8cec90dc791eca492508ea7402fe3e75f1a6c745899de0a1915e3b39d2ac3325b88 SHA512 4fbde15efd3f1e2b3aa1002eea1746c22b68a2d9682100785fd2f64487f504b30e99b28f9d8d2514c35514196afcf0cc3d987a73b7f6438d77b906709b1313e1
+DIST chromium-76.0.3809.87.tar.xz 728890984 BLAKE2B d09b6b4dd84d6e2ad6a24602296bfab99294ca09c21553312fa55979eb308d1b3a42cc0e31b4e619cd19c0dfc38dda89bca3b5d2787a96b8836d720f0763f124 SHA512 f237cb794bff68cbc2ea3daadea2852df810543873ceaefa4be901702b3578ce7b23a0f083b76373de20e60ea2dc1245c58de0888fb6c72ca465bca0ee0e7c1a
+EBUILD chromium-75.0.3770.142.ebuild 21531 BLAKE2B 4f1e8ca832be0392df5d32e41cc9fb27365f45bbad03a2d17b39831818b13ce72531545712f0ff712b925413129143b80f07398712251eae91d3cd623b04e90d SHA512 53ac5bc2629ed7e54db851f638a7b16df9b50b9500f148d2feaa0ace5491e3c6289d72c703a20da7fbf737d064036eed8723d8da16bf44bc694a49949a401e56
+EBUILD chromium-76.0.3809.87.ebuild 22110 BLAKE2B f8c2c485cea3be1210f2ca38ce1e8fdfb426909d8ed51a7652d2ac0ba07f377b3b3722a2f4edeaca2b93be5335a5f3f5a856ba8b3b508dd231814a59bc71f003 SHA512 dc361d4713c52a9127d08fc665702ad7df2bf93d065172015329c975dbdfa0dfa6eee72ed94657f4b5c8990371c9d06acea79855709d86682b66698850c0cfb4
MISC metadata.xml 1538 BLAKE2B 6c68f673e2892063f4b7a5afc8314356e3e8182d8765a193c36be7ed6b61e7680dbd0a58e2386904ff2877c81ad45cdae07754996f706f986f16f3a159500930 SHA512 16e98f9dc01cfdce307dd17fc2ba83ff1eff10eaeb65aaf9154b0dedfc61086334d56f50b6ce1d673715148e29e045eb0eed21495efef942ef56e4ba4e514187
diff --git a/www-client/chromium/chromium-75.0.3770.142.ebuild b/www-client/chromium/chromium-75.0.3770.142.ebuild
index f2173168d4a2..9dc1a9c45b46 100644
--- a/www-client/chromium/chromium-75.0.3770.142.ebuild
+++ b/www-client/chromium/chromium-75.0.3770.142.ebuild
@@ -87,11 +87,11 @@ RDEPEND="${COMMON_DEPEND}
tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
"
-# dev-vcs/git - https://bugs.gentoo.org/593476
-# sys-apps/sandbox - https://crbug.com/586444
DEPEND="${COMMON_DEPEND}
"
+# dev-vcs/git - https://bugs.gentoo.org/593476
BDEPEND="
+ ${PYTHON_DEPS}
>=app-arch/gzip-1.7
!arm? (
dev-lang/yasm
@@ -150,7 +150,7 @@ PATCHES=(
"${FILESDIR}/chromium-75-unique_ptr.patch"
"${FILESDIR}/chromium-75-noexcept.patch"
"${FILESDIR}/chromium-75-llvm8.patch"
- "${FILESDIR}/chromium-75-pure-virtual.patch"
+ "${FILESDIR}/chromium-76-gcc-pure-virtual.patch"
"${FILESDIR}/chromium-75-post-task-crash.patch"
)
diff --git a/www-client/chromium/chromium-76.0.3809.71.ebuild b/www-client/chromium/chromium-76.0.3809.87.ebuild
index f785c3c3110e..8da832b3d8c6 100644
--- a/www-client/chromium/chromium-76.0.3809.71.ebuild
+++ b/www-client/chromium/chromium-76.0.3809.87.ebuild
@@ -16,8 +16,8 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+closure-compile component-build cups gnome-keyring +hangouts jumbo-build kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
+KEYWORDS="amd64 ~x86"
+IUSE="+closure-compile component-build cups cpu_flags_arm_neon gnome-keyring +hangouts jumbo-build kerberos pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
REQUIRED_USE="component-build? ( !suid )"
@@ -87,11 +87,11 @@ RDEPEND="${COMMON_DEPEND}
tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
"
-# dev-vcs/git - https://bugs.gentoo.org/593476
-# sys-apps/sandbox - https://crbug.com/586444
DEPEND="${COMMON_DEPEND}
"
+# dev-vcs/git - https://bugs.gentoo.org/593476
BDEPEND="
+ ${PYTHON_DEPS}
>=app-arch/gzip-1.7
!arm? (
dev-lang/yasm
@@ -145,6 +145,7 @@ PATCHES=(
"${FILESDIR}/chromium-widevine-r4.patch"
"${FILESDIR}/chromium-fix-char_traits.patch"
"${FILESDIR}/chromium-angle-inline.patch"
+ "${FILESDIR}/chromium-76-arm64-skia.patch"
"${FILESDIR}/chromium-76-quiche.patch"
"${FILESDIR}/chromium-76-gcc-vulkan.patch"
"${FILESDIR}/chromium-76-gcc-private.patch"
@@ -555,7 +556,7 @@ src_configure() {
ffmpeg_target_arch=arm64
elif [[ $myarch = arm ]] ; then
myconf_gn+=" target_cpu=\"arm\""
- ffmpeg_target_arch=$(usex neon arm-neon arm)
+ ffmpeg_target_arch=$(usex cpu_flags_arm_neon arm-neon arm)
else
die "Failed to determine target arch, got '$myarch'."
fi
diff --git a/www-client/chromium/files/chromium-75-pure-virtual.patch b/www-client/chromium/files/chromium-75-pure-virtual.patch
deleted file mode 100644
index 3d34e436a281..000000000000
--- a/www-client/chromium/files/chromium-75-pure-virtual.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From cdf306db81efaaaa954487585d5a5a16205a5ebd Mon Sep 17 00:00:00 2001
-From: Jose Dapena Paz <jose.dapena@lge.com>
-Date: Wed, 05 Jun 2019 14:45:06 +0000
-Subject: [PATCH] Avoid pure virtual crash destroying RenderProcessUserData
-
-When RenderProcessUserData is destroyed from the destructor of
-RenderProcessHostImpl, it is done in the destructor of RenderProcessHost.
-At this point RemoveObserver override is already freed, so RenderProcessHost
-is pure virtual. This crash happens at least building with GCC:
-
- at /usr/include/c++/8/ext/new_allocator.h:140
- (this=0x7fffffffcb50, __in_chrg=<optimized out>) at /usr/include/c++/8/bits/stl_tree.h:964
-
-We need to destroy RenderProcessUserData before that happens. To do that
-we can just override RenderProcessHostDestroyed.
-
-Bug: 910288
-Change-Id: I38107b178829b0cb7494f5333b765e5b087d82cd
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1645366
-Commit-Queue: Sigurður Ásgeirsson <siggi@chromium.org>
-Reviewed-by: Sigurður Ásgeirsson <siggi@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#666279}
----
-
-diff --git a/chrome/browser/performance_manager/render_process_user_data.cc b/chrome/browser/performance_manager/render_process_user_data.cc
-index 2e2c199..ef6e1fb 100644
---- a/chrome/browser/performance_manager/render_process_user_data.cc
-+++ b/chrome/browser/performance_manager/render_process_user_data.cc
-@@ -116,4 +116,9 @@
- base::Unretained(process_node_.get()), info.exit_code));
- }
-
-+void RenderProcessUserData::RenderProcessHostDestroyed(
-+ content::RenderProcessHost* host) {
-+ host->RemoveUserData(kRenderProcessUserDataKey);
-+}
-+
- } // namespace performance_manager
-diff --git a/chrome/browser/performance_manager/render_process_user_data.h b/chrome/browser/performance_manager/render_process_user_data.h
-index ac74b1d..f3b4d16 100644
---- a/chrome/browser/performance_manager/render_process_user_data.h
-+++ b/chrome/browser/performance_manager/render_process_user_data.h
-@@ -47,6 +47,7 @@
- void RenderProcessExited(
- content::RenderProcessHost* host,
- const content::ChildProcessTerminationInfo& info) override;
-+ void RenderProcessHostDestroyed(content::RenderProcessHost* host) override;
-
- // All instances are linked together in a doubly linked list to allow orderly
- // destruction at browser shutdown time.
diff --git a/www-client/chromium/files/chromium-76-arm64-skia.patch b/www-client/chromium/files/chromium-76-arm64-skia.patch
new file mode 100644
index 000000000000..8a44235c8030
--- /dev/null
+++ b/www-client/chromium/files/chromium-76-arm64-skia.patch
@@ -0,0 +1,41 @@
+From 7aacb0b30a86936aedd1308708d1a51d951197f2 Mon Sep 17 00:00:00 2001
+From: Mike Klein <mtklein@google.com>
+Date: Tue, 02 Jul 2019 13:23:06 -0500
+Subject: [PATCH] fix GCC arm64 builds
+
+These two guards are checking if we're building for aarch64 and thus
+have F16 conversion instructions, but weren't checking if we want to use
+them (if we have them _and_ we're being compiled by Clang). At head
+we're trying to pass a 2-byte uint16_t to a function expecting an 8-byte
+uint16x4_t, etc.
+
+Change-Id: I21f6cd2100ec81ccdd47c4ec0575107624cd7c5a
+Reviewed-on: https://skia-review.googlesource.com/c/skia/+/225257
+Reviewed-by: Herb Derby <herb@google.com>
+Commit-Queue: Mike Klein <mtklein@google.com>
+---
+
+diff --git a/third_party/skia/src/opts/SkRasterPipeline_opts.h b/third_party/skia/src/opts/SkRasterPipeline_opts.h
+index 0eae9fe..e05f36c 100644
+--- a/third_party/skia/src/opts/SkRasterPipeline_opts.h
++++ b/third_party/skia/src/opts/SkRasterPipeline_opts.h
+@@ -972,7 +972,8 @@
+ }
+
+ SI F from_half(U16 h) {
+-#if defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
++#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \
++ && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
+ return vcvt_f32_f16(h);
+
+ #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)
+@@ -992,7 +993,8 @@
+ }
+
+ SI U16 to_half(F f) {
+-#if defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
++#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \
++ && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
+ return vcvt_f16_f32(f);
+
+ #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)