1 files changed, 0 insertions, 187 deletions
diff --git a/dev-util/electron/files/electron-1.6.15-vendor-brightray.patch b/dev-util/electron/files/electron-1.6.15-vendor-brightray.patch
deleted file mode 100644
index 6acf412173ec..000000000000
--- a/dev-util/electron/files/electron-1.6.15-vendor-brightray.patch
+++ /dev/null
@@ -1,187 +0,0 @@
-From 055fb62fc58ef7027b444dd235bc4781effa30d7 Mon Sep 17 00:00:00 2001
-From: Elvis Pranskevichus <elvis@magic.io>
-Date: Mon, 2 Oct 2017 15:22:51 -0400
-Subject: [PATCH] Gentoo build fixes
-
----
- brightray.gyp  | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
- brightray.gypi | 14 ++-------
- 2 files changed, 88 insertions(+), 19 deletions(-)
-
-diff --git a/brightray.gyp b/brightray.gyp
-index e60d17a..79e0618 100644
---- a/brightray.gyp
-+++ b/brightray.gyp
-@@ -1,7 +1,7 @@
- {
-   'variables': {
-     # The libraries brightray will be compiled to.
--    'linux_system_libraries': 'gtk+-2.0 dbus-1 x11 x11-xcb xcb xi xcursor xdamage xrandr xcomposite xext xfixes xrender xtst xscrnsaver gconf-2.0 gmodule-2.0 nss'
-+    'linux_system_libraries': 'gtk+-2.0 dbus-1 x11 x11-xcb xcb xi xcursor xdamage xrandr xcomposite xext xfixes xrender xtst xscrnsaver gmodule-2.0 nss'
-   },
-   'includes': [
-     'filenames.gypi',
-@@ -9,6 +9,11 @@
-   'targets': [
-     {
-       'target_name': 'brightray',
-+      'dependencies': [
-+        'cups',
-+        'gconf',
-+        'icu',
-+      ],
-       'type': 'static_library',
-       'include_dirs': [
-         '.',
-@@ -130,18 +135,33 @@
-             }, {
-               'link_settings': {
-                 'libraries': [
--                  # Link with ffmpeg.
--                  '<(libchromiumcontent_dir)/libffmpeg.so',
-                   # Following libraries are required by libchromiumcontent:
-+                  '-lFLAC',
-                   '-lasound',
-+                  '-lavcodec',
-+                  '-lavformat',
-+                  '-lavutil',
-                   '-lcap',
--                  '-lcups',
--                  '-lrt',
-+                  '-lcrypto',
-                   '-ldl',
--                  '-lresolv',
-+                  '-lexpat',
-                   '-lfontconfig',
-                   '-lfreetype',
--                  '-lexpat',
-+                  '-lharfbuzz',
-+                  '-ljpeg',
-+                  '-lminizip',
-+                  '-lpng',
-+                  '-lre2',
-+                  '-lresolv',
-+                  '-lrt',
-+                  '-lsnappy',
-+                  '-lssl',
-+                  '-lvpx',
-+                  '-lwebp',
-+                  '-lwebpdemux',
-+                  '-lxml2',
-+                  '-lxslt',
-+                  '-lz',
-                 ],
-               },
-             }],
-@@ -390,5 +410,64 @@
-         }],  # OS=="win"
-       ],
-     },
-+    {
-+      'target_name': 'gconf',
-+      'type': 'none',
-+      'conditions': [
-+        ['use_gconf==1 and _toolset=="target"', {
-+          'direct_dependent_settings': {
-+            'cflags': [
-+              '<!@(<(pkg-config) --cflags gconf-2.0)',
-+            ],
-+            'defines': [
-+              'USE_GCONF',
-+            ],
-+          },
-+          'link_settings': {
-+            'ldflags': [
-+              '<!@(<(pkg-config) --libs-only-L --libs-only-other gconf-2.0)',
-+            ],
-+            'libraries': [
-+              '<!@(<(pkg-config) --libs-only-l gconf-2.0)',
-+            ],
-+          },
-+        }],
-+      ],
-+    },
-+    {
-+      'target_name': 'cups',
-+      'type': 'none',
-+      'conditions': [
-+        ['use_cups==1', {
-+          'direct_dependent_settings': {
-+            'defines': [
-+              'USE_CUPS',
-+            ],
-+            'link_settings': {
-+              'libraries': [
-+                '-lcups',
-+              ],
-+            },
-+          },
-+        }],
-+      ],
-+    },
-+    {
-+      'target_name': 'icu',
-+      'type': 'none',
-+      'conditions': [
-+        ['use_system_icu==1', {
-+          'direct_dependent_settings': {
-+            'link_settings': {
-+              'libraries': [
-+                '-licui18n',
-+                '-licuuc',
-+                '-licudata',
-+              ],
-+            },
-+          },
-+        }],
-+      ],
-+    },
-   ],
- }
-diff --git a/brightray.gypi b/brightray.gypi
-index 064ae1a..95d6f14 100644
---- a/brightray.gypi
-+++ b/brightray.gypi
-@@ -1,6 +1,6 @@
- {
-   'includes': [
--    'vendor/download/libchromiumcontent/filenames.gypi',
-+    'vendor/libchromiumcontent/dist/main/filenames.gypi',
-   ],
-   'variables': {
-     'libchromiumcontent_component%': 1,
-@@ -14,7 +14,7 @@
-       }, {
-         'libchromiumcontent_dir%': '<(libchromiumcontent_static_libraries_dir)',
-         'libchromiumcontent_libraries%': '<(libchromiumcontent_static_libraries)',
--        'libchromiumcontent_v8_libraries%': '<(libchromiumcontent_static_v8_libraries)',
-+        'libchromiumcontent_v8_libraries%': '<(libchromiumcontent_shared_v8_libraries)',
-       }],
-     ],
-   },
-@@ -235,22 +235,12 @@
-         'conditions': [
-           ['OS=="linux"', {
-             'cflags': [
--              '-O2',
--              # Generate symbols, will be stripped later.
--              '-g',
--              # Don't emit the GCC version ident directives, they just end up
--              # in the .comment section taking up binary size.
--              '-fno-ident',
-               # Put data and code in their own sections, so that unused symbols
-               # can be removed at link time with --gc-sections.
-               '-fdata-sections',
-               '-ffunction-sections',
-             ],
-             'ldflags': [
--              # Specifically tell the linker to perform optimizations.
--              # See http://lwn.net/Articles/192624/ .
--              '-Wl,-O1',
--              '-Wl,--as-needed',
-               '-Wl,--gc-sections',
-             ],
-           }],  # OS=="linux"
--- 
-2.14.3
-