summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2017-12-09 10:57:53 -0500
committerMike Gilbert <floppym@gentoo.org>2017-12-09 11:00:22 -0500
commit9b71cea30d2c8cc87b672238ff90f97b2a919ecf (patch)
tree34846b464eb4ed561faebdadaa75ee6c58bb1fd7
parentapp-office/libreoffice: Merge USE=gnome into gtk3 (diff)
downloadgentoo-9b71cea30d2c8cc87b672238ff90f97b2a919ecf.tar.gz
gentoo-9b71cea30d2c8cc87b672238ff90f97b2a919ecf.tar.bz2
gentoo-9b71cea30d2c8cc87b672238ff90f97b2a919ecf.zip
www-client/chromium: dev channel bump (64.0.3282.14)
Package-Manager: Portage-2.3.15, Repoman-2.3.6_p7
-rw-r--r--www-client/chromium/Manifest2
-rw-r--r--www-client/chromium/chromium-64.0.3282.14.ebuild (renamed from www-client/chromium/chromium-64.0.3253.3.ebuild)18
-rw-r--r--www-client/chromium/files/chromium-memcpy-r0.patch11
3 files changed, 23 insertions, 8 deletions
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 76f06a2f480e..400ca74383f6 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -2,5 +2,5 @@ DIST chromium-62.0.3202.89.tar.xz 517100784 BLAKE2B c257a554c12bba7b38c85de41e97
DIST chromium-62.0.3202.94.tar.xz 517173548 BLAKE2B 1ec2cadd6581ea14566a0ae9803aecbf176712379a5d56e9f970e7cf5de06d51e2812247c09e96fcfcd3d8f671cead224089479855379be72b591455c76b3c77 SHA512 09e05aec663de94633fb7b658154a5b0146159dea0f434ef412405530274daefc5e554be8120653b840d2b55f5e35202be1a653ece7796d00956df58bc7608ad
DIST chromium-63.0.3239.70.tar.xz 534258328 BLAKE2B 8e6d846333bfea5e28f04cf2f856a295f0a179bb5d8fa8777d9b4ec8808814b79475a10a4c22dfd7bd606e7cdd99e15a32eb0aae7027a42f4526a05942f6ec85 SHA512 fdc5f433e3520cd053a48dfb107b33da6d844429169047e132663435708ed8fbbabf6949290aca0ff15eecd66fc470c9218bb9fc0376811c7684c8c67fdded6c
DIST chromium-63.0.3239.84.tar.xz 534280828 BLAKE2B 08437f625a97ea49f274140a0444dc5531e7a178a99d04592194158817169f4b9c42769dd76b5df624b5189705b17b9b049f61c2474b411ee520439213f12513 SHA512 049a09a821606ff7f52fa8f41d34f0e67c02a20a346841dfcbb06c4138c60a62240f33d9255662260251e5be913a14b004cb2a12873d2ed34751be2b1efb3f34
-DIST chromium-64.0.3253.3.tar.xz 567976356 BLAKE2B 2dbef0c2b3454b52a39ec03c3af618108e47bbefd63b4e3addbb64d2526778e14299a8597246876d30aed7e37ce8b6e0b227915e2d625202353594a9eb2032d4 SHA512 fd0307337eec5513d73c14a0d8bf494d87e1a658c48585afbf7d0c08314297bf28825ee99bbeab95ccaae8a0e5b1536794c3b4c94f996ba0a4a217cdbc224267
DIST chromium-64.0.3260.2.tar.xz 568772508 BLAKE2B 8aee43fded3504c5a64b537d8845096a4412353c16ae24b405c10b20b0e49e926bf8db531fa03390cc608c39e5cb09a2b2aab659ceda9320bf8e1f69d75e8bd2 SHA512 f7003976c8c5449569e0017fae5e1f2f7150a297a4bb4ad2a9bafe69e9fb4e931c76efeecbe07cc11a00af5a49591655734f21892e69e3ac523fc4d3faa2795f
+DIST chromium-64.0.3282.14.tar.xz 482211216 BLAKE2B 0ffc69478719903e39998fd6f908883dadcb32580a64b1e8a93b270dfb221cb89b674c7e288649de24e468a56da78cdbf35af9693cd24f5cba158789db609d30 SHA512 75b851be4bf4814e91a4e7a036b7aa78d0c76e138605a42ebe9ce8d2017a1f95eb2dc67bd73f4fa911ce2a28cec769a699f52c98c2b1b3a037321af517692c28
diff --git a/www-client/chromium/chromium-64.0.3253.3.ebuild b/www-client/chromium/chromium-64.0.3282.14.ebuild
index 3961a106c128..a03199f21308 100644
--- a/www-client/chromium/chromium-64.0.3253.3.ebuild
+++ b/www-client/chromium/chromium-64.0.3282.14.ebuild
@@ -145,9 +145,7 @@ PATCHES=(
"${FILESDIR}/chromium-widevine-r1.patch"
"${FILESDIR}/chromium-FORTIFY_SOURCE-r2.patch"
"${FILESDIR}/chromium-webrtc-r0.patch"
- "${FILESDIR}/chromium-math-includes-r0.patch"
- "${FILESDIR}/chromium-${PV}-gpu_lists_version.h.patch"
- "${FILESDIR}/chromium-gcc5-r5.patch"
+ "${FILESDIR}/chromium-memcpy-r0.patch"
)
pre_build_checks() {
@@ -184,13 +182,13 @@ pkg_pretend() {
pkg_setup() {
pre_build_checks
- # Make sure the build system will use the right python, bug #344367.
- python-any-r1_pkg_setup
-
chromium_suid_sandbox_check_kernel_config
}
src_prepare() {
+ # Calling this here supports resumption via FEATURES=keepwork
+ python_setup
+
default
mkdir -p third_party/node/linux/node-linux-x64/bin || die
@@ -220,6 +218,7 @@ src_prepare() {
third_party/angle/src/third_party/trace_event
third_party/blink
third_party/boringssl
+ third_party/boringssl/src/third_party/fiat
third_party/breakpad
third_party/breakpad/breakpad/src/third_party/curl
third_party/brotli
@@ -235,7 +234,6 @@ src_prepare() {
third_party/catapult/tracing/third_party/oboe
third_party/catapult/tracing/third_party/pako
third_party/ced
- third_party/cld_2
third_party/cld_3
third_party/crc32c
third_party/cros_system_api
@@ -360,6 +358,9 @@ bootstrap_gn() {
}
src_configure() {
+ # Calling this here supports resumption via FEATURES=keepwork
+ python_setup
+
local myconf_gn=""
# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
@@ -539,6 +540,9 @@ src_configure() {
}
src_compile() {
+ # Calling this here supports resumption via FEATURES=keepwork
+ python_setup
+
local ninja_targets="chrome chromedriver"
if use suid; then
ninja_targets+=" chrome_sandbox"
diff --git a/www-client/chromium/files/chromium-memcpy-r0.patch b/www-client/chromium/files/chromium-memcpy-r0.patch
new file mode 100644
index 000000000000..618a2e6e0dc7
--- /dev/null
+++ b/www-client/chromium/files/chromium-memcpy-r0.patch
@@ -0,0 +1,11 @@
+--- a/cc/paint/raw_memory_transfer_cache_entry.cc
++++ b/cc/paint/raw_memory_transfer_cache_entry.cc
+@@ -4,6 +4,8 @@
+
+ #include "cc/paint/raw_memory_transfer_cache_entry.h"
+
++#include <cstring>
++
+ namespace cc {
+
+ ClientRawMemoryTransferCacheEntry::ClientRawMemoryTransferCacheEntry(