From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 85F221396D0 for ; Wed, 9 Aug 2017 14:04:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D7A45E023C; Wed, 9 Aug 2017 14:04:54 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A305CE023C for ; Wed, 9 Aug 2017 14:04:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 537C2341750 for ; Wed, 9 Aug 2017 14:04:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A07A075F8 for ; Wed, 9 Aug 2017 14:04:51 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1502287465.689090f1ec53b7b958a903f6ed01f38b71e1b819.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/, www-client/chromium/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/chromium/chromium-61.0.3163.31.ebuild www-client/chromium/files/chromium-mojo-dep.patch X-VCS-Directories: www-client/chromium/files/ www-client/chromium/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 689090f1ec53b7b958a903f6ed01f38b71e1b819 X-VCS-Branch: master Date: Wed, 9 Aug 2017 14:04:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: efef9d7a-82b0-4b19-9182-7f51c5e1a851 X-Archives-Hash: 59c179490bdf13dfa91478a14aae047b commit: 689090f1ec53b7b958a903f6ed01f38b71e1b819 Author: Mike Gilbert gentoo org> AuthorDate: Wed Aug 9 14:04:25 2017 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Wed Aug 9 14:04:25 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=689090f1 www-client/chromium: backport build fix Bug: https://bugs.gentoo.org/626684 Package-Manager: Portage-2.3.6_p23, Repoman-2.3.3_p1 www-client/chromium/chromium-61.0.3163.31.ebuild | 1 + www-client/chromium/files/chromium-mojo-dep.patch | 54 +++++++++++++++++++++++ 2 files changed, 55 insertions(+) diff --git a/www-client/chromium/chromium-61.0.3163.31.ebuild b/www-client/chromium/chromium-61.0.3163.31.ebuild index 600995b990b..c55fd86c15d 100644 --- a/www-client/chromium/chromium-61.0.3163.31.ebuild +++ b/www-client/chromium/chromium-61.0.3163.31.ebuild @@ -146,6 +146,7 @@ PATCHES=( "${FILESDIR}/${PN}-gcc-r1.patch" "${FILESDIR}/${PN}-gn-bootstrap-r14.patch" "${FILESDIR}/${PN}-atk-r1.patch" + "${FILESDIR}/${PN}-mojo-dep.patch" ) pre_build_checks() { diff --git a/www-client/chromium/files/chromium-mojo-dep.patch b/www-client/chromium/files/chromium-mojo-dep.patch new file mode 100644 index 00000000000..bf618540d17 --- /dev/null +++ b/www-client/chromium/files/chromium-mojo-dep.patch @@ -0,0 +1,54 @@ +From f8e2c057ec6123b0a1d08294f41e78c427636b49 Mon Sep 17 00:00:00 2001 +From: Mike Bjorge +Date: Mon, 7 Aug 2017 18:41:58 +0000 +Subject: [PATCH] Add mojo_blink dep from WebKit loader/. + +Now that loader has a direct dependency on the generated mojom-blink +headers (https://chromium-review.googlesource.com/c/577488), the loader/ +target should have a dep on the mojo target that generates the headers, +otherwise the build may fail depending on build order. + +All the other platform/ targets that depend on the mojom-blink headers +are directly included in the platform target, which has the necessary +dependency already. + +Bug: 746197 +Bug: 750883 +Change-Id: Ife1429ec649605aae3f7920560cec37f3a218154 +Reviewed-on: https://chromium-review.googlesource.com/602869 +Reviewed-by: Yutaka Hirano +Reviewed-by: Matt Falkenhagen +Commit-Queue: Mike Bjorge +Cr-Commit-Position: refs/heads/master@{#492369} +--- + third_party/WebKit/Source/platform/loader/BUILD.gn | 1 + + third_party/WebKit/public/BUILD.gn | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/third_party/WebKit/Source/platform/loader/BUILD.gn b/third_party/WebKit/Source/platform/loader/BUILD.gn +index d483734b21cf..409befe884a8 100644 +--- a/third_party/WebKit/Source/platform/loader/BUILD.gn ++++ b/third_party/WebKit/Source/platform/loader/BUILD.gn +@@ -99,6 +99,7 @@ source_set("loader") { + "//components/link_header_util:link_header_util", + "//mojo/public/cpp/system:system", + "//storage/public/interfaces:interfaces_blink__generator", ++ "//third_party/WebKit/public:mojo_bindings_blink", + ] + + public_deps = [ +diff --git a/third_party/WebKit/public/BUILD.gn b/third_party/WebKit/public/BUILD.gn +index 84ee3ca9136d..cc847663efc6 100644 +--- a/third_party/WebKit/public/BUILD.gn ++++ b/third_party/WebKit/public/BUILD.gn +@@ -755,6 +755,7 @@ mojom("mojo_bindings") { + visibility_blink = [ + "//content/common:mojo_bindings_blink", + "//third_party/WebKit/Source/platform", ++ "//third_party/WebKit/Source/platform/loader", + ] + sources = [ + "platform/display_mode.mojom", +-- +2.14.0 +