summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPawel Hajdan, Jr <phajdan.jr@gentoo.org>2015-09-08 23:01:06 +0200
committerPawel Hajdan, Jr <phajdan.jr@gentoo.org>2015-09-08 23:01:27 +0200
commit7c186f8f74d8aca1509b3f7d6a45ce51e6fd08ec (patch)
treef856cfc141e4db59bde68d55df8b7f1e5c1e3a85 /www-client
parentpackage.mask: roll mask for www-client/chromium-47 (diff)
downloadgentoo-7c186f8f74d8aca1509b3f7d6a45ce51e6fd08ec.tar.gz
gentoo-7c186f8f74d8aca1509b3f7d6a45ce51e6fd08ec.tar.bz2
gentoo-7c186f8f74d8aca1509b3f7d6a45ce51e6fd08ec.zip
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
Diffstat (limited to 'www-client')
-rw-r--r--www-client/chromium/chromium-45.0.2454.85.ebuild1
-rw-r--r--www-client/chromium/files/chromium-tracing-r0.patch10
2 files changed, 11 insertions, 0 deletions
diff --git a/www-client/chromium/chromium-45.0.2454.85.ebuild b/www-client/chromium/chromium-45.0.2454.85.ebuild
index 70baec6ccf3d..2df11cab4822 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 000000000000..73121164077f
--- /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))