diff options
author | Mike Gilbert <floppym@gentoo.org> | 2018-10-15 00:58:03 -0400 |
---|---|---|
committer | Mike Gilbert <floppym@gentoo.org> | 2018-10-15 00:59:02 -0400 |
commit | b04680338806ed8c7c345da7f65af6673d35d59b (patch) | |
tree | 0880bf3ec24d81bc77d27660ae84c5820e7b7166 | |
parent | dev-util/gn: bump to 0.1479 (diff) | |
download | gentoo-b04680338806ed8c7c345da7f65af6673d35d59b.tar.gz gentoo-b04680338806ed8c7c345da7f65af6673d35d59b.tar.bz2 gentoo-b04680338806ed8c7c345da7f65af6673d35d59b.zip |
www-client/chromium: dev channel bump (71.0.3573.0)
Package-Manager: Portage-2.3.50_p14, Repoman-2.3.11_p21
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
-rw-r--r-- | www-client/chromium/Manifest | 2 | ||||
-rw-r--r-- | www-client/chromium/chromium-71.0.3573.0.ebuild (renamed from www-client/chromium/chromium-71.0.3554.4.ebuild) | 41 | ||||
-rw-r--r-- | www-client/chromium/files/chromium-ceil-r0.patch | 59 | ||||
-rw-r--r-- | www-client/chromium/files/chromium-compiler-r6.patch | 170 | ||||
-rw-r--r-- | www-client/chromium/files/chromium-widevine-r3.patch | 23 |
5 files changed, 279 insertions, 16 deletions
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 0dc8a80d14f1..f9246fe25f24 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -1,5 +1,5 @@ DIST chromium-69.0.3497.100.tar.xz 617374764 BLAKE2B 45805e7a743982c167974cbe223b126dad83cca2eca6c78b6fe707431b2df45cb30271c0ee5002839c84f661260063852a1e1a913d26a073a87fb20e7b4d964e SHA512 bc9dd4a63eb9a8c369bd360f7fd0fb9b72addfa553e9a9d8adbfafe7ec4af39ec1fb3dd6523af1f17cb141aaf017ca4b6abc357c4a595ff627e88c58e87e8f6f DIST chromium-70.0.3538.45.tar.xz 622986816 BLAKE2B f21d7755251e62c52dd8ea7a7e3300b77c8ca361671632e778becd68ff205c4d84386b7feab12aeb1f18082a79dca4d69a414294c2055bbb29ef448a27c783e0 SHA512 a5f87fd765e7cb9b07ffa3b04aed2d5a7f94c213de6b9d0abcb3e1e8e640e3b70e44d233c2865b418a021285fd1e797db49e3e9dd1cc9ac24f815419d57132a1 DIST chromium-70.0.3538.54.tar.xz 623081708 BLAKE2B 795bb43b3f36f9caedd72959446398b3129de7428fa055427aca8df962cb10f450ebaa32ae9bb538fd2d6842c198cab6e8eb9a4f7d2f7c74c5d6abfd75740669 SHA512 c20ee15f6f0856940ac6696de6fe258c528719101c10ef8f04773355e9c60a41eba5c3ace75f5be368c9b8107a3c5053bf56727aa3626ad012f8cd5371eb7d0e -DIST chromium-71.0.3554.4.tar.xz 626667348 BLAKE2B 4cdbd7041fd087c860bfc5c731073713ac01059fa388de10684058a81178d007e6fe2ad2bf6ce58a44b5489b24ded1a29862f98dd8f9ec8484e5e0d9d7a2e38e SHA512 ad4c6bc8ab857bf1a928b959129f5b64c1333f109cc7a5482f3bea3cab070faee85e41128acc4d9e479a312dd66ec201cf115e2dd8e35587f1bdd95ff78dfd18 DIST chromium-71.0.3559.6.tar.xz 626881656 BLAKE2B 4712e7bb9c7018ed4ace7f8d7d7c313e26c6a156c937084f5553e18bd38edd98536b09e867718ed1e9e561c3f39ddc6de4802b780e33d72f1329f636fa356250 SHA512 12ba43ee94aa185d13035c01755b0166082fe4831f1787e755de11a9b6121c0384eb04352f0582659a23908acc4544db359a30e0f22715d69f357c8a1baa3aac +DIST chromium-71.0.3573.0.tar.xz 626729588 BLAKE2B 5fc5b030f8bfef2721234026ba5411896795132592db2c4732f98b08d74b31ed2fe9b59efc78754b5f72d5908f1d5ccb1054abdead51c53235c1118fa91b2cbf SHA512 27a8dd60dc319b33d954440b1e8aac382a4fe6afaca88e63175b72c6040c5bb5653d01ecabd8e8ebd99d954781299fa3bf44518c0fc396d9d56a97bdb1291503 diff --git a/www-client/chromium/chromium-71.0.3554.4.ebuild b/www-client/chromium/chromium-71.0.3573.0.ebuild index d01d061f6aba..4b58a52df69d 100644 --- a/www-client/chromium/chromium-71.0.3554.4.ebuild +++ b/www-client/chromium/chromium-71.0.3573.0.ebuild @@ -1,14 +1,14 @@ # Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 PYTHON_COMPAT=( python2_7 ) CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv sw ta te th tr uk vi zh-CN zh-TW" -inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils +inherit check-reqs chromium-2 desktop flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils DESCRIPTION="Open-source version of Google Chrome web browser" HOMEPAGE="http://chromium.org/" @@ -89,6 +89,8 @@ RDEPEND="${COMMON_DEPEND} # dev-vcs/git - https://bugs.gentoo.org/593476 # sys-apps/sandbox - https://crbug.com/586444 DEPEND="${COMMON_DEPEND} +" +BDEPEND=" >=app-arch/gzip-1.7 !arm? ( dev-lang/yasm @@ -101,11 +103,16 @@ DEPEND="${COMMON_DEPEND} sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex - >=sys-devel/clang-5 virtual/pkgconfig dev-vcs/git " +: ${CHROMIUM_FORCE_CLANG=yes} + +if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then + BDEPEND+=" >=sys-devel/clang-5" +fi + if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then EBUILD_DEATH_HOOKS+=" chromium_pkg_die"; fi @@ -130,12 +137,13 @@ GTK+ icon theme. " PATCHES=( - "${FILESDIR}/chromium-compiler-r4.patch" - "${FILESDIR}/chromium-widevine-r2.patch" + "${FILESDIR}/chromium-compiler-r6.patch" + "${FILESDIR}/chromium-widevine-r3.patch" "${FILESDIR}/chromium-webrtc-r0.patch" "${FILESDIR}/chromium-memcpy-r0.patch" "${FILESDIR}/chromium-math.h-r0.patch" "${FILESDIR}/chromium-stdint.patch" + "${FILESDIR}/chromium-ceil-r0.patch" ) pre_build_checks() { @@ -154,14 +162,12 @@ pre_build_checks() { # Check build requirements, bug #541816 and bug #471810 . CHECKREQS_MEMORY="3G" CHECKREQS_DISK_BUILD="5G" - eshopts_push -s extglob - if is-flagq '-g?(gdb)?([1-9])'; then + if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then CHECKREQS_DISK_BUILD="25G" if ! use component-build; then CHECKREQS_MEMORY="16G" fi fi - eshopts_pop check-reqs_pkg_setup } @@ -317,6 +323,7 @@ src_prepare() { third_party/skia/third_party/vulkan third_party/smhasher third_party/spirv-headers + third_party/SPIRV-Tools third_party/spirv-tools-angle third_party/sqlite third_party/swiftshader @@ -380,7 +387,7 @@ src_configure() { # Make sure the build system will use the right tools, bug #340795. tc-export AR CC CXX NM - if ! tc-is-clang; then + if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] && ! tc-is-clang; then # Force clang since gcc is pretty broken at the moment. CC=${CHOST}-clang CXX=${CHOST}-clang++ @@ -677,17 +684,21 @@ src_install() { readme.gentoo_create_doc } -pkg_preinst() { - gnome2_icon_savelist -} - pkg_postrm() { - gnome2_icon_cache_update + if type gtk-update-icon-cache &>/dev/null; then + ebegin "Updating GTK icon cache" + gtk-update-icon-cache "${EROOT}/usr/share/icons/hicolor" + eend $? + fi xdg_desktop_database_update } pkg_postinst() { - gnome2_icon_cache_update + if type gtk-update-icon-cache &>/dev/null; then + ebegin "Updating GTK icon cache" + gtk-update-icon-cache "${EROOT}/usr/share/icons/hicolor" + eend $? + fi xdg_desktop_database_update readme.gentoo_print_elog } diff --git a/www-client/chromium/files/chromium-ceil-r0.patch b/www-client/chromium/files/chromium-ceil-r0.patch new file mode 100644 index 000000000000..9e7f2a7392e9 --- /dev/null +++ b/www-client/chromium/files/chromium-ceil-r0.patch @@ -0,0 +1,59 @@ +From cc843eb64f6599d9ede176f711fe6355015c30b1 Mon Sep 17 00:00:00 2001 +From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com> +Date: Mon, 8 Oct 2018 22:33:38 +0000 +Subject: [PATCH] PictureLayerImpl: Use ceil() instead of ceilf() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +ceilf() is only formally mentioned in C++17, even though previous versions +of the standard say <cmath> should have the same contents as C's math.h. + +libstdc++ does not ship ceilf() in its cmath, but the ceil(float) overload +that _is_ in the standard is available everywhere, so use that instead. + +This fixes the build with libstdc++ after 77b67445ba ("Elements with fixed +bottom and top stick to top"): + + ../../cc/layers/picture_layer_impl.cc: In member function ‘void cc::PictureLayerImpl::UpdateViewportRectForTilePriorityInContentSpace()’: + ../../cc/layers/picture_layer_impl.cc:738:16: error: ‘ceilf’ is not a member of ‘std’ + std::ceilf(-total_controls_height * hidden_ratio)); // bottom + ^~~~~ + ../../cc/layers/picture_layer_impl.cc:738:16: note: suggested alternative: ‘ceil’ + std::ceilf(-total_controls_height * hidden_ratio)); // bottom + ^~~~~ + ceil + +Bug: 819294 +Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;master.tryserver.blink:linux_trusty_blink_rel +Change-Id: Ida69eb3127ca132e7090c9aad0dd17dc314b6992 +Reviewed-on: https://chromium-review.googlesource.com/c/1264537 +Commit-Queue: David Bokan <bokan@chromium.org> +Reviewed-by: David Bokan <bokan@chromium.org> +Cr-Commit-Position: refs/heads/master@{#597709} +--- + cc/layers/picture_layer_impl.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/cc/layers/picture_layer_impl.cc b/cc/layers/picture_layer_impl.cc +index 937255884a6e..020bcee55201 100644 +--- a/cc/layers/picture_layer_impl.cc ++++ b/cc/layers/picture_layer_impl.cc +@@ -727,10 +727,10 @@ void PictureLayerImpl::UpdateViewportRectForTilePriorityInContentSpace() { + 1.f - layer_tree_impl()->CurrentBrowserControlsShownRatio(); + + viewport_rect_for_tile_priority_in_content_space_.Inset( +- 0, // left +- 0, // top, +- 0, // right, +- std::ceilf(-total_controls_height * hidden_ratio)); // bottom ++ 0, // left ++ 0, // top, ++ 0, // right, ++ std::ceil(-total_controls_height * hidden_ratio)); // bottom + } + } + } +-- +2.19.1 + diff --git a/www-client/chromium/files/chromium-compiler-r6.patch b/www-client/chromium/files/chromium-compiler-r6.patch new file mode 100644 index 000000000000..db8d04649fdc --- /dev/null +++ b/www-client/chromium/files/chromium-compiler-r6.patch @@ -0,0 +1,170 @@ +From cec10e55fdb150b33342ad462907fb6202de364e Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <floppym@gentoo.org> +Date: Wed, 25 Apr 2018 13:22:49 -0400 +Subject: [PATCH] Disable various compiler configs + +--- + build/config/compiler/BUILD.gn | 63 ++++++++++------------------------ + 1 file changed, 18 insertions(+), 45 deletions(-) + +diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn +index 0f7a6b48f7b2..c91b702147d4 100644 +--- a/build/config/compiler/BUILD.gn ++++ b/build/config/compiler/BUILD.gn +@@ -236,8 +236,6 @@ config("compiler") { + + configs += [ + # See the definitions below. +- ":clang_revision", +- ":compiler_cpu_abi", + ":compiler_codegen", + ] + +@@ -502,17 +500,6 @@ config("compiler") { + } + } + +- if (is_clang && !is_nacl && !use_xcode_clang) { +- cflags += [ +- # TODO(hans): Remove this once Clang generates better optimized debug info +- # by default. https://crbug.com/765793 +- "-Xclang", +- "-mllvm", +- "-Xclang", +- "-instcombine-lower-dbg-declare=0", +- ] +- } +- + # Print absolute paths in diagnostics. There is no precedent for doing this + # on Linux/Mac (GCC doesn't support it), but MSVC does this with /FC and + # Windows developers rely on it (crbug.com/636109) so only do this on Windows. +@@ -1498,13 +1485,6 @@ config("default_warnings") { + cflags += [ + # TODO(thakis): https://crbug.com/753973 + "-Wno-enum-compare-switch", +- +- # Ignore warnings about MSVC optimization pragmas. +- # TODO(thakis): Only for no_chromium_code? http://crbug.com/505314 +- "-Wno-ignored-pragma-optimize", +- +- # TODO(hans): https://crbug.com/890307 +- "-Wno-defaulted-function-deleted", + ] + } + } +@@ -1546,22 +1526,6 @@ config("chromium_code") { + "__STDC_FORMAT_MACROS", + ] + +- if (!is_debug && !using_sanitizer && +- (!is_linux || !is_clang || is_official_build) && +- current_cpu != "s390x" && current_cpu != "s390" && +- current_cpu != "ppc64" && current_cpu != "ppc64" && +- current_cpu != "mips" && current_cpu != "mips64") { +- # _FORTIFY_SOURCE isn't really supported by Clang now, see +- # http://llvm.org/bugs/show_bug.cgi?id=16821. +- # It seems to work fine with Ubuntu 12 headers though, so use it in +- # official builds. +- # +- # Non-chromium code is not guaranteed to compile cleanly with +- # _FORTIFY_SOURCE. Also, fortified build may fail when optimizations are +- # disabled, so only do that for Release build. +- defines += [ "_FORTIFY_SOURCE=2" ] +- } +- + if (is_mac) { + cflags_objc = [ "-Wobjc-missing-property-synthesis" ] + cflags_objcc = [ "-Wobjc-missing-property-synthesis" ] +@@ -1931,7 +1895,8 @@ config("default_stack_frames") { + } + + # Default "optimization on" config. +-config("optimize") { ++config("optimize") { } ++config("xoptimize") { + if (is_win) { + # TODO(thakis): Remove is_clang here, https://crbug.com/598772 + if (is_official_build && full_wpo_on_official && !is_clang) { +@@ -1965,7 +1930,8 @@ config("optimize") { + } + + # Same config as 'optimize' but without the WPO flag. +-config("optimize_no_wpo") { ++config("optimize_no_wpo") { } ++config("xoptimize_no_wpo") { + if (is_win) { + # Favor size over speed, /O1 must be before the common flags. The GYP + # build also specifies /Os and /GF but these are implied by /O1. +@@ -1988,7 +1954,8 @@ config("optimize_no_wpo") { + } + + # Turn off optimizations. +-config("no_optimize") { ++config("no_optimize") { } ++config("xno_optimize") { + if (is_win) { + cflags = [ + "/Od", # Disable optimization. +@@ -2012,7 +1979,8 @@ config("no_optimize") { + # Turns up the optimization level. On Windows, this implies whole program + # optimization and link-time code generation which is very expensive and should + # be used sparingly. +-config("optimize_max") { ++config("optimize_max") { } ++config("xoptimize_max") { + if (is_nacl && is_nacl_irt) { + # The NaCl IRT is a special case and always wants its own config. + # Various components do: +@@ -2059,7 +2027,8 @@ config("optimize_max") { + # + # TODO(crbug.com/621335) - rework how all of these configs are related + # so that we don't need this disclaimer. +-config("optimize_speed") { ++config("optimize_speed") { } ++config("xoptimize_speed") { + if (is_nacl && is_nacl_irt) { + # The NaCl IRT is a special case and always wants its own config. + # Various components do: +@@ -2097,7 +2066,8 @@ config("optimize_speed") { + } + } + +-config("optimize_fuzzing") { ++config("optimize_fuzzing") { } ++config("xoptimize_fuzzing") { + cflags = [ "-O1" ] + common_optimize_on_cflags + ldflags = common_optimize_on_ldflags + visibility = [ ":default_optimization" ] +@@ -2183,7 +2153,8 @@ config("afdo") { + # configs += [ "//build/config/compiler:symbols" ] + + # Full symbols. +-config("symbols") { ++config("symbols") { } ++config("xsymbols") { + if (is_win) { + if (use_goma || is_clang) { + # Note that with VC++ this requires is_win_fastlink, enforced elsewhere. +@@ -2281,7 +2252,8 @@ config("symbols") { + # Minimal symbols. + # This config guarantees to hold symbol for stack trace which are shown to user + # when crash happens in unittests running on buildbot. +-config("minimal_symbols") { ++config("minimal_symbols") { } ++config("xminimal_symbols") { + if (is_win) { + # Linker symbols for backtraces only. + cflags = [] +@@ -2321,7 +2293,8 @@ config("minimal_symbols") { + } + + # No symbols. +-config("no_symbols") { ++config("no_symbols") { } ++config("xno_symbols") { + if (!is_win) { + cflags = [ "-g0" ] + asmflags = cflags +-- +2.19.1 + diff --git a/www-client/chromium/files/chromium-widevine-r3.patch b/www-client/chromium/files/chromium-widevine-r3.patch new file mode 100644 index 000000000000..a126084563ce --- /dev/null +++ b/www-client/chromium/files/chromium-widevine-r3.patch @@ -0,0 +1,23 @@ +From 5818fdbef3d399fe1bfbb56f81e59184e1a8e467 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <floppymaster@gmail.com> +Date: Sun, 14 Oct 2018 20:04:03 -0400 +Subject: [PATCH] Define WIDEVINE_CDM_VERSION_STRING + +--- + third_party/widevine/cdm/widevine_cdm_version.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/third_party/widevine/cdm/widevine_cdm_version.h b/third_party/widevine/cdm/widevine_cdm_version.h +index dd6efed02646..eaa017197e61 100644 +--- a/third_party/widevine/cdm/widevine_cdm_version.h ++++ b/third_party/widevine/cdm/widevine_cdm_version.h +@@ -11,5 +11,6 @@ + // If the Widevine CDM is available define the following: + // - WIDEVINE_CDM_VERSION_STRING (with the version of the CDM that's available + // as a string, e.g., "1.0.123.456"). ++#define WIDEVINE_CDM_VERSION_STRING "unknown" + + #endif // WIDEVINE_CDM_VERSION_H_ +-- +2.19.1 + |