[packages/chromium-browser/dev-38: 4/7] update system jinja patch from gentoo

glen glen at pld-linux.org
Mon Oct 13 20:44:48 CEST 2014


commit fdcb38f6baaea73cb665d99a766ddb4539ac7f95
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat Oct 4 19:07:18 2014 +0300

    update system jinja patch from gentoo

 system-jinja.patch | 60 ++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 45 insertions(+), 15 deletions(-)
---
diff --git a/system-jinja.patch b/system-jinja.patch
index e301016..6a3ae46 100644
--- a/system-jinja.patch
+++ b/system-jinja.patch
@@ -1,18 +1,16 @@
---- third_party/WebKit/Source/bindings/generated_bindings.gyp.orig	2014-02-20 03:49:21.821527295 +0000
-+++ third_party/WebKit/Source/bindings/generated_bindings.gyp	2014-02-20 03:49:34.401607238 +0000
-@@ -110,9 +110,6 @@
-       'scripts/unstable/idl_compiler.py',
-       '<(DEPTH)/third_party/ply/lex.py',
-       '<(DEPTH)/third_party/ply/yacc.py',
--      # jinja2/__init__.py contains version string, so sufficient for package
--      '<(DEPTH)/third_party/jinja2/__init__.py',
--      '<(DEPTH)/third_party/markupsafe/__init__.py',  # jinja2 dep
-       '<(DEPTH)/tools/idl_parser/idl_lexer.py',
-       '<(DEPTH)/tools/idl_parser/idl_node.py',
-       '<(DEPTH)/tools/idl_parser/idl_parser.py',
---- third_party/WebKit/Source/build/scripts/scripts.gypi.orig	2014-02-20 03:49:59.351765796 +0000
-+++ third_party/WebKit/Source/build/scripts/scripts.gypi	2014-02-20 03:50:08.111821470 +0000
-@@ -1,10 +1,6 @@
+--- third_party/WebKit/Source/bindings/scripts/scripts.gyp.orig	2014-08-19 09:55:10.330972228 +0000
++++ third_party/WebKit/Source/bindings/scripts/scripts.gyp	2014-08-19 09:55:26.387286232 +0000
+@@ -54,7 +54,6 @@
+     'actions': [{
+       'action_name': 'cache_jinja_templates',
+       'inputs': [
+-        '<@(jinja_module_files)',
+         'code_generator_v8.py',
+         '<@(code_generator_template_files)',
+       ],
+--- third_party/WebKit/Source/build/scripts/scripts.gypi.orig	2014-08-19 10:00:00.216521733 +0000
++++ third_party/WebKit/Source/build/scripts/scripts.gypi	2014-08-19 10:00:11.464735099 +0000
+@@ -2,10 +2,6 @@
  {
      'variables': {
          'scripts_for_in_files': [
@@ -23,3 +21,35 @@
              'hasher.py',
              'in_file.py',
              'in_generator.py',
+--- third_party/WebKit/Source/bindings/core/v8/generated.gyp.orig	2014-08-19 10:15:53.874850750 +0000
++++ third_party/WebKit/Source/bindings/core/v8/generated.gyp	2014-08-19 10:16:04.163050746 +0000
+@@ -80,7 +80,6 @@
+       # Update that regex if command line changes (other than changing flags)
+       'action': [
+         'python',
+-        '-S',  # skip 'import site' to speed up startup
+         '<(bindings_scripts_dir)/idl_compiler.py',
+         '--cache-dir',
+         '<(bindings_scripts_output_dir)',
+--- third_party/WebKit/Source/bindings/modules/v8/generated.gyp.orig	2014-08-19 10:17:07.340279760 +0000
++++ third_party/WebKit/Source/bindings/modules/v8/generated.gyp	2014-08-19 10:17:13.556400768 +0000
+@@ -68,7 +68,6 @@
+       # Update that regex if command line changes (other than changing flags)
+       'action': [
+         'python',
+-        '-S',  # skip 'import site' to speed up startup
+         '<(bindings_scripts_dir)/idl_compiler.py',
+         '--cache-dir',
+         '<(bindings_scripts_output_dir)',
+--- third_party/WebKit/Source/bindings/scripts/scripts.gypi.orig	2014-08-19 10:53:02.824618979 +0000
++++ third_party/WebKit/Source/bindings/scripts/scripts.gypi	2014-08-19 10:53:20.784957370 +0000
+@@ -12,9 +12,6 @@
+       '<(DEPTH)/third_party/markupsafe/__init__.py',  # jinja2 dep
+     ],
+     'idl_lexer_parser_files': [
+-      # 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',
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/chromium-browser.git/commitdiff/9a5405892c0c23c48aa134fb24ac65ccaa0b5f71



More information about the pld-cvs-commit mailing list