www-client/chromium: fix build when dev-python/tracing is installed
authorPawel Hajdan, Jr <phajdan.jr@gentoo.org>
Tue, 8 Sep 2015 21:01:06 +0000 (23:01 +0200)
committerPawel Hajdan, Jr <phajdan.jr@gentoo.org>
Tue, 8 Sep 2015 21:01:27 +0000 (23:01 +0200)
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
www-client/chromium/files/chromium-tracing-r0.patch [new file with mode: 0644]

index 70baec6ccf3dd1248675e6292cca2579b6c724b5..2df11cab4822932350969c5a83f46dcad201d12f 100644 (file)
@@ -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 (file)
index 0000000..7312116
--- /dev/null
@@ -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))