summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Hajdan <phajdan.jr@gentoo.org>2014-03-05 04:37:08 +0000
committerPaweł Hajdan <phajdan.jr@gentoo.org>2014-03-05 04:37:08 +0000
commit9b4fa037f84339498caca9fd7050c96992d94026 (patch)
tree0e2c81e30087c0b65bef6d44567c3ea0c139bed4 /www-client/chromium/files
parentThanks for jer for reporting in bug 453396 that "And now cross-compiling migh... (diff)
downloadgentoo-2-9b4fa037f84339498caca9fd7050c96992d94026.tar.gz
gentoo-2-9b4fa037f84339498caca9fd7050c96992d94026.tar.bz2
gentoo-2-9b4fa037f84339498caca9fd7050c96992d94026.zip
Dev channel bump. Use bundled protobuf, bug #503084 by Craig Chasseur, also tested by Martin Jansa.
(Portage version: 2.2.8-r1/cvs/Linux i686, signed Manifest commit with key 0x4F1A2555EA71991D!)
Diffstat (limited to 'www-client/chromium/files')
-rw-r--r--www-client/chromium/files/chromium-system-jinja-r5.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/www-client/chromium/files/chromium-system-jinja-r5.patch b/www-client/chromium/files/chromium-system-jinja-r5.patch
new file mode 100644
index 000000000000..4a1d2e3985b6
--- /dev/null
+++ b/www-client/chromium/files/chromium-system-jinja-r5.patch
@@ -0,0 +1,31 @@
+--- third_party/WebKit/Source/bindings/generated_bindings.gyp.orig 2014-03-04 23:10:29.140572304 +0000
++++ third_party/WebKit/Source/bindings/generated_bindings.gyp 2014-03-04 23:12:53.991556052 +0000
+@@ -109,15 +109,9 @@
+
+ # Python source
+ 'jinja_module_files': [
+- # jinja2/__init__.py contains version string, so sufficient for package
+- '<(DEPTH)/third_party/jinja2/__init__.py',
+- '<(DEPTH)/third_party/markupsafe/__init__.py', # jinja2 dep
+ ],
+ 'idl_compiler_files': [
+ 'scripts/idl_compiler.py',
+- # PLY (Python Lex-Yacc)
+- '<(DEPTH)/third_party/ply/lex.py',
+- '<(DEPTH)/third_party/ply/yacc.py',
+ # Web IDL lexer/parser (base parser)
+ '<(DEPTH)/tools/idl_parser/idl_lexer.py',
+ '<(DEPTH)/tools/idl_parser/idl_node.py',
+--- third_party/WebKit/Source/build/scripts/scripts.gypi.orig 2014-03-04 23:11:54.731153647 +0000
++++ third_party/WebKit/Source/build/scripts/scripts.gypi 2014-03-04 23:12:05.861229233 +0000
+@@ -1,10 +1,6 @@
+ {
+ 'variables': {
+ 'scripts_for_in_files': [
+- # jinja2/__init__.py contains version string, so sufficient as
+- # dependency for whole jinja2 package
+- '<(DEPTH)/third_party/jinja2/__init__.py',
+- '<(DEPTH)/third_party/markupsafe/__init__.py', # jinja2 dep
+ 'hasher.py',
+ 'in_file.py',
+ 'in_generator.py',