commit: d430acd6636f85536169d842ebe991d2bb7825c3 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Mon Nov 5 00:19:33 2018 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Mon Nov 5 00:20:21 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d430acd6
www-client/chromium: beta channel bump (71.0.3578.30) Closes: https://bugs.gentoo.org/669542 Package-Manager: Portage-2.3.51_p2, Repoman-2.3.11_p27 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> www-client/chromium/Manifest | 2 +- ....3573.0.ebuild => chromium-71.0.3578.30.ebuild} | 17 ++++--- www-client/chromium/files/chromium-71-gcc-0.patch | 57 ++++++++++++++++++++++ 3 files changed, 69 insertions(+), 7 deletions(-) diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index a65355a7998..0192285a2ef 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -1,3 +1,3 @@ DIST chromium-70.0.3538.67.tar.xz 623057648 BLAKE2B fd6667d8ca82721ca4cb70b39f66c88f1e10f82a5f9b8beadabd56882f9e4e32e249b25f4484a323f8efc9d940f2afb1c73b76cea0803ce18c138adfc8bdc3c0 SHA512 923dd574dce15627678d1601d34e37285ac438bb61ee252ecd15bdec3e5f76066897848addeedd3c61f2c5e550a284d14e0af3d02ae5666c9f6eb047c9d4441f -DIST chromium-71.0.3573.0.tar.xz 626729588 BLAKE2B 5fc5b030f8bfef2721234026ba5411896795132592db2c4732f98b08d74b31ed2fe9b59efc78754b5f72d5908f1d5ccb1054abdead51c53235c1118fa91b2cbf SHA512 27a8dd60dc319b33d954440b1e8aac382a4fe6afaca88e63175b72c6040c5bb5653d01ecabd8e8ebd99d954781299fa3bf44518c0fc396d9d56a97bdb1291503 DIST chromium-71.0.3578.10.tar.xz 633514144 BLAKE2B 6a90e46378d2ffe97a1ab6a104f0e6bc5332750d18116ee78ad7200192260aad5ee0fcee917e6c6d065aa227eb2b5e84f392e96a6b8ec18d8bbe805a5f371594 SHA512 b17db9c3fac5f96d59bdc11faaa4664d977293eabb9d74120c2af961af8c866aaa5f017ce3a2629bcf189bbeb2e7e2d9c7d6ca9716ff361e3cfe648f0b802f1e +DIST chromium-71.0.3578.30.tar.xz 633685260 BLAKE2B 486c34d34da7078d4ffedc46519cb214460335f37f5c3a8f72cde9cc30e9730912122016af5bc2877b6f6a1c10e96b6de473b6ea8f88f7d64252322885c0f0fc SHA512 7f8114b678cb2ab9f449ab0dd91ef668d953cd6dd97c47cd187644820af137d9914b9b59f876802f58f8b2ddd78833529a8efc02b7d2ea3abeb21366258120cd diff --git a/www-client/chromium/chromium-71.0.3573.0.ebuild b/www-client/chromium/chromium-71.0.3578.30.ebuild similarity index 98% rename from www-client/chromium/chromium-71.0.3573.0.ebuild rename to www-client/chromium/chromium-71.0.3578.30.ebuild index 4b58a52df69..3f45008f2cd 100644 --- a/www-client/chromium/chromium-71.0.3573.0.ebuild +++ b/www-client/chromium/chromium-71.0.3578.30.ebuild @@ -21,10 +21,10 @@ IUSE="component-build cups gnome-keyring +hangouts jumbo-build kerberos neon pic RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )" COMMON_DEPEND=" - app-accessibility/at-spi2-atk:2 + >=app-accessibility/at-spi2-atk-2.26:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) - dev-libs/atk + >=dev-libs/atk-2.26 dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59:= ) @@ -32,12 +32,12 @@ COMMON_DEPEND=" dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= - >=dev-libs/re2-0.2016.05.01:= + >=dev-libs/re2-0.2016.11.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.8.8:=[icu(-)] + >=media-libs/harfbuzz-2.0.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) @@ -107,7 +107,7 @@ BDEPEND=" dev-vcs/git " -: ${CHROMIUM_FORCE_CLANG=yes} +: ${CHROMIUM_FORCE_CLANG=no} if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then BDEPEND+=" >=sys-devel/clang-5" @@ -143,7 +143,8 @@ PATCHES=( "${FILESDIR}/chromium-memcpy-r0.patch" "${FILESDIR}/chromium-math.h-r0.patch" "${FILESDIR}/chromium-stdint.patch" - "${FILESDIR}/chromium-ceil-r0.patch" + "${FILESDIR}/chromium-harfbuzz-r0.patch" + "${FILESDIR}/chromium-71-gcc-0.patch" ) pre_build_checks() { @@ -268,6 +269,7 @@ src_prepare() { third_party/iccjpeg third_party/inspector_protocol third_party/jinja2 + third_party/jsoncpp third_party/jstemplate third_party/khronos third_party/leveldatabase @@ -577,6 +579,9 @@ src_configure() { } src_compile() { + # Final link uses lots of file descriptors. + ulimit -n 2048 + # Calling this here supports resumption via FEATURES=keepwork python_setup diff --git a/www-client/chromium/files/chromium-71-gcc-0.patch b/www-client/chromium/files/chromium-71-gcc-0.patch new file mode 100644 index 00000000000..711b827566f --- /dev/null +++ b/www-client/chromium/files/chromium-71-gcc-0.patch @@ -0,0 +1,57 @@ +From 65be571f6ac2f7942b4df9e50b24da517f829eec Mon Sep 17 00:00:00 2001 +From: Raphael Kubo da Costa <raphael.kubo.da.co...@intel.com> +Date: Mon, 15 Oct 2018 20:26:10 +0000 +Subject: [PATCH] google_util: Explicitly use std::initializer_list with + base::NoDestructor +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Follow-up to ac53c5c53 ("Remove CR_DEFINE_STATIC_LOCAL from /components"). +Due to https://gcc.gnu.org/bugzilla/show_bug.cgi?id=84849, having +base::NoDestructor<T<U>> and passing an initializer list of Us does not +work if this is not done explicitly, as GCC incorrectly fails to determine +which constructor overload to use: + + ../../components/google/core/common/google_util.cc: In function ‘bool google_util::{anonymous}::IsCanonicalHostGoogleHostname(base::StringPiece, google_util::SubdomainPermission)’: + ../../components/google/core/common/google_util.cc:120:24: error: call of overloaded ‘NoDestructor(<brace-enclosed initializer list>)’ is ambiguous + {GOOGLE_TLD_LIST}); + +See also: https://chromium-review.googlesource.com/c/chromium/src/+/1170905 + +Bug: 819294 +Change-Id: Ie1490b6646d7998d636c485769caabf56c1cf44c +Reviewed-on: https://chromium-review.googlesource.com/c/1275854 +Reviewed-by: Peter Kasting <pkast...@chromium.org> +Commit-Queue: Raphael Kubo da Costa (CET) <raphael.kubo.da.co...@intel.com> +Cr-Commit-Position: refs/heads/master@{#599733} +--- + components/google/core/common/google_util.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/components/google/core/common/google_util.cc b/components/google/core/common/google_util.cc +index a44c84393820..7733848a0443 100644 +--- a/components/google/core/common/google_util.cc ++++ b/components/google/core/common/google_util.cc +@@ -117,7 +117,7 @@ bool IsCanonicalHostGoogleHostname(base::StringPiece canonical_host, + StripTrailingDot(&tld); + + static base::NoDestructor<std::set<std::string>> google_tlds( +- {GOOGLE_TLD_LIST}); ++ std::initializer_list<std::string>({GOOGLE_TLD_LIST})); + return base::ContainsKey(*google_tlds, tld.as_string()); + } + +@@ -132,7 +132,8 @@ bool IsGoogleSearchSubdomainUrl(const GURL& url) { + StripTrailingDot(&host); + + static base::NoDestructor<std::set<std::string>> google_subdomains( +- {"ipv4.google.com", "ipv6.google.com"}); ++ std::initializer_list<std::string>( ++ {"ipv4.google.com", "ipv6.google.com"})); + + return base::ContainsKey(*google_subdomains, host.as_string()); + } +-- +2.19.1 +
