commit: 6c3b7c4ea7c9df81989d27583719879f886a9f61 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Sun Jan 14 02:31:48 2018 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sun Jan 14 02:32:20 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c3b7c4e
www-client/chromium: dev channel bump (65.0.3315.3) Package-Manager: Portage-2.3.19_p11, Repoman-2.3.6_p45 www-client/chromium/Manifest | 2 +- ...0.3294.5.ebuild => chromium-65.0.3315.3.ebuild} | 24 +++-- www-client/chromium/files/chromium-gcc-r0.patch | 55 ++++++++++ www-client/chromium/files/chromium-gn-r0.patch | 33 ++++++ www-client/chromium/files/chromium-vulkan-r0.patch | 120 +++++++++++++++++++++ 5 files changed, 224 insertions(+), 10 deletions(-) diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index af9065743ea..f6efb007a6d 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -2,5 +2,5 @@ DIST chromium-63.0.3239.108.tar.xz 534294640 BLAKE2B f0f87115e91d7a2aa331cbab054 DIST chromium-63.0.3239.132.tar.xz 534286424 BLAKE2B 52658d4e8ff50bb8bdb1d397bc90a36e73407810198c4f28eea29bd0a4ad98bd4af947bdb8a5ecdbd73a248be8f375ba80c74c9a097aa57ef51eed1dc440ff95 SHA512 96e9ebdf1c3dc14a914bee50ced9547d5a94838ed602552379711ba67f00381173059ceb8a552efadd3175ceaa4cb6c15902fe582fc2eba7b7bdb8a19f47d1a0 DIST chromium-64.0.3282.71.tar.xz 482134720 BLAKE2B 691e33c396fde798985af96168a7b7aa92e3c90bc542c6e84df1b41a74ae0f8cb7364edfcf148db48971dabd5b2af422d884a36528b5549ec2fd52f5e6d7f643 SHA512 90fff36292898e47a2c47940efadc98b7099cdfdd8df4659b5e1ba327e26230919dc1e9e21a4496207cf88f9976d048dd2f200424224f2bc25e7ee9ab2755f06 DIST chromium-64.0.3282.85.tar.xz 482224568 BLAKE2B f8650721a2a30ea7f9c651efab58c54a225d7dda177c924c2ade132d488bb4b415e6155426384a005bafbcff5affbc99e142f45c85042cc6367e17c88c806f12 SHA512 52842b4f8304b4eb4e8fb25b586e0d03af5a5d0aebe2fc9ae517f97e05ee5ece3f71fd2b48a4f148fccec859b13c98a669ccbb4183d99ebd3bcf7e617ca241d0 -DIST chromium-65.0.3294.5.tar.xz 484687920 BLAKE2B 2d4d30ea83bfa0d5753eecd4ea735ec5d81097867b7c32c190853adee372c5032dac549c064fb22688555ef6231a3e2e43b274735883285f91a0a2d9c7a151ec SHA512 089bcc7eba7d5a2a964b5b6e94c7735653582cd6925325b9bdb2788bd4abb4b3cbc8c71f5c77004600864106a18da3fddda0adaa53ad54a96efe21498e45f23a DIST chromium-65.0.3298.3.tar.xz 485716108 BLAKE2B 185b3f683b2a732343fa5f98b24171f1d3cf2cf8eeb63c56efa7699f6b038d2a7eea4f9277b0b7ee2fdfa207a4f13edbaf2cc9a591a79ec4d058a131ce44366b SHA512 f1ed9a403036e87da7897f173eeb1aa71fe2650efc5ef5b98f814c7d4d9c879971597f9ded11324c86d6edc7f12f3bcf2786a6fb022e9697dbdb8eae086e18b7 +DIST chromium-65.0.3315.3.tar.xz 532475512 BLAKE2B 1a118ddd05f2b939ff0fd84f85e1c22789713351776d889bafb55ddb2b897b2921050a3df3b7d5e3224be84539d95dddce1a27a948c61b29c788ed9f8e194e02 SHA512 c7f0feda90c0df15058473d39482e9b9a9b3236dcb90ff8ba7ad53afde2fce4901b2cbd678d8470560cc0cb6e31c8d3caee9f0a9f100d82d95feacabcdb7f8ce diff --git a/www-client/chromium/chromium-65.0.3294.5.ebuild b/www-client/chromium/chromium-65.0.3315.3.ebuild similarity index 96% rename from www-client/chromium/chromium-65.0.3294.5.ebuild rename to www-client/chromium/chromium-65.0.3315.3.ebuild index 92ee58d2d8e..b8011501a83 100644 --- a/www-client/chromium/chromium-65.0.3294.5.ebuild +++ b/www-client/chromium/chromium-65.0.3315.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -17,25 +17,27 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P} LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~x86" -IUSE="component-build cups gnome-keyring +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine" +IUSE="component-build cups gnome-keyring +hangouts jumbo-build kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine" RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )" COMMON_DEPEND=" + app-accessibility/at-spi2-atk:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) + dev-libs/atk dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= - >=dev-libs/nss-3.14.3:= + >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= - >=media-libs/harfbuzz-1.5.0:=[icu(-)] + >=media-libs/harfbuzz-1.6.0:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) @@ -147,12 +149,14 @@ PATCHES=( "${FILESDIR}/chromium-webrtc-r0.patch" "${FILESDIR}/chromium-memcpy-r0.patch" "${FILESDIR}/chromium-clang-r2.patch" + "${FILESDIR}/chromium-gn-r0.patch" + "${FILESDIR}/chromium-vulkan-r0.patch" + "${FILESDIR}/chromium-gcc-r0.patch" ) pre_build_checks() { if [[ ${MERGE_TYPE} != binary ]]; then local -x CPP="$(tc-getCXX) -E" - tc-is-clang || die "Build currently fails with gcc, please use clang" if tc-is-clang && ! version_is_at_least "3.9.1" "$(clang-fullversion)"; then # bugs: #601654 die "At least clang 3.9.1 is required" @@ -376,13 +380,16 @@ src_configure() { # for development and debugging. myconf_gn+=" is_component_build=$(usex component-build true false)" + # https://chromium.googlesource.com/chromium/src/+/lkcr/docs/jumbo.md + myconf_gn+=" use_jumbo_build=$(usex jumbo-build true false)" + myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")" # Disable nacl, we can't build without pnacl (http://crbug.com/269560). myconf_gn+=" enable_nacl=false" # Use system-provided libraries. - # TODO: freetype (https://bugs.chromium.org/p/pdfium/issues/detail?id=733). + # TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733). # TODO: use_system_hunspell (upstream changes needed). # TODO: use_system_libsrtp (bug #459932). # TODO: use_system_protobuf (bug #525560). @@ -392,8 +399,8 @@ src_configure() { # libevent: https://bugs.gentoo.org/593458 local gn_system_libraries=( flac - # https://chromium.googlesource.com/chromium/src/+/4f1a60552748d150783655ee6f7b6f7084e3af95 - #fontconfig + fontconfig + freetype # Need harfbuzz_from_pkgconfig target #harfbuzz-ng libdrm @@ -426,7 +433,6 @@ src_configure() { myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)" myconf_gn+=" enable_widevine=$(usex widevine true false)" myconf_gn+=" use_cups=$(usex cups true false)" - myconf_gn+=" use_gconf=false" myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)" myconf_gn+=" use_kerberos=$(usex kerberos true false)" myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)" diff --git a/www-client/chromium/files/chromium-gcc-r0.patch b/www-client/chromium/files/chromium-gcc-r0.patch new file mode 100644 index 00000000000..b0aaae8de55 --- /dev/null +++ b/www-client/chromium/files/chromium-gcc-r0.patch @@ -0,0 +1,55 @@ +From 353219b1d808a8980af93eff5412ec2863557e35 Mon Sep 17 00:00:00 2001 +From: Jose Dapena Paz <[email protected]> +Date: Wed, 10 Jan 2018 15:34:25 +0000 +Subject: [PATCH] GCC fixes: avoid symbol collision between Element::ComputedAccessibleNode and ComputedAccessibleNode. + +GCC at least fails to compile if the method has the same name of the class. To avoid +this we rename the getter method to be prefixed with Get. + +Change-Id: I7f7ac2ecf0947718f72e78ccef019c3239c9b921 +Reviewed-on: https://chromium-review.googlesource.com/857716 +Reviewed-by: Daniel Cheng <[email protected]> +Reviewed-by: Hayato Ito <[email protected]> +Commit-Queue: José Dapena Paz <[email protected]> +Cr-Commit-Position: refs/heads/master@{#528322} +--- + +diff --git a/third_party/WebKit/Source/core/dom/Element.cpp b/third_party/WebKit/Source/core/dom/Element.cpp +index 4f50b7d..d0fa7b1 100644 +--- a/third_party/WebKit/Source/core/dom/Element.cpp ++++ b/third_party/WebKit/Source/core/dom/Element.cpp +@@ -1276,7 +1276,7 @@ + return rare_data.EnsureAccessibleNode(this); + } + +-ComputedAccessibleNode* Element::ComputedAccessibleNode() { ++ComputedAccessibleNode* Element::GetComputedAccessibleNode() { + if (!RuntimeEnabledFeatures::AccessibilityObjectModelEnabled()) + return nullptr; + +diff --git a/third_party/WebKit/Source/core/dom/Element.h b/third_party/WebKit/Source/core/dom/Element.h +index 733596b..986e31a 100644 +--- a/third_party/WebKit/Source/core/dom/Element.h ++++ b/third_party/WebKit/Source/core/dom/Element.h +@@ -295,7 +295,7 @@ + AccessibleNode* ExistingAccessibleNode() const; + AccessibleNode* accessibleNode(); + +- ComputedAccessibleNode* ComputedAccessibleNode(); ++ ComputedAccessibleNode* GetComputedAccessibleNode(); + + void DidMoveToNewDocument(Document&) override; + +diff --git a/third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp b/third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp +index 642f55f..f6a8d8e 100644 +--- a/third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp ++++ b/third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp +@@ -1110,7 +1110,7 @@ + Element* element) { + DCHECK(element); + ComputedAccessibleNode* computed_accessible_node = +- element->ComputedAccessibleNode(); ++ element->GetComputedAccessibleNode(); + return computed_accessible_node->ComputePromiseProperty(script_state); + } + diff --git a/www-client/chromium/files/chromium-gn-r0.patch b/www-client/chromium/files/chromium-gn-r0.patch new file mode 100644 index 00000000000..8f01e864ce5 --- /dev/null +++ b/www-client/chromium/files/chromium-gn-r0.patch @@ -0,0 +1,33 @@ +From 47b25a1f83f8166c6cd5cf1f13bf6dcce125511a Mon Sep 17 00:00:00 2001 +From: Tom Anderson <[email protected]> +Date: Tue, 9 Jan 2018 15:23:14 -0800 +Subject: [PATCH] Fix gn bootstrap + +BUG=800553 [email protected] + +Change-Id: I5c1cfeb7542bf990c59451aabcae7c120cbf09c0 +Reviewed-on: https://chromium-review.googlesource.com/858276 +Reviewed-by: Dirk Pranke <[email protected]> +Commit-Queue: Thomas Anderson <[email protected]> +Cr-Commit-Position: refs/heads/master@{#528197} +--- + tools/gn/bootstrap/bootstrap.py | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py +index a0f32ad31df0..5376c6253a32 100755 +--- a/tools/gn/bootstrap/bootstrap.py ++++ b/tools/gn/bootstrap/bootstrap.py +@@ -178,6 +178,11 @@ def build_gn_with_ninja_manually(tempdir, options): + root_gen_dir = os.path.join(tempdir, 'gen') + mkdir_p(root_gen_dir) + ++ write_buildflag_header_manually( ++ root_gen_dir, ++ 'base/synchronization/synchronization_flags.h', ++ {'ENABLE_MUTEX_PRIORITY_INHERITANCE': 'false'}) ++ + write_buildflag_header_manually(root_gen_dir, 'base/allocator/features.h', + {'USE_ALLOCATOR_SHIM': 'true' if is_linux else 'false'}) + diff --git a/www-client/chromium/files/chromium-vulkan-r0.patch b/www-client/chromium/files/chromium-vulkan-r0.patch new file mode 100644 index 00000000000..4553bb76667 --- /dev/null +++ b/www-client/chromium/files/chromium-vulkan-r0.patch @@ -0,0 +1,120 @@ +From 949b4f07fd1ef5b208136fe38327c28c95f18928 Mon Sep 17 00:00:00 2001 +From: Jamie Madill <[email protected]> +Date: Mon, 08 Jan 2018 11:15:38 -0500 +Subject: [PATCH] Vulkan: Allow for no .git directory in build. + +The SPIRV-Tools 'external revision generate' script is coded such that +it assumes a .git folder is present. This causes a problem for the +tarball build. We can fix this by using the same tooling we use for +ANGLE's commit id script to check if the .git directory is present +before running the generator. If it is missing, we insert a hard-coded +dummy header. Also use the 'DEPS' file as a placeholder for .git/HEAD +to check if the current revision needs updating. + +Bug: chromium:799620 +Bug: angleproject:2237 +Change-Id: Icea8e9c66f1600df7dca2aaa45fe449f687f5b55 +Reviewed-on: https://chromium-review.googlesource.com/854255 +Reviewed-by: Jamie Madill <[email protected]> +Commit-Queue: Jamie Madill <[email protected]> +--- + +diff --git a/third_party/angle/src/commit_id.py b/third_party/angle/src/commit_id.py +index bbdb810..57651a5 100644 +--- a/third_party/angle/src/commit_id.py ++++ b/third_party/angle/src/commit_id.py +@@ -23,6 +23,9 @@ + print("0") + sys.exit(0) + ++if len(sys.argv) < 4 or operation != 'gen': ++ sys.exit(usage) ++ + output_file = sys.argv[3] + commit_id_size = 12 + +diff --git a/third_party/angle/src/vulkan_support/BUILD.gn b/third_party/angle/src/vulkan_support/BUILD.gn +index fe61826..24f5a3a 100644 +--- a/third_party/angle/src/vulkan_support/BUILD.gn ++++ b/third_party/angle/src/vulkan_support/BUILD.gn +@@ -145,21 +145,40 @@ + } + } + +-# This could be generalized to a foreach if other revisions are added. +-action("spirv_tools_external_revision_generate") { +- script = "$vulkan_layers_dir/scripts/external_revision_generator.py" +- inputs = [ +- "$spirv_tools_dir/.git/HEAD", +- "$spirv_tools_dir/.git/index", +- ] +- outputs = [ +- "$vulkan_gen_dir/spirv_tools_commit_id.h", +- ] +- args = [ +- "$raw_spirv_tools_dir", +- "SPIRV_TOOLS_COMMIT_ID", +- "$raw_vulkan_gen_dir/spirv_tools_commit_id.h", +- ] ++spirv_git_is_present = exec_script("$angle_root/src/commit_id.py", ++ [ ++ "check", ++ raw_spirv_tools_dir, ++ ], ++ "value") ++ ++spirv_use_commit_id = spirv_git_is_present == 1 ++ ++if (spirv_use_commit_id) { ++ # This could be generalized to a foreach if other revisions are added. ++ action("spirv_tools_external_revision_generate") { ++ script = "$vulkan_layers_dir/scripts/external_revision_generator.py" ++ inputs = [ ++ "$angle_root/DEPS", ++ ] ++ outputs = [ ++ "$vulkan_gen_dir/spirv_tools_commit_id.h", ++ ] ++ args = [ ++ "$raw_spirv_tools_dir", ++ "SPIRV_TOOLS_COMMIT_ID", ++ "$raw_vulkan_gen_dir/spirv_tools_commit_id.h", ++ ] ++ } ++} else { ++ copy("spirv_tools_external_revision_generate") { ++ sources = [ ++ "dummy_spirv_tools_commit_id.h", ++ ] ++ outputs = [ ++ "$vulkan_gen_dir/spirv_tools_commit_id.h", ++ ] ++ } + } + + config("vulkan_generate_helper_files_config") { +@@ -864,7 +883,7 @@ + sources += [ "$vulkan_layers_dir/layers/VkLayer_$name.def" ] + } + if (is_linux) { +- ldflags = [ "-Wl,-Bsymbolic,--exclude-libs,ALL" ] ++ ldflags = [ "-Wl,-Bsymbolic,--exclude-libs,ALL" ] + } + } + } +diff --git a/third_party/angle/src/vulkan_support/dummy_spirv_tools_commit_id.h b/third_party/angle/src/vulkan_support/dummy_spirv_tools_commit_id.h +new file mode 100644 +index 0000000..e1793bd +--- /dev/null ++++ b/third_party/angle/src/vulkan_support/dummy_spirv_tools_commit_id.h +@@ -0,0 +1,10 @@ ++// ++// Copyright 2018 The ANGLE Project Authors. All rights reserved. ++// Use of this source code is governed by a BSD-style license that can be ++// found in the LICENSE file. ++// ++// This file is a dummy file to enable building SPIRV tools when git is absent. ++ ++#pragma once ++ ++#define SPIRV_TOOLS_COMMIT_ID "0000000000000000000000000000000000000000"
