reinit the tree, so we can have metadata

1 files changed, 163 insertions, 0 deletions

diff --git a/dev-util/electron/files/electron-1.6.11-vendor-brightray.patch b/dev-util/electron/files/electron-1.6.11-vendor-brightray.patch
new file mode 100644
index 000000000000..a1a351195d00
--- /dev/null
+++ b/dev-util/electron/files/electron-1.6.11-vendor-brightray.patch
@@ -0,0 +1,163 @@
+From 610ee2681f9532a13f63edf78aab55b1dcb8abf2 Mon Sep 17 00:00:00 2001
+From: Elvis Pranskevichus <elvis@magic.io>
+Date: Mon, 8 Feb 2016 15:14:58 -0500
+Subject: [PATCH] brightray build fixes
+
+---
+ brightray.gyp  | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
+ brightray.gypi | 14 ++-----------
+ 2 files changed, 64 insertions(+), 16 deletions(-)
+
+diff --git a/brightray.gyp b/brightray.gyp
+index e60d17a..37e5159 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,10 @@
+   'targets': [
+     {
+       'target_name': 'brightray',
++      'dependencies': [
++        'cups',
++        'gconf',
++      ],
+       'type': 'static_library',
+       'include_dirs': [
+         '.',
+@@ -130,18 +134,30 @@
+             }, {
+               'link_settings': {
+                 'libraries': [
+-                  # Link with ffmpeg.
+-                  '<(libchromiumcontent_dir)/libffmpeg.so',
+                   # Following libraries are required by libchromiumcontent:
+                   '-lasound',
+                   '-lcap',
+-                  '-lcups',
+                   '-lrt',
+                   '-ldl',
+                   '-lresolv',
+                   '-lfontconfig',
+                   '-lfreetype',
+                   '-lexpat',
++                  '-lre2',
++                  '-ljpeg',
++                  '-lsnappy',
++                  '-lharfbuzz',
++                  '-lpng',
++                  '-lxml2',
++                  '-lxslt',
++                  '-lwebp',
++                  '-lwebpdemux',
++                  '-lavcodec',
++                  '-lavformat',
++                  '-lavutil',
++                  '-lvpx',
++                  '-lFLAC',
++                  '-lminizip',
+                 ],
+               },
+             }],
+@@ -390,5 +406,47 @@
+         }],  # 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',
++              ],
++            },
++          },
++        }],
++      ],
++    },
+   ],
+ }
+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.13.3
+