commit: 70c3976527e032bdd94aa920e114b1b5c217f548 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Mon Oct 30 19:03:57 2017 +0000 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> CommitDate: Mon Oct 30 21:26:24 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70c39765
dev-util/electron: remove unused patches. Closes: https://github.com/gentoo/gentoo/pull/6091 dev-util/electron/files/chromium-jinja-fix.patch | 24 ------ .../electron/files/chromium-system-jinja-r11.patch | 79 ------------------- .../electron/files/chromium-system-jinja-r9.patch | 71 ----------------- .../files/electron-1.3.6-vendor-node.patch | 92 ---------------------- 4 files changed, 266 deletions(-) diff --git a/dev-util/electron/files/chromium-jinja-fix.patch b/dev-util/electron/files/chromium-jinja-fix.patch deleted file mode 100644 index 83ac33be31b..00000000000 --- a/dev-util/electron/files/chromium-jinja-fix.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/third_party/WebKit/Source/platform/v8_inspector/v8_inspector.gyp ---- b/third_party/WebKit/Source/platform/v8_inspector/v8_inspector.gyp -@@ -53,21 +53,10 @@ - 'type': 'none', - 'dependencies': ['protocol_version'], - 'variables': { -- 'conditions': [ -- ['debug_devtools=="node"', { -- # Node build -- 'jinja_module_files': [ -- '../../deps/jinja2/jinja2/__init__.py', -- '../../deps/markupsafe/markupsafe/__init__.py', # jinja2 dep -- ], -- }, { - 'jinja_module_files': [ - '<(DEPTH)/third_party/jinja2/__init__.py', - '<(DEPTH)/third_party/markupsafe/__init__.py', # jinja2 dep - ], -- } -- ], -- ], - }, - 'actions': [ - { diff --git a/dev-util/electron/files/chromium-system-jinja-r11.patch b/dev-util/electron/files/chromium-system-jinja-r11.patch deleted file mode 100644 index 0b3c9b72478..00000000000 --- a/dev-util/electron/files/chromium-system-jinja-r11.patch +++ /dev/null @@ -1,79 +0,0 @@ ---- 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': [ -- # 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', ---- 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', ---- third_party/WebKit/Source/build/scripts/scripts.gni.orig 2016-06-02 09:54:28.510152077 +0000 -+++ third_party/WebKit/Source/build/scripts/scripts.gni 2016-06-02 09:54:50.966612510 +0000 -@@ -9,10 +9,6 @@ - _scripts_dir = "//third_party/WebKit/Source/build/scripts" - - scripts_for_in_files = [ -- # jinja2/__init__.py contains version string, so sufficient as -- # dependency for whole jinja2 package -- "//third_party/jinja2/__init__.py", -- "//third_party/markupsafe/__init__.py", # jinja2 dep - "$_scripts_dir/hasher.py", - "$_scripts_dir/in_file.py", - "$_scripts_dir/in_generator.py", ---- third_party/WebKit/Source/bindings/scripts/BUILD.gn.orig 2016-06-02 10:03:01.100658943 +0000 -+++ third_party/WebKit/Source/bindings/scripts/BUILD.gn 2016-06-02 10:03:13.240907715 +0000 -@@ -36,7 +36,7 @@ - action("cached_jinja_templates") { - script = "code_generator_v8.py" - -- inputs = jinja_module_files + [ "code_generator_v8.py" ] + -+ inputs = [ "code_generator_v8.py" ] + - code_generator_template_files - - # Dummy file to track dependency. ---- third_party/WebKit/Source/platform/v8_inspector/v8_inspector.gyp.orig 2016-06-03 12:31:49.844954196 +0000 -+++ third_party/WebKit/Source/platform/v8_inspector/v8_inspector.gyp 2016-06-03 12:32:01.869198425 +0000 -@@ -60,7 +60,6 @@ - { - 'action_name': 'generateV8InspectorProtocolBackendSources', - 'inputs': [ -- '<@(jinja_module_files)', - # The python script in action below. - '../inspector_protocol/CodeGenerator.py', - # Input files for the script. ---- third_party/WebKit/Source/core/inspector/inspector.gyp.orig 2016-06-03 12:38:20.712891692 +0000 -+++ third_party/WebKit/Source/core/inspector/inspector.gyp 2016-06-03 12:38:31.197104557 +0000 -@@ -52,7 +52,6 @@ - { - 'action_name': 'generateInspectorProtocolBackendSources', - 'inputs': [ -- '<@(jinja_module_files)', - # The python script in action below. - '../../platform/inspector_protocol/CodeGenerator.py', - # Input files for the script. diff --git a/dev-util/electron/files/chromium-system-jinja-r9.patch b/dev-util/electron/files/chromium-system-jinja-r9.patch deleted file mode 100644 index 1de9083f307..00000000000 --- a/dev-util/electron/files/chromium-system-jinja-r9.patch +++ /dev/null @@ -1,71 +0,0 @@ ---- 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': [ -- # 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', ---- 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', ---- third_party/WebKit/Source/platform/inspector_protocol/protocol.gyp.orig 2016-03-23 15:10:41.522637837 +0000 -+++ third_party/WebKit/Source/platform/inspector_protocol/protocol.gyp 2016-03-23 15:10:56.938953740 +0000 -@@ -6,9 +6,6 @@ - 'variables': { - 'blink_platform_output_dir': '<(SHARED_INTERMEDIATE_DIR)/blink/platform', - '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 - ], - }, - ---- third_party/WebKit/Source/build/scripts/scripts.gni.orig 2016-06-02 09:54:28.510152077 +0000 -+++ third_party/WebKit/Source/build/scripts/scripts.gni 2016-06-02 09:54:50.966612510 +0000 -@@ -9,10 +9,6 @@ - _scripts_dir = "//third_party/WebKit/Source/build/scripts" - - scripts_for_in_files = [ -- # jinja2/__init__.py contains version string, so sufficient as -- # dependency for whole jinja2 package -- "//third_party/jinja2/__init__.py", -- "//third_party/markupsafe/__init__.py", # jinja2 dep - "$_scripts_dir/hasher.py", - "$_scripts_dir/in_file.py", - "$_scripts_dir/in_generator.py", ---- third_party/WebKit/Source/bindings/scripts/BUILD.gn.orig 2016-06-02 10:03:01.100658943 +0000 -+++ third_party/WebKit/Source/bindings/scripts/BUILD.gn 2016-06-02 10:03:13.240907715 +0000 -@@ -36,7 +36,7 @@ - action("cached_jinja_templates") { - script = "code_generator_v8.py" - -- inputs = jinja_module_files + [ "code_generator_v8.py" ] + -+ inputs = [ "code_generator_v8.py" ] + - code_generator_template_files - - # Dummy file to track dependency. diff --git a/dev-util/electron/files/electron-1.3.6-vendor-node.patch b/dev-util/electron/files/electron-1.3.6-vendor-node.patch deleted file mode 100644 index 6d55d87de68..00000000000 --- a/dev-util/electron/files/electron-1.3.6-vendor-node.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 742d610e4936d7377dd66b8ec6213c6c0afa121f Mon Sep 17 00:00:00 2001 -From: Elvis Pranskevichus <[email protected]> -Date: Wed, 10 Feb 2016 14:45:13 -0500 -Subject: [PATCH] Build fixes - ---- - lib/internal/bootstrap_node.js | 2 ++ - node.gyp | 13 ++++++++----- - src/node_main.cc | 2 ++ - 3 files changed, 12 insertions(+), 5 deletions(-) - -diff --git a/lib/internal/bootstrap_node.js b/lib/internal/bootstrap_node.js -index 3e698ed..c748f64 100644 ---- a/lib/internal/bootstrap_node.js -+++ b/lib/internal/bootstrap_node.js -@@ -50,7 +50,9 @@ - setupGlobalConsole(); - } - -+ if (!process.env.ELECTRON_NODE_DISABLE_ASAR_SUPPORT) { - setupAsarSupport(); -+ } - - const _process = NativeModule.require('internal/process'); - -diff --git a/node.gyp b/node.gyp -index 1ad0137..8f24426 100644 ---- a/node.gyp -+++ b/node.gyp -@@ -1,6 +1,7 @@ - { - 'variables': { - 'v8_use_snapshot%': 'false', -+ 'v8_gyp_path%': 'deps/v8/tools/gyp/v8.gyp', - 'node_use_dtrace%': 'false', - 'node_use_lttng%': 'false', - 'node_use_etw%': 'false', -@@ -126,6 +127,8 @@ - - 'dependencies': [ - 'node_js2c#host', -+ '<(v8_gyp_path):v8', -+ '<(v8_gyp_path):v8_libplatform' - ], - - 'include_dirs': [ -@@ -254,8 +257,8 @@ - ], - - 'dependencies': [ -- 'deps/v8/tools/gyp/v8.gyp:v8', -- 'deps/v8/tools/gyp/v8.gyp:v8_libplatform' -+ '<(v8_gyp_path):v8', -+ '<(v8_gyp_path):v8_libplatform' - ], - }], - [ 'node_use_v8_platform=="true"', { -@@ -842,13 +845,13 @@ - }], - [ 'node_use_v8_platform=="true"', { - 'dependencies': [ -- 'deps/v8/tools/gyp/v8.gyp:v8_libplatform', -+ '<(v8_gyp_path):v8_libplatform', - ], - }], - [ 'node_use_bundled_v8=="true"', { - 'dependencies': [ -- 'deps/v8/tools/gyp/v8.gyp:v8', -- 'deps/v8/tools/gyp/v8.gyp:v8_libplatform' -+ '<(v8_gyp_path):v8', -+ '<(v8_gyp_path):v8_libplatform' - ], - }], - ] -diff --git a/src/node_main.cc b/src/node_main.cc -index 02082ba..641e8db 100644 ---- a/src/node_main.cc -+++ b/src/node_main.cc -@@ -49,8 +49,10 @@ int wmain(int argc, wchar_t *wargv[]) { - } - #else - // UNIX -+#include <stdlib.h> - int main(int argc, char *argv[]) { - setvbuf(stderr, NULL, _IOLBF, 1024); -+ putenv("ELECTRON_NODE_DISABLE_ASAR_SUPPORT=1"); - return node::Start(argc, argv); - } - #endif --- -2.7.3 -
