From c5f8e4360c84d3d1d361c070f1a0a286900760cd Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 8 Apr 2015 04:08:21 +0000
Subject: [PATCH] Link with static_library version of libgtk2ui

---
 brightray/brightray.gyp             | 18 +++++++++++++++---
 brightray/vendor/libchromiumcontent |  2 +-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/brightray/brightray.gyp b/brightray/brightray.gyp
index 3b989acb569..d5316e05f92 100644
--- a/brightray/brightray.gyp
+++ b/brightray/brightray.gyp
@@ -110,9 +110,21 @@
               '<!@(pkg-config --libs-only-l gtk+-2.0 libnotify dbus-1 x11 xrandr xext gconf-2.0)',
             ],
           },
-        }],
-        ['OS=="linux" and libchromiumcontent_component==0', {
-          '<(libchromiumcontent_dir)/libboringssl.so',
+          'conditions': [
+            ['libchromiumcontent_component', {
+              'link_settings': {
+                'libraries': [
+                  '<(libchromiumcontent_dir)/libgtk2ui.a',
+                ],
+              },
+            }, {
+              'link_settings': {
+                'libraries': [
+                  '<(libchromiumcontent_dir)/libboringssl.so',
+                ],
+              },
+            }],
+          ],
         }],
         ['OS=="mac"', {
           'link_settings': {
diff --git a/brightray/vendor/libchromiumcontent b/brightray/vendor/libchromiumcontent
index c9c7f2f62ec..c94e623f595 160000
--- a/brightray/vendor/libchromiumcontent
+++ b/brightray/vendor/libchromiumcontent
@@ -1 +1 @@
-Subproject commit c9c7f2f62ec12521956281bc71869688213bd759
+Subproject commit c94e623f5951db672958f10b098808fc2017ea40