From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id C35CA139A8D for ; Tue, 8 Sep 2015 21:01:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 50E4E141D5; Tue, 8 Sep 2015 21:01:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E0B10141D5 for ; Tue, 8 Sep 2015 21:01:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E922A34087C for ; Tue, 8 Sep 2015 21:01:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2326918C for ; Tue, 8 Sep 2015 21:01:35 +0000 (UTC) From: "Paweł Hajdan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Paweł Hajdan" Message-ID: <1441746087.7c186f8f74d8aca1509b3f7d6a45ce51e6fd08ec.phajdan.jr@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/, www-client/chromium/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/chromium/chromium-45.0.2454.85.ebuild www-client/chromium/files/chromium-tracing-r0.patch X-VCS-Directories: www-client/chromium/ www-client/chromium/files/ X-VCS-Committer: phajdan.jr X-VCS-Committer-Name: Paweł Hajdan X-VCS-Revision: 7c186f8f74d8aca1509b3f7d6a45ce51e6fd08ec X-VCS-Branch: master Date: Tue, 8 Sep 2015 21:01:35 +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: da8a10f7-880d-43fb-8949-f60b677e3ce0 X-Archives-Hash: 83a739f498229cddf734d53b4d97bd1d commit: 7c186f8f74d8aca1509b3f7d6a45ce51e6fd08ec Author: Pawel Hajdan, Jr gentoo org> AuthorDate: Tue Sep 8 21:01:06 2015 +0000 Commit: Paweł Hajdan gentoo org> CommitDate: Tue Sep 8 21:01:27 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c186f8f www-client/chromium: fix build when dev-python/tracing is installed This fixes bug #556812 by Helmut Jarausch. Culprit has been identified by Guillaume ZITTA. Package-Manager: portage-2.2.20.1 www-client/chromium/chromium-45.0.2454.85.ebuild | 1 + www-client/chromium/files/chromium-tracing-r0.patch | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/www-client/chromium/chromium-45.0.2454.85.ebuild b/www-client/chromium/chromium-45.0.2454.85.ebuild index 70baec6..2df11ca 100644 --- a/www-client/chromium/chromium-45.0.2454.85.ebuild +++ b/www-client/chromium/chromium-45.0.2454.85.ebuild @@ -187,6 +187,7 @@ src_prepare() { # fi epatch "${FILESDIR}/${PN}-system-jinja-r7.patch" + epatch "${FILESDIR}/${PN}-tracing-r0.patch" epatch_user diff --git a/www-client/chromium/files/chromium-tracing-r0.patch b/www-client/chromium/files/chromium-tracing-r0.patch new file mode 100644 index 0000000..7312116 --- /dev/null +++ b/www-client/chromium/files/chromium-tracing-r0.patch @@ -0,0 +1,10 @@ +--- third_party/trace-viewer/tracing/build/generate_about_tracing_contents.orig 2015-09-08 13:14:21.048113295 +0000 ++++ third_party/trace-viewer/tracing/build/generate_about_tracing_contents 2015-09-08 13:14:34.232384815 +0000 +@@ -8,6 +8,6 @@ + + if __name__ == '__main__': + top_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..')) +- sys.path.append(top_dir) ++ sys.path.insert(0, top_dir) + from tracing.build import generate_about_tracing_contents + sys.exit(generate_about_tracing_contents.main(sys.argv))